summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFridrich Štrba <fridrich.strba@bluewin.ch>2020-02-19 08:17:04 +0100
committerFridrich Štrba <fridrich.strba@bluewin.ch>2020-02-19 08:17:04 +0100
commit900c54843680df8fe5c0209fd6935c2591b093f9 (patch)
tree6a0390040a75b63a8c52fdc99c180ed8317dc3c3
parent637b22b22fa71ee2d6e58f4dc12792b2b2ae8ea0 (diff)
Move debug messages inside the _resolveColorPalette function
Change-Id: I07aff123bf56d5202acca17233d525cf572a5ffc
-rw-r--r--src/lib/CDRParser.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/lib/CDRParser.cpp b/src/lib/CDRParser.cpp
index d95a6bf..c6c9d97 100644
--- a/src/lib/CDRParser.cpp
+++ b/src/lib/CDRParser.cpp
@@ -784,12 +784,8 @@ libcdr::CDRColor libcdr::CDRParser::readColor(librevenge::RVNGInputStream *input
tmpColor.m_colorValue = readU32(input);
}
- CDR_DEBUG_MSG(("CDRParser::readColor --> colorModel 0x%x -- colorPalette 0x%x -- colorValue 0x%x\n", tmpColor.m_colorModel, tmpColor.m_colorPalette, tmpColor.m_colorValue));
-
_resolveColorPalette(tmpColor);
- CDR_DEBUG_MSG(("CDRParser::readColor resolved --> colorModel 0x%x -- colorPalette 0x%x -- colorValue 0x%x\n", tmpColor.m_colorModel, tmpColor.m_colorPalette, tmpColor.m_colorValue));
-
return tmpColor;
}
@@ -3144,6 +3140,8 @@ void libcdr::CDRParser::_skipX3Optional(librevenge::RVNGInputStream *input)
void libcdr::CDRParser::_resolveColorPalette(libcdr::CDRColor &color)
{
+ CDR_DEBUG_MSG(("CDRParser::_resolveColorPalette --> model 0x%x -- palette 0x%x -- value 0x%x\n", color.m_colorModel, color.m_colorPalette, color.m_colorValue));
+
unsigned char r = 0;
unsigned char g = 0;
unsigned char b = 0;
@@ -3561,6 +3559,9 @@ void libcdr::CDRParser::_resolveColorPalette(libcdr::CDRColor &color)
break;
}
}
+
+ CDR_DEBUG_MSG(("CDRParser::_resolveColorPalette resolved --> model 0x%x -- palette 0x%x -- value 0x%x\n", color.m_colorModel, color.m_colorPalette, color.m_colorValue));
+
}
/* vim:set shiftwidth=2 softtabstop=2 expandtab: */