Skip to content

Commit bbb062a

Browse files
committed
Fix exiting tests and add two more
Signed-off-by: Aleksandr Motsjonov <[email protected]>
1 parent 412d41f commit bbb062a

File tree

2 files changed

+124
-169
lines changed

2 files changed

+124
-169
lines changed

src/rawtoaces_util/image_converter.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1439,11 +1439,11 @@ bool ImageConverter::configure(
14391439
return false;
14401440
}
14411441

1442-
bool spectral_white_balance =
1442+
bool is_spectral_white_balance =
14431443
settings.WB_method == Settings::WBMethod::Illuminant;
1444-
bool spectral_matrix = matrix_method == Settings::MatrixMethod::Spectral;
1444+
bool is_spectral_matrix = matrix_method == Settings::MatrixMethod::Spectral;
14451445

1446-
if ( spectral_white_balance || spectral_matrix )
1446+
if ( is_spectral_white_balance || is_spectral_matrix )
14471447
{
14481448
if ( !prepare_transform_spectral(
14491449
image_spec,
@@ -1457,7 +1457,7 @@ bool ImageConverter::configure(
14571457
return false;
14581458
}
14591459

1460-
if ( spectral_white_balance )
1460+
if ( is_spectral_white_balance )
14611461
{
14621462
float custom_WB[4];
14631463

@@ -1580,9 +1580,9 @@ bool ImageConverter::configure(
15801580

15811581
if ( settings.crop_box[2] > 0 && settings.crop_box[3] > 0 )
15821582
{
1583-
std::cerr << " Crop box: [" << settings.crop_box[0] << ", "
1584-
<< settings.crop_box[1] << ", " << settings.crop_box[2]
1585-
<< ", " << settings.crop_box[3] << "]" << std::endl;
1583+
std::cerr << " Crop box: ["
1584+
<< OIIO::Strutil::join( settings.crop_box, ", " ) << "]"
1585+
<< std::endl;
15861586
}
15871587

15881588
std::cerr << " Demosaic: " << settings.demosaic_algorithm << std::endl;

0 commit comments

Comments
 (0)