clean up header includes a bit

more grouping.

Signed-off-by: Rosen Penev <[email protected]>

Author: neheb

src/bmffimage.cpp

@@ -10,14 +10,14 @@
 #include "futils.hpp"
 #include "image.hpp"
 #include "image_int.hpp"
-#include "safe_op.hpp"
 #include "tiffcomposite_int.hpp"
 #include "tiffimage_int.hpp"
 #include "types.hpp"
 #include "utils.hpp"
 
 #ifdef EXV_HAVE_BROTLI
 #include <brotli/decode.h>  // for JXL brob
+#include "safe_op.hpp"
 #endif
 
 // + standard includes

src/bmpimage.cpp

@@ -7,6 +7,7 @@
 
 #include "bmpimage.hpp"
 #include "basicio.hpp"
+#include "config.h"
 #include "error.hpp"
 #include "futils.hpp"
 #include "image.hpp"

src/convert.cpp

@@ -7,13 +7,11 @@
              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"
@@ -25,6 +23,9 @@
 #include <functional>
 
 #ifdef EXV_HAVE_ICONV
+#ifndef SUPPRESS_WARNINGS
+#include "futils.hpp"
+#endif
 #include <iconv.h>
 #elif defined _WIN32
 #include <windows.h>

src/crwimage.cpp

@@ -5,9 +5,8 @@
   History:   28-Aug-05, ahu: created
  */
 // included header files
-#include "config.h"
-
 #include "crwimage.hpp"
+#include "config.h"
 #include "crwimage_int.hpp"
 #include "error.hpp"
 #include "futils.hpp"

src/crwimage_int.cpp

@@ -1,9 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "config.h"
-
-#include "canonmn_int.hpp"
 #include "crwimage_int.hpp"
+#include "canonmn_int.hpp"
+#include "config.h"
 #include "enforce.hpp"
 #include "error.hpp"
 #include "i18n.h"  // NLS support.

src/datasets.cpp

@@ -9,9 +9,8 @@
 #include "datasets.hpp"
 #include "error.hpp"
 #include "i18n.h"  // NLS support.
-#include "types.hpp"
-
 #include "image_int.hpp"
+#include "types.hpp"
 
 #include <iomanip>
 

src/easyaccess.cpp

@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 // included header files
 #include "easyaccess.hpp"
+
 #include "utils.hpp"
 
 #include <sstream>

src/epsimage.cpp

@@ -8,11 +8,11 @@
  */
 // *****************************************************************************
 // included header files
-#include "config.h"
+#include "epsimage.hpp"
 
 #include "basicio.hpp"
+#include "config.h"
 #include "enforce.hpp"
-#include "epsimage.hpp"
 #include "error.hpp"
 #include "futils.hpp"
 #include "image.hpp"

src/http.cpp

@@ -1,9 +1,8 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include "http.hpp"
 #include "config.h"
-
 #include "futils.hpp"
-#include "http.hpp"
 
 #include <array>
 #include <cerrno>

src/iptc.cpp

@@ -1,10 +1,8 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "config.h"
-
 // included header files
 #include "iptc.hpp"
-
+#include "config.h"
 #include "datasets.hpp"
 #include "enforce.hpp"
 #include "error.hpp"