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

[trunk] Make sure to not use alpha pointer if it is not an RGBA input 

Fixes issue 310
This commit is contained in:
Mathieu Malaterre 2014-03-25 11:47:34 +00:00
parent 492d8ab7d9
commit 18d5d25cb6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bin/jp2/convert.c
View File

@ -3222,7 +3222,7 @@ opj_image_t *pngtoimage(const char *read_idf, opj_cparameters_t * params)
opj_image_cmptparm_t cmptparm[4]; opj_image_cmptparm_t cmptparm[4];
int sub_dx, sub_dy; int sub_dx, sub_dy;
unsigned int nr_comp; unsigned int nr_comp;
int *r, *g, *b, *a; int *r, *g, *b, *a = NULL;
unsigned char sigbuf[8]; unsigned char sigbuf[8];
if((reader = fopen(read_idf, "rb")) == NULL) if((reader = fopen(read_idf, "rb")) == NULL)
@ -3312,7 +3312,7 @@ opj_image_t *pngtoimage(const char *read_idf, opj_cparameters_t * params)
png_read_image(png, rows); png_read_image(png, rows);
memset(&cmptparm, 0, 4 * sizeof(opj_image_cmptparm_t)); memset(cmptparm, 0, sizeof(cmptparm));
sub_dx = params->subsampling_dx; sub_dy = params->subsampling_dy; sub_dx = params->subsampling_dx; sub_dy = params->subsampling_dy;
@ -3340,7 +3340,7 @@ opj_image_t *pngtoimage(const char *read_idf, opj_cparameters_t * params)
r = image->comps[0].data; r = image->comps[0].data;
g = image->comps[1].data; g = image->comps[1].data;
b = image->comps[2].data; b = image->comps[2].data;
a = image->comps[3].data; if(has_alpha) a = image->comps[3].data;
for(i = 0; i < height; ++i) for(i = 0; i < height; ++i)
{ {