fix compilation with EXIV2_DEBUG_MESSAGES

Signed-off-by: Rosen Penev <[email protected]>
Exiv2 · May 14, 2021 · bf290e8 · bf290e8
1 parent 44eb561
commit bf290e8
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/src/cr2image.cpp b/src/cr2image.cpp
@@ -175,7 +175,7 @@ namespace Exiv2 {
         };
         for (auto&& filteredIfd : filteredIfds) {
 #ifdef EXIV2_DEBUG_MESSAGES
-            std::cerr << "Warning: Exif IFD " << filteredIfds[i] << " not encoded\n";
+            std::cerr << "Warning: Exif IFD " << filteredIfd << " not encoded\n";
 #endif
             ed.erase(std::remove_if(ed.begin(), ed.end(), FindExifdatum(filteredIfd)), ed.end());
         }

diff --git a/src/exif.cpp b/src/exif.cpp
@@ -711,7 +711,7 @@ namespace Exiv2 {
         };
         for (auto&& filteredIfd : filteredIfds) {
 #ifdef EXIV2_DEBUG_MESSAGES
-            std::cerr << "Warning: Exif IFD " << filteredIfds[i] << " not encoded\n";
+            std::cerr << "Warning: Exif IFD " << filteredIfds << " not encoded\n";
 #endif
             eraseIfd(ed, filteredIfd);
         }

diff --git a/src/orfimage.cpp b/src/orfimage.cpp
@@ -181,7 +181,7 @@ namespace Exiv2 {
         };
         for (auto&& filteredIfd : filteredIfds) {
 #ifdef EXIV2_DEBUG_MESSAGES
-            std::cerr << "Warning: Exif IFD " << filteredIfds[i] << " not encoded\n";
+            std::cerr << "Warning: Exif IFD " << filteredIfds << " not encoded\n";
 #endif
             ed.erase(std::remove_if(ed.begin(), ed.end(), FindExifdatum(filteredIfd)), ed.end());
         }

diff --git a/src/rw2image.cpp b/src/rw2image.cpp
@@ -156,8 +156,8 @@ namespace Exiv2 {
                 auto dup = prevData.findKey(ExifKey(pos.key()));
                 if (dup != prevData.end()) {
 #ifdef EXIV2_DEBUG_MESSAGES
-                    std::cerr << "Filtering duplicate tag " << pos->key()
-                              << " (values '" << pos->value()
+                    std::cerr << "Filtering duplicate tag " << pos.key()
+                              << " (values '" << pos.value()
                               << "' and '" << dup->value() << "')\n";
 #endif
                     prevData.erase(dup);

diff --git a/src/tiffimage.cpp b/src/tiffimage.cpp
@@ -291,7 +291,7 @@ namespace Exiv2 {
         };
         for (auto&& filteredIfd : filteredIfds) {
 #ifdef EXIV2_DEBUG_MESSAGES
-            std::cerr << "Warning: Exif IFD " << filteredIfds[i] << " not encoded\n";
+            std::cerr << "Warning: Exif IFD " << filteredIfd << " not encoded\n";
 #endif
             ed.erase(std::remove_if(ed.begin(), ed.end(), FindExifdatum(filteredIfd)), ed.end());
         }

diff --git a/src/xmp.cpp b/src/xmp.cpp
@@ -746,7 +746,7 @@ namespace Exiv2 {
         // Register custom namespaces with XMP-SDK
         for (auto&& i : XmpProperties::nsRegistry_) {
 #ifdef EXIV2_DEBUG_MESSAGES
-            std::cerr << "Registering " << i->second.prefix_ << " : " << i->first << "\n";
+            std::cerr << "Registering " << i.second.prefix_ << " : " << i.first << "\n";
 #endif
             registerNs(i.first, i.second.prefix_);
         }