Remove some simple warnings about comments

[openjpeg.git] / libopenjpeg / phix_manager.c

diff --git a/libopenjpeg/phix_manager.c b/libopenjpeg/phix_manager.c
index 71465ce50cb96d83226610d79bc688f7b75f4087..c6a8889a60707fc45654fdf748cc5aefd33c56c0 100755 (executable)
--- a/libopenjpeg/phix_manager.c
+++ b/libopenjpeg/phix_manager.c
@@ -35,8 +35,7 @@
 
 #include <stdlib.h>
 #include <math.h>
-#include "indexbox_manager.h"
-#include "cio.h"
+#include "opj_includes.h"
 
 /* 
  * Write faix box of phix
@@ -56,7 +55,7 @@ int write_phix( int coff, opj_codestream_info_t cstr_info, opj_bool EPHused, int
   int len, lenp=0, compno, i;
   opj_jp2_box_t *box;
 
-  box = (opj_jp2_box_t *)calloc( cstr_info.numcomps, sizeof(opj_jp2_box_t));
+  box = (opj_jp2_box_t *)opj_calloc( cstr_info.numcomps, sizeof(opj_jp2_box_t));
   
   for( i=0;i<2;i++){
     if (i) cio_seek( cio, lenp);
@@ -78,18 +77,20 @@ int write_phix( int coff, opj_codestream_info_t cstr_info, opj_bool EPHused, int
     cio_seek( cio, lenp+len);
   }
 
-  free(box);
+  opj_free(box);
 
   return len;
 }
 
 int write_phixfaix( int coff, int compno, opj_codestream_info_t cstr_info, opj_bool EPHused, int j2klen, opj_cio_t *cio)
 {
-  int len, lenp;
-  int size_of_coding; // 4 or 8
-  int version;
-  int tileno, resno, precno, layno, num_packet=0;
-    
+  int len, lenp, tileno, version, i, nmax, size_of_coding; /* 4 or 8 */
+  opj_tile_info_t *tile_Idx;
+  opj_packet_info_t packet;
+  int resno, precno, layno, num_packet;
+  int numOfres, numOfprec, numOflayers;
+  packet.end_ph_pos = packet.start_pos = -1;
+
   if( j2klen > pow( 2, 32)){
     size_of_coding =  8;
     version = 1;
@@ -104,20 +105,46 @@ int write_phixfaix( int coff, int compno, opj_codestream_info_t cstr_info, opj_b
   cio_write( cio, JPIP_FAIX, 4);  /* FAIX                */ 
   cio_write( cio, version,1);     /* Version 0 = 4 bytes */
 
-  cio_write( cio, cstr_info.packno, size_of_coding); /* NMAX */
+  nmax = 0;
+  for( i=0; i<=cstr_info.numdecompos[compno]; i++)
+    nmax += cstr_info.tile[0].ph[i] * cstr_info.tile[0].pw[i] * cstr_info.numlayers;
+  
+  cio_write( cio, nmax, size_of_coding); /* NMAX */
   cio_write( cio, cstr_info.tw*cstr_info.th, size_of_coding);      /* M    */
   
   for( tileno=0; tileno<cstr_info.tw*cstr_info.th; tileno++){
+    tile_Idx = &cstr_info.tile[ tileno];
     
-    opj_tile_info_t *tile_Idx = &cstr_info.tile[ tileno];
-    //    int correction = EPHused ? 3 : 1;
     num_packet = 0;
+    numOfres = cstr_info.numdecompos[compno] + 1;
 
-    for( resno=0; resno<cstr_info.numdecompos[compno]+1; resno++){
-      for( precno=0; precno<tile_Idx->pw[resno]*tile_Idx->ph[resno]; precno++){
-       for( layno=0; layno<cstr_info.numlayers; layno++){        
-         opj_packet_info_t packet = tile_Idx->packet[num_packet];
-         cio_write( cio, packet.start_pos-coff, size_of_coding);                                   /* start position */
+    for( resno=0; resno<numOfres ; resno++){
+      numOfprec = tile_Idx->pw[resno]*tile_Idx->ph[resno];
+      for( precno=0; precno<numOfprec; precno++){
+       numOflayers = cstr_info.numlayers;
+       for( layno=0; layno<numOflayers; layno++){
+         
+         switch ( cstr_info.prog){
+         case LRCP:
+           packet = tile_Idx->packet[ ((layno*numOfres+resno)*cstr_info.numcomps+compno)*numOfprec+precno];
+           break;
+         case RLCP:
+           packet = tile_Idx->packet[ ((resno*numOflayers+layno)*cstr_info.numcomps+compno)*numOfprec+precno];
+           break;
+         case RPCL:
+           packet = tile_Idx->packet[ ((resno*numOfprec+precno)*cstr_info.numcomps+compno)*numOflayers+layno];
+           break;
+         case PCRL:
+           packet = tile_Idx->packet[ ((precno*cstr_info.numcomps+compno)*numOfres+resno)*numOflayers + layno];
+           break;
+         case CPRL:
+           packet = tile_Idx->packet[ ((compno*numOfprec+precno)*numOfres+resno)*numOflayers + layno];
+           break;
+         default:
+           fprintf( stderr, "failed to ppix indexing\n");
+         }
+
+         cio_write( cio, packet.start_pos-coff, size_of_coding);                /* start position */
          cio_write( cio, packet.end_ph_pos-packet.start_pos+1, size_of_coding); /* length         */
          
          num_packet++;
@@ -126,7 +153,7 @@ int write_phixfaix( int coff, int compno, opj_codestream_info_t cstr_info, opj_b
     }
 
     /* PADDING */
-    while( num_packet < cstr_info.packno){
+    while( num_packet < nmax){
       cio_write( cio, 0, size_of_coding); /* start position            */
       cio_write( cio, 0, size_of_coding); /* length                    */
       num_packet++;