mirror of
https://invent.kde.org/frameworks/kimageformats.git
synced 2025-07-14 02:54:19 -04:00
Add JPEG 2000 support
JPEG 2000 support using OpenJPEG library. - Add read/write support to JP2/J2K format for Gray/RGB(A)/CMYK images @8/16-bits - Read test case images generated by Photoshop The plugin has the following limitations: - Resolution is not set (JP2_RES box is marked "For the future" in jp2.h) - Metadata are not set (as with resolution) Closes #13
This commit is contained in:
committed by
Albert Astals Cid
parent
e6a0f8758b
commit
c97ee00f5e
@ -119,6 +119,18 @@ if (LibHeif_FOUND)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if (OpenJPEG_FOUND)
|
||||
kimageformats_read_tests(
|
||||
jp2
|
||||
)
|
||||
# CMYK writing is incorrect in versions before 2.5.3
|
||||
if ("${OPENJPEG_MAJOR_VERSION}.${OPENJPEG_MINOR_VERSION}.${OPENJPEG_BUILD_VERSION}" VERSION_GREATER_EQUAL "2.5.3")
|
||||
kimageformats_write_tests(
|
||||
jp2-nodatacheck-lossless
|
||||
)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if (LibJXL_FOUND AND LibJXLThreads_FOUND)
|
||||
kimageformats_read_tests(
|
||||
jxl
|
||||
|
BIN
autotests/read/jp2/testcard_cmyk.jp2
Normal file
BIN
autotests/read/jp2/testcard_cmyk.jp2
Normal file
Binary file not shown.
11
autotests/read/jp2/testcard_cmyk.jp2.json
Normal file
11
autotests/read/jp2/testcard_cmyk.jp2.json
Normal file
@ -0,0 +1,11 @@
|
||||
[
|
||||
{
|
||||
"minQtVersion" : "6.8.0",
|
||||
"fileName" : "testcard_cmyk.tif"
|
||||
},
|
||||
{
|
||||
"maxQtVersion" : "6.7.99",
|
||||
"unsupportedFormat" : true,
|
||||
"comment" : "Qt versions lower than 6.8 do not support CMYK format so this test should be skipped."
|
||||
}
|
||||
]
|
BIN
autotests/read/jp2/testcard_cmyk.tif
Normal file
BIN
autotests/read/jp2/testcard_cmyk.tif
Normal file
Binary file not shown.
BIN
autotests/read/jp2/testcard_cmyk16.jp2
Normal file
BIN
autotests/read/jp2/testcard_cmyk16.jp2
Normal file
Binary file not shown.
11
autotests/read/jp2/testcard_cmyk16.jp2.json
Normal file
11
autotests/read/jp2/testcard_cmyk16.jp2.json
Normal file
@ -0,0 +1,11 @@
|
||||
[
|
||||
{
|
||||
"minQtVersion" : "6.8.0",
|
||||
"fileName" : "testcard_cmyk16.tif"
|
||||
},
|
||||
{
|
||||
"maxQtVersion" : "6.7.99",
|
||||
"unsupportedFormat" : true,
|
||||
"comment" : "Qt versions lower than 6.8 do not support CMYK format so this test should be skipped."
|
||||
}
|
||||
]
|
BIN
autotests/read/jp2/testcard_cmyk16.tif
Normal file
BIN
autotests/read/jp2/testcard_cmyk16.tif
Normal file
Binary file not shown.
BIN
autotests/read/jp2/testcard_gray.jp2
Normal file
BIN
autotests/read/jp2/testcard_gray.jp2
Normal file
Binary file not shown.
BIN
autotests/read/jp2/testcard_gray.png
Normal file
BIN
autotests/read/jp2/testcard_gray.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 12 KiB |
BIN
autotests/read/jp2/testcard_gray16.jp2
Normal file
BIN
autotests/read/jp2/testcard_gray16.jp2
Normal file
Binary file not shown.
BIN
autotests/read/jp2/testcard_gray16.png
Normal file
BIN
autotests/read/jp2/testcard_gray16.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 11 KiB |
BIN
autotests/read/jp2/testcard_rgb.jp2
Normal file
BIN
autotests/read/jp2/testcard_rgb.jp2
Normal file
Binary file not shown.
BIN
autotests/read/jp2/testcard_rgb.png
Normal file
BIN
autotests/read/jp2/testcard_rgb.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 12 KiB |
BIN
autotests/read/jp2/testcard_rgb16.jp2
Normal file
BIN
autotests/read/jp2/testcard_rgb16.jp2
Normal file
Binary file not shown.
BIN
autotests/read/jp2/testcard_rgb16.png
Normal file
BIN
autotests/read/jp2/testcard_rgb16.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 16 KiB |
BIN
autotests/read/jp2/testcard_rgba.j2k
Normal file
BIN
autotests/read/jp2/testcard_rgba.j2k
Normal file
Binary file not shown.
BIN
autotests/read/jp2/testcard_rgba.jp2
Normal file
BIN
autotests/read/jp2/testcard_rgba.jp2
Normal file
Binary file not shown.
BIN
autotests/read/jp2/testcard_rgba.png
Normal file
BIN
autotests/read/jp2/testcard_rgba.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 18 KiB |
BIN
autotests/read/jp2/testcard_rgba16.jp2
Normal file
BIN
autotests/read/jp2/testcard_rgba16.jp2
Normal file
Binary file not shown.
BIN
autotests/read/jp2/testcard_rgba16.png
Normal file
BIN
autotests/read/jp2/testcard_rgba16.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 23 KiB |
BIN
autotests/write/format/jp2/Format_A2BGR30_Premultiplied.jp2
Normal file
BIN
autotests/write/format/jp2/Format_A2BGR30_Premultiplied.jp2
Normal file
Binary file not shown.
BIN
autotests/write/format/jp2/Format_A2RGB30_Premultiplied.jp2
Normal file
BIN
autotests/write/format/jp2/Format_A2RGB30_Premultiplied.jp2
Normal file
Binary file not shown.
BIN
autotests/write/format/jp2/Format_ARGB32.jp2
Normal file
BIN
autotests/write/format/jp2/Format_ARGB32.jp2
Normal file
Binary file not shown.
BIN
autotests/write/format/jp2/Format_ARGB32_Premultiplied.jp2
Normal file
BIN
autotests/write/format/jp2/Format_ARGB32_Premultiplied.jp2
Normal file
Binary file not shown.
BIN
autotests/write/format/jp2/Format_ARGB4444_Premultiplied.jp2
Normal file
BIN
autotests/write/format/jp2/Format_ARGB4444_Premultiplied.jp2
Normal file
Binary file not shown.
BIN
autotests/write/format/jp2/Format_ARGB6666_Premultiplied.jp2
Normal file
BIN
autotests/write/format/jp2/Format_ARGB6666_Premultiplied.jp2
Normal file
Binary file not shown.
BIN
autotests/write/format/jp2/Format_ARGB8555_Premultiplied.jp2
Normal file
BIN
autotests/write/format/jp2/Format_ARGB8555_Premultiplied.jp2
Normal file
Binary file not shown.
BIN
autotests/write/format/jp2/Format_ARGB8565_Premultiplied.jp2
Normal file
BIN
autotests/write/format/jp2/Format_ARGB8565_Premultiplied.jp2
Normal file
Binary file not shown.
BIN
autotests/write/format/jp2/Format_BGR30.jp2
Normal file
BIN
autotests/write/format/jp2/Format_BGR30.jp2
Normal file
Binary file not shown.
BIN
autotests/write/format/jp2/Format_BGR888.jp2
Normal file
BIN
autotests/write/format/jp2/Format_BGR888.jp2
Normal file
Binary file not shown.
BIN
autotests/write/format/jp2/Format_CMYK8888.jp2
Normal file
BIN
autotests/write/format/jp2/Format_CMYK8888.jp2
Normal file
Binary file not shown.
BIN
autotests/write/format/jp2/Format_Grayscale16.jp2
Normal file
BIN
autotests/write/format/jp2/Format_Grayscale16.jp2
Normal file
Binary file not shown.
BIN
autotests/write/format/jp2/Format_Grayscale8.jp2
Normal file
BIN
autotests/write/format/jp2/Format_Grayscale8.jp2
Normal file
Binary file not shown.
BIN
autotests/write/format/jp2/Format_Indexed8.jp2
Normal file
BIN
autotests/write/format/jp2/Format_Indexed8.jp2
Normal file
Binary file not shown.
BIN
autotests/write/format/jp2/Format_Mono.jp2
Normal file
BIN
autotests/write/format/jp2/Format_Mono.jp2
Normal file
Binary file not shown.
BIN
autotests/write/format/jp2/Format_MonoLSB.jp2
Normal file
BIN
autotests/write/format/jp2/Format_MonoLSB.jp2
Normal file
Binary file not shown.
BIN
autotests/write/format/jp2/Format_RGB16.jp2
Normal file
BIN
autotests/write/format/jp2/Format_RGB16.jp2
Normal file
Binary file not shown.
BIN
autotests/write/format/jp2/Format_RGB30.jp2
Normal file
BIN
autotests/write/format/jp2/Format_RGB30.jp2
Normal file
Binary file not shown.
BIN
autotests/write/format/jp2/Format_RGB32.jp2
Normal file
BIN
autotests/write/format/jp2/Format_RGB32.jp2
Normal file
Binary file not shown.
BIN
autotests/write/format/jp2/Format_RGB444.jp2
Normal file
BIN
autotests/write/format/jp2/Format_RGB444.jp2
Normal file
Binary file not shown.
BIN
autotests/write/format/jp2/Format_RGB555.jp2
Normal file
BIN
autotests/write/format/jp2/Format_RGB555.jp2
Normal file
Binary file not shown.
BIN
autotests/write/format/jp2/Format_RGB666.jp2
Normal file
BIN
autotests/write/format/jp2/Format_RGB666.jp2
Normal file
Binary file not shown.
BIN
autotests/write/format/jp2/Format_RGB888.jp2
Normal file
BIN
autotests/write/format/jp2/Format_RGB888.jp2
Normal file
Binary file not shown.
BIN
autotests/write/format/jp2/Format_RGBA16FPx4.jp2
Normal file
BIN
autotests/write/format/jp2/Format_RGBA16FPx4.jp2
Normal file
Binary file not shown.
BIN
autotests/write/format/jp2/Format_RGBA16FPx4_Premultiplied.jp2
Normal file
BIN
autotests/write/format/jp2/Format_RGBA16FPx4_Premultiplied.jp2
Normal file
Binary file not shown.
BIN
autotests/write/format/jp2/Format_RGBA32FPx4.jp2
Normal file
BIN
autotests/write/format/jp2/Format_RGBA32FPx4.jp2
Normal file
Binary file not shown.
BIN
autotests/write/format/jp2/Format_RGBA32FPx4_Premultiplied.jp2
Normal file
BIN
autotests/write/format/jp2/Format_RGBA32FPx4_Premultiplied.jp2
Normal file
Binary file not shown.
BIN
autotests/write/format/jp2/Format_RGBA64.jp2
Normal file
BIN
autotests/write/format/jp2/Format_RGBA64.jp2
Normal file
Binary file not shown.
BIN
autotests/write/format/jp2/Format_RGBA64_Premultiplied.jp2
Normal file
BIN
autotests/write/format/jp2/Format_RGBA64_Premultiplied.jp2
Normal file
Binary file not shown.
BIN
autotests/write/format/jp2/Format_RGBA8888.jp2
Normal file
BIN
autotests/write/format/jp2/Format_RGBA8888.jp2
Normal file
Binary file not shown.
BIN
autotests/write/format/jp2/Format_RGBA8888_Premultiplied.jp2
Normal file
BIN
autotests/write/format/jp2/Format_RGBA8888_Premultiplied.jp2
Normal file
Binary file not shown.
BIN
autotests/write/format/jp2/Format_RGBX16FPx4.jp2
Normal file
BIN
autotests/write/format/jp2/Format_RGBX16FPx4.jp2
Normal file
Binary file not shown.
BIN
autotests/write/format/jp2/Format_RGBX32FPx4.jp2
Normal file
BIN
autotests/write/format/jp2/Format_RGBX32FPx4.jp2
Normal file
Binary file not shown.
BIN
autotests/write/format/jp2/Format_RGBX64.jp2
Normal file
BIN
autotests/write/format/jp2/Format_RGBX64.jp2
Normal file
Binary file not shown.
BIN
autotests/write/format/jp2/Format_RGBX8888.jp2
Normal file
BIN
autotests/write/format/jp2/Format_RGBX8888.jp2
Normal file
Binary file not shown.
Reference in New Issue
Block a user