cleanup

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

Author: antond-weta

include/rawtoaces/acesrender.h

@@ -124,7 +124,7 @@ class ImageConverter
     /// Configure the converter using the command line parameters and
     /// environment variables. This is optional, the `settings` struct can also
     /// be modified manually.
-    int configure_settings( int argc, char const * const argv[] );
+    int configure_settings( int argc, char const *const argv[] );
 
     /// Collects all illuminants supported by this version.
     std::vector<std::string> supported_illuminants();

src/rawtoaces_util/acesrender.cpp

@@ -641,14 +641,13 @@ bool prepare_transform_nonDNG(
     return true;
 }
 
-int ImageConverter::configure_settings( int argc, char const * const argv[] )
+int ImageConverter::configure_settings( int argc, char const *const argv[] )
 {
     settings.database_directories = database_paths();
 
     char *cp, *sp;
     int   arg;
-//    argv[argc] = (char *)"";
-    
+
     static unordered_map<string, char> keys;
     create_key( keys );
 

unittest/config_tests/util/util_test.cpp

@@ -16,9 +16,9 @@
 
 BOOST_AUTO_TEST_CASE( Test_AcesRender )
 {
-    char const * const argv[] = {
+    char const *const argv[] = {
         "dummy_binary_path",
-
+        
     // getting "Subprocess aborted" in unit tests
     // when this is enabled on Mac, the tests fail on linux if
     // skipped completely.
@@ -31,50 +31,39 @@ BOOST_AUTO_TEST_CASE( Test_AcesRender )
         "dummy_image_path"
     };
 
+    const int argc = sizeof( argv ) / sizeof( argv[0] );
+
+    std::filesystem::path pathToRaw = std::filesystem::absolute(
+        "../../unittest/materials/blackmagic_cinema_camera_cinemadng.dng" );
+    BOOST_CHECK( std::filesystem::exists( pathToRaw ) );
+
+    rta::util::ImageConverter converter;
+
+    int arg = converter.configure_settings( argc, argv );
+    BOOST_CHECK_EQUAL( arg, argc - 1 );
+    BOOST_CHECK(
+        converter.settings.wbMethod ==
+        rta::util::ImageConverter::Settings::WBMethod::Metadata );
+    BOOST_CHECK(
+        converter.settings.matrixMethod ==
+        rta::util::ImageConverter::Settings::MatrixMethod::Metadata );
+
+    // Disable for now. Needs better checks if the installed OIIO version
+    // is compatible.
+    if ( false ) //(OIIO::openimageio_version() > 20500 )
     {
-        const int argc = sizeof( argv ) / sizeof( argv[0] );
-        
-        std::filesystem::path pathToRaw = std::filesystem::absolute(
-                                                                    "../../unittest/materials/blackmagic_cinema_camera_cinemadng.dng" );
-        BOOST_CHECK( std::filesystem::exists( pathToRaw ) );
-        
-        std::cerr << "IMAGE PATH " << pathToRaw.string() << std::endl;
-        
-        rta::util::ImageConverter converter;
-        std::cerr << "1" << std::endl;
-        
-        int arg = converter.configure_settings( argc, argv );
-        std::cerr << "2" << std::endl;
+        OIIO::ParamValueList hints;
+        bool result = converter.configure( pathToRaw.string(), hints );
+        BOOST_CHECK_EQUAL( result, true );
+
+        auto idt = converter.get_IDT_matrix();
+
+        double matrix[3][3] = { { 1.0536466144, 0.0039044182, 0.0049084502 },
+                                { -0.4899562165, 1.3614787986, 0.1020844728 },
+                                { -0.0024498461, 0.0060497128, 1.0139159537 } };
+
+        for ( size_t i = 0; i < 3; i++ )
+            for ( size_t j = 0; j < 3; j++ )
+                BOOST_CHECK_CLOSE( idt[i][j], matrix[i][j], 1e-5 );
     }
-//    BOOST_CHECK_EQUAL( arg, argc - 1 );
-//    std::cerr << "3" << std::endl;
-//    BOOST_CHECK(
-//        converter.settings.wbMethod ==
-//        rta::util::ImageConverter::Settings::WBMethod::Metadata );
-//    std::cerr << "4" << std::endl;
-//    BOOST_CHECK(
-//        converter.settings.matrixMethod ==
-//        rta::util::ImageConverter::Settings::MatrixMethod::Metadata );
-//    std::cerr << "5" << std::endl;
-//
-//    // Disable for now. Needs better checks if the installed OIIO version
-//    // is compatible.
-//    if ( false ) //(OIIO::openimageio_version() > 20500 )
-//    {
-//        OIIO::ParamValueList hints;
-//        bool result = converter.configure( pathToRaw.string(), hints );
-//        BOOST_CHECK_EQUAL( result, true );
-//
-//        auto idt = converter.get_IDT_matrix();
-//
-//        double matrix[3][3] = { { 1.0536466144, 0.0039044182, 0.0049084502 },
-//                                { -0.4899562165, 1.3614787986, 0.1020844728 },
-//                                { -0.0024498461, 0.0060497128, 1.0139159537 } };
-//
-//        for ( size_t i = 0; i < 3; i++ )
-//            for ( size_t j = 0; j < 3; j++ )
-//                BOOST_CHECK_CLOSE( idt[i][j], matrix[i][j], 1e-5 );
-//    }
-    
-    std::cerr << "5" << std::endl;
 };