Rebase and internal changes

- Removed verbosity check from main; now consistently using cout and cerr
- Moved rawtoaces_core_priv.h and rawtoaces_util_priv.h into tests
- Fixed argv handling in arg_parser
- Reordered non–class member functions in rawtoaces_core.cpp so that dependencies are defined before use
- Added comments for calculate_daylight_SPD and calculate_blackbody_SPD (for review)

Signed-off-by: Mikael Sundell <[email protected]>

Author: mikaelsundell

src/rawtoaces/main.cpp

@@ -55,25 +55,16 @@ int main( int argc, const char *argv[] )
         for ( auto const &input_filename: batch )
         {
             ++file_index;
-            if ( converter.settings.verbosity > 0 )
-            {
-                std::cerr << "[" << file_index << "/" << total_files
-                          << "] Processing file: " << input_filename
-                          << std::endl;
-            }
+            std::cout << "[" << file_index << "/" << total_files
+                      << "] Processing file: " << input_filename << std::endl;
 
             empty  = false;
             result = converter.process_image( input_filename );
             if ( !result )
             {
-
-                if ( converter.settings.verbosity > 0 )
-                {
-                    std::cerr << "Failed on file [" << file_index << "/"
-                              << total_files << "]: " << input_filename
-                              << std::endl;
-                }
-
+                std::cerr << "Failed on file [" << file_index << "/"
+                          << total_files << "]: " << input_filename
+                          << std::endl;
                 break;
             }
         }

src/rawtoaces_core/CMakeLists.txt

@@ -17,7 +17,6 @@ add_library( ${RAWTOACES_CORE_LIB} ${DO_SHARED}
 
     # Make the headers visible in IDEs. This should not affect the builds.
     ${CORE_PUBLIC_HEADER}
-    rawtoaces_core_priv.h
     define.h
     mathOps.h
 )

src/rawtoaces_core/rawtoaces_core.cpp

@@ -886,8 +886,9 @@ void ImageConverter::init_parser( OIIO::ArgParse &arg_parser )
         .help(
             "(-v) Print progress messages. "
             "Repeat -v to increase verbosity (e.g. -v -v, -v -v -v)." )
-        .action(
-            [&]( OIIO::cspan<const char *> argv ) { settings.verbosity++; } );
+        .action( [&]( OIIO::cspan<const char *> /* argv */ ) {
+            settings.verbosity++;
+        } );
 
     arg_parser.arg( "-v" ).hidden().action(
         [&]( OIIO::cspan<const char *> /* argv */ ) { settings.verbosity++; } );

src/rawtoaces_util/image_converter.cpp

@@ -69,6 +69,8 @@ add_test ( NAME Test_SpectralData COMMAND Test_SpectralData )
 add_executable (
 	Test_IDT
 	testIDT.cpp
+    # Make the headers visible in IDEs. This should not affect the builds.
+    rawtoaces_core_priv.h
 )
 
 target_link_libraries(
@@ -86,6 +88,8 @@ add_test ( NAME Test_IDT COMMAND Test_IDT )
 add_executable (
 	Test_Illum
 	testIllum.cpp
+    # Make the headers visible in IDEs. This should not affect the builds.
+    rawtoaces_core_priv.h
 )
 
 target_link_libraries(
@@ -103,6 +107,8 @@ add_test ( NAME Test_Illum COMMAND Test_Illum )
 add_executable (
 	Test_DNGIdt
 	testDNGIdt.cpp
+    # Make the headers visible in IDEs. This should not affect the builds.
+    rawtoaces_core_priv.h
 )
 
 target_link_libraries(
@@ -188,6 +194,8 @@ add_test ( NAME Test_UsageTimer COMMAND Test_UsageTimer )
 add_executable (
 	Test_ImageConverter
 	test_image_converter.cpp
+    # Make the headers visible in IDEs. This should not affect the builds.
+    rawtoaces_util_priv.h
 )
 
 target_link_libraries(

tests/CMakeLists.txt

@@ -17,8 +17,7 @@ namespace util
 {
 
 std::vector<std::string>
-database_paths( const std::string &override_path = "" );
-
+     database_paths( const std::string &override_path = "" );
 void fix_metadata( OIIO::ImageSpec &spec );
 
 } // namespace util

src/rawtoaces_core/rawtoaces_core_priv.h renamed to tests/rawtoaces_core_priv.h

@@ -6,7 +6,7 @@
 
 #include <rawtoaces/rawtoaces_core.h>
 #include "../src/rawtoaces_core/define.h"
-#include "../src/rawtoaces_core/rawtoaces_core_priv.h"
+#include "rawtoaces_core_priv.h"
 
 void testIDT_CcttoMired()
 {

src/rawtoaces_util/rawtoaces_util_priv.h renamed to tests/rawtoaces_util_priv.h

@@ -11,7 +11,7 @@
 
 #include "../src/rawtoaces_core/mathOps.h"
 #include <rawtoaces/rawtoaces_core.h>
-#include "../src/rawtoaces_core/rawtoaces_core_priv.h"
+#include "rawtoaces_core_priv.h"
 
 #define DATA_PATH "../_deps/rawtoaces_data-src/data/"
 

tests/testDNGIdt.cpp

@@ -11,7 +11,7 @@
 
 #include "../src/rawtoaces_core/mathOps.h"
 #include <rawtoaces/rawtoaces_core.h>
-#include "../src/rawtoaces_core/rawtoaces_core_priv.h"
+#include "rawtoaces_core_priv.h"
 
 #define DATA_PATH "../_deps/rawtoaces_data-src/data/"