From cf37058d7c5ba3560e86e40244556b58e4349e8c Mon Sep 17 00:00:00 2001 From: Mickael Savinaud Date: Mon, 19 Sep 2011 15:51:20 +0000 Subject: [PATCH] WIP: remove a piece of code copy by the merge op at the wrong place --- CHANGES | 1 + libopenjpeg/j2k.c | 8 +------- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/CHANGES b/CHANGES index 8a454091..581b63c1 100644 --- a/CHANGES +++ b/CHANGES @@ -6,6 +6,7 @@ What's New for OpenJPEG + : added September 19, 2011 ++ [mickael] WIP: remove a piece of code copy by the merge op at the wrong place + [mickael] WIP: begin to clean j2k_dump and some other small things + [mickael] WIP: enchance the new version with some bug fixes from v1 and from me + [mickael] WIP: add support of jp2 for new j2k_dump function and some other small stuff diff --git a/libopenjpeg/j2k.c b/libopenjpeg/j2k.c index e2e6bd29..f551c10c 100644 --- a/libopenjpeg/j2k.c +++ b/libopenjpeg/j2k.c @@ -4863,6 +4863,7 @@ static void j2k_add_tlmarker( int tileno, opj_codestream_info_t *cstr_info, unsi + /* * ----------------------------------------------------------------------- * ----------------------------------------------------------------------- @@ -6214,10 +6215,3 @@ void j2k_copy_tile_quantization_parameters( opj_j2k_v2_t *p_j2k ) ++l_copied_tccp; } } - - /* add the marker */ - marker->type = type; - marker->pos = pos; - marker->len = len; - cstr_info->tile[tileno].marknum++; -}