diff options
author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2021-03-26 18:59:28 +0100 |
---|---|---|
committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2021-03-26 18:59:28 +0100 |
commit | 55bfa48a55dfa090cb4fa4fdcd9eae309a5a1252 (patch) | |
tree | 938b039461e8d034aa0554b0fd33ef7fa9d01c3b | |
parent | 1ef7c4c1ba476ffe1ac9ee748b3b83c2a25c69af (diff) |
Unused value + some more meaningful debug output
Change-Id: Ic8e94d97a8e85efd47c5e4f6ed9dcd87dedaa570
-rw-r--r-- | src/lib/CDRParser.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/lib/CDRParser.cpp b/src/lib/CDRParser.cpp index a309355..b9a95e9 100644 --- a/src/lib/CDRParser.cpp +++ b/src/lib/CDRParser.cpp @@ -113,7 +113,6 @@ static int parseColourString(const char *colourString, libcdr::CDRColor &colour, boost::optional<unsigned> colourModel, colourPalette; std::vector<std::string> fallbackColours; - std::string rest; std::vector<unsigned> val; if (colourString) @@ -172,6 +171,8 @@ static int parseColourString(const char *colourString, libcdr::CDRColor &colour, CDR_DEBUG_MSG(("parseColourString --> spirit grammar failed with string: %s\n", colourString)); return -1; } + CDR_DEBUG_MSG(("parseColourString --> colourModel %u, colourPalette %u, val size %lu, num fallback %lu\n", + colourModel ? colourModel.get() : 0, colourPalette ? colourPalette.get() : 0, val.size(), fallbackColours.size())); // If fallback colours exist, use the first of them, since we are more likely // to get them right then the paletted spot colours @@ -216,10 +217,10 @@ static int parseColourString(const char *colourString, libcdr::CDRColor &colour, } else { - CDR_DEBUG_MSG(("parseColourString --> bRes %i, size %lu, colorModel %u, colorValue 0x%.8x bkp: %lu\n", bRes, val.size(), colour.m_colorModel, colour.m_colorValue, fallbackColours.size())); + CDR_DEBUG_MSG(("parseColourString --> colourModel %u, colorValue 0x%.8x, return 0\n", colour.m_colorModel, colour.m_colorValue)); return 0; } - CDR_DEBUG_MSG(("parseColourString --> bRes %i, size %lu, colorModel %u, colorValue 0x%.8x blp: %lu\n", bRes, val.size(), colour.m_colorModel, colour.m_colorValue, fallbackColours.size())); + CDR_DEBUG_MSG(("parseColourString --> colourModel %u, colorValue 0x%.8x, return 1\n", colour.m_colorModel, colour.m_colorValue)); return 1; } |