simplify header inclusion in public headers

neheb · neheb · commit d4900fc90d4f · 2025-08-13T10:12:24.000-07:00
Signed-off-by: Rosen Penev &lt;rosenp@gmail.com&gt;
diff --git a/include/exiv2/basicio.hpp b/include/exiv2/basicio.hpp
@@ -3,6 +3,8 @@
 #ifndef EXIV2_BASICIO_HPP
 #define EXIV2_BASICIO_HPP
 
+#include "config.h"
+
 // *****************************************************************************
 #include "exiv2lib_export.h"
 
diff --git a/include/exiv2/bmffimage.hpp b/include/exiv2/bmffimage.hpp
@@ -3,6 +3,8 @@
 #ifndef EXIV2_BMFFIMAGE_HPP
 #define EXIV2_BMFFIMAGE_HPP
 
+#include "config.h"
+
 // *****************************************************************************
 #include "exiv2lib_export.h"
 
diff --git a/include/exiv2/convert.hpp b/include/exiv2/convert.hpp
@@ -15,10 +15,7 @@
 
 #include "exiv2lib_export.h"
 
-// included header files
-#include "config.h"
-
-// + standard includes
+// standard includes
 #include <string>
 
 // *****************************************************************************
diff --git a/include/exiv2/easyaccess.hpp b/include/exiv2/easyaccess.hpp
@@ -23,10 +23,6 @@
 #include "exif.hpp"
 
 namespace Exiv2 {
-// *****************************************************************************
-// class declarations
-class ExifData;
-
 //! Return the orientation of the image. Please keep in mind that this accessor is provided for convenience only and
 //! will return expected/desired metadata most of the time.
 EXIV2API ExifData::const_iterator orientation(const ExifData& ed);
diff --git a/include/exiv2/error.hpp b/include/exiv2/error.hpp
@@ -14,8 +14,6 @@
 // *****************************************************************************
 #include "exiv2lib_export.h"
 
-#include "config.h"
-
 #include <exception>  // for exception
 #include <sstream>    // for operator<<, ostream, ostringstream, bas...
 #include <string>     // for basic_string, string
diff --git a/include/exiv2/exif.hpp b/include/exiv2/exif.hpp
@@ -13,6 +13,8 @@
 // *****************************************************************************
 #include "exiv2lib_export.h"
 
+#include "config.h"
+
 // included header files
 #include "config.h"
 #include "metadatum.hpp"
diff --git a/include/exiv2/futils.hpp b/include/exiv2/futils.hpp
@@ -3,7 +3,6 @@
 #ifndef EXIV2_FUTILS_HPP
 #define EXIV2_FUTILS_HPP
 
-#include "config.h"
 #include "exiv2lib_export.h"
 
 #include <string>
diff --git a/include/exiv2/image.hpp b/include/exiv2/image.hpp
@@ -3,6 +3,8 @@
 #ifndef EXIV2_IMAGE_HPP
 #define EXIV2_IMAGE_HPP
 
+#include "config.h"
+
 // *****************************************************************************
 #include "exiv2lib_export.h"
 
diff --git a/include/exiv2/preview.hpp b/include/exiv2/preview.hpp
@@ -3,6 +3,8 @@
 #ifndef EXIV2_PREVIEW_HPP
 #define EXIV2_PREVIEW_HPP
 
+#include "config.h"
+
 // *****************************************************************************
 #include "exiv2lib_export.h"
 
diff --git a/include/exiv2/quicktimevideo.hpp b/include/exiv2/quicktimevideo.hpp
@@ -24,7 +24,6 @@
 #include "exiv2lib_export.h"
 
 // included header files
-#include "exif.hpp"
 #include "image.hpp"
 
 // *****************************************************************************
diff --git a/include/exiv2/riffvideo.hpp b/include/exiv2/riffvideo.hpp
@@ -2,8 +2,8 @@
 #ifndef EXIV2_RIFFVIDEO_HPP
 #define EXIV2_RIFFVIDEO_HPP
 
-#include "exif.hpp"
 #include "exiv2lib_export.h"
+
 #include "image.hpp"
 
 namespace Exiv2 {
diff --git a/include/exiv2/types.hpp b/include/exiv2/types.hpp
@@ -6,13 +6,11 @@
 #include "exiv2lib_export.h"
 
 // included header files
-#include "config.h"
 #include "slice.hpp"
 
 // standard includes
 #include <algorithm>
 #include <cstdint>
-#include <limits>
 #include <sstream>
 #include <vector>
 
diff --git a/include/exiv2/version.hpp b/include/exiv2/version.hpp
@@ -4,7 +4,6 @@
 #define EXIV2_VERSION_HPP
 
 #include "exiv2lib_export.h"
-#include "exv_conf.h"
 
 // *****************************************************************************
 // included header files
diff --git a/include/exiv2/xmp_exiv2.hpp b/include/exiv2/xmp_exiv2.hpp
@@ -7,15 +7,16 @@
 #include "exiv2lib_export.h"
 
 // included header files
+#include "datasets.hpp"
 #include "metadatum.hpp"
-#include "properties.hpp"
 
 // *****************************************************************************
 // namespace extensions
 namespace Exiv2 {
 // *****************************************************************************
 // class declarations
 class ExifData;
+class XmpKey;
 
 // *****************************************************************************
 // class definitions
diff --git a/samples/exifdata-test.cpp b/samples/exifdata-test.cpp
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <exiv2/exiv2.hpp>
+#include <iomanip>
 #include <iostream>
 
 static void write(const std::string& file, Exiv2::ExifData& ed);
diff --git a/samples/exifprint.cpp b/samples/exifprint.cpp
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <exiv2/exiv2.hpp>
+#include <iomanip>
 #include <iostream>
 #include <regex>
 
diff --git a/samples/iptcprint.cpp b/samples/iptcprint.cpp
@@ -3,6 +3,7 @@
 
 #include <exiv2/exiv2.hpp>
 
+#include <iomanip>
 #include <iostream>
 
 int main(int argc, char* const argv[]) try {
diff --git a/samples/stringto-test.cpp b/samples/stringto-test.cpp
@@ -3,6 +3,7 @@
 
 #include <exiv2/exiv2.hpp>
 
+#include <iomanip>
 #include <iostream>
 
 static constexpr const char* testcases[] = {
diff --git a/samples/write-test.cpp b/samples/write-test.cpp
@@ -2,6 +2,7 @@
 
 #include <exiv2/exiv2.hpp>
 
+#include <iomanip>
 #include <iostream>
 
 // *****************************************************************************
diff --git a/samples/write2-test.cpp b/samples/write2-test.cpp
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <exiv2/exiv2.hpp>
+#include <iomanip>
 #include <iostream>
 
 static void write(const std::string& file, Exiv2::ExifData& ed);
diff --git a/samples/xmpparse.cpp b/samples/xmpparse.cpp
@@ -2,6 +2,7 @@
 // Read an XMP packet from a file, parse it and print all (known) properties.
 
 #include <exiv2/exiv2.hpp>
+#include <iomanip>
 #include <iostream>
 
 int main(int argc, char* const argv[]) try {
diff --git a/samples/xmpparser-test.cpp b/samples/xmpparser-test.cpp
@@ -2,6 +2,7 @@
 // Read an XMP packet from a file, parse and re-serialize it.
 
 #include <exiv2/exiv2.hpp>
+#include <iomanip>
 #include <iostream>
 
 int main(int argc, char* const argv[]) try {
diff --git a/samples/xmpsample.cpp b/samples/xmpsample.cpp
@@ -5,6 +5,7 @@
 
 #include <cassert>
 #include <cmath>
+#include <iomanip>
 #include <iostream>
 
 namespace {
diff --git a/src/convert.cpp b/src/convert.cpp
@@ -7,14 +7,16 @@
              20-May-08, vn:  added actual conversion logic
  */
 // *****************************************************************************
+#include "config.h"
+
 // included header files
 #include "convert.hpp"
-#include "config.h"
 #include "error.hpp"
 #include "exif.hpp"
 #include "futils.hpp"
 #include "image_int.hpp"
 #include "iptc.hpp"
+#include "properties.hpp"
 #include "types.hpp"
 #include "xmp_exiv2.hpp"
 
diff --git a/src/crwimage_int.hpp b/src/crwimage_int.hpp
@@ -19,7 +19,6 @@
 // namespace extensions
 namespace Exiv2 {
 class Image;
-struct DataBuf;
 
 namespace Internal {
 // *****************************************************************************
diff --git a/src/easyaccess.cpp b/src/easyaccess.cpp
@@ -3,6 +3,8 @@
 #include "easyaccess.hpp"
 #include "utils.hpp"
 
+#include <sstream>
+
 // *****************************************************************************
 namespace {
 using namespace Exiv2;
diff --git a/src/image_int.hpp b/src/image_int.hpp
@@ -3,6 +3,8 @@
 #ifndef IMAGE_INT_HPP_
 #define IMAGE_INT_HPP_
 
+#include "config.h"
+
 // *****************************************************************************
 // included header files
 #include "slice.hpp"  // for Slice
diff --git a/src/iptc.cpp b/src/iptc.cpp
@@ -1,5 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include "config.h"
+
 // included header files
 #include "iptc.hpp"
 
diff --git a/src/metadatum.cpp b/src/metadatum.cpp
@@ -2,6 +2,8 @@
 
 #include "metadatum.hpp"
 
+#include <sstream>
+
 namespace Exiv2 {
 
 Key::~Key() = default;
diff --git a/src/nikonmn_int.cpp b/src/nikonmn_int.cpp
@@ -1,5 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include "config.h"
+
 // included header files
 #include "nikonmn_int.hpp"
 
@@ -14,6 +16,7 @@
 // + standard includes
 #include <array>
 #include <cmath>
+#include <iomanip>
 
 // *****************************************************************************
 // class member definitions
diff --git a/src/pentaxmn_int.cpp b/src/pentaxmn_int.cpp
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "config.h"
-
 #include "pentaxmn_int.hpp"
 
 // included header files
@@ -25,6 +23,44 @@ class LensInfoNotFound : public std::exception {
 // *****************************************************************************
 // class member definitions
 namespace Exiv2::Internal {
+/*!
+  @brief Print function to translate Pentax "combi-values" to a description
+         by looking up a reference table.
+ */
+template <size_t N, const TagDetails (&array)[N], int count, int ignoredcount, int ignoredcountmax>
+std::ostream& printCombiTag(std::ostream& os, const Value& value, const ExifData* metadata) {
+  static_assert(N > 0, "Passed zero length printCombiTag");
+  std::ios::fmtflags f(os.flags());
+  if ((value.count() != count &&
+       (value.count() < (count + ignoredcount) || value.count() > (count + ignoredcountmax))) ||
+      count > 4) {
+    return printValue(os, value, metadata);
+  }
+  uint32_t l = 0;
+  for (int c = 0; c < count; ++c) {
+    if (value.toInt64(c) < 0 || value.toInt64(c) > 255) {
+      return printValue(os, value, metadata);
+    }
+    l += (value.toUint32(c) << ((count - c - 1) * 8));
+  }
+  if (auto td = Exiv2::find(array, l)) {
+    os << exvGettext(td->label_);
+  } else {
+    os << exvGettext("Unknown") << " (0x" << std::setw(2 * count) << std::setfill('0') << std::hex << l << std::dec
+       << ")";
+  }
+
+  os.flags(f);
+  return os;
+}
+
+//! Shortcut for the printCombiTag template which requires typing the array name only once.
+#define EXV_PRINT_COMBITAG(array, count, ignoredcount) \
+  printCombiTag<std::size(array), array, count, ignoredcount, ignoredcount>
+//! Shortcut for the printCombiTag template which requires typing the array name only once.
+#define EXV_PRINT_COMBITAG_MULTI(array, count, ignoredcount, ignoredcountmax) \
+  printCombiTag<std::size(array), array, count, ignoredcount, ignoredcountmax>
+
 //! ShootingMode, tag 0x0001
 constexpr TagDetails pentaxShootingMode[] = {
     {0, N_("Auto")},
diff --git a/src/pentaxmn_int.hpp b/src/pentaxmn_int.hpp
diff --git a/src/photoshop.cpp b/src/photoshop.cpp
diff --git a/src/preview.cpp b/src/preview.cpp
diff --git a/src/properties.cpp b/src/properties.cpp
diff --git a/src/quicktimevideo.cpp b/src/quicktimevideo.cpp
diff --git a/src/sonymn_int.cpp b/src/sonymn_int.cpp
diff --git a/src/tags_int.cpp b/src/tags_int.cpp
diff --git a/src/tiffvisitor_int.cpp b/src/tiffvisitor_int.cpp
diff --git a/src/tiffvisitor_int.hpp b/src/tiffvisitor_int.hpp
diff --git a/src/types.cpp b/src/types.cpp
diff --git a/src/value.cpp b/src/value.cpp
diff --git a/src/version.cpp b/src/version.cpp
diff --git a/src/xmp.cpp b/src/xmp.cpp
diff --git a/src/xmpsidecar.cpp b/src/xmpsidecar.cpp
