Skip to content

Commit 1d3b119

Browse files
kornelskikornelski
committed
Fix djpeg tests
1 parent 38869c2 commit 1d3b119

1 file changed

Lines changed: 32 additions & 32 deletions

File tree

‎CMakeLists.txt‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1259,7 +1259,7 @@ foreach(libtype ${TEST_LIBTYPES})
12591259
testout16_lossless.jpg ${TESTIMAGES}/testorig.ppm
12601260
${MD5_JPEG_LOSSLESS})
12611261
add_bittest(djpeg16 lossless
1262-
"-fast;-scale;1/8;-revert;-dct;float;-dither;none;-nosmooth;-onepass"
1262+
"-fast;-scale;1/8;-dct;float;-dither;none;-nosmooth;-onepass"
12631263
testout16_lossless.ppm testout16_lossless.jpg
12641264
${MD5_PPM_LOSSLESS} cjpeg16-${libtype}-lossless)
12651265

@@ -1424,7 +1424,7 @@ foreach(libtype ${TEST_LIBTYPES})
14241424

14251425
# CC: null SAMP: fullsize IDCT: islow ENT: huff
14261426
add_bittest(${djpeg} rgb-islow
1427-
"-revert;-dct;int;-ppm;-icc;${testout}_rgb_islow.icc"
1427+
"-dct;int;-ppm;-icc;${testout}_rgb_islow.icc"
14281428
${testout}_rgb_islow.ppm ${testout}_rgb_islow.jpg
14291429
${MD5_PPM_RGB_ISLOW} ${cjpeg}-${libtype}-rgb-islow)
14301430

@@ -1439,12 +1439,12 @@ foreach(libtype ${TEST_LIBTYPES})
14391439

