Skip to content

Commit acd1d7b

Browse files
committed
Update jpeg-turbo to 3.0.4
1 parent a5b3c60 commit acd1d7b

File tree

2 files changed

+11
-13
lines changed

2 files changed

+11
-13
lines changed

src/jpeg-turbo/CMakeLists.txt

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ if(CMAKE_EXECUTABLE_SUFFIX)
55
endif()
66

77
project(libjpeg-turbo C)
8-
set(VERSION 3.0.3)
8+
set(VERSION 3.0.4)
99
set(COPYRIGHT_YEAR "1991-2024")
1010
string(REPLACE "." ";" VERSION_TRIPLET ${VERSION})
1111
list(GET VERSION_TRIPLET 0 VERSION_MAJOR)
@@ -309,12 +309,12 @@ endif()
309309
# 1: + In-memory source/destination managers (libjpeg-turbo 1.3.x)
310310
# 2: + Partial image decompression functions (libjpeg-turbo 1.5.x)
311311
# 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)
313313
#
314314
# libjpeg v8 API/ABI emulation:
315315
# 1: + Partial image decompression functions (libjpeg-turbo 1.5.x)
316316
# 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)
318318
set(SO_AGE 3)
319319
if(NOT WITH_JPEG8)
320320
set(SO_AGE 4)
@@ -1202,7 +1202,7 @@ foreach(libtype ${TEST_LIBTYPES})
12021202

12031203
set(TESTORIG testorig12.jpg)
12041204
set(MD5_JPEG_RGB_ISLOW 9d7369207c520d37f2c1cbfcb82b2964)
1205-
set(MD5_JPEG_RGB_ISLOW2 a00bd20d8ae49684640ef7177d2e0b64)
1205+
set(MD5_JPEG_RGB_ISLOW2 e619791332a99813bdca9f56fd60f9f9)
12061206
set(MD5_PPM_RGB_ISLOW f3301d2219783b8b3d942b7239fa50c0)
12071207
set(MD5_JPEG_422_IFAST_OPT 7322e3bd2f127f7de4b40d4480ce60e4)
12081208
set(MD5_PPM_422_IFAST 79807fa552899e66a04708f533e16950)
@@ -1259,7 +1259,7 @@ foreach(libtype ${TEST_LIBTYPES})
12591259
set(MD5_JPEG_CROP cdb35ff4b4519392690ea040c56ea99c)
12601260

12611261
set(MD5_JPEG_EXAMPLE_COMPRESS 5e502da0c3c0f957a58c536f31e973dc)
1262-
set(MD5_PPM_EXAMPLE_DECOMPRESS 2ff0e8505ee6e0ffaeb24037d5650b57)
1262+
set(MD5_PPM_EXAMPLE_DECOMPRESS 70194fdcb73370ee7ba0db868d0c6fc8)
12631263
else()
12641264
set(cjpeg cjpeg)
12651265
set(djpeg djpeg)
@@ -1268,7 +1268,7 @@ foreach(libtype ${TEST_LIBTYPES})
12681268

12691269
set(TESTORIG testorig.jpg)
12701270
set(MD5_JPEG_RGB_ISLOW 1d44a406f61da743b5fd31c0a9abdca3)
1271-
set(MD5_JPEG_RGB_ISLOW2 31d121e57b6c2934c890a7fc7763bcd4)
1271+
set(MD5_JPEG_RGB_ISLOW2 b811e5ad807beb9384e51ef6a47f715d)
12721272
set(MD5_PPM_RGB_ISLOW 00a257f5393fef8821f2b88ac7421291)
12731273
set(MD5_BMP_RGB_ISLOW_565 f07d2e75073e4bb10f6c6f4d36e2e3be)
12741274
set(MD5_BMP_RGB_ISLOW_565D 4cfa0928ef3e6bb626d7728c924cfda4)
@@ -1343,7 +1343,7 @@ foreach(libtype ${TEST_LIBTYPES})
13431343
set(MD5_JPEG_CROP b4197f377e621c4e9b1d20471432610d)
13441344

13451345
set(MD5_JPEG_EXAMPLE_COMPRESS 95d4d72e2ef127332654c2599afb47bf)
1346-
set(MD5_PPM_EXAMPLE_DECOMPRESS 6fdde7301575bfd711e295b969b6b3de)
1346+
set(MD5_PPM_EXAMPLE_DECOMPRESS dea1d7bbc37e39adf628342c86096641)
13471347
endif()
13481348

13491349
# CC: null SAMP: fullsize FDCT: islow ENT: huff
@@ -1362,7 +1362,7 @@ foreach(libtype ${TEST_LIBTYPES})
13621362
set_tests_properties(${djpeg}-${libtype}-rgb-islow-icc-cmp PROPERTIES
13631363
DEPENDS ${djpeg}-${libtype}-rgb-islow)
13641364

1365-
add_bittest(${jpegtran} icc "-copy;all;-icc;${TESTIMAGES}/test2.icc"
1365+
add_bittest(${jpegtran} icc "-copy;all;-icc;${TESTIMAGES}/test3.icc"
13661366
${testout}_rgb_islow2.jpg ${testout}_rgb_islow.jpg
13671367
${MD5_JPEG_RGB_ISLOW2} ${cjpeg}-${libtype}-rgb-islow)
13681368

@@ -1673,9 +1673,7 @@ foreach(libtype ${TEST_LIBTYPES})
16731673

16741674
add_test(NAME example-${sample_bits}bit-${libtype}-decompress
16751675
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)
16791677
add_test(NAME example-${sample_bits}bit-${libtype}-decompress-cmp
16801678
COMMAND md5cmp ${MD5_PPM_EXAMPLE_DECOMPRESS} ${testout}-example.ppm)
16811679
set_tests_properties(example-${sample_bits}bit-${libtype}-decompress-cmp

src/jpeg-turbo/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
repo: https://github.com/libjpeg-turbo/libjpeg-turbo.git
2-
ver: 3.0.3
1+
repo: https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/3.0.4/libjpeg-turbo-3.0.4.tar.gz
2+
ver: 3.0.4
33
tag_prefix: ''
44
tag_dot2ul: false
55
cb_tool: cmake

0 commit comments

Comments
 (0)