diff options
| author | ALONSO Laurent <laurent.alonso@inria.fr> | 2021-09-19 13:01:50 +0200 |
|---|---|---|
| committer | ALONSO Laurent <laurent.alonso@inria.fr> | 2021-09-19 13:01:50 +0200 |
| commit | 161cd06164397f8eef8698b6781543b8e84a2bca (patch) | |
| tree | 0565f991f1e021d6c4e8cd2ae5358b97b7d4c834 | |
| parent | 41f8aa4dc9203631ade0ac3135c3e92f79bb6858 (diff) | |
gcc: correct some warnings...
Change-Id: I35dd857bf0c879222467ecefcfcbe97e2da1bcff
| -rw-r--r-- | src/lib/IWAParser.cpp | 4 | ||||
| -rw-r--r-- | src/lib/IWORKXMLParserState.cpp | 1 | ||||
| -rw-r--r-- | src/lib/libetonyek_utils.cpp | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/lib/IWAParser.cpp b/src/lib/IWAParser.cpp index d4f914a..8519856 100644 --- a/src/lib/IWAParser.cpp +++ b/src/lib/IWAParser.cpp @@ -2810,7 +2810,7 @@ void IWAParser::parseTileDefinition(unsigned row, unsigned column, RVNGInputStre bool numberSet=false; auto begPos=input->tell(); - if (begPos+(oldFormat ? 10 : 12)>endPos) + if (begPos+(oldFormat ? 10 : 12)>long(endPos)) { ETONYEK_DEBUG_MSG(("IWAParser::parseTileDefinition: the zone seems too short\n")); return; @@ -3330,7 +3330,7 @@ bool IWAParser::parseFormat(const IWAMessage &msg, IWAParser::Format &format) auto it= m_uidFormatMap.find(get(uid)); if (it==m_uidFormatMap.end()) { - ETONYEK_DEBUG_MSG(("IWAParser::parseFormat: can not find the format %llx\n", get(uid))); + ETONYEK_DEBUG_MSG(("IWAParser::parseFormat: can not find the format %x\n", unsigned(get(uid)))); return false; } format=it->second; diff --git a/src/lib/IWORKXMLParserState.cpp b/src/lib/IWORKXMLParserState.cpp index fb5cc03..764e650 100644 --- a/src/lib/IWORKXMLParserState.cpp +++ b/src/lib/IWORKXMLParserState.cpp @@ -25,6 +25,7 @@ IWORKXMLParserState::IWORKXMLParserState(IWORKParser &parser, IWORKCollector &co : m_tableData() , m_stylesheet() , m_enableCollector(true) + , m_formatNameMap() , m_tableNameMap(std::make_shared<IWORKTableNameMap_t>()) , m_langManager() , m_currentTable() diff --git a/src/lib/libetonyek_utils.cpp b/src/lib/libetonyek_utils.cpp index 419697e..5e12d96 100644 --- a/src/lib/libetonyek_utils.cpp +++ b/src/lib/libetonyek_utils.cpp @@ -11,7 +11,9 @@ #include <cmath> #include <cstdarg> +#include <cstdint> #include <cstdio> +#include <cstdlib> #include <limits> #include <stdexcept> @@ -597,7 +599,7 @@ try else { width=double(readU32(stream, false)); - height=double(std::abs<int32_t>(int32_t(readU32(stream, false)))); + height=static_cast<double>(std::abs(int32_t(readU32(stream, false)))); if (headerSz>=46) { stream->seek(38, librevenge::RVNG_SEEK_SET); |