@@ -41,20 +41,20 @@ class ImageConverter
4141 // / the camera.
4242 Illuminant,
4343 // / Calculate white balance by averaging over a specified region of
44- // / the image. See `wbBox `. In this mode if an empty box if provided,
44+ // / the image. See `WB_box `. In this mode if an empty box if provided,
4545 // / white balancing is done by averaging over the whole image.
4646 Box,
4747 // / Use custom white balancing multipliers. This mode is useful if
4848 // / the white balancing coefficients are calculated by an external
4949 // / tool.
5050 Custom
51- } wbMethod = WBMethod::Metadata;
51+ } WB_method = WBMethod::Metadata;
5252
5353 enum class MatrixMethod
5454 {
5555 // / Use the camera spectral sensitivity curves to solve for the colour
5656 // / conversion matrix. In this mode the illuminant is either provided
57- // / directly in `illuminant` if `wbMethod ` ==
57+ // / directly in `illuminant` if `WB_method ` ==
5858 // / `WBMethod::Illuminant`, or the best illuminant is derived from the
5959 // / white balancing multipliers.
6060 Spectral,
@@ -67,7 +67,7 @@ class ImageConverter
6767 // / Specify a custom matrix in `colourMatrix`. This mode is useful if
6868 // / the matrix is calculated by an external tool.
6969 Custom
70- } matrixMethod = MatrixMethod::Spectral;
70+ } matrix_method = MatrixMethod::Spectral;
7171
7272 // / Cropping mode.
7373 enum class CropMode
@@ -81,18 +81,18 @@ class ImageConverter
8181 } crop_mode = CropMode::Hard;
8282
8383 // / An illuminant to use for white balancing and/or colour matrix
84- // / calculation. Only used when `wbMethod ` ==
85- // / `WBMethod::Illuminant` and `matrixMethod ` == `MatrixMethod::Spectral`.
84+ // / calculation. Only used when `WB_method ` ==
85+ // / `WBMethod::Illuminant` and `matrix_method ` == `MatrixMethod::Spectral`.
8686 // / An illuminant can be provided as a black body correlated colour
8787 // / temperature, like `3200K`; or a D-series illuminant, like `D56`;
8888 // / or any other illuminant, in such case it must be present in the data
8989 // / folder.
9090 std::string illuminant;
9191
92- float headroom = 6.0 ;
93- int wbBox [4 ] = { 0 };
94- float customWB [4 ] = { 1.0 , 1.0 , 1.0 , 1.0 };
95- float customMatrix [3 ][3 ] = { { 1 , 0 , 0 }, { 0 , 1 , 0 }, { 0 , 0 , 1 } };
92+ float headroom = 6.0 ;
93+ int WB_box [4 ] = { 0 };
94+ float custom_WB [4 ] = { 1.0 , 1.0 , 1.0 , 1.0 };
95+ float custom_matrix [3 ][3 ] = { { 1 , 0 , 0 }, { 0 , 1 , 0 }, { 0 , 0 , 1 } };
9696
9797 std::string custom_camera_make;
9898 std::string custom_camera_model;
@@ -105,8 +105,8 @@ class ImageConverter
105105 bool half_size = false ;
106106 int highlight_mode = 0 ;
107107 int flip = 0 ;
108- int cropbox [4 ] = { 0 , 0 , 0 , 0 };
109- float aberration [2 ] = { 1 .0f , 1 .0f };
108+ int crop_box [4 ] = { 0 , 0 , 0 , 0 };
109+ float chromatic_aberration [2 ] = { 1 .0f , 1 .0f };
110110 float denoise_threshold = 0 ;
111111 float scale = 1 .0f ;
112112 std::string demosaic_algorithm = " AHD" ;
0 commit comments