Fix a few conditions (libjxl#2947)

Fixes libjxl#2939 and libjxl#2940.
libsdl-org · Nov 15, 2023 · 54eb36c · 54eb36c
1 parent f1fd4c3
commit 54eb36c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/lib/jxl/cms/color_management.cc b/lib/jxl/cms/color_management.cc
@@ -797,7 +797,7 @@ Status PrimariesToXYZ(float rx, float ry, float gx, float gy, float bx,
 
 // Adapts whitepoint x, y to D50
 Status AdaptToXYZD50(float wx, float wy, float matrix[9]) {
-  bool ok = (wx >= 0) || (wx <= 1) || (wy > 0) || (wy <= 1);
+  bool ok = (wx >= 0) && (wx <= 1) && (wy > 0) && (wy <= 1);
   if (!ok) {
     // Out of range values can cause division through zero
     // further down with the bradford adaptation too.

diff --git a/lib/jxl/render_pipeline/stage_tone_mapping.cc b/lib/jxl/render_pipeline/stage_tone_mapping.cc
@@ -28,24 +28,25 @@ class ToneMappingStage : public RenderPipelineStage {
       // No tone mapping requested.
       return;
     }
-    const auto& tf = output_encoding_info_.orig_color_encoding.Tf();
-    if (tf.IsPQ() && output_encoding_info_.desired_intensity_target <
-                         output_encoding_info_.orig_intensity_target) {
+    const auto& orig_tf = output_encoding_info_.orig_color_encoding.Tf();
+    const auto& dest_tf = output_encoding_info_.color_encoding.Tf();
+    if (orig_tf.IsPQ() && output_encoding_info_.desired_intensity_target <
+                              output_encoding_info_.orig_intensity_target) {
       tone_mapper_ = jxl::make_unique<ToneMapper>(
           /*source_range=*/std::pair<float, float>(
               0, output_encoding_info_.orig_intensity_target),
           /*target_range=*/
           std::pair<float, float>(
               0, output_encoding_info_.desired_intensity_target),
           output_encoding_info_.luminances);
-    } else if (tf.IsHLG() && !tf.IsHLG()) {
+    } else if (orig_tf.IsHLG() && !dest_tf.IsHLG()) {
       hlg_ootf_ = jxl::make_unique<HlgOOTF>(
           /*source_luminance=*/output_encoding_info_.orig_intensity_target,
           /*target_luminance=*/output_encoding_info_.desired_intensity_target,
           output_encoding_info_.luminances);
     }
 
-    if (tf.IsPQ() && (tone_mapper_ || hlg_ootf_)) {
+    if (dest_tf.IsPQ() && (tone_mapper_ || hlg_ootf_)) {
       to_intensity_target_ =
           10000.f / output_encoding_info_.orig_intensity_target;
       from_desired_intensity_target_ =