Fix debug builds

samples/xmpsample.cpp

@@ -3,8 +3,9 @@
 
 #include <exiv2/exiv2.hpp>
 
-#include <iostream>
+#include <cassert>
 #include <cmath>
+#include <iostream>
 
 bool isEqual(float a, float b)
 {
@@ -79,7 +80,7 @@ try {
 
     [[maybe_unused]] const Exiv2::Value &getv6 = xmpData["Xmp.dc.six"].value();
     assert(getv6.toInt64() == 0);
-    assert(getv6.ok()^);
+    assert(getv6.ok());
     assert(getv6.toFloat() == 0.0f);
     assert(getv6.ok());
     assert(getv6.toRational() == Exiv2::Rational(0, 1));

src/bmpimage.cpp

@@ -14,6 +14,7 @@
 // + standard includes
 #include <cstring>
 #include <string>
+#include <iostream>
 
 // *****************************************************************************
 // class member definitions

src/cr2image.cpp

@@ -11,6 +11,8 @@
 #include "tiffcomposite_int.hpp"
 #include "tiffimage_int.hpp"
 
+#include <iostream>
+
 // *****************************************************************************
 // class member definitions
 namespace Exiv2 {

src/crwimage.cpp

@@ -13,6 +13,8 @@
 #include "futils.hpp"
 #include "tags.hpp"
 
+#include <iostream>
+
 // *****************************************************************************
 // class member definitions
 namespace Exiv2 {

src/gifimage.cpp

@@ -7,6 +7,8 @@
 #include "error.hpp"
 #include "futils.hpp"
 
+#include <iostream>
+
 // *****************************************************************************
 // class member definitions
 namespace Exiv2 {

src/iptc.cpp

@@ -12,6 +12,7 @@
 
 // + standard includes
 #include <algorithm>
+#include <iostream>
 
 // *****************************************************************************
 namespace {

src/jp2image.cpp

@@ -15,6 +15,7 @@
 #include "safe_op.hpp"
 
 #include <array>
+#include <iostream>
 
 // JPEG-2000 box types
 const uint32_t kJp2BoxTypeJp2Header   = 0x6a703268; // 'jp2h'

src/jpgimage.cpp

@@ -21,6 +21,8 @@
 
 #include "fff.h"
 
+#include <iostream>
+
 // *****************************************************************************
 // class member definitions
 

src/mrwimage.cpp

@@ -11,6 +11,8 @@
 #include "image.hpp"
 #include "tiffimage.hpp"
 
+#include <iostream>
+
 namespace Exiv2 {
 
     MrwImage::MrwImage(BasicIo::UniquePtr io, bool /*create*/)

src/orfimage.cpp

@@ -13,6 +13,8 @@
 #include "tiffimage.hpp"
 #include "tiffimage_int.hpp"
 
+#include <iostream>
+
 // *****************************************************************************
 // class member definitions
 namespace Exiv2 {

src/pgfimage.cpp

@@ -10,6 +10,8 @@
 #include "futils.hpp"
 #include "image.hpp"
 
+#include <iostream>
+
 // Signature from front of PGF file
 const unsigned char pgfSignature[3] = { 0x50, 0x47, 0x46 };
 

src/pngimage.cpp

@@ -18,6 +18,8 @@
 #include "tiffimage.hpp"
 #include "types.hpp"
 
+#include <iostream>
+
 // Signature from front of PNG file
 const unsigned char pngSignature[8] = { 0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A };
 

src/properties.cpp

@@ -11,6 +11,8 @@
 #include "value.hpp"
 #include "xmp_exiv2.hpp"
 
+#include <iostream>
+
 namespace {
 
     //! Struct used in the lookup table for pretty print functions

src/psdimage.cpp

@@ -11,6 +11,8 @@
 #include "image.hpp"
 #include "jpgimage.hpp"
 
+#include <iostream>
+
 // Todo: Consolidate with existing code in struct Photoshop (jpgimage.hpp):
 //       Extend this helper to a proper class with all required functionality,
 //       then move it here or into a separate file?

src/rafimage.cpp

@@ -13,6 +13,8 @@
 #include "safe_op.hpp"
 #include "tiffimage.hpp"
 
+#include <iostream>
+
 // *****************************************************************************
 // class member definitions
 namespace Exiv2 {

src/tgaimage.cpp

@@ -9,6 +9,8 @@
 #include "futils.hpp"
 #include "image.hpp"
 
+#include <iostream>
+
 // *****************************************************************************
 // class member definitions
 namespace Exiv2 {

src/tiffcomposite_int.cpp

@@ -11,6 +11,8 @@
 #include "error.hpp"
 #include "enforce.hpp"
 
+#include <iostream>
+
 // *****************************************************************************
 namespace {
     //! Add \em tobe - \em curr 0x00 filler bytes if necessary

src/tiffimage.cpp

@@ -12,6 +12,8 @@
 #include "tiffimage_int.hpp"
 #include "types.hpp"
 
+#include <iostream>
+
 /* --------------------------------------------------------------------------
 
    Todo:

src/tiffimage_int.cpp

@@ -8,6 +8,8 @@
 #include "tiffvisitor_int.hpp"
 #include "i18n.h"                // NLS support.
 
+#include <iostream>
+
 // Shortcuts for the newTiffBinaryArray templates.
 #define EXV_BINARY_ARRAY(arrayCfg, arrayDef) (newTiffBinaryArray0<&arrayCfg, EXV_COUNTOF(arrayDef), arrayDef>)
 #define EXV_SIMPLE_BINARY_ARRAY(arrayCfg) (newTiffBinaryArray1<&arrayCfg>)

src/tiffvisitor_int.cpp

@@ -14,6 +14,7 @@
 #include "jpgimage.hpp"
 #include "sonymn_int.hpp"
 
+#include <iostream>
 
 // *****************************************************************************
 namespace {

src/webpimage.cpp

@@ -17,6 +17,8 @@
 #include "safe_op.hpp"
 #include "types.hpp"
 
+#include <iostream>
+
 namespace {
     [[maybe_unused]] std::string binaryToHex(const uint8_t* data, size_t size)
     {

src/xmp.cpp

@@ -9,6 +9,7 @@
 
 // + standard includes
 #include <algorithm>
+#include <iostream>
 
 // Adobe XMP Toolkit
 #ifdef   EXV_HAVE_XMP_TOOLKIT

src/xmpsidecar.cpp

@@ -9,6 +9,8 @@
 #include "image.hpp"
 #include "xmp_exiv2.hpp"
 
+#include <iostream>
+
 namespace {
     constexpr auto xmlHeader = "<?xpacket begin=\"\xef\xbb\xbf\" id=\"W5M0MpCehiHzreSzNTczkc9d\"?>\n";
     const auto xmlHdrCnt = static_cast<long>(std::strlen(xmlHeader));  // without the trailing 0-character