Fixed --keep_invisible defaults. (#3562)

libjxl · May 7, 2024 · 661fec1 · 661fec1
1 parent 663cb5f
commit 661fec1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/lib/jxl/enc_frame.cc b/lib/jxl/enc_frame.cc
@@ -1533,7 +1533,7 @@ Status ComputeEncodingData(
     bool lossless = cparams.IsLossless();
     if (alpha && !alpha_eci->alpha_associated &&
         frame_header.frame_type == FrameType::kRegularFrame &&
-        !ApplyOverride(cparams.keep_invisible, true) &&
+        !ApplyOverride(cparams.keep_invisible, cparams.IsLossless()) &&
         cparams.ec_resampling == cparams.resampling &&
         !cparams.disable_percepeptual_optimizations) {
       // simplify invisible pixels

diff --git a/lib/jxl/jxl_test.cc b/lib/jxl/jxl_test.cc
@@ -384,15 +384,9 @@ JXL_X86_64_TEST(JxlTest, RoundtripLargeEmptyModular) {
   cparams.AddOption(JXL_ENC_FRAME_SETTING_DECODING_SPEED, 2);
 
   PackedPixelFile ppf_out;
-  EXPECT_NEAR(Roundtrip(t.ppf(), cparams, {}, pool.get(), &ppf_out), 3474795,
+  EXPECT_NEAR(Roundtrip(t.ppf(), cparams, {}, pool.get(), &ppf_out), 669009,
               100000);
-  EXPECT_SLIGHTLY_BELOW(ComputeDistance2(t.ppf(), ppf_out),
-#if JXL_HIGH_PRECISION
-                        2050
-#else
-                        12100
-#endif
-  );
+  EXPECT_SLIGHTLY_BELOW(ButteraugliDistance(t.ppf(), ppf_out), 0.19);
 }
 
 TEST(JxlTest, RoundtripOutputColorSpace) {