From f20530dce21ac115628fffc0f58c52989bd5e4ba Mon Sep 17 00:00:00 2001
From: Kaori Hagihara <khagihara@users.noreply.github.com>
Date: Mon, 10 Oct 2011 13:15:18 +0000
Subject: [PATCH] enable JPT-stream request from client viewer option

---
 applications/jpip/CHANGES                     |   1 +
 applications/jpip/README                      |  11 ++-
 .../jpip/libopenjpip/cachemodel_manager.c     |  15 +++-
 .../jpip/libopenjpip/cachemodel_manager.h     |   8 +-
 applications/jpip/libopenjpip/index_manager.c |   8 ++
 applications/jpip/libopenjpip/index_manager.h |  10 +++
 .../jpip/libopenjpip/j2kheader_manager.c      |  15 ++--
 applications/jpip/libopenjpip/jp2k_encoder.c  |  20 +++--
 .../jpip/libopenjpip/msgqueue_manager.c       |  16 ++--
 .../jpip/libopenjpip/msgqueue_manager.h       |   2 -
 .../jpip/libopenjpip/target_manager.c         |   5 +-
 .../jpip/libopenjpip/target_manager.h         |   3 +
 .../opj_viewer/dist/opj_viewer-20110930.jar   | Bin 15592 -> 0 bytes
 .../opj_client/opj_viewer/dist/opj_viewer.jar |   2 +-
 .../opj_viewer/src/ImageManager.java          |  13 +--
 .../opj_viewer/src/ImageViewer.java           |   4 +-
 .../opj_viewer/src/ImageWindow.java           |  21 ++---
 .../opj_viewer/src/JPIPHttpClient.java        |  76 ++++++++++++------
 ...930.jar => opj_viewer_xerces-20111010.jar} | Bin 20047 -> 20390 bytes
 .../dist/opj_viewer_xerces.jar                |   2 +-
 .../opj_viewer_xerces/src/ImageViewer.java    |  21 +++--
 .../opj_viewer_xerces/src/ImageWindow.java    |  22 +++--
 applications/jpip/opj_server/opj_server.c     |  46 ++++++-----
 applications/jpip/tools/Makefile.nix          |   1 -
 applications/jpip/tools/jpip_to_j2k.c         |   4 +-
 25 files changed, 207 insertions(+), 119 deletions(-)
 delete mode 100644 applications/jpip/opj_client/opj_viewer/dist/opj_viewer-20110930.jar
 rename applications/jpip/opj_client/opj_viewer_xerces/dist/{opj_viewer_xerces-20110930.jar => opj_viewer_xerces-20111010.jar} (54%)

diff --git a/applications/jpip/CHANGES b/applications/jpip/CHANGES
index 3f1db2ad..ad582949 100644
--- a/applications/jpip/CHANGES
+++ b/applications/jpip/CHANGES
@@ -7,6 +7,7 @@ What's New for OpenJPIP
 
 October 10, 2011
 - [antonin] removed obsolete indexer utility
++ [kaori]   enable JPT-stream request from client viewer option
 
 September 30, 2011
 + [kaori] enabled JPP-stream
diff --git a/applications/jpip/README b/applications/jpip/README
index 72796460..0bd22fda 100644
--- a/applications/jpip/README
+++ b/applications/jpip/README
@@ -103,11 +103,12 @@ Client:
     % ../opj_dec_server
 
  2. Open image viewers (as many as needed)
-    % java -jar opj_viewer.jar http://hostname/myFCGI JP2_filename.jp2 [stateless]
+    % java -jar opj_viewer.jar http://hostname/myFCGI JP2_filename.jp2 [stateless/session] [jptstream/jppstream]
     ( The arguments 
       - http://hostname/myFCGI is the HTTP server URI (myFCGI refers to opj_server by the server setting)
       - JP2_filename.jp2 is the name of a JP2 file available on the server.
-      - stateless if stateless request is desired, otherwise session request is implemented
+      - request type stateless for no caching, session (default) for caching
+      - return media type, JPT-stream tile based stream, or JPP-stream (default) precinct based stream  
     Image viewer GUI instructions:
       Scale up request: Enlarge the window
       ROI request:      Select a region by mouse click and drag, then click inside the red frame of the selected region
@@ -125,7 +126,11 @@ Client:
 ----------
 
 An example to encode a TIF image "copenhague1.tif" at resolution 4780x4050, 8bit/pixel, grayscale.
-   % ./image_to_j2k -i copenhague1.tif -o copenhague1.jp2 -p RPCL -c [64,64] -t 640,480 -jpip
+   % ./image_to_j2k -i copenhague1.tif -o copenhague1.jp2 -p RPCL -c [64,64] -t 640,480 -jpip -v R
+
+ options
+  -jpip : embed index table box into the output JP2 file (obligation for JPIP)
+  -v R  : partition a tile into tile parts of different resolution levels (obligation for JPT-stream)
 
 <Option>
  3. Embed metadata into JP2 file
diff --git a/applications/jpip/libopenjpip/cachemodel_manager.c b/applications/jpip/libopenjpip/cachemodel_manager.c
index d710e149..7a97ee34 100644
--- a/applications/jpip/libopenjpip/cachemodel_manager.c
+++ b/applications/jpip/libopenjpip/cachemodel_manager.c
@@ -55,7 +55,7 @@ cachemodellist_param_t * gene_cachemodellist()
   return cachemodellist;
 }
 
