@@ -5,7 +5,7 @@ if(CMAKE_EXECUTABLE_SUFFIX)
5
5
endif ()
6
6
7
7
project (libjpeg-turbo C )
8
- set (VERSION 3.0.3 )
8
+ set (VERSION 3.0.4 )
9
9
set (COPYRIGHT_YEAR "1991-2024" )
10
10
string (REPLACE "." ";" VERSION_TRIPLET ${VERSION} )
11
11
list (GET VERSION_TRIPLET 0 VERSION_MAJOR )
@@ -309,12 +309,12 @@ endif()
309
309
# 1: + In-memory source/destination managers (libjpeg-turbo 1.3.x)
310
310
# 2: + Partial image decompression functions (libjpeg-turbo 1.5.x)
311
311
# 3: + ICC functions (libjpeg-turbo 2.0.x)
312
- # 4: + 12-bit-per-component and lossless functions (libjpeg-turbo 2.2 .x)
312
+ # 4: + 12-bit-per-sample and lossless functions (libjpeg-turbo 3.0 .x)
313
313
#
314
314
# libjpeg v8 API/ABI emulation:
315
315
# 1: + Partial image decompression functions (libjpeg-turbo 1.5.x)
316
316
# 2: + ICC functions (libjpeg-turbo 2.0.x)
317
- # 3: + 12-bit-per-component and lossless functions (libjpeg-turbo 2.2 .x)
317
+ # 3: + 12-bit-per-sample and lossless functions (libjpeg-turbo 3.0 .x)
318
318
set (SO_AGE 3 )
319
319
if (NOT WITH_JPEG8 )
320
320
set (SO_AGE 4 )
@@ -1202,7 +1202,7 @@ foreach(libtype ${TEST_LIBTYPES})
1202
1202
1203
1203
set (TESTORIG testorig12.jpg )
1204
1204
set (MD5_JPEG_RGB_ISLOW 9d7369207c520d37f2c1cbfcb82b2964 )
1205
- set (MD5_JPEG_RGB_ISLOW2 a00bd20d8ae49684640ef7177d2e0b64 )
1205
+ set (MD5_JPEG_RGB_ISLOW2 e619791332a99813bdca9f56fd60f9f9 )
1206
1206
set (MD5_PPM_RGB_ISLOW f3301d2219783b8b3d942b7239fa50c0 )
1207
1207
set (MD5_JPEG_422_IFAST_OPT 7322e3bd2f127f7de4b40d4480ce60e4 )
1208
1208
set (MD5_PPM_422_IFAST 79807fa552899e66a04708f533e16950 )
@@ -1259,7 +1259,7 @@ foreach(libtype ${TEST_LIBTYPES})
1259
1259
set (MD5_JPEG_CROP cdb35ff4b4519392690ea040c56ea99c )
1260
1260
1261
1261
set (MD5_JPEG_EXAMPLE_COMPRESS 5e502da0c3c0f957a58c536f31e973dc )
1262
- set (MD5_PPM_EXAMPLE_DECOMPRESS 2ff0e8505ee6e0ffaeb24037d5650b57 )
1262
+ set (MD5_PPM_EXAMPLE_DECOMPRESS 70194fdcb73370ee7ba0db868d0c6fc8 )
1263
1263
else ()
1264
1264
set (cjpeg cjpeg )
1265
1265
set (djpeg djpeg )
@@ -1268,7 +1268,7 @@ foreach(libtype ${TEST_LIBTYPES})
1268
1268
1269
1269
set (TESTORIG testorig.jpg )
1270
1270
set (MD5_JPEG_RGB_ISLOW 1d44a406f61da743b5fd31c0a9abdca3 )
1271
- set (MD5_JPEG_RGB_ISLOW2 31d121e57b6c2934c890a7fc7763bcd4 )
1271
+ set (MD5_JPEG_RGB_ISLOW2 b811e5ad807beb9384e51ef6a47f715d )
1272
1272
set (MD5_PPM_RGB_ISLOW 00a257f5393fef8821f2b88ac7421291 )
1273
1273
set (MD5_BMP_RGB_ISLOW_565 f07d2e75073e4bb10f6c6f4d36e2e3be )
1274
1274
set (MD5_BMP_RGB_ISLOW_565D 4cfa0928ef3e6bb626d7728c924cfda4 )
@@ -1343,7 +1343,7 @@ foreach(libtype ${TEST_LIBTYPES})
1343
1343
set (MD5_JPEG_CROP b4197f377e621c4e9b1d20471432610d )
1344
1344
1345
1345
set (MD5_JPEG_EXAMPLE_COMPRESS 95d4d72e2ef127332654c2599afb47bf )
1346
- set (MD5_PPM_EXAMPLE_DECOMPRESS 6fdde7301575bfd711e295b969b6b3de )
1346
+ set (MD5_PPM_EXAMPLE_DECOMPRESS dea1d7bbc37e39adf628342c86096641 )
1347
1347
endif ()
1348
1348
1349
1349
# CC: null SAMP: fullsize FDCT: islow ENT: huff
@@ -1362,7 +1362,7 @@ foreach(libtype ${TEST_LIBTYPES})
1362
1362
set_tests_properties (${djpeg} -${libtype}-rgb-islow-icc-cmp PROPERTIES
1363
1363
DEPENDS ${djpeg} -${libtype}-rgb-islow )
1364
1364
1365
- add_bittest (${jpegtran} icc "-copy;all;-icc;${TESTIMAGES} /test2 .icc"
1365
+ add_bittest (${jpegtran} icc "-copy;all;-icc;${TESTIMAGES} /test3 .icc"
1366
1366
${testout} _rgb_islow2.jpg ${testout} _rgb_islow.jpg
1367
1367
${MD5_JPEG_RGB_ISLOW2} ${cjpeg} -${libtype}-rgb-islow )
1368
1368
@@ -1673,9 +1673,7 @@ foreach(libtype ${TEST_LIBTYPES})
1673
1673
1674
1674
add_test (NAME example-${sample_bits}bit-${libtype}-decompress
1675
1675
COMMAND example${suffix} decompress ${EXAMPLE_12BIT_ARG}
1676
- ${testout} -example.jpg ${testout} -example.ppm )
1677
- set_tests_properties (example-${sample_bits}bit-${libtype}-decompress
1678
- PROPERTIES DEPENDS example-${sample_bits}bit-${libtype}-compress )
1676
+ ${TESTIMAGES} /${TESTORIG} ${testout} -example.ppm )
1679
1677
add_test (NAME example-${sample_bits}bit-${libtype}-decompress-cmp
1680
1678
COMMAND md5cmp ${MD5_PPM_EXAMPLE_DECOMPRESS} ${testout} -example.ppm )
1681
1679
set_tests_properties (example-${sample_bits}bit-${libtype}-decompress-cmp
0 commit comments