Merge pull request #1801 from kevinbackhouse/FixBuildDebugMessages

Fix build error when EXIV2_DEBUG_MESSAGES is enabled
Exiv2 · Jul 26, 2021 · c6f7e48 · c6f7e48
2 parents de6b706 + f0371af
commit c6f7e48
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/iptc.cpp b/src/iptc.cpp
@@ -366,7 +366,7 @@ namespace Exiv2 {
             sprintf(buff, "  %6d | %7d | %-24s | %6d | ", record, dataset,
                     Exiv2::IptcDataSets::dataSetName(dataset, record).c_str(), len);
 
-            enforce(bytes.size() - i >= 5 + len, kerCorruptedMetadata);
+            enforce(bytes.size() - i >= 5 + static_cast<size_t>(len), kerCorruptedMetadata);
             out << buff << Internal::binaryToString(makeSlice(bytes, i + 5, i + 5 + (len > 40 ? 40 : len)))
                 << (len > 40 ? "..." : "")
                 << std::endl;

diff --git a/src/jpgimage.cpp b/src/jpgimage.cpp
@@ -693,7 +693,7 @@ namespace Exiv2 {
                         if (size >= 16) {
                             out.write(reinterpret_cast<const char*>(buf.pData_ + 16), size - 16);
 #ifdef EXIV2_DEBUG_MESSAGES
-                            std::cout << "iccProfile size = " << icc.size_ << std::endl;
+                            std::cout << "iccProfile size = " << size - 16 << std::endl;
 #endif
                         }
                     } else if (option == kpsIptcErase && signature.compare("Photoshop 3.0") == 0) {