-
Notifications
You must be signed in to change notification settings - Fork 701
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #13829 from boegel/libjxl05
update to libjxl 0.5 + disable building of man pages
- Loading branch information
Showing
3 changed files
with
73 additions
and
36 deletions.
There are no files selected for viewing
28 changes: 0 additions & 28 deletions
28
easybuild/easyconfigs/l/libjxl/libjxl-0.3.7_openexr-3.0_compat.patch
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
64 changes: 64 additions & 0 deletions
64
easybuild/easyconfigs/l/libjxl/libjxl-0.5_remove-broken-test.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| remove broken test, see also https://github.com/libjxl/libjxl/issues/500 | ||
| author: Kenneth Hoste (HPC-UGent) | ||
| --- libjxl-0.5/lib/jxl/decode_test.cc.orig 2021-09-03 17:43:40.833113581 +0200 | ||
| +++ libjxl-0.5/lib/jxl/decode_test.cc 2021-09-03 17:43:51.029009242 +0200 | ||
| @@ -1701,59 +1701,6 @@ | ||
| JxlDecoderDestroy(dec); | ||
| } | ||
|
|
||
| -TEST(DecodeTest, PixelTestWithICCProfileLossy) { | ||
| - JxlDecoder* dec = JxlDecoderCreate(NULL); | ||
| - | ||
| - size_t xsize = 123, ysize = 77; | ||
| - size_t num_pixels = xsize * ysize; | ||
| - std::vector<uint8_t> pixels = jxl::test::GetSomeTestImage(xsize, ysize, 3, 0); | ||
| - JxlPixelFormat format_orig = {3, JXL_TYPE_UINT16, JXL_BIG_ENDIAN, 0}; | ||
| - jxl::CompressParams cparams; | ||
| - jxl::PaddedBytes compressed = jxl::CreateTestJXLCodestream( | ||
| - jxl::Span<const uint8_t>(pixels.data(), pixels.size()), xsize, ysize, 3, | ||
| - cparams, kCSBF_None, JXL_ORIENT_IDENTITY, /*add_preview=*/false, | ||
| - /*add_icc_profile=*/true); | ||
| - uint32_t channels = 3; | ||
| - | ||
| - JxlPixelFormat format = {channels, JXL_TYPE_FLOAT, JXL_LITTLE_ENDIAN, 0}; | ||
| - | ||
| - std::vector<uint8_t> pixels2 = jxl::DecodeWithAPI( | ||
| - dec, jxl::Span<const uint8_t>(compressed.data(), compressed.size()), | ||
| - format, /*use_callback=*/false, /*set_buffer_early=*/true, | ||
| - /*use_resizable_runner=*/false); | ||
| - JxlDecoderReset(dec); | ||
| - EXPECT_EQ(num_pixels * channels * 4, pixels2.size()); | ||
| - | ||
| - // The input pixels use the profile matching GetIccTestProfile, since we set | ||
| - // add_icc_profile for CreateTestJXLCodestream to true. | ||
| - jxl::ColorEncoding color_encoding0; | ||
| - EXPECT_TRUE(color_encoding0.SetICC(GetIccTestProfile())); | ||
| - jxl::Span<const uint8_t> span0(pixels.data(), pixels.size()); | ||
| - jxl::CodecInOut io0; | ||
| - io0.SetSize(xsize, ysize); | ||
| - EXPECT_TRUE(ConvertFromExternal( | ||
| - span0, xsize, ysize, color_encoding0, | ||
| - /*has_alpha=*/false, false, 16, format_orig.endianness, | ||
| - /*flipped_y=*/false, /*pool=*/nullptr, &io0.Main())); | ||
| - | ||
| - // The output pixels are expected to be in the same colorspace as the input | ||
| - // profile, as the profile can be represented by enum values. | ||
| - jxl::ColorEncoding color_encoding1 = color_encoding0; | ||
| - jxl::Span<const uint8_t> span1(pixels2.data(), pixels2.size()); | ||
| - jxl::CodecInOut io1; | ||
| - io1.SetSize(xsize, ysize); | ||
| - EXPECT_TRUE( | ||
| - ConvertFromExternal(span1, xsize, ysize, color_encoding1, | ||
| - /*has_alpha=*/false, false, 32, format.endianness, | ||
| - /*flipped_y=*/false, /*pool=*/nullptr, &io1.Main())); | ||
| - | ||
| - jxl::ButteraugliParams ba; | ||
| - EXPECT_LE(ButteraugliDistance(io0, io1, ba, /*distmap=*/nullptr, nullptr), | ||
| - 2.4f); | ||
| - | ||
| - JxlDecoderDestroy(dec); | ||
| -} | ||
| - | ||
| // Tests the case of lossy sRGB image without alpha channel, decoded to RGB8 | ||
| // and to RGBA8 | ||
| TEST(DecodeTest, PixelTestOpaqueSrgbLossy) { |