[trunk] merge rev 1228 from 1.5 to trunk

2012-03-02 14:14:31 +00:00
parent 687a43e199
commit 24d7f54662
11 changed files with 40 additions and 40 deletions
--- a/libopenjpeg/thix_manager.c
+++ b/libopenjpeg/thix_manager.c
@@ -107,7 +107,7 @@ int write_tilemhix( int coff, opj_codestream_info_t cstr_info, int tileno, opj_c
    cio_write( cio, marker[i].len, 2);
  }
     
-  //  free( marker);
+  /*  free( marker);*/

  len = cio_tell( cio) - lenp;
  cio_seek( cio, lenp);