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

[trunk] minor coding style change to match 1.5

This commit is contained in:
Mathieu Malaterre 2012-03-02 13:57:04 +00:00
parent c7540fba94
commit ea2b1d36aa
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
applications/mj2/mj2.c
View File

@ -1099,7 +1099,7 @@ int mj2_read_smj2(opj_image_t * img, mj2_tk_t * tk, opj_cio_t *cio)
opj_jp2_color_t color; opj_jp2_color_t color;
int i; int i;
opj_bool ok; opj_bool ok;
mj2_read_boxhdr(&box, cio); mj2_read_boxhdr(&box, cio);
if (MJ2_MJ2 != box.type) { if (MJ2_MJ2 != box.type) {
@ -1156,13 +1156,12 @@ int mj2_read_smj2(opj_image_t * img, mj2_tk_t * tk, opj_cio_t *cio)
tk->or_fieldorder = 0; tk->or_fieldorder = 0;
cio_skip(cio,2); /* Pre-defined = -1 */ cio_skip(cio,2); /* Pre-defined = -1 */
memset(&color, 0, sizeof(opj_jp2_color_t)); memset(&color, 0, sizeof(opj_jp2_color_t));
tk->jp2_struct.cinfo = tk->cinfo; tk->jp2_struct.cinfo = tk->cinfo;
ok = jp2_read_jp2h(&tk->jp2_struct, cio, &color); ok = jp2_read_jp2h(&tk->jp2_struct, cio, &color);
tk->jp2_struct.cinfo = NULL; tk->jp2_struct.cinfo = NULL;
if(ok == OPJ_FALSE) if(ok == OPJ_FALSE)
{ {