walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

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

This commit is contained in:
Antonin Descampe 2004-05-07 14:41:45 +00:00
parent a4911967eb
commit 275b153fc2
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libopenjpeg/j2k.c
View File

@ -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;

6
libopenjpeg/j2k.h
View File

@ -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 */