WIP: remove a piece of code copy by the merge op at the wrong place

diff --git a/CHANGES b/CHANGES
index 8a454091067765889ee058ca4b60930440020264..581b63c16adceb1fab44d149944113d5f991408f 100644 (file)
--- 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 e2e6bd290ab30690f53f2e76b98fb40833e9073d..f551c10c8af8bb9678ab603e28fbddb6cce751eb 100644 (file)
--- 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++;
-}