walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'upstream/master'

This commit is contained in:
trylab 2016-09-13 17:16:52 +08:00
parent 2cbad4f074 805972f4c8
commit 5dca623ba8
5 changed files with 41 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
THANKS.md
View File

@ -4,34 +4,35 @@ Many people have contributed to OpenJPEG by reporting problems, suggesting vario
or submitting actual code. Here is a list of these people. Help me keep or submitting actual code. Here is a list of these people. Help me keep
it complete and exempt of errors. it complete and exempt of errors.
Giuseppe Baruffa * Giuseppe Baruffa
Ben Boeckel * Ben Boeckel
Aaron Boxer * Aaron Boxer
David Burken * David Burken
Matthieu Darbois * Matthieu Darbois
Rex Dieter * Rex Dieter
Herve Drolon * Herve Drolon
Antonin Descampe * Antonin Descampe
Francois-Olivier Devaux * Francois-Olivier Devaux
Parvatha Elangovan * Parvatha Elangovan
Jerôme Fimes * Jerôme Fimes
Bob Friesenhahn * Bob Friesenhahn
Kaori Hagihara * Kaori Hagihara
Luc Hermitte * Luc Hermitte
Luis Ibanez * Luis Ibanez
David Janssens * David Janssens
Hans Johnson * Hans Johnson
Callum Lerwick * Callum Lerwick
Sebastien Lugan * Ke Liu (Tencent's Xuanwu LAB)
Benoit Macq * Sebastien Lugan
Mathieu Malaterre * Benoit Macq
Julien Malik * Mathieu Malaterre
Arnaud Maye * Julien Malik
Vincent Nicolas * Arnaud Maye
Glenn Pearson * Vincent Nicolas
Even Rouault * Glenn Pearson
Dzonatas Sol * Even Rouault
Winfried Szukalski * Dzonatas Sol
Vincent Torri * Winfried Szukalski
Yannick Verschueren * Vincent Torri
Peter Wimmer * Yannick Verschueren
* Peter Wimmer

2
src/lib/openjp2/pi.c
View File

@ -1241,7 +1241,7 @@ opj_pi_iterator_t *opj_pi_create_decode(opj_image_t *p_image,
l_current_pi->include = 00; l_current_pi->include = 00;
if (l_step_l <= (((OPJ_UINT32)-1) / (l_tcp->numlayers + 1U))) if (l_step_l <= (((OPJ_UINT32)-1) / (l_tcp->numlayers + 1U)))
{ {
l_current_pi->include = (OPJ_INT16*) opj_calloc((l_tcp->numlayers +1) * l_step_l, sizeof(OPJ_INT16)); l_current_pi->include = (OPJ_INT16*) opj_calloc((size_t)(l_tcp->numlayers + 1U) * l_step_l, sizeof(OPJ_INT16));
} }
if if

1
src/lib/openjp2/t1_generate_luts.c
View File

@ -52,6 +52,7 @@ static int t1_init_ctxno_zc(int f, int orient) {
t = h; t = h;
h = v; h = v;
v = t; v = t;
/* fall through */
case 0: case 0:
case 1: case 1:
if (!h) { if (!h) {

1
tests/nonregression/CMakeLists.txt
View File

@ -51,6 +51,7 @@ set(BLACKLIST_JPEG2000_TMP
issue427-null-image-size.jp2 issue427-null-image-size.jp2
issue427-illegal-tile-offset.jp2 issue427-illegal-tile-offset.jp2
issue495.jp2 issue495.jp2
issue820.jp2
) )
# Define a list of file which should be gracefully rejected: # Define a list of file which should be gracefully rejected:

9
tests/nonregression/test_suite.ctest.in
View File

@ -566,6 +566,9 @@ opj_decompress -i @INPUT_NR_PATH@/issue726.j2k -o @TEMP_PATH@/issue726.png
!opj_decompress -i @INPUT_NR_PATH@/issue775-2.j2k -o @TEMP_PATH@/issue775-2.png !opj_decompress -i @INPUT_NR_PATH@/issue775-2.j2k -o @TEMP_PATH@/issue775-2.png
# issue 818 # issue 818
opj_decompress -i @INPUT_NR_PATH@/issue818.jp2 -o @TEMP_PATH@/issue818.png opj_decompress -i @INPUT_NR_PATH@/issue818.jp2 -o @TEMP_PATH@/issue818.png
# issue 823 (yes, not a typo, test image is issue822) # issue 823
!opj_decompress -i @INPUT_NR_PATH@/issue822.jp2 -o @TEMP_PATH@/issue822.png !opj_decompress -i @INPUT_NR_PATH@/issue823.jp2 -o @TEMP_PATH@/issue823.png
# issue 826
!opj_decompress -i @INPUT_NR_PATH@/issue826.jp2 -o @TEMP_PATH@/issue826.png
# issue 820
!opj_decompress -i @INPUT_NR_PATH@/issue820.jp2 -o @TEMP_PATH@/issue820.png