Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add tests for CMYK/esYCC/CIELab #567

Merged
merged 1 commit into from
Aug 21, 2015
Merged

Add tests for CMYK/esYCC/CIELab #567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/bin/common/color.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,7 +569,7 @@ void color_apply_conversion(opj_image_t *image)

image->color_space = OPJ_CLRSPC_SRGB;

numcomps = image->numcomps;
numcomps = (int)image->numcomps;

if(numcomps != 3)
{
Expand Down Expand Up @@ -615,7 +615,7 @@ void color_apply_conversion(opj_image_t *image)
prec1 = (double)image->comps[1].prec;
prec2 = (double)image->comps[2].prec;

default_type = row[1];
default_type = (unsigned int)row[1];

if(default_type == 0x44454600)// DEF : default
{
Expand Down Expand Up @@ -749,8 +749,8 @@ void color_esycc_to_rgb(opj_image_t *image)
w = image->comps[0].w;
h = image->comps[0].h;

sign1 = image->comps[1].sgnd;
sign2 = image->comps[2].sgnd;
sign1 = (int)image->comps[1].sgnd;
sign2 = (int)image->comps[2].sgnd;

max = w * h;

Expand Down
31 changes: 19 additions & 12 deletions tests/nonregression/md5refs.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,26 +24,24 @@ c6091c07bf0ff221008dfb60d893cdff issue134.jp2_2.pgx
cccccccccccccccccccccccccccccccc issue135.j2k_0.pgx
cccccccccccccccccccccccccccccccc issue135.j2k_1.pgx
cccccccccccccccccccccccccccccccc issue135.j2k_2.pgx
619694e5674992b3286244bf13058f7c issue142.j2k_0.pgx
c675c4b77dc3cc2a0d6542a32b438a48 issue142.j2k_1.pgx
663ebdd12dd6a36915ea1152c43cb69a issue142.j2k_2.pgx
aa7461b31e14641586803b23b7fb04f2 issue142.j2k_0.pgx
a809006e7a0c1eed68bc86c96af43fe3 issue142.j2k_1.pgx
74f7a7a194a74a947245b843c62c4054 issue142.j2k_2.pgx
c44662b1f7fe01caa2ebf3ad62948e3e issue171.jp2_0.pgx
f70e8a4e5dbefeb44d50edd79b6c4cf6 issue171.jp2_1.pgx
18bc167a1c851db2fd9f8c7af3289134 issue171.jp2_2.pgx
adda4f5e46845b96dd3df14a76aa7229 issue188_beach_64bitsbox.jp2_0.pgx
90a9709c166019d1e101e7b96d257ed9 issue188_beach_64bitsbox.jp2_1.pgx
37e23d2df06ee60bf0f9f5e1c16054d8 issue188_beach_64bitsbox.jp2_2.pgx
cb89739232898a823355861d834b5734 issue205.jp2_0.pgx
a09d34928fd86e6f2d7e6edc1764d2b7 issue205.jp2_1.pgx
6f712d0685f2c5522f01b238365f4284 issue205.jp2_2.pgx
de992d54d59032eb07d21983dbe8155b issue205.jp2_3.pgx
4507d80b4133fc8d8f84beca949dbca5 issue205.jp2_0.pgx
697b6a4b1a7eea09110a029fa28cf51e issue205.jp2_1.pgx
911a6e6b3dec0fa7c5dd821f92dd707f issue205.jp2_2.pgx
1a507a95237768e41cd0987ad0f134f4 issue206_image-000.jp2_0.pgx
dacea42ff8bb859504820100637de2b6 issue206_image-000.jp2_1.pgx
1831abb207d2c85e9b8d4da308144213 issue206_image-000.jp2_2.pgx
b7073a2c1b5a42f9555eb0f0bd3c6510 issue208.jp2_0.pgx
df65beeb8fd056c8f7b8dfc699caa12b issue208.jp2_1.pgx
15cba2ad37c1a8e1eb3eb4bc42d5a2a2 issue208.jp2_2.pgx
301fabf4aac5729b44aab845580d5038 issue208.jp2_3.pgx
6e40cbf1dbf7db68ff7975a7a99362b9 issue208.jp2_0.pgx
822f330a38c053130c707cadd31d3b41 issue208.jp2_1.pgx
60316fb101af743c0f3e24924365b178 issue208.jp2_2.pgx
a0823d21d9de699353a3bd1adb23bd1c issue211.jp2_0.pgx
1820161df26c360a62d11800d6cf173f issue211.jp2_1.pgx
e1807db57b5f5192c4b77b83e8b5c477 issue228.j2k_0.pgx
Expand Down Expand Up @@ -261,4 +259,13 @@ fc2844a9f3c8e924e349180ba9e122dd p0_14_png-2.png
5e3ada868a3b0238f38c15e134090971 dwt_interleave_h.gsr105.jp2_0.pgx
5e3ada868a3b0238f38c15e134090971 dwt_interleave_h.gsr105.jp2_1.pgx
8a9142362814afeef644f6d054bca43a dwt_interleave_h.gsr105.jp2_2.pgx

63bf755af5a1f8a478d65079dc7c8964 issue205-tif.jp2.tif
b01ed87dbac424bc820b2ac590e4884e issue236-ESYCC-CDEF.jp2_0.pgx
2635cc00b1e18ef11adcba09e845d459 issue236-ESYCC-CDEF.jp2_1.pgx
f9c95d0aec2f6e7b814fa1d09edcdbda issue236-ESYCC-CDEF.jp2_2.pgx
5f0c1d5c5127c1eabb86a5e0112f139b issue559-eci-090-CIELab.jp2_0.pgx
cdae87485eaada56be3671eec39452e6 issue559-eci-090-CIELab.jp2_1.pgx
e163102afcc857cf001337178241f518 issue559-eci-090-CIELab.jp2_2.pgx
b004b2e08b0dfb217c131b353cf157eb issue559-eci-091-CIELab.jp2_0.pgx
2400da6b8ed6b1747b9913af544580f9 issue559-eci-091-CIELab.jp2_1.pgx
cf73dda887967928dbcf5cc87ab204cc issue559-eci-091-CIELab.jp2_2.pgx
10 changes: 10 additions & 0 deletions tests/nonregression/test_suite.ctest.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,3 +492,13 @@ opj_decompress -i @INPUT_NR_PATH@/basn6a08.jp2 -o @TEMP_PATH@/basn6a08_png-16.pn
# issue 388
opj_decompress -i @INPUT_NR_PATH@/v4dwt_interleave_h.gsr105.j2k -o @TEMP_PATH@/v4dwt_interleave_h.gsr105.j2k.pgx
opj_decompress -i @INPUT_NR_PATH@/dwt_interleave_h.gsr105.jp2 -o @TEMP_PATH@/dwt_interleave_h.gsr105.jp2.pgx

# PR 559 : CMYK tif output
opj_decompress -i @INPUT_NR_PATH@/issue205.jp2 -o @TEMP_PATH@/issue205-tif.jp2.tif

# issue 236: esYCC colorspace
opj_decompress -i @INPUT_NR_PATH@/issue236-ESYCC-CDEF.jp2 -o @TEMP_PATH@/issue236-ESYCC-CDEF.jp2.pgx

# issue 326 + PR 559: CIELab colorspace
opj_decompress -i @INPUT_NR_PATH@/issue559-eci-090-CIELab.jp2 -o @TEMP_PATH@/issue559-eci-090-CIELab.jp2.pgx
opj_decompress -i @INPUT_NR_PATH@/issue559-eci-091-CIELab.jp2 -o @TEMP_PATH@/issue559-eci-091-CIELab.jp2.pgx