removed more unnecessary stuff from public headers

Signed-off-by: Anton Dukhovnikov <[email protected]>

Author: antond-weta

config/RAWTOACESConfig.cmake.in

@@ -12,10 +12,10 @@ if( EXISTS "${RAWTOACES_CMAKE_DIR}/CMakeCache.txt" )
   include( "${RAWTOACES_CMAKE_DIR}/RAWTOACESBuildTreeSettings.cmake" )
 else()
   set( RAWTOACES_INCLUDE_DIRS "${RAWTOACES_CMAKE_DIR}/@CONF_REL_INCLUDE_DIR@" )
-endif
+endif()
 
 # setup our library dependencies (i.e. ilmbase)
-include( "${RAWTOACES_CMAKE_DIR}/RAWTOACESLibraryDepends.cmake" )
+# include( "${RAWTOACES_CMAKE_DIR}/RAWTOACESLibraryDepends.cmake" )
 
 set( RAWTOACES_LIBRARIES RAWTOACES )
 set( RAWTOACES_EXECUTABLE rawtoaces )

include/rawtoaces/acesrender.h

@@ -56,7 +56,7 @@
 #define _ACESRENDER_h__
 
 #include <rawtoaces/rta.h>
-
+#include <libraw/libraw.h>
 #include <unordered_map>
 
 using namespace rta;
@@ -67,8 +67,8 @@ void usage( const char *prog );
 class LibRawAces : virtual public LibRaw
 {
 public:
-    LibRawAces(){};
-    ~LibRawAces(){};
+    LibRawAces() {};
+    ~LibRawAces() {};
 
     void show() { printf( "I am here with LibRawAces.\n" ); }
 };

include/rawtoaces/define.h

@@ -55,8 +55,9 @@
 #define _DEFINE_h__
 
 #include <string>
+#include <vector>
 #include <algorithm>
-#include <boost/filesystem.hpp>
+#include <filesystem>
 
 #ifndef WIN32
 #    include <sys/stat.h>
@@ -357,9 +358,9 @@ inline vector<string> openDir( string path = "." )
 {
     vector<string> paths;
 
-    for ( auto &i: boost::filesystem::directory_iterator( path ) )
+    for ( auto &i: filesystem::directory_iterator( path ) )
     {
-        if ( i.status().type() != boost::filesystem::file_type::directory_file )
+        if ( i.status().type() != filesystem::file_type::directory )
             paths.push_back( i.path().string() );
     }
 

include/rawtoaces/rta.h

@@ -58,9 +58,7 @@
 #include "define.h"
 
 #include <stdint.h>
-#include <libraw/libraw.h>
 
-#include "mathOps.h"
 #include "metadata.h"
 
 using namespace std;
@@ -69,8 +67,8 @@ namespace rta
 {
 struct CIEXYZ
 {
-    CIEXYZ(){};
-    CIEXYZ( double X, double Y, double Z ) : _Xt( X ), _Yt( Y ), _Zt( Z ){};
+    CIEXYZ() {};
+    CIEXYZ( double X, double Y, double Z ) : _Xt( X ), _Yt( Y ), _Zt( Z ) {};
     double _Xt;
     double _Yt;
     double _Zt;
@@ -92,9 +90,9 @@ struct CMF
 
 struct RGBSen
 {
-    RGBSen(){};
+    RGBSen() {};
     RGBSen( double R, double G, double B )
-        : _RSen( R ), _GSen( G ), _BSen( B ){};
+        : _RSen( R ), _GSen( G ), _BSen( B ) {};
 
     double _RSen;
     double _GSen;
@@ -145,7 +143,7 @@ class Spst
         : _brand( brand )
         , _model( model )
         , _increment( increment )
-        , _rgbsen( rgbsen ){};
+        , _rgbsen( rgbsen ) {};
     ~Spst();
 
     void setBrand( const char *brand );

src/rawtoaces_idt/CMakeLists.txt

@@ -15,7 +15,6 @@ target_link_libraries(
     PUBLIC
         Boost::boost
         Boost::system
-        Boost::filesystem
         Imath::Imath
         Imath::ImathConfig
 )

src/rawtoaces_util/CMakeLists.txt

@@ -18,6 +18,7 @@ endif()
 target_link_libraries ( ${RAWTOACESLIB}
     PUBLIC
         ${RAWTOACESIDTLIB}
+        Boost::filesystem
     INTERFACE
         Eigen3::Eigen
         Imath::Imath

src/rawtoaces_util2/rawtoaces_util.cpp

@@ -6,6 +6,7 @@
 #include <rawtoaces/define.h>
 #include <rawtoaces/metadata.h>
 #include <rawtoaces/rta.h>
+#include <rawtoaces/mathOps.h>
 
 #include <OpenImageIO/imageio.h>
 #include <OpenImageIO/imagebuf.h>
@@ -296,15 +297,12 @@ bool check_param(
                 return false;
             }
 
-            if ( param_value.size() != correct_size )
-            {
-                std::cerr << "Warning: The parameter \"" << param_name
-                          << "\" must have " << correct_size << " values. "
-                          << default_value_message << std::endl;
+            std::cerr << "Warning: The parameter \"" << param_name
+                      << "\" must have " << correct_size << " values. "
+                      << default_value_message << std::endl;
 
-                on_failure();
-                return false;
-            }
+            on_failure();
+            return false;
         }
     }
     else

unittest/testDNGIdt.cpp

@@ -57,6 +57,8 @@
 #include <boost/filesystem.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 
+#include <libraw/libraw.h>
+
 #include <rawtoaces/rta.h>
 
 using namespace std;