From ea2b1d36aa3ad8d260bf6fe91907b19e9c5f2e25 Mon Sep 17 00:00:00 2001 From: Mathieu Malaterre Date: Fri, 2 Mar 2012 13:57:04 +0000 Subject: [PATCH] [trunk] minor coding style change to match 1.5 --- applications/mj2/mj2.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/applications/mj2/mj2.c b/applications/mj2/mj2.c index 886eeac9..a8b3e37f 100644 --- a/applications/mj2/mj2.c +++ b/applications/mj2/mj2.c @@ -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; int i; opj_bool ok; - + mj2_read_boxhdr(&box, cio); 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; cio_skip(cio,2); /* Pre-defined = -1 */ - memset(&color, 0, sizeof(opj_jp2_color_t)); tk->jp2_struct.cinfo = tk->cinfo; ok = jp2_read_jp2h(&tk->jp2_struct, cio, &color); - tk->jp2_struct.cinfo = NULL; + tk->jp2_struct.cinfo = NULL; if(ok == OPJ_FALSE) {