diff --git a/include/rawtoaces/image_converter.h b/include/rawtoaces/image_converter.h index d050a272..e1a78f1b 100644 --- a/include/rawtoaces/image_converter.h +++ b/include/rawtoaces/image_converter.h @@ -160,14 +160,14 @@ class ImageConverter /// decode the pixels. /// @param input_filename /// A file name of the raw image file to read the metadata from. - /// @param hints + /// @param options /// Conversion hints to be passed to OIIO when reading an image file. /// The list can be pre- or post- updated with other hints, unrelated to /// the rawtoaces conversion. /// @result /// `true` if configured successfully. bool configure( - const std::string &input_filename, const OIIO::ParamValueList &hints ); + const std::string &input_filename, OIIO::ParamValueList &options ); /// Configures the converter using the requested white balance and colour /// matrix method, and the metadata of the given OIIO::ImageSpec object. @@ -175,14 +175,14 @@ class ImageConverter /// on disk operations. /// @param imageSpec /// An image spec obtained from OIIO::ImageInput or OIIO::ImageBuf. - /// @param hints + /// @param options /// Conversion hints to be passed to OIIO when reading an image file. /// The list can be pre- or post- updated with other hints, unrelated to /// the rawtoaces conversion. /// @result /// `true` if configured successfully. bool configure( - const OIIO::ImageSpec &imageSpec, const OIIO::ParamValueList &hints ); + const OIIO::ImageSpec &imageSpec, OIIO::ParamValueList &options ); /// Load an image from a given `path` into a `buffer` using the `hints` /// calculated by the `configure` method. The hints can be manually diff --git a/src/rawtoaces_util/image_converter.cpp b/src/rawtoaces_util/image_converter.cpp index e03beb66..190228bf 100644 --- a/src/rawtoaces_util/image_converter.cpp +++ b/src/rawtoaces_util/image_converter.cpp @@ -1239,9 +1239,8 @@ void fix_metadata( OIIO::ImageSpec &spec ) } bool ImageConverter::configure( - const std::string &input_filename, const OIIO::ParamValueList &hints = {} ) + const std::string &input_filename, OIIO::ParamValueList &options ) { - OIIO::ParamValueList options = hints; options["raw:ColorSpace"] = "XYZ"; options["raw:use_camera_wb"] = 0; options["raw:use_auto_wb"] = 0; @@ -1275,9 +1274,8 @@ bool ImageConverter::configure( // -G - green_matching() filter bool ImageConverter::configure( - const OIIO::ImageSpec &image_spec, const OIIO::ParamValueList &hints = {} ) + const OIIO::ImageSpec &image_spec, OIIO::ParamValueList &options ) { - OIIO::ParamValueList options = hints; options["raw:use_camera_wb"] = 0; options["raw:use_auto_wb"] = 0;