TonemapCommand::Run: Use `image` consistently (#3283) Once the local variable `image` is declared and initialized to decoder->image, use `image` intead of `decoder->image` consistently.
diff --git a/apps/avifgainmaputil/swapbase_command.cc b/apps/avifgainmaputil/swapbase_command.cc index e774fd8..d46c904 100644 --- a/apps/avifgainmaputil/swapbase_command.cc +++ b/apps/avifgainmaputil/swapbase_command.cc
@@ -171,7 +171,7 @@ return result; } - avifImage* image = decoder->image; + avifImage* const image = decoder->image; if (image->gainMap == nullptr || image->gainMap->image == nullptr) { std::cerr << "Input image " << arg_input_filename_ << " does not contain a gain map\n";
diff --git a/apps/avifgainmaputil/tonemap_command.cc b/apps/avifgainmaputil/tonemap_command.cc index 270096a..27d366f 100644 --- a/apps/avifgainmaputil/tonemap_command.cc +++ b/apps/avifgainmaputil/tonemap_command.cc
@@ -80,7 +80,7 @@ arg_input_cicp_.value().matrix_coefficients; } - avifImage* image = decoder->image; + avifImage* const image = decoder->image; if (image->gainMap == nullptr || image->gainMap->image == nullptr) { std::cerr << "Input image " << arg_input_filename_ << " does not contain a gain map\n"; @@ -203,7 +203,7 @@ } avifDiagnostics diag; result = avifImageApplyGainMap( - decoder->image, image->gainMap, arg_headroom_, cicp.color_primaries, + image, image->gainMap, arg_headroom_, cicp.color_primaries, cicp.transfer_characteristics, &tone_mapped_rgb, clli_set ? nullptr : &clli_box, &diag); if (result != AVIF_RESULT_OK) { @@ -217,14 +217,14 @@ << "\n"; return result; } - result = avifImageSetMetadataXMP(tone_mapped.get(), decoder->image->xmp.data, - decoder->image->xmp.size); + result = avifImageSetMetadataXMP(tone_mapped.get(), image->xmp.data, + image->xmp.size); if (result != AVIF_RESULT_OK) { std::cerr << "Failed to copy XMP: " << avifResultToString(result) << "\n"; return result; } - result = avifImageSetMetadataExif( - tone_mapped.get(), decoder->image->exif.data, decoder->image->exif.size); + result = avifImageSetMetadataExif(tone_mapped.get(), image->exif.data, + image->exif.size); if (result != AVIF_RESULT_OK) { std::cerr << "Failed to copy EXIF: " << avifResultToString(result) << "\n"; return result;