small changes in the INDEX-file generation (in order to only use data from index...

diff --git a/libopenjpeg/j2k.c b/libopenjpeg/j2k.c
index a4c8630d15ca7ee1d70df2a26df08f58bc42e4a4..0caed6678e22b60cb4b06b8b1ff08460aa5647f1 100644 (file)
--- a/libopenjpeg/j2k.c
+++ b/libopenjpeg/j2k.c
@@ -968,8 +968,8 @@ LIBJ2K_API int j2k_encode(j2k_image_t * img, j2k_cp_t * cp, char *outfile,
     info_IM.Im_w = j2k_img->x1 - j2k_img->x0;
     info_IM.Im_h = j2k_img->y1 - j2k_img->y0;
     info_IM.Prog = (&j2k_cp->tcps[0])->prg;
-    /* info_IM.Tile_x=j2k_cp->tw; old version parser */
-    /* info_IM.Tile_y=j2k_cp->th; old version parser */
+    info_IM.tw=j2k_cp->tw; 
+    info_IM.th=j2k_cp->th; 
     info_IM.Tile_x = j2k_cp->tdx;      /* new version parser */
     info_IM.Tile_y = j2k_cp->tdy;      /* new version parser */
     info_IM.Comp = j2k_img->numcomps;
@@ -1091,7 +1091,7 @@ LIBJ2K_API int j2k_encode(j2k_image_t * img, j2k_cp_t * cp, char *outfile,
     fprintf(INDEX, "%d %d\n", info_IM.Im_w, info_IM.Im_h);
     fprintf(INDEX, "%d\n", info_IM.Prog);
     fprintf(INDEX, "%d %d\n", info_IM.Tile_x, info_IM.Tile_y);
-    fprintf(INDEX, "%d %d\n", j2k_cp->tw, j2k_cp->th);
+    fprintf(INDEX, "%d %d\n", info_IM.tw, info_IM.th);
     fprintf(INDEX, "%d\n", info_IM.Comp);
     fprintf(INDEX, "%d\n", info_IM.Layer);
     fprintf(INDEX, "%d\n", info_IM.Decomposition);
@@ -1101,7 +1101,7 @@ LIBJ2K_API int j2k_encode(j2k_image_t * img, j2k_cp_t * cp, char *outfile,
     fprintf(INDEX,"\n");
     fprintf(INDEX, "%d\n", info_IM.Main_head_end);
     fprintf(INDEX, "%d\n", info_IM.codestream_size);
-    for (tileno = 0; tileno < j2k_cp->tw * j2k_cp->th; tileno++) {
+    for (tileno = 0; tileno < info_IM.tw * info_IM.th; tileno++) {
       fprintf(INDEX, "%4d %9d %9d %9d %9e %9d %9e\n",
              info_IM.tile[tileno].num_tile,
              info_IM.tile[tileno].start_pos,
@@ -1109,7 +1109,7 @@ LIBJ2K_API int j2k_encode(j2k_image_t * img, j2k_cp_t * cp, char *outfile,
              info_IM.tile[tileno].end_pos, info_IM.tile[tileno].distotile, info_IM.tile[tileno].nbpix,
              info_IM.tile[tileno].distotile / info_IM.tile[tileno].nbpix);
     }
-    for (tileno = 0; tileno < j2k_cp->tw * j2k_cp->th; tileno++) {
+    for (tileno = 0; tileno < info_IM.tw * info_IM.th; tileno++) {
       int start_pos, end_pos;
       double disto = 0;
       pack_nb = 0;

diff --git a/libopenjpeg/j2k.h b/libopenjpeg/j2k.h
index 30764bc86aad3f01d85f0bbada761016d1bda8fc..18645bdbeb8adba0e6678378acf4b5cc7621e3ce 100644 (file)
--- a/libopenjpeg/j2k.h
+++ b/libopenjpeg/j2k.h
@@ -174,13 +174,11 @@ typedef struct {
   int index_write;             /* writing the packet inthe index with t2_encode_packets */
   int Im_w, Im_h;              /* Image width and Height                                */
   int Prog;                    /* progression order                                     */
-  int Tile_x, Tile_y;          /* Number of Tile in X and Y                             */
-  int tw, th;
+  int Tile_x, Tile_y;          /* Tile size in x and y                                  */
+  int tw, th;                  /* Number of Tile in X and Y                             */
   int Comp;                    /* Component numbers                                     */
   int Layer;                   /* number of layer                                       */
   int Decomposition;           /* number of decomposition                               */
-  //int pw, ph;                        /* nombre precinct in X and Y                            */
-  //int pdx, pdy;                      /* size of precinct in X and Y                           */
   int Main_head_end;           /* Main header position                                  */
   int codestream_size;         /* codestream's size                                     */
   info_tile *tile;             /* information concerning tiles inside image             */