From fa52d7e2cb987cabc9299186d902216673b9f6fa Mon Sep 17 00:00:00 2001
From: Kevin Backhouse <kevinbackhouse@github.com>
Date: Mon, 12 Jul 2021 18:00:35 +0100
Subject: [PATCH] Better way to print the error message.

---
 src/crwimage_int.cpp                                    | 4 +---
 tests/bugfixes/github/test_issue_ghsa_mv9g_fxh2_m49m.py | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/crwimage_int.cpp b/src/crwimage_int.cpp
index fd139271..eac64ddd 100644
--- a/src/crwimage_int.cpp
+++ b/src/crwimage_int.cpp
@@ -1237,9 +1237,7 @@ namespace Exiv2 {
                 if (len < s) len = s;
                 exif.copy(buf.pData_ + exif.tag() * 2, byteOrder);
             } else {
-#ifdef EXIV2_DEBUG_MESSAGES
-                std::cerr << "packIfdId out-of-bounds error: s = " << std::dec << s << "\n";
-#endif
+                EXV_ERROR << "packIfdId out-of-bounds error: s = " << std::dec << s << "\n";
             }
         }
         // Round the size to make it even.
diff --git a/tests/bugfixes/github/test_issue_ghsa_mv9g_fxh2_m49m.py b/tests/bugfixes/github/test_issue_ghsa_mv9g_fxh2_m49m.py
index eb86c49f..c896ef7a 100644
--- a/tests/bugfixes/github/test_issue_ghsa_mv9g_fxh2_m49m.py
+++ b/tests/bugfixes/github/test_issue_ghsa_mv9g_fxh2_m49m.py
@@ -5,7 +5,7 @@ from system_tests import CaseMeta, path
 class test_issue_ghsa_mv9g_fxh2_m49m(metaclass=CaseMeta):
 
     filename = path("$data_path/test_issue_ghsa_mv9g_fxh2_m49m.crw")
-    commands  = ["$exiv2 fi $filename"]
+    commands  = ["$exiv2 -q fi $filename"]
     stdout = [""]
     stderr = ["""Exiv2 exception in fixiso action for file $filename:
 $kerCorruptedMetadata