14401440
if(sample_bits EQUAL 8)
14411441
# CC: RGB->RGB565 SAMP: fullsize IDCT: islow ENT: huff
1442-
add_bittest(${djpeg} rgb-islow-565 "-revert;-dct;int;-rgb565;-dither;none;-bmp"
1442+
add_bittest(${djpeg} rgb-islow-565 "-dct;int;-rgb565;-dither;none;-bmp"
14431443
${testout}_rgb_islow_565.bmp ${testout}_rgb_islow.jpg
14441444
${MD5_BMP_RGB_ISLOW_565} ${cjpeg}-${libtype}-rgb-islow)
14451445

14461446
# CC: RGB->RGB565 (dithered) SAMP: fullsize IDCT: islow ENT: huff
1447-
add_bittest(${djpeg} rgb-islow-565D "-revert;-dct;int;-rgb565;-bmp"
1447+
add_bittest(${djpeg} rgb-islow-565D "-dct;int;-rgb565;-bmp"
14481448
${testout}_rgb_islow_565D.bmp ${testout}_rgb_islow.jpg
14491449
${MD5_BMP_RGB_ISLOW_565D} ${cjpeg}-${libtype}-rgb-islow)
14501450
endif()
@@ -1455,7 +1455,7 @@ foreach(libtype ${TEST_LIBTYPES})
14551455
${MD5_JPEG_422_IFAST_OPT})
14561456

14571457
# CC: YCC->RGB SAMP: fullsize/h2v1 fancy IDCT: ifast ENT: huff
1458-
add_bittest(${djpeg} 422-ifast "-revert;-dct;fast"
1458+
add_bittest(${djpeg} 422-ifast "-dct;fast"
14591459
${testout}_422_ifast.ppm ${testout}_422_ifast_opt.jpg
14601460
${MD5_PPM_422_IFAST} ${cjpeg}-${libtype}-422-ifast-opt)
14611461

@@ -1465,24 +1465,24 @@ foreach(libtype ${TEST_LIBTYPES})
14651465
${MD5_JPEG_440_ISLOW})
14661466

14671467
# CC: YCC->RGB SAMP: fullsize/h1v2 fancy IDCT: islow ENT: huff
1468-
add_bittest(${djpeg} 440-islow "-revert;-dct;int"
1468+
add_bittest(${djpeg} 440-islow "-dct;int"
14691469
${testout}_440_islow.ppm ${testout}_440_islow.jpg
14701470
${MD5_PPM_440_ISLOW} ${cjpeg}-${libtype}-440-islow)
14711471

14721472
# CC: YCC->RGB SAMP: h2v1 merged IDCT: ifast ENT: huff
1473-
add_bittest(${djpeg} 422m-ifast "-revert;-dct;fast;-nosmooth"
1473+
add_bittest(${djpeg} 422m-ifast "-dct;fast;-nosmooth"
14741474
${testout}_422m_ifast.ppm ${testout}_422_ifast_opt.jpg
14751475
${MD5_PPM_422M_IFAST} ${cjpeg}-${libtype}-422-ifast-opt)
14761476

14771477
if(sample_bits EQUAL 8)
14781478
# CC: YCC->RGB565 SAMP: h2v1 merged IDCT: ifast ENT: huff
14791479
add_bittest(${djpeg} 422m-ifast-565
1480-
"-revert;-dct;int;-nosmooth;-rgb565;-dither;none;-bmp"
1480+
"-dct;int;-nosmooth;-rgb565;-dither;none;-bmp"
14811481
${testout}_422m_ifast_565.bmp ${testout}_422_ifast_opt.jpg
14821482
${MD5_BMP_422M_IFAST_565} ${cjpeg}-${libtype}-422-ifast-opt)
14831483

14841484
# CC: YCC->RGB565 (dithered) SAMP: h2v1 merged IDCT: ifast ENT: huff
1485-
add_bittest(${djpeg} 422m-ifast-565D "-revert;-dct;int;-nosmooth;-rgb565;-bmp"
1485+
add_bittest(${djpeg} 422m-ifast-565D "-dct;int;-nosmooth;-rgb565;-bmp"
14861486
${testout}_422m_ifast_565D.bmp ${testout}_422_ifast_opt.jpg
14871487
${MD5_BMP_422M_IFAST_565D} ${cjpeg}-${libtype}-422-ifast-opt)
14881488
endif()
@@ -1494,12 +1494,12 @@ foreach(libtype ${TEST_LIBTYPES})
14941494
${MD5_JPEG_420_IFAST_Q100_PROG})
14951495

14961496
# CC: YCC->RGB SAMP: fullsize/h2v2 fancy IDCT: ifast ENT: prog huff
1497-
add_bittest(${djpeg} 420-q100-ifast-prog "-revert;-dct;fast"
1497+
add_bittest(${djpeg} 420-q100-ifast-prog "-dct;fast"
14981498
${testout}_420_q100_ifast.ppm ${testout}_420_q100_ifast_prog.jpg
14991499
${MD5_PPM_420_Q100_IFAST} ${cjpeg}-${libtype}-420-q100-ifast-prog)
15001500

15011501
# CC: YCC->RGB SAMP: h2v2 merged IDCT: ifast ENT: prog huff
1502-
add_bittest(${djpeg} 420m-q100-ifast-prog "-revert;-dct;fast;-nosmooth"
1502+
add_bittest(${djpeg} 420m-q100-ifast-prog "-dct;fast;-nosmooth"
15031503
${testout}_420m_q100_ifast.ppm ${testout}_420_q100_ifast_prog.jpg
15041504
${MD5_PPM_420M_Q100_IFAST} ${cjpeg}-${libtype}-420-q100-ifast-prog)
15051505

@@ -1509,23 +1509,23 @@ foreach(libtype ${TEST_LIBTYPES})
15091509
${MD5_JPEG_GRAY_ISLOW})
15101510

15111511
# CC: Gray->Gray SAMP: fullsize IDCT: islow ENT: huff
1512-
add_bittest(${djpeg} gray-islow "-revert;-dct;int"
1512+
add_bittest(${djpeg} gray-islow "-dct;int"
15131513
${testout}_gray_islow.ppm ${testout}_gray_islow.jpg
15141514
${MD5_PPM_GRAY_ISLOW} ${cjpeg}-${libtype}-gray-islow)
15151515

15161516
# CC: Gray->RGB SAMP: fullsize IDCT: islow ENT: huff
1517-
add_bittest(${djpeg} gray-islow-rgb "-revert;-dct;int;-rgb"
1517+
add_bittest(${djpeg} gray-islow-rgb "-dct;int;-rgb"
15181518
${testout}_gray_islow_rgb.ppm ${testout}_gray_islow.jpg
15191519
${MD5_PPM_GRAY_ISLOW_RGB} ${cjpeg}-${libtype}-gray-islow)
15201520

15211521
if(sample_bits EQUAL 8)
15221522
# CC: Gray->RGB565 SAMP: fullsize IDCT: islow ENT: huff
1523-
add_bittest(${djpeg} gray-islow-565 "-revert;-dct;int;-rgb565;-dither;none;-bmp"
1523+
add_bittest(${djpeg} gray-islow-565 "-dct;int;-rgb565;-dither;none;-bmp"
15241524
${testout}_gray_islow_565.bmp ${testout}_gray_islow.jpg
15251525
${MD5_BMP_GRAY_ISLOW_565} ${cjpeg}-${libtype}-gray-islow)
15261526

15271527
# CC: Gray->RGB565 (dithered) SAMP: fullsize IDCT: islow ENT: huff
1528-
add_bittest(${djpeg} gray-islow-565D "-revert;-dct;int;-rgb565;-bmp"
1528+
add_bittest(${djpeg} gray-islow-565D "-dct;int;-rgb565;-bmp"
15291529
${testout}_gray_islow_565D.bmp ${testout}_gray_islow.jpg
15301530
${MD5_BMP_GRAY_ISLOW_565D} ${cjpeg}-${libtype}-gray-islow)
15311531
endif()
@@ -1543,7 +1543,7 @@ foreach(libtype ${TEST_LIBTYPES})
15431543
${MD5_JPEG_3x2_FLOAT_PROG_${FLOATTEST${sample_bits}_UC}})
15441544

15451545
# CC: YCC->RGB SAMP: fullsize/int IDCT: float ENT: prog huff
1546-
add_bittest(${djpeg} 3x2-float-prog "-revert;-dct;float"
1546+
add_bittest(${djpeg} 3x2-float-prog "-dct;float"
15471547
${testout}_3x2_float.ppm ${testout}_3x2_float_prog.jpg
15481548
${MD5_PPM_3x2_FLOAT_${FLOATTEST${sample_bits}_UC}}
15491549
${cjpeg}-${libtype}-3x2-float-prog)
@@ -1555,7 +1555,7 @@ foreach(libtype ${TEST_LIBTYPES})
15551555
${MD5_JPEG_3x2_IFAST_PROG})
15561556

15571557
# CC: YCC->RGB SAMP: fullsize/int IDCT: ifast ENT: prog huff
1558-
add_bittest(${djpeg} 3x2-ifast-prog "-revert;-dct;fast"
1558+
add_bittest(${djpeg} 3x2-ifast-prog "-dct;fast"
15591559
${testout}_3x2_ifast.ppm ${testout}_3x2_ifast_prog.jpg
15601560
${MD5_PPM_3x2_IFAST} ${cjpeg}-${libtype}-3x2-ifast-prog)
15611561

@@ -1578,7 +1578,7 @@ foreach(libtype ${TEST_LIBTYPES})
15781578

15791579
if(WITH_ARITH_DEC AND sample_bits EQUAL 8)
15801580
# CC: RGB->YCC SAMP: h2v2 merged IDCT: ifast ENT: arith
1581-
add_bittest(${djpeg} 420m-ifast-ari "-revert;-fast;-skip;1,20;-ppm"
1581+
add_bittest(${djpeg} 420m-ifast-ari "-fast;-skip;1,20;-ppm"
15821582
${testout}_420m_ifast_ari.ppm ${TESTIMAGES}/testimgari.jpg
15831583
${MD5_PPM_420M_IFAST_ARI})
15841584

@@ -1609,35 +1609,35 @@ foreach(libtype ${TEST_LIBTYPES})
16091609
foreach(scale 2_1 15_8 13_8 11_8 9_8 7_8 3_4 5_8 1_2 3_8 1_4 1_8)
16101610
string(REGEX REPLACE "_" "/" scalearg ${scale})
16111611
add_bittest(${djpeg} 420m-islow-${scale}
1612-
"-revert;-dct;int;-scale;${scalearg};-nosmooth;-ppm"
1612+
"-dct;int;-scale;${scalearg};-nosmooth;-ppm"
16131613
${testout}_420m_islow_${scale}.ppm ${TESTIMAGES}/${TESTORIG}
16141614
${MD5_PPM_420M_ISLOW_${scale}})
16151615
endforeach()
16161616

16171617
if(sample_bits EQUAL 8)
16181618
# CC: YCC->RGB (dithered) SAMP: h2v2 fancy IDCT: islow ENT: huff
1619-
add_bittest(${djpeg} 420-islow-256 "-revert;-dct;int;-colors;256;-bmp"
1619+
add_bittest(${djpeg} 420-islow-256 "-dct;int;-colors;256;-bmp"
16201620
${testout}_420_islow_256.bmp ${TESTIMAGES}/${TESTORIG}
16211621
${MD5_BMP_420_ISLOW_256})
16221622

16231623
# CC: YCC->RGB565 SAMP: h2v2 fancy IDCT: islow ENT: huff
1624-
add_bittest(${djpeg} 420-islow-565 "-revert;-dct;int;-rgb565;-dither;none;-bmp"
1624+
add_bittest(${djpeg} 420-islow-565 "-dct;int;-rgb565;-dither;none;-bmp"
16251625
${testout}_420_islow_565.bmp ${TESTIMAGES}/${TESTORIG}
16261626
${MD5_BMP_420_ISLOW_565})
16271627

16281628
# CC: YCC->RGB565 (dithered) SAMP: h2v2 fancy IDCT: islow ENT: huff
1629-
add_bittest(${djpeg} 420-islow-565D "-revert;-dct;int;-rgb565;-bmp"
1629+
add_bittest(${djpeg} 420-islow-565D "-dct;int;-rgb565;-bmp"
16301630
${testout}_420_islow_565D.bmp ${TESTIMAGES}/${TESTORIG}
16311631
${MD5_BMP_420_ISLOW_565D})
16321632

16331633
# CC: YCC->RGB565 SAMP: h2v2 merged IDCT: islow ENT: huff
16341634
add_bittest(${djpeg} 420m-islow-565
1635-
"-revert;-dct;int;-nosmooth;-rgb565;-dither;none;-bmp"
1635+
"-dct;int;-nosmooth;-rgb565;-dither;none;-bmp"
16361636
${testout}_420m_islow_565.bmp ${TESTIMAGES}/${TESTORIG}
16371637
${MD5_BMP_420M_ISLOW_565})
16381638

16391639
# CC: YCC->RGB565 (dithered) SAMP: h2v2 merged IDCT: islow ENT: huff
1640-
add_bittest(${djpeg} 420m-islow-565D "-revert;-dct;int;-nosmooth;-rgb565;-bmp"
1640+
add_bittest(${djpeg} 420m-islow-565D "-dct;int;-nosmooth;-rgb565;-bmp"
16411641
${testout}_420m_islow_565D.bmp ${TESTIMAGES}/${TESTORIG}
16421642
${MD5_BMP_420M_ISLOW_565D})
16431643
endif()
@@ -1649,7 +1649,7 @@ foreach(libtype ${TEST_LIBTYPES})
16491649
${testout}_lossless.jpg ${TESTIMAGES}/testorig.ppm
16501650
${MD5_JPEG_LOSSLESS})
16511651
add_bittest(${djpeg} lossless
1652-
"-fast;-scale;1/8;-revert;-dct;float;-dither;none;-nosmooth;-onepass"
1652+
"-fast;-scale;1/8;-dct;float;-dither;none;-nosmooth;-onepass"
16531653
${testout}_lossless.ppm ${testout}_lossless.jpg
16541654
${MD5_PPM_LOSSLESS} ${cjpeg}-${libtype}-lossless)
16551655

@@ -1658,15 +1658,15 @@ foreach(libtype ${TEST_LIBTYPES})
16581658

16591659
# Context rows: Yes Intra-iMCU row: Yes iMCU row prefetch: No
16601660
# ENT: huff
1661-
add_bittest(${djpeg} 420-islow-skip15_31 "-revert;-dct;int;-skip;15,31;-ppm"
1661+
add_bittest(${djpeg} 420-islow-skip15_31 "-dct;int;-skip;15,31;-ppm"
16621662
${testout}_420_islow_skip15,31.ppm ${TESTIMAGES}/${TESTORIG}
16631663
${MD5_PPM_420_ISLOW_SKIP15_31})
16641664

16651665
# Context rows: Yes Intra-iMCU row: No iMCU row prefetch: Yes
16661666
# ENT: arith
16671667
if(WITH_ARITH_DEC AND sample_bits EQUAL 8)
16681668
add_bittest(${djpeg} 420-islow-ari-skip16_139
1669-
"-revert;-dct;int;-skip;16,139;-ppm"
1669+
"-dct;int;-skip;16,139;-ppm"
16701670
${testout}_420_islow_ari_skip16,139.ppm ${TESTIMAGES}/testimgari.jpg
16711671
${MD5_PPM_420_ISLOW_ARI_SKIP16_139})
16721672
endif()
@@ -1677,7 +1677,7 @@ foreach(libtype ${TEST_LIBTYPES})
16771677
COMMAND cjpeg${suffix} -revert -dct int -prog -precision ${sample_bits}
16781678
-outfile ${testout}_420_islow_prog.jpg ${TESTIMAGES}/testorig.ppm)
16791679
add_bittest(${djpeg} 420-islow-prog-crop62x62_71_71
1680-
"-revert;-dct;int;-crop;62x62+71+71;-ppm"
1680+
"-dct;int;-crop;62x62+71+71;-ppm"
16811681
${testout}_420_islow_prog_crop62x62,71,71.ppm
16821682
${testout}_420_islow_prog.jpg ${MD5_PPM_420_ISLOW_PROG_CROP62x62_71_71}
16831683
${cjpeg}-${libtype}-420-islow-prog)
@@ -1686,7 +1686,7 @@ foreach(libtype ${TEST_LIBTYPES})
16861686
# ENT: arith
16871687
if(WITH_ARITH_DEC AND sample_bits EQUAL 8)
16881688
add_bittest(${djpeg} 420-islow-ari-crop53x53_4_4
1689-
"-revert;-dct;int;-crop;53x53+4+4;-ppm"
1689+
"-dct;int;-crop;53x53+4+4;-ppm"
16901690
${testout}_420_islow_ari_crop53x53,4,4.ppm ${TESTIMAGES}/testimgari.jpg
16911691
${MD5_PPM_420_ISLOW_ARI_CROP53x53_4_4})
16921692
endif()
@@ -1695,7 +1695,7 @@ foreach(libtype ${TEST_LIBTYPES})
16951695
add_test(NAME ${cjpeg}-${libtype}-444-islow
16961696
COMMAND cjpeg${suffix} -revert -dct int -sample 1x1 -precision ${sample_bits}
16971697
-outfile ${testout}_444_islow.jpg ${TESTIMAGES}/testorig.ppm)
1698-
add_bittest(${djpeg} 444-islow-skip1_6 "-revert;-dct;int;-skip;1,6;-ppm"
1698+
add_bittest(${djpeg} 444-islow-skip1_6 "-dct;int;-skip;1,6;-ppm"
16991699
${testout}_444_islow_skip1,6.ppm ${testout}_444_islow.jpg
17001700
${MD5_PPM_444_ISLOW_SKIP1_6} ${cjpeg}-${libtype}-444-islow)
17011701

@@ -1705,7 +1705,7 @@ foreach(libtype ${TEST_LIBTYPES})
17051705
-sample 1x1 -outfile ${testout}_444_islow_prog.jpg
17061706
${TESTIMAGES}/testorig.ppm)
17071707
add_bittest(${djpeg} 444-islow-prog-crop98x98_13_13
1708-
"-revert;-dct;int;-crop;98x98+13+13;-ppm"
1708+
"-dct;int;-crop;98x98+13+13;-ppm"
17091709
${testout}_444_islow_prog_crop98x98,13,13.ppm
17101710
${testout}_444_islow_prog.jpg ${MD5_PPM_444_ISLOW_PROG_CROP98x98_13_13}
17111711
${cjpeg}-${libtype}-444-islow-prog)
@@ -1718,7 +1718,7 @@ foreach(libtype ${TEST_LIBTYPES})
17181718
${TESTIMAGES}/testorig.ppm)
17191719
if(WITH_ARITH_DEC)
17201720
add_bittest(${djpeg} 444-islow-ari-crop37x37_0_0
1721-
"-revert;-dct;int;-crop;37x37+0+0;-ppm"
1721+
"-dct;int;-crop;37x37+0+0;-ppm"
17221722
${testout}_444_islow_ari_crop37x37,0,0.ppm
17231723
${testout}_444_islow_ari.jpg ${MD5_PPM_444_ISLOW_ARI_CROP37x37_0_0}
17241724
${cjpeg}-${libtype}-444-islow-ari)

0 commit comments

Comments
 (0)