-cachemodel_param_t * gene_cachemodel( cachemodellist_param_t *cachemodellist, target_param_t *target)
+cachemodel_param_t * gene_cachemodel( cachemodellist_param_t *cachemodellist, target_param_t *target, bool reqJPP)
 {
   cachemodel_param_t *cachemodel;
   faixbox_param_t *tilepart;
@@ -67,6 +67,19 @@ cachemodel_param_t * gene_cachemodel( cachemodellist_param_t *cachemodellist, ta
   cachemodel = (cachemodel_param_t *)malloc( sizeof(cachemodel_param_t));
 
   refer_target( target, &cachemodel->target);
+  
+  if( reqJPP){
+    if( target->jppstream)
+      cachemodel->jppstream = true;
+    else
+      cachemodel->jppstream = false;
+  } else{ // reqJPT
+    if( target->jptstream)
+      cachemodel->jppstream = false;
+    else
+      cachemodel->jppstream = true;
+  }
+
   cachemodel->mhead_model = false;
   
   tilepart = target->codeidx->tilepart;
diff --git a/applications/jpip/libopenjpip/cachemodel_manager.h b/applications/jpip/libopenjpip/cachemodel_manager.h
index 03ae18cd..77387a29 100644
--- a/applications/jpip/libopenjpip/cachemodel_manager.h
+++ b/applications/jpip/libopenjpip/cachemodel_manager.h
@@ -37,6 +37,7 @@
 //! Cache model parameters
 typedef struct cachemodel_param{
   target_param_t *target;        //!< reference pointer to the target
+  bool jppstream;                //!< return type, true: JPP-stream, false: JPT-stream
   bool mhead_model;              //!< main header model, if sent, 1, else 0
   bool *tp_model;                //!< dynamic array pointer of tile part model, if sent, 1, else 0
   bool *th_model;                //!< dynamic array pointer of tile header model
@@ -59,13 +60,14 @@ typedef struct cachemodellist_param{
 cachemodellist_param_t * gene_cachemodellist();
 
 /**
- * generate a session under the sesion list
+ * generate a cache model under a list
  *
- * @param[in] cachemodellist cachemodel list to insert the generated cache model
+ * @param[in] cachemodellist cachemodel list to insert the generated cache model, NULL for stateless
  * @param[in] target         pointer the reference target
+ * @param[in] reqJPP         if JPP-stream is desired true, JPT-stream false
  * @return                   pointer to the generated cache model
  */
-cachemodel_param_t * gene_cachemodel( cachemodellist_param_t *cachemodellist, target_param_t *target);
+cachemodel_param_t * gene_cachemodel( cachemodellist_param_t *cachemodellist, target_param_t *target, bool reqJPP);
 
 
 /**
diff --git a/applications/jpip/libopenjpip/index_manager.c b/applications/jpip/libopenjpip/index_manager.c
index 7a603e8d..2f8268a5 100644
--- a/applications/jpip/libopenjpip/index_manager.c
+++ b/applications/jpip/libopenjpip/index_manager.c
@@ -706,3 +706,11 @@ Byte4_t min( Byte4_t n1, Byte4_t n2)
   else
     return n2;
 }
+
+bool isJPTfeasible( index_param_t index)
+{
+  if( 1 < get_nmax( index.tilepart))
+    return true;
+  else
+    return false;
+}
diff --git a/applications/jpip/libopenjpip/index_manager.h b/applications/jpip/libopenjpip/index_manager.h
index 1d5226e4..74e25c72 100644
--- a/applications/jpip/libopenjpip/index_manager.h
+++ b/applications/jpip/libopenjpip/index_manager.h
@@ -35,6 +35,7 @@
 #include "faixbox_manager.h"
 #include "metadata_manager.h"
 #include "mhixbox_manager.h"
+#include "bool.h"
 
 //! progression order 
 typedef enum porder {
@@ -166,4 +167,13 @@ range_param_t get_tile_Yrange( SIZmarker_param_t SIZ, Byte4_t tile_id, int level
 Byte4_t get_tile_XSiz( SIZmarker_param_t SIZ, Byte4_t tile_id, int level);
 Byte4_t get_tile_YSiz( SIZmarker_param_t SIZ, Byte4_t tile_id, int level);
 
+
+/**
+ * answers if the target is feasible to JPT-stream
+ *
+ * @param[in] index index parameters
+ * @return    true if JPT-stream is feasible
+ */
+bool isJPTfeasible( index_param_t index);
+
 #endif 	    /* !INDEX_MANAGER_H_ */
diff --git a/applications/jpip/libopenjpip/j2kheader_manager.c b/applications/jpip/libopenjpip/j2kheader_manager.c
index 3a069bcd..ad94d587 100644
--- a/applications/jpip/libopenjpip/j2kheader_manager.c
+++ b/applications/jpip/libopenjpip/j2kheader_manager.c
@@ -212,11 +212,16 @@ Byte2_t modify_CODmkrstream( CODmarker_param_t COD, int numOfdecomp, Byte_t *COD
     return 0;
   }
   
-  newLcod  = 13+numOfdecomp;
-
-  *CODstream++ = (Byte_t)((Byte2_t)(newLcod & 0xff00) >> 8);
-  *CODstream++ = (Byte_t)(newLcod & 0x00ff);
+  if( COD.Scod & 0x01){
+    newLcod  = 13+numOfdecomp;
 
+    *CODstream++ = (Byte_t)((Byte2_t)(newLcod & 0xff00) >> 8);
+    *CODstream++ = (Byte_t)(newLcod & 0x00ff);
+  }
+  else{
+    newLcod = COD.Lcod;
+    CODstream += 2;
+  }
   CODstream += 5; // skip Scod & SGcod
   
   // SPcod
@@ -258,7 +263,7 @@ bool modify_tileheader( Byte_t *j2kstream, Byte8_t SOToffset, int numOfdecomp, B
     thstream += ((thstream[0]<<8)+(thstream[1])); // marker length
   }
 
-  if( (*j2klen)-SOToffset < Psot){
+  if( (*j2klen)-SOToffset != Psot){
     Psot = (*j2klen)-SOToffset;
     modify_4Bytecode( Psot, Psot_stream);
   }
diff --git a/applications/jpip/libopenjpip/jp2k_encoder.c b/applications/jpip/libopenjpip/jp2k_encoder.c
index 18735cf4..e1488cde 100644
--- a/applications/jpip/libopenjpip/jp2k_encoder.c
+++ b/applications/jpip/libopenjpip/jp2k_encoder.c
@@ -248,12 +248,12 @@ Byte_t * recons_codestream_from_JPPstream( msgqueue_param_t *msgqueue, Byte_t *j
     fprintf( FCGI_stderr, "Error, Only RPCL order supported\n");
     return j2kstream;
   }
-  
+
   if( fw == 0 || fh == 0)
     mindeclev = 0;
   else
     mindeclev = comp_decomplev( fw, fh, SIZ.Xsiz, SIZ.Ysiz);
-
+  
   max_reslev = -1;
   last_tileID = get_last_tileID( msgqueue, csn, true); 
   
@@ -312,17 +312,23 @@ Byte_t * recons_RPCLbitstream( msgqueue_param_t *msgqueue, Byte_t *jpipstream, B
 			       Byte8_t tileID, SIZmarker_param_t SIZ, CODmarker_param_t COD, int mindeclev, 
 			       int *max_reslev, Byte8_t *j2klen)
 {
-  int r, p, c;
+  int r, p, c, numOfprcts;
   bool foundPrec;
   Byte8_t binOffset, precID, seqID;
   Byte4_t XTsiz, YTsiz;
   message_param_t *ptr;
   
   for( r=0, seqID=0; r<=(COD.numOfdecomp-mindeclev); r++){
-    XTsiz = get_tile_XSiz( SIZ, tileID, COD.numOfdecomp-r);
-    YTsiz = get_tile_YSiz( SIZ, tileID, COD.numOfdecomp-r);
     
-    for( p=0; p<ceil((double)XTsiz/(double)COD.XPsiz[r])*ceil((double)YTsiz/(double)COD.YPsiz[r]); p++, seqID++){      
+    if( COD.Scod & 0x01){
+      XTsiz = get_tile_XSiz( SIZ, tileID, COD.numOfdecomp-r);
+      YTsiz = get_tile_YSiz( SIZ, tileID, COD.numOfdecomp-r);
+      numOfprcts = ceil((double)XTsiz/(double)COD.XPsiz[r])*ceil((double)YTsiz/(double)COD.YPsiz[r]);
+    }
+    else
+      numOfprcts = 1;
+    
+    for( p=0; p<numOfprcts; p++, seqID++){      
       for( c=0; c<SIZ.Csiz; c++){
 
 	precID = comp_precinct_id( tileID, c, seqID, SIZ.Csiz, SIZ.XTnum*SIZ.YTnum);
@@ -341,7 +347,7 @@ Byte_t * recons_RPCLbitstream( msgqueue_param_t *msgqueue, Byte_t *jpipstream, B
 	  }
 	  ptr = ptr->next;
 	}
-	if(!foundPrec)
+	if(!foundPrec && COD.Scod & 0x01)
 	  j2kstream = add_padding( 1, j2kstream, j2klen);
       }
     }
diff --git a/applications/jpip/libopenjpip/msgqueue_manager.c b/applications/jpip/libopenjpip/msgqueue_manager.c
index ef1fb62a..8cc89f48 100644
--- a/applications/jpip/libopenjpip/msgqueue_manager.c
+++ b/applications/jpip/libopenjpip/msgqueue_manager.c
@@ -154,7 +154,7 @@ void enqueue_tileheader( int tile_id, msgqueue_param_t *msgqueue)
   cachemodel = msgqueue->cachemodel;
   target = cachemodel->target;
   codeidx = target->codeidx;
-  
+
   if( !cachemodel->th_model[ tile_id]){
     msg = (message_param_t *)malloc( sizeof(message_param_t));
     msg->last_byte = true;
@@ -164,7 +164,7 @@ void enqueue_tileheader( int tile_id, msgqueue_param_t *msgqueue)
     msg->bin_offset = 0;
     msg->length = codeidx->tileheader[tile_id]->tlen;
     msg->aux = 0; // non exist
-    msg->res_offset = codeidx->offset + get_elemOff( codeidx->tilepart, 0, tile_id); // Changed from Lucian's
+    msg->res_offset = codeidx->offset + get_elemOff( codeidx->tilepart, 0, tile_id);
     msg->phld = NULL;
     msg->next = NULL;
     
@@ -183,7 +183,7 @@ void enqueue_tile( int tile_id, int level, msgqueue_param_t *msgqueue)
   index_param_t *codeidx;
   faixbox_param_t *tilepart;
   message_param_t *msg;
-  Byte8_t binOffset, binLength;
+  Byte8_t binOffset, binLength, class_id;
   int i;
 
   cachemodel = msgqueue->cachemodel;
@@ -194,13 +194,15 @@ void enqueue_tile( int tile_id, int level, msgqueue_param_t *msgqueue)
   numOftparts = get_nmax( tilepart);
   numOftiles  = get_m( tilepart);
 
+  class_id = (numOftparts==1) ? TILE_MSG : EXT_TILE_MSG;
+  
   if( tile_id < 0 || numOftiles <= tile_id){
     fprintf( FCGI_stderr, "Error, Invalid tile-id %d\n", tile_id);
     return;
   }
   
   tp_model = &cachemodel->tp_model[ tile_id*numOftparts];
-  
+
   binOffset=0;
   for( i=0; i<numOftparts-level; i++){
     binLength = get_elemLen( tilepart, i, tile_id);
@@ -210,11 +212,7 @@ void enqueue_tile( int tile_id, int level, msgqueue_param_t *msgqueue)
       
       msg->last_byte = i==numOftparts-1? true : false;
       msg->in_class_id = tile_id;
-#if 0
-      msg->class_id = TILE_MSG;
-#else
-      msg->class_id = EXT_TILE_MSG;
-#endif
+      msg->class_id = class_id;
       msg->csn = target->csn;
       msg->bin_offset = binOffset;
       msg->length = binLength;
diff --git a/applications/jpip/libopenjpip/msgqueue_manager.h b/applications/jpip/libopenjpip/msgqueue_manager.h
index 8f36bbc6..d75a5518 100644
--- a/applications/jpip/libopenjpip/msgqueue_manager.h
+++ b/applications/jpip/libopenjpip/msgqueue_manager.h
@@ -106,7 +106,6 @@ void print_msgqueue( msgqueue_param_t *msgqueue);
  */
 void enqueue_mainheader( msgqueue_param_t *msgqueue);
 
-
 /**
  * enqueue tile headers data-bin into message queue
  *
@@ -115,7 +114,6 @@ void enqueue_mainheader( msgqueue_param_t *msgqueue);
  */
 void enqueue_tileheader( int tile_id, msgqueue_param_t *msgqueue);
 
-
 /**
  * enqueue tile data-bin into message queue
  *
diff --git a/applications/jpip/libopenjpip/target_manager.c b/applications/jpip/libopenjpip/target_manager.c
index 6aea9aec..692dd59f 100644
--- a/applications/jpip/libopenjpip/target_manager.c
+++ b/applications/jpip/libopenjpip/target_manager.c
@@ -97,8 +97,9 @@ target_param_t * gene_target( targetlist_param_t *targetlist, char *targetname)
   target->fd = fd;
   target->csn = last_csn++;
   target->codeidx = jp2idx;
-  target->num_of_use = 0;
-  
+  target->num_of_use = 0; 
+  target->jppstream = true;
+  target->jptstream = isJPTfeasible( *jp2idx);
   target->next=NULL;
 
   if( targetlist->first) // there are one or more entries
diff --git a/applications/jpip/libopenjpip/target_manager.h b/applications/jpip/libopenjpip/target_manager.h
index fc872ea8..027ac243 100644
--- a/applications/jpip/libopenjpip/target_manager.h
+++ b/applications/jpip/libopenjpip/target_manager.h
@@ -31,6 +31,7 @@
 #ifndef   	TARGET_MANAGER_H_
 # define   	TARGET_MANAGER_H_
 
+#include "bool.h"
 #include "index_manager.h"
 
 //! maximum length of target identifier
@@ -47,6 +48,8 @@ typedef struct target_param{
   int csn;                        //!< codestream number
   index_param_t *codeidx;         //!< index information of codestream
   int num_of_use;                 //!< numbers of sessions refering to this target
+  bool jppstream;                 //!< if this target can return JPP-stream
+  bool jptstream;                 //!< if this target can return JPP-stream
   struct target_param *next;      //!< pointer to the next target
 } target_param_t;
 
diff --git a/applications/jpip/opj_client/opj_viewer/dist/opj_viewer-20110930.jar b/applications/jpip/opj_client/opj_viewer/dist/opj_viewer-20110930.jar
deleted file mode 100644
index 15ecf9027d348dfc8ec336db13b87dcd12c27ea1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15592
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

diff --git a/applications/jpip/opj_client/opj_viewer/dist/opj_viewer.jar b/applications/jpip/opj_client/opj_viewer/dist/opj_viewer.jar
index 02f0435b..2c3fead7 120000
--- a/applications/jpip/opj_client/opj_viewer/dist/opj_viewer.jar
+++ b/applications/jpip/opj_client/opj_viewer/dist/opj_viewer.jar
@@ -1 +1 @@
-opj_viewer-20110930.jar
\ No newline at end of file
+opj_viewer-20111007.jar
\ No newline at end of file
diff --git a/applications/jpip/opj_client/opj_viewer/src/ImageManager.java b/applications/jpip/opj_client/opj_viewer/src/ImageManager.java
index 557c9038..5634123f 100644
--- a/applications/jpip/opj_client/opj_viewer/src/ImageManager.java
+++ b/applications/jpip/opj_client/opj_viewer/src/ImageManager.java
@@ -43,25 +43,26 @@ public class ImageManager extends JPIPHttpClient
     public int getOrigWidth(){ return pnmimage.get_width();}
     public int getOrigHeight(){ return pnmimage.get_height();}
     
-    public Image getImage( String j2kfilename, int reqfw, int reqfh, boolean reqcnew)
+    public Image getImage( String j2kfilename, int reqfw, int reqfh, boolean reqcnew, boolean reqJPP, boolean reqJPT)
     {
 	System.err.println();
 	
 	String refcid = null;
 	byte[] jpipstream;
 	
+	// Todo: check if the cid is for the same stream type
 	if( reqcnew)
-	    refcid = ImgdecClient.query_cid( j2kfilename);
-	    
+	    refcid = ImgdecClient.query_cid( j2kfilename);	
+	
 	if( refcid == null){
 	    String reftid = ImgdecClient.query_tid( j2kfilename);
 	    if( reftid == null)
-		jpipstream = super.requestViewWindow( j2kfilename, reqfw, reqfh, reqcnew);
+		jpipstream = super.requestViewWindow( j2kfilename, reqfw, reqfh, reqcnew, reqJPP, reqJPT);
 	    else
-		jpipstream = super.requestViewWindow( j2kfilename, reftid, reqfw, reqfh, reqcnew);
+		jpipstream = super.requestViewWindow( j2kfilename, reftid, reqfw, reqfh, reqcnew, reqJPP, reqJPT);
 	}
 	else
-	    jpipstream = super.requestViewWindow( reqfw, reqfh, refcid, reqcnew);
+	    jpipstream = super.requestViewWindow( reqfw, reqfh, refcid, reqcnew, reqJPP, reqJPT);
 	
 	System.err.println( "decoding to PNM image");
 	if((pnmimage = ImgdecClient.decode_jpipstream( jpipstream, j2kfilename, tid, cid, fw, fh))!=null){
diff --git a/applications/jpip/opj_client/opj_viewer/src/ImageViewer.java b/applications/jpip/opj_client/opj_viewer/src/ImageViewer.java
index 0b1c2b3d..dcd66141 100644
--- a/applications/jpip/opj_client/opj_viewer/src/ImageViewer.java
+++ b/applications/jpip/opj_client/opj_viewer/src/ImageViewer.java
@@ -53,7 +53,7 @@ public class ImageViewer extends JPanel
     private Rectangle roirect[] = null;
     private String roiname[] = null;
       
-    public ImageViewer( String j2kfilename, ImageManager manager, boolean session)
+    public ImageViewer( String j2kfilename, ImageManager manager, boolean session, boolean jppstream)
     {
 	String str;
 	MML myMML;
@@ -69,7 +69,7 @@ public class ImageViewer extends JPanel
 
 	imgmanager = manager;
 
-	img = imgmanager.getImage( j2kfilename, vw, vh, session);
+	img = imgmanager.getImage( j2kfilename, vw, vh, session, jppstream, !jppstream);
 
 	addMouseListener(myMML);
 	addMouseMotionListener(myMML);
diff --git a/applications/jpip/opj_client/opj_viewer/src/ImageWindow.java b/applications/jpip/opj_client/opj_viewer/src/ImageWindow.java
index 5ffe9a5e..4f44cced 100644
--- a/applications/jpip/opj_client/opj_viewer/src/ImageWindow.java
+++ b/applications/jpip/opj_client/opj_viewer/src/ImageWindow.java
@@ -35,24 +35,20 @@ import java.awt.*;
 public class ImageWindow extends JFrame
 {
     private ImageViewer imgviewer;
-    //    private OptionPanel optpanel;
     private ImageManager imgmanager;
     
-    public ImageWindow( String uri, String j2kfilename, boolean session)
+    public ImageWindow( String uri, String j2kfilename, boolean session, boolean jppstream)
     {
 	super( j2kfilename);
 
 	imgmanager = new ImageManager( uri);
     
-	imgviewer = new ImageViewer( j2kfilename, imgmanager, session);
+	imgviewer = new ImageViewer( j2kfilename, imgmanager, session, jppstream);
 	imgviewer.setOpaque(true); //content panes must be opaque
-    
-	//	optpanel = new OptionPanel( imgmanager, imgviewer);
 
 	JPanel panel = new JPanel();
 	panel.setLayout(new BorderLayout());
 	panel.add( imgviewer, BorderLayout.CENTER);
-	//	panel.add( optpanel, BorderLayout.EAST);
 
 	setContentPane( panel);
         
@@ -71,21 +67,26 @@ public class ImageWindow extends JFrame
     public static void main(String s[])
     {
 	String j2kfilename, uri;
-	boolean session;
+	boolean session, jppstream;
 
-	if(s.length > 0){
+	if(s.length >= 2){
 	    uri = s[0];
 	    j2kfilename = s[1];
 	    if( s.length > 2)
 		session = !s[2].equalsIgnoreCase( "stateless");
 	    else
 		session = true;
+
+	    if( s.length > 3)
+		jppstream = !s[3].equalsIgnoreCase( "JPT");
+	    else
+		jppstream = true;
 	}
 	else{
-	    System.out.println("Usage: java -jar opj_viewer.jar HTTP_server_URI imagefile.jp2 [stateless/session]");
+	    System.out.println("Usage: java -jar opj_viewer.jar HTTP_server_URI imagefile.jp2 [stateless/session] [JPT/JPP]");
 	    return;
 	}
-	ImageWindow frame = new ImageWindow( uri, j2kfilename, session);
+	ImageWindow frame = new ImageWindow( uri, j2kfilename, session, jppstream);
     
 	frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
    
diff --git a/applications/jpip/opj_client/opj_viewer/src/JPIPHttpClient.java b/applications/jpip/opj_client/opj_viewer/src/JPIPHttpClient.java
index dcf7d013..eee20f71 100644
--- a/applications/jpip/opj_client/opj_viewer/src/JPIPHttpClient.java
+++ b/applications/jpip/opj_client/opj_viewer/src/JPIPHttpClient.java
@@ -41,6 +41,8 @@ public class JPIPHttpClient
     protected int rw, rh;
     protected String cid;
     protected String tid;
+    private boolean JPTstream;
+    private boolean JPPstream;
     
     public JPIPHttpClient( String URI)
     {
@@ -50,6 +52,8 @@ public class JPIPHttpClient
 	rw = rh = -1;
 	cid = null;
 	tid = null;
+	JPTstream = false;
+	JPPstream = false;
     }
 
     public int getFw(){ return fw;}
@@ -72,53 +76,52 @@ public class JPIPHttpClient
 	if( cid != null)
 	    return requestViewWindow( reqfw, reqfh, reqrx, reqry, reqrw, reqrh, cid);
 	else
-	    //		return null;
 	    if( tid != null)
-		return requestViewWindow( null, tid, reqfw, reqfh, reqrx, reqry, reqrw, reqrh, null, false);
+		return requestViewWindow( null, tid, reqfw, reqfh, reqrx, reqry, reqrw, reqrh, null, false, false, false);
 	    else
 		return null;
     }
 
     public byte[] requestViewWindow( int reqfw, int reqfh, String reqcid)
     {
-	return requestViewWindow( null, null, reqfw, reqfh, -1, -1, -1, -1, reqcid, false);
+	return requestViewWindow( null, null, reqfw, reqfh, -1, -1, -1, -1, reqcid, false, false, false);
     }
 
     public byte[] requestViewWindow( int reqfw, int reqfh, int reqrx, int reqry, int reqrw, int reqrh, String reqcid)
     {
-	return requestViewWindow( null, null, reqfw, reqfh, reqrx, reqry, reqrw, reqrh, reqcid, false);
+	return requestViewWindow( null, null, reqfw, reqfh, reqrx, reqry, reqrw, reqrh, reqcid, false, false, false);
     }
 
     public byte[] requestViewWindow( String target, int reqfw, int reqfh)
     {
-	return requestViewWindow( target, null, reqfw, reqfh, -1, -1, -1, -1, null, false);
+	return requestViewWindow( target, null, reqfw, reqfh, -1, -1, -1, -1, null, false, false, false);
     }
     
-    public byte[] requestViewWindow( String target, int reqfw, int reqfh, boolean reqcnew)
+    public byte[] requestViewWindow( String target, int reqfw, int reqfh, boolean reqcnew, boolean reqJPP, boolean reqJPT)
     {
 	if( cid == null) // 1 channel allocation only
-	    return requestViewWindow( target, null, reqfw, reqfh, -1, -1, -1, -1, null, reqcnew);
+	    return requestViewWindow( target, null, reqfw, reqfh, -1, -1, -1, -1, null, reqcnew, reqJPP, reqJPT);
 	else
 	    return null;
     }
 
-    public byte[] requestViewWindow( String target, String reqtid, int reqfw, int reqfh, boolean reqcnew)
+    public byte[] requestViewWindow( String target, String reqtid, int reqfw, int reqfh, boolean reqcnew, boolean reqJPP, boolean reqJPT)
     {
 	if( cid == null) // 1 channel allocation only
-	    return requestViewWindow( target, reqtid, reqfw, reqfh, -1, -1, -1, -1, null, reqcnew);
+	    return requestViewWindow( target, reqtid, reqfw, reqfh, -1, -1, -1, -1, null, reqcnew, reqJPP, reqJPT);
 	else
 	    return null;
     }
     
     public byte[] requestViewWindow( String target, int reqfw, int reqfh, int reqrx, int reqry, int reqrw, int reqrh)
     {
-	return requestViewWindow( target, null, reqfw, reqfh, reqrx, reqry, reqrw, reqrh, null, false);
+	return requestViewWindow( target, null, reqfw, reqfh, reqrx, reqry, reqrw, reqrh, null, false, false, false);
     }
 
  
-    public byte[] requestViewWindow( int reqfw, int reqfh, String reqcid, boolean reqcnew)
+    public byte[] requestViewWindow( int reqfw, int reqfh, String reqcid, boolean reqcnew, boolean reqJPP, boolean reqJPT)
     {
-	return requestViewWindow( null, null, reqfw, reqfh, -1, -1, -1, -1, reqcid, reqcnew);
+	return requestViewWindow( null, null, reqfw, reqfh, -1, -1, -1, -1, reqcid, reqcnew, reqJPP, reqJPT);
     }
     
     public byte[] requestViewWindow( String target,
@@ -126,12 +129,12 @@ public class JPIPHttpClient
 				     int reqfw, int reqfh, 
 				     int reqrx, int reqry, 
 				     int reqrw, int reqrh, 
-				     String reqcid, boolean reqcnew)
+				     String reqcid, boolean reqcnew, boolean reqJPP, boolean reqJPT)
     {
 	if( reqtid != null)
 	    tid = reqtid;
 
-	String urlstring = const_urlstring( target, reqtid, reqfw, reqfh, reqrx, reqry, reqrw, reqrh, reqcid, reqcnew);
+	String urlstring = const_urlstring( target, reqtid, reqfw, reqfh, reqrx, reqry, reqrw, reqrh, reqcid, reqcnew, reqJPP, reqJPT);
 	return GETrequest( urlstring);
     }
     
@@ -167,16 +170,24 @@ public class JPIPHttpClient
 	    
 	    Map<String,java.util.List<String>> headers = urlconn.getHeaderFields();
 	    java.util.List<String> hvaluelist;
+	    String hvalueline;
 	    
 	    String status = headers.get(null).get(0);
 	    
 	    System.err.println( status);
 	    if( !status.contains("OK"))
 		System.err.println( headers.get("Reason"));
-	    System.err.println( headers.get("Content-type"));
+	    
+	    hvalueline = headers.get("Content-type").get(0);
+	    System.err.println( hvalueline);
+
+	    if( hvalueline.endsWith("jpt-stream"))
+		JPTstream = true;
+	    else if( hvalueline.endsWith("jpp-stream"))
+		JPPstream = true;
 	    
 	    if(( hvaluelist = headers.get("JPIP-fsiz")) != null){
-		String hvalueline = hvaluelist.get(0);
+		hvalueline = hvaluelist.get(0);
 		fw = Integer.valueOf( hvalueline.substring( 0, hvalueline.indexOf(','))).intValue();
 		fh = Integer.valueOf( hvalueline.substring( hvalueline.indexOf(',')+1 )).intValue();
 	
@@ -184,27 +195,27 @@ public class JPIPHttpClient
 	    }
       
 	    if(( hvaluelist = headers.get("JPIP-roff")) != null){
-		String hvalueline = hvaluelist.get(0);
+		hvalueline = hvaluelist.get(0);
 		rx = Integer.valueOf( hvalueline.substring( 0, hvalueline.indexOf(','))).intValue();
 		ry = Integer.valueOf( hvalueline.substring( hvalueline.indexOf(',')+1 )).intValue();
 		System.err.println("rx,ry: " + rx + "," + ry);
 	    }
     
 	    if(( hvaluelist = headers.get("JPIP-rsiz")) != null){
-		String hvalueline = hvaluelist.get(0);
+		hvalueline = hvaluelist.get(0);
 		rw = Integer.valueOf( hvalueline.substring( 0, hvalueline.indexOf(','))).intValue();
 		rh = Integer.valueOf( hvalueline.substring( hvalueline.indexOf(',')+1 )).intValue();
 		System.err.println("rw,rh: " + rw + "," + rh);
 	    }
-    
+	    
 	    if(( hvaluelist = headers.get("JPIP-cnew")) != null){
-		String hvalueline = hvaluelist.get(0);
+		hvalueline = hvaluelist.get(0);
 		cid = hvalueline.substring( hvalueline.indexOf('=')+1, hvalueline.indexOf(','));
 		System.err.println("cid: " + cid);
 	    }
 
 	    if(( hvaluelist = headers.get("JPIP-tid")) != null){
-		String hvalueline = hvaluelist.get(0);
+		hvalueline = hvaluelist.get(0);
 		tid = hvalueline.substring( hvalueline.indexOf('=')+1);
 		System.err.println("tid: " + tid);
 	    }
@@ -270,7 +281,7 @@ public class JPIPHttpClient
 				    int reqfw, int reqfh, 
 				    int reqrx, int reqry, 
 				    int reqrw, int reqrh, 
-				    String reqcid, boolean reqcnew)
+				    String reqcid, boolean reqcnew, boolean reqJPP, boolean reqJPT)
     {
 	String urlstring = comURL;
 
@@ -313,9 +324,24 @@ public class JPIPHttpClient
 	    urlstring = urlstring.concat( "cnew=http");
 	}
 
-	if( !urlstring.endsWith("?"))
-	    urlstring = urlstring.concat( "&");
-	urlstring = urlstring.concat( "type=jpp-stream");
+	if( reqJPP && !JPTstream){
+	    if( !urlstring.endsWith("?"))
+		urlstring = urlstring.concat( "&");
+	    urlstring = urlstring.concat( "type=jpp-stream");
+	}
+	else if( reqJPT && !JPPstream){
+	    if( !urlstring.endsWith("?"))
+		urlstring = urlstring.concat( "&");
+	    urlstring = urlstring.concat( "type=jpt-stream");
+	}
+	else{ // remove this option later
+	    if( !urlstring.endsWith("?"))
+		urlstring = urlstring.concat( "&");
+	    if( JPTstream)
+		urlstring = urlstring.concat( "type=jpt-stream");
+	    else if( JPPstream)
+		urlstring = urlstring.concat( "type=jpp-stream");
+	}
 
 	return urlstring;
     }
diff --git a/applications/jpip/opj_client/opj_viewer_xerces/dist/opj_viewer_xerces-20110930.jar b/applications/jpip/opj_client/opj_viewer_xerces/dist/opj_viewer_xerces-20111010.jar
similarity index 54%
rename from applications/jpip/opj_client/opj_viewer_xerces/dist/opj_viewer_xerces-20110930.jar
rename to applications/jpip/opj_client/opj_viewer_xerces/dist/opj_viewer_xerces-20111010.jar
index 6c77243e5d01e28524194a15724c5287c09f0f51..e2f78889c4b534474ce2df0b623a844211eb2857 100644
GIT binary patch
delta 8362
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

delta 7950
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

diff --git a/applications/jpip/opj_client/opj_viewer_xerces/dist/opj_viewer_xerces.jar b/applications/jpip/opj_client/opj_viewer_xerces/dist/opj_viewer_xerces.jar
index dcd96580..8fbb188c 120000
--- a/applications/jpip/opj_client/opj_viewer_xerces/dist/opj_viewer_xerces.jar
+++ b/applications/jpip/opj_client/opj_viewer_xerces/dist/opj_viewer_xerces.jar
@@ -1 +1 @@
-opj_viewer_xerces-20110930.jar
\ No newline at end of file
+opj_viewer_xerces-20111010.jar
\ No newline at end of file
diff --git a/applications/jpip/opj_client/opj_viewer_xerces/src/ImageViewer.java b/applications/jpip/opj_client/opj_viewer_xerces/src/ImageViewer.java
index 9fab7f0a..0fa2a84e 100644
--- a/applications/jpip/opj_client/opj_viewer_xerces/src/ImageViewer.java
+++ b/applications/jpip/opj_client/opj_viewer_xerces/src/ImageViewer.java
@@ -40,8 +40,6 @@ import java.io.*;
 
 public class ImageViewer extends JPanel
 {  
-    private MML myMML;
-    private ResizeListener myRL;
     private ImageManager imgmanager;
     private int vw, vh;
     private int iw, ih;
@@ -54,12 +52,13 @@ public class ImageViewer extends JPanel
     private Rectangle rect = new Rectangle();
     private Rectangle roirect[] = null;
     private String roiname[] = null;
-      
-    public ImageViewer( String j2kfilename, ImageManager manager)
+
+    public ImageViewer( String j2kfilename, ImageManager manager, boolean session, boolean jppstream)      
     {
 	String str;
+	MML myMML;
 
-	this.setSize( 200, 200);
+	this.setSize( 170, 170);
 	Dimension asz = this.getSize();
     
 	vw = asz.width;
@@ -67,14 +66,14 @@ public class ImageViewer extends JPanel
     
 	setBackground(Color.black);
 	myMML = new MML(this);
-	myRL = new ResizeListener(this);
-
+	
 	imgmanager = manager;
-	img = imgmanager.getImage( j2kfilename, vw, vh);
+
+	img = imgmanager.getImage( j2kfilename, vw, vh, session, jppstream, !jppstream);
 
 	addMouseListener(myMML);
 	addMouseMotionListener(myMML);
-	addComponentListener(myRL);
+	addComponentListener( new ResizeListener(this));
     }
 
     public Image getImage()
@@ -87,8 +86,8 @@ public class ImageViewer extends JPanel
 	roirect = null;
 	roiname = null;
 
-	double scalex = vw/(double)rect.width;
-	double scaley = vh/(double)rect.height;
+	double scalex = (double)vw/(double)rect.width;
+	double scaley = (double)vh/(double)rect.height;
     
 	int fw = (int)(imgmanager.getFw()*scalex);
 	int fh = (int)(imgmanager.getFh()*scaley);
diff --git a/applications/jpip/opj_client/opj_viewer_xerces/src/ImageWindow.java b/applications/jpip/opj_client/opj_viewer_xerces/src/ImageWindow.java
index dd12eee2..cbf546cc 100644
--- a/applications/jpip/opj_client/opj_viewer_xerces/src/ImageWindow.java
+++ b/applications/jpip/opj_client/opj_viewer_xerces/src/ImageWindow.java
@@ -38,13 +38,13 @@ public class ImageWindow extends JFrame
     private OptionPanel optpanel;
     private ImageManager imgmanager;
     
-    public ImageWindow( String uri, String j2kfilename)
+    public ImageWindow( String uri, String j2kfilename, boolean session, boolean jppstream)
     {
 	super( j2kfilename);
 
 	imgmanager = new ImageManager( uri);
-    
-	imgviewer = new ImageViewer( j2kfilename, imgmanager);
+
+	imgviewer = new ImageViewer( j2kfilename, imgmanager, session, jppstream);
 	imgviewer.setOpaque(true); //content panes must be opaque
     
 	optpanel = new OptionPanel( imgmanager, imgviewer);
@@ -71,16 +71,26 @@ public class ImageWindow extends JFrame
     public static void main(String s[])
     {
 	String j2kfilename, uri;
+	boolean session, jppstream;
 
-	if(s.length > 0){
+	if(s.length >= 2){
 	    uri = s[0];
 	    j2kfilename = s[1];
+	    if( s.length > 2)
+		session = !s[2].equalsIgnoreCase( "stateless");
+	    else
+		session = true;
+
+	    if( s.length > 3)
+		jppstream = !s[3].equalsIgnoreCase( "JPT");
+	    else
+		jppstream = true;
 	}
 	else{
-	    System.out.println("Usage: java -jar opj_viewer.jar HTTP_server_URI imagefile.jp2");
+	    System.out.println("Usage: java -jar opj_viewer.jar HTTP_server_URI imagefile.jp2 [stateless/session] [JPT/JPP]");
 	    return;
 	}
-	ImageWindow frame = new ImageWindow( uri, j2kfilename);
+	ImageWindow frame = new ImageWindow( uri, j2kfilename, session, jppstream);
     
 	frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
    
diff --git a/applications/jpip/opj_server/opj_server.c b/applications/jpip/opj_server/opj_server.c
index a66a7b57..a9778cd4 100644
--- a/applications/jpip/opj_server/opj_server.c
+++ b/applications/jpip/opj_server/opj_server.c
@@ -115,15 +115,6 @@ int main(void)
       msgqueue_param_t *msgqueue;
 
       parse_query( query_string, &query_param); 
-      
-      switch( query_param.return_type){
-      case JPPstream:
-	fprintf( FCGI_stdout, "Content-type: image/jpp-stream\r\n");
-	break;
-      default:
-	fprintf( FCGI_stdout, "Content-type: image/jpt-stream\r\n");
-	break;
-      }
 
 #ifndef SERVER
       print_queryparam( query_param);
@@ -315,7 +306,7 @@ bool open_channel( query_param_t query_param,
     if( !(*cursession))
       *cursession = gene_session( sessionlist);
     if( !( cachemodel = search_cachemodel( target, (*cursession)->cachemodellist)))
-      if( !(cachemodel = gene_cachemodel( (*cursession)->cachemodellist, target)))
+      if( !(cachemodel = gene_cachemodel( (*cursession)->cachemodellist, target, query_param.return_type==JPPstream)))
 	return false;
   }
   else
@@ -406,7 +397,7 @@ bool gene_JPIPstream( query_param_t query_param,
   if( !cursession || !curchannel){ // stateless
     if( !target)
       return false;
-    if( !(cachemodel = gene_cachemodel( NULL, target)))
+    if( !(cachemodel = gene_cachemodel( NULL, target, query_param.return_type==JPPstream)))
       return false;
     *msgqueue = gene_msgqueue( true, cachemodel);
   }
@@ -416,6 +407,11 @@ bool gene_JPIPstream( query_param_t query_param,
     *msgqueue = gene_msgqueue( false, cachemodel);
   }
   
+  if( cachemodel->jppstream)
+    fprintf( FCGI_stdout, "Content-type: image/jpp-stream\r\n");
+  else
+    fprintf( FCGI_stdout, "Content-type: image/jpt-stream\r\n");
+
   codeidx = target->codeidx;
 
   //meta
@@ -467,13 +463,19 @@ void enqueue_imagedata( query_param_t query_param, msgqueue_param_t *msgqueue)
   range_param_t tile_Xrange, tile_Yrange;
   int u, v, tile_id;
   int xmin, xmax, ymin, ymax;
+  int numOfreslev;
 
   codeidx = msgqueue->cachemodel->target->codeidx;
 
+  if( !(msgqueue->cachemodel->jppstream)  &&  get_nmax( codeidx->tilepart) == 1) // normally not the case
+    numOfreslev = 1;
+  else
+    numOfreslev = codeidx->COD.numOfdecomp+1;
+
   imgreg  = map_viewin2imgreg( query_param.fx, query_param.fy, 
 			       query_param.rx, query_param.ry, query_param.rw, query_param.rh,
 			       codeidx->SIZ.XOsiz, codeidx->SIZ.YOsiz, codeidx->SIZ.Xsiz, codeidx->SIZ.Ysiz, 
-			       codeidx->COD.numOfdecomp+1);
+			       numOfreslev );
 
   for( u=0, tile_id=0; u<codeidx->SIZ.YTnum; u++){
     tile_Yrange = get_tile_Yrange( codeidx->SIZ, tile_id, imgreg.level);
@@ -496,7 +498,7 @@ void enqueue_imagedata( query_param_t query_param, msgqueue_param_t *msgqueue)
 	  // Tile completely contained within view-window
 	  // high priority
 	  //printf("Tile completely contained within view-window %d\n", tile_id);
-	  if( query_param.return_type == JPPstream){
+	  if( msgqueue->cachemodel->jppstream){
 	    enqueue_tileheader( tile_id, msgqueue);
 	    enqueue_allprecincts( tile_id, imgreg.level, query_param.lastcomp, query_param.comps, msgqueue);
 	  }
@@ -507,8 +509,9 @@ void enqueue_imagedata( query_param_t query_param, msgqueue_param_t *msgqueue)
 	  // Tile partially overlaps view-window
 	  // low priority
 	  //printf("Tile partially overlaps view-window %d\n", tile_id);
-	  if( query_param.return_type == JPPstream){
+	  if( msgqueue->cachemodel->jppstream){
 	    enqueue_tileheader( tile_id, msgqueue);
+
 	    xmin = tile_Xrange.minvalue >= imgreg.xosiz + imgreg.ox ? 0 : imgreg.xosiz + imgreg.ox - tile_Xrange.minvalue;
 	    xmax = tile_Xrange.maxvalue <= imgreg.xosiz + imgreg.ox + imgreg.sx ? tile_Xrange.maxvalue - tile_Xrange.minvalue -1 : imgreg.xosiz + imgreg.ox + imgreg.sx - tile_Xrange.minvalue -1;
 	    ymin = tile_Yrange.minvalue >= imgreg.yosiz + imgreg.oy ? 0 : imgreg.yosiz + imgreg.oy - tile_Yrange.minvalue;
@@ -543,9 +546,9 @@ void enqueue_precincts( int xmin, int xmax, int ymin, int ymax, int tile_id, int
 	XTsiz = get_tile_XSiz( codeidx->SIZ, tile_id, dec_lev);
 	YTsiz = get_tile_YSiz( codeidx->SIZ, tile_id, dec_lev);
 	
-	XPsiz = codeidx->COD.XPsiz[ res_lev];
-	YPsiz = codeidx->COD.YPsiz[ res_lev];
-	
+	XPsiz = ( codeidx->COD.Scod & 0x01) ? codeidx->COD.XPsiz[ res_lev] : XTsiz;
+	YPsiz = ( codeidx->COD.Scod & 0x01) ? codeidx->COD.YPsiz[ res_lev] : YTsiz;
+	  
 	for( u=0; u<ceil((double)YTsiz/(double)YPsiz); u++){
 	  yminP = u*YPsiz;
 	  ymaxP = (u+1)*YPsiz-1;
@@ -594,13 +597,12 @@ void enqueue_allprecincts( int tile_id, int level, int lastcomp, bool *comps, ms
 	
 	XTsiz = get_tile_XSiz( codeidx->SIZ, tile_id, dec_lev);
 	YTsiz = get_tile_YSiz( codeidx->SIZ, tile_id, dec_lev);
-
-	XPsiz = codeidx->COD.XPsiz[ res_lev];
-	YPsiz = codeidx->COD.YPsiz[ res_lev];
 	
-	for( i=0; i<ceil((double)YTsiz/(double)YPsiz)*ceil((double)XTsiz/(double)XPsiz); i++, seq_id++){
+	XPsiz = ( codeidx->COD.Scod & 0x01) ? codeidx->COD.XPsiz[ res_lev] : XTsiz;
+	YPsiz = ( codeidx->COD.Scod & 0x01) ? codeidx->COD.YPsiz[ res_lev] : YTsiz;
+	
+	for( i=0; i<ceil((double)YTsiz/(double)YPsiz)*ceil((double)XTsiz/(double)XPsiz); i++, seq_id++)
 	  enqueue_precinct( seq_id, tile_id, c, msgqueue);
-	}
       }
     }
 }
diff --git a/applications/jpip/tools/Makefile.nix b/applications/jpip/tools/Makefile.nix
index 707f3f9e..87fcda74 100644
--- a/applications/jpip/tools/Makefile.nix
+++ b/applications/jpip/tools/Makefile.nix
@@ -18,4 +18,3 @@ test_index: test_index.o $(LIBFNAME)
 
 clean:
 	rm -f $(ALL) *.o *~
-	make clean -C indexer -f Makefile.nix
diff --git a/applications/jpip/tools/jpip_to_j2k.c b/applications/jpip/tools/jpip_to_j2k.c
index 3eab0c3e..dfceb69f 100644
--- a/applications/jpip/tools/jpip_to_j2k.c
+++ b/applications/jpip/tools/jpip_to_j2k.c
@@ -88,9 +88,9 @@ int main(int argc,char *argv[])
   parse_JPIPstream( jpipstream, jpiplen, 0, msgqueue);
   
   //print_msgqueue( msgqueue);
-
-  j2kstream = recons_j2k( msgqueue, jpipstream, msgqueue->first->csn, 0, 0, &j2klen);
   
+  j2kstream = recons_j2k( msgqueue, jpipstream, msgqueue->first->csn, 0, 0, &j2klen);
+    
   delete_msgqueue( &msgqueue);
   free( jpipstream);