[trunk] FolderReorgProposal task: fix jpip doxygen

Update issue 177

diff --git a/doc/mainpage.dox.in b/doc/mainpage.dox.in
index 732f7540d7c756642424c3535514e1dfe7213df1..8531aee6316f8d329b26f7e58bfea3a921c9083b 100644 (file)
--- a/doc/mainpage.dox.in
+++ b/doc/mainpage.dox.in
@@ -1,5 +1,5 @@
 /*
- * $Id: mainpage.dox.cmake 2011-09-21 Mickael Savinaud $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2011, Mickael Savinaud, Communications & Systemes <mickael.savinaud@c-s.fr>

diff --git a/doc/openjpip.dox.in b/doc/openjpip.dox.in
index 76bc5d2a8f29995419a2dba0ee72131aaae66953..695cb6865f6c915bd8f5e5e9ebf062e950bae3fc 100644 (file)
--- a/doc/openjpip.dox.in
+++ b/doc/openjpip.dox.in
@@ -1,5 +1,5 @@
 /*
- * $Id: mainpage.h 47 2011-02-17 16:57:49Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq
@@ -28,7 +28,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-/*! \page openjpippage OpenJPIP v2.1 Documentation
+/*! \page openjpippage OpenJPIP v@OPENJPEG_VERSION@ Documentation
  *
  * \section intro Introduction
  * This manual documents the low-level OpenJPIP C API.\n
@@ -36,12 +36,11 @@
  * ( For more info about JPIP, check the website: http://www.jpeg.org/jpeg2000/j2kpart9.html)\n
  *
  * This whole documents covers the following six programs.\n
- * - opj_server.c     JPIP server supporting HTTP connection and JPT/JPP-stream
- * - opj_dec_server.c Server to decode JPT/JPP-stream and communicate locally with JPIP client, which is coded in java
- * - addXMLinJP2.c    To Embed metadata into JP2 file
- * - jpip_to_jp2.c    To Convert JPT/JPP-stream to JP2
- * - jpip_to_j2k.c    To Convert JPT/JPP-stream to J2K
- * - test_index.c     To test index code format of a JP2 file
+ * - opj_server.c          JPIP server supporting HTTP connection and JPT/JPP-stream
+ * - opj_dec_server.c      Server to decode JPT/JPP-stream and communicate locally with JPIP client, which is coded in java
+ * - opj_jpip_addxml.c     To Embed metadata into JP2 file
+ * - opj_jpip_transcode.c  To Convert JPT/JPP-stream to JP2 or J2K
+ * - opj_jpip_test.c       To test index code format of a JP2 file
  *
  * \section license License
  * This software is released under the BSD license, anybody can use or modify the library, even for commercial applications.\n

diff --git a/src/bin/jpip/CMakeLists.txt b/src/bin/jpip/CMakeLists.txt
index 6a411a03c15bc26a656f9d577ebaa167a96c4215..6106e0d23f3270da2e34fe90aeb64c90c1823242 100644 (file)
--- a/src/bin/jpip/CMakeLists.txt
+++ b/src/bin/jpip/CMakeLists.txt
@@ -47,14 +47,7 @@ set(EXES
   opj_jpip_test
   )
 foreach(exe ${EXES})
-  if(${exe} STREQUAL "opj_jpip_transcode")
-    add_executable(${exe} ${exe}.c
-      jpip_to_jp2.c
-      jpip_to_j2k.c
-    )
-  else()
-    add_executable(${exe} ${exe}.c)
-  endif()
+  add_executable(${exe} ${exe}.c)
   target_link_libraries(${exe} openjpip_local)
   install(TARGETS ${exe}
     EXPORT OpenJPEGTargets

diff --git a/src/bin/jpip/jpip_to_j2k.c b/src/bin/jpip/jpip_to_j2k.c
deleted file mode 100644 (file)
index 0f64715..0000000
--- a/src/bin/jpip/jpip_to_j2k.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * $Id$
- *
- * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2011, Professor Benoit Macq
- * Copyright (c) 2010-2011, Kaori Hagihara
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*! \file
- *  \brief jpip_to_j2k is a program to convert JPT- JPP- stream to J2K file
- *
- *  \section impinst Implementing instructions
- *  This program takes two arguments. \n
- *   -# Input  JPT or JPP file
- *   -# Output J2K file\n
- *   % ./jpip_to_j2k input.jpt output.j2k
- *   or
- *   % ./jpip_to_j2k input.jpp output.j2k
- */
-
-#include <stdio.h>
-#include "openjpip.h"
-
-int jpip_to_j2k(int argc,char *argv[])
-{
-  jpip_dec_param_t *dec;
-  
-  if( argc < 3){
-    fprintf( stderr, "Too few arguments:\n");
-    fprintf( stderr, " - input  jpt or jpp file\n");
-    fprintf( stderr, " - output j2k file\n");
-    return -1;
-  }
-  
-  dec = init_jpipdecoder( false);
-  
-  if(!( fread_jpip( argv[1], dec)))
-    return -1;
-  
-  decode_jpip( dec);
-  
-  if(!( fwrite_jp2k( argv[2], dec)))
-    return -1;
-  
-  /*  output_log( true, false, false, dec); */
-  
-  destroy_jpipdecoder( &dec);
-
-  return 0;
-}

diff --git a/src/bin/jpip/jpip_to_jp2.c b/src/bin/jpip/jpip_to_jp2.c
deleted file mode 100644 (file)
index 138fc8a..0000000
--- a/src/bin/jpip/jpip_to_jp2.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * $Id$
- *
- * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2011, Professor Benoit Macq
- * Copyright (c) 2010-2011, Kaori Hagihara
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*! \file
- *  \brief jpip_to_jp2 is a program to convert JPT- JPP- stream to JP2 file
- *
- *  \section impinst Implementing instructions
- *  This program takes two arguments. \n
- *   -# Input JPT or JPP file
- *   -# Output JP2 file\n
- *   % ./jpip_to_jp2 input.jpt output.jp2
- *   or
- *   % ./jpip_to_jp2 input.jpp output.jp2
- */
-
-#include <stdio.h>
-#include "openjpip.h"
-
-int jpip_to_jp2(int argc,char *argv[])
-{
-  jpip_dec_param_t *dec;
-    
-  if( argc < 3){
-    fprintf( stderr, "Too few arguments:\n");
-    fprintf( stderr, " - input  jpt or jpp file\n");
-    fprintf( stderr, " - output jp2 file\n");
-    return -1;
-  }
-  
-  dec = init_jpipdecoder( true);
-  
-  if(!( fread_jpip( argv[1], dec)))
-    return -1;
-  
-  decode_jpip( dec);
-  
-  if(!(fwrite_jp2k( argv[2], dec)))
-    return -1;
-
-  output_log( true, false, true, dec);
-
-  destroy_jpipdecoder( &dec);
-
-  return 0;
-}

diff --git a/src/bin/jpip/opj_jpip_transcode.c b/src/bin/jpip/opj_jpip_transcode.c
index 4bb8b35458758976939733ab5ec20620688daab6..55ec21822999ab1be1a82cf595e9eaad6f9c4854 100644 (file)
--- a/src/bin/jpip/opj_jpip_transcode.c
+++ b/src/bin/jpip/opj_jpip_transcode.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq
- * Copyright (c) 2012, Mathieu Malaterre
+ * Copyright (c) 2010-2011, Kaori Hagihara
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -28,19 +28,86 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <stdio.h>
+#include "openjpip.h"
+
+/*! \file
+ *  \brief jpip_to_jp2 is a program to convert JPT- JPP- stream to JP2 file
+ *
+ *  \section impinst Implementing instructions
+ *  This program takes two arguments. \n
+ *   -# Input JPT or JPP file
+ *   -# Output JP2 file\n
+ *   % ./jpip_to_jp2 input.jpt output.jp2
+ *   or
+ *   % ./jpip_to_jp2 input.jpp output.jp2
+ */
+static int jpip_to_jp2(int argc,char *argv[])
+{
+  jpip_dec_param_t *dec;
+    
+  if( argc < 3){
+    fprintf( stderr, "Too few arguments:\n");
+    fprintf( stderr, " - input  jpt or jpp file\n");
+    fprintf( stderr, " - output jp2 file\n");
+    return -1;
+  }
+  
+  dec = init_jpipdecoder( true);
+  
+  if(!( fread_jpip( argv[1], dec)))
+    return -1;
+  
+  decode_jpip( dec);
+  
+  if(!(fwrite_jp2k( argv[2], dec)))
+    return -1;
+
+  output_log( true, false, true, dec);
+
+  destroy_jpipdecoder( &dec);
+
+  return 0;
+}
+
 /*! \file
- *  \brief opj_jpip_transcode is a program to convert JPT- JPP- stream to J2K/JP2 file
+ *  \brief jpip_to_j2k is a program to convert JPT- JPP- stream to J2K file
  *
  *  \section impinst Implementing instructions
  *  This program takes two arguments. \n
  *   -# Input  JPT or JPP file
  *   -# Output J2K file\n
- *   % ./opj_jpip_transcode input.jpt output.j2k
+ *   % ./jpip_to_j2k input.jpt output.j2k
  *   or
  *   % ./jpip_to_j2k input.jpp output.j2k
  */
-extern int jpip_to_j2k(int argc,char *argv[]);
-extern int jpip_to_jp2(int argc,char *argv[]);
+static int jpip_to_j2k(int argc,char *argv[])
+{
+  jpip_dec_param_t *dec;
+  
+  if( argc < 3){
+    fprintf( stderr, "Too few arguments:\n");
+    fprintf( stderr, " - input  jpt or jpp file\n");
+    fprintf( stderr, " - output j2k file\n");
+    return -1;
+  }
+  
+  dec = init_jpipdecoder( false);
+  
+  if(!( fread_jpip( argv[1], dec)))
+    return -1;
+  
+  decode_jpip( dec);
+  
+  if(!( fwrite_jp2k( argv[2], dec)))
+    return -1;
+  
+  /*  output_log( true, false, false, dec); */
+  
+  destroy_jpipdecoder( &dec);
+
+  return 0;
+}
 
 int main(int argc,char *argv[])
 {

diff --git a/src/lib/openjpip/box_manager.c b/src/lib/openjpip/box_manager.c
index 87bb7756685fdb76452778165c1de6abca4c5222..00d8edca9422751e56ed5169c0fb183ef491e9f0 100644 (file)
--- a/src/lib/openjpip/box_manager.c
+++ b/src/lib/openjpip/box_manager.c
@@ -1,5 +1,5 @@
 /*
- * $Id: box_manager.c 44 2011-02-15 12:32:29Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq

diff --git a/src/lib/openjpip/box_manager.h b/src/lib/openjpip/box_manager.h
index 88cd5336697a8dee3ada63ac3115377bc55a91e3..7b4a93778e961b1c51d46862ebfe1cfffacc07ec 100644 (file)
--- a/src/lib/openjpip/box_manager.h
+++ b/src/lib/openjpip/box_manager.h
@@ -1,5 +1,5 @@
 /*
- * $Id: box_manager.h 44 2011-02-15 12:32:29Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq

diff --git a/src/lib/openjpip/boxheader_manager.c b/src/lib/openjpip/boxheader_manager.c
index b345a96dd6f7ca40d0aa6c6def44b629ac1c2028..98b32d31fe571efc8337fed287e429b61d08fedd 100644 (file)
--- a/src/lib/openjpip/boxheader_manager.c
+++ b/src/lib/openjpip/boxheader_manager.c
@@ -1,5 +1,5 @@
 /*
- * $Id: boxheader_manager.c 44 2011-02-15 12:32:29Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq

diff --git a/src/lib/openjpip/boxheader_manager.h b/src/lib/openjpip/boxheader_manager.h
index f8e48f392ab9f84cc3413da2e709264cb29cdc2d..91092df912abd1d8f589820487c8ef815ab4f71c 100644 (file)
--- a/src/lib/openjpip/boxheader_manager.h
+++ b/src/lib/openjpip/boxheader_manager.h
@@ -1,5 +1,5 @@
 /*
- * $Id: boxheader_manager.h 44 2011-02-15 12:32:29Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq

diff --git a/src/lib/openjpip/byte_manager.c b/src/lib/openjpip/byte_manager.c
index 502c26bd5d6167165e4a3c41a32f24a82138d852..cac02b5fe2351a005ef68280ec8dd5d541512061 100644 (file)
--- a/src/lib/openjpip/byte_manager.c
+++ b/src/lib/openjpip/byte_manager.c
@@ -1,5 +1,5 @@
 /*
- * $Id: byte_manager.c 44 2011-02-15 12:32:29Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq

diff --git a/src/lib/openjpip/byte_manager.h b/src/lib/openjpip/byte_manager.h
index 0a29503e453086f91ef3714bf6d045d60eaeafce..696c1f69225f7ce31977a09e51d11baa55721987 100644 (file)
--- a/src/lib/openjpip/byte_manager.h
+++ b/src/lib/openjpip/byte_manager.h
@@ -1,5 +1,5 @@
 /*
- * $Id: byte_manager.h 44 2011-02-15 12:32:29Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq

diff --git a/src/lib/openjpip/cache_manager.c b/src/lib/openjpip/cache_manager.c
index 76f7b7b3555d1c0575b9b911a56d54cbe39482df..ce8e012a3d0ee0fdca5e705d4abe08b3e233fabc 100644 (file)
--- a/src/lib/openjpip/cache_manager.c
+++ b/src/lib/openjpip/cache_manager.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cache_manager.c 53 2011-05-09 16:55:39Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq

diff --git a/src/lib/openjpip/cache_manager.h b/src/lib/openjpip/cache_manager.h
index 0c9afb0b750d72f4fd77f64f33148a80db368b97..ad6a13f5df92686f5525a33bcd2c1612d90fb0ae 100644 (file)
--- a/src/lib/openjpip/cache_manager.h
+++ b/src/lib/openjpip/cache_manager.h
@@ -1,5 +1,5 @@
 /*
- * $Id: cache_manager.h 44 2011-02-15 12:32:29Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq

diff --git a/src/lib/openjpip/channel_manager.c b/src/lib/openjpip/channel_manager.c
index 313f8ced90e05183e4ce246f74ee3c70dd8b6aa7..8060d680bfb6f0662100550cb946ad4246b050bc 100644 (file)
--- a/src/lib/openjpip/channel_manager.c
+++ b/src/lib/openjpip/channel_manager.c
@@ -1,5 +1,5 @@
 /*
- * $Id: channel_manager.c 44 2011-02-15 12:32:29Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq

diff --git a/src/lib/openjpip/channel_manager.h b/src/lib/openjpip/channel_manager.h
index 79cc0160ce80a1fe1c28b3e4fc152e5063383ecf..b1aeb2b453d4c75c6f3ce81575f47cb6f40f8d15 100644 (file)
--- a/src/lib/openjpip/channel_manager.h
+++ b/src/lib/openjpip/channel_manager.h
@@ -1,5 +1,5 @@
 /*
- * $Id: channel_manager.h 44 2011-02-15 12:32:29Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq

diff --git a/src/lib/openjpip/codestream_manager.c b/src/lib/openjpip/codestream_manager.c
index d7797c1330386be929b29133d00ff1c9bd7b9485..27ae5e1ab09729e08729313b0b8be563a8d00944 100644 (file)
--- a/src/lib/openjpip/codestream_manager.c
+++ b/src/lib/openjpip/codestream_manager.c
@@ -1,5 +1,5 @@
 /*
- * $Id: codestream_manager.c 44 2011-02-15 12:32:29Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq

diff --git a/src/lib/openjpip/codestream_manager.h b/src/lib/openjpip/codestream_manager.h
index b600d8e58aebd878833829c93d7b79df0c4d5f3a..d671a6ed302817bc9708ac69662e9f39d3954c37 100644 (file)
--- a/src/lib/openjpip/codestream_manager.h
+++ b/src/lib/openjpip/codestream_manager.h
@@ -1,5 +1,5 @@
 /*
- * $Id: codestream_manager.h 44 2011-02-15 12:32:29Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq

diff --git a/src/lib/openjpip/faixbox_manager.c b/src/lib/openjpip/faixbox_manager.c
index 3c4438326fb4ff670a1c515eead0cc99ea4aa779..bfc3d4d3f0e95481c4743200f91b7b5bc2d204e6 100644 (file)
--- a/src/lib/openjpip/faixbox_manager.c
+++ b/src/lib/openjpip/faixbox_manager.c
@@ -1,5 +1,5 @@
 /*
- * $Id: faixbox_manager.c 53 2011-05-09 16:55:39Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq

diff --git a/src/lib/openjpip/faixbox_manager.h b/src/lib/openjpip/faixbox_manager.h
index 45ea8c3e2c8ee662baf7c726b4354f956356df21..bf4a02a669c8f7f50105d2a10a9badc7a4aa53d9 100644 (file)
--- a/src/lib/openjpip/faixbox_manager.h
+++ b/src/lib/openjpip/faixbox_manager.h
@@ -1,5 +1,5 @@
 /*
- * $Id: faixbox_manager.h 44 2011-02-15 12:32:29Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq

diff --git a/src/lib/openjpip/ihdrbox_manager.c b/src/lib/openjpip/ihdrbox_manager.c
index d501b6125d5c743be03e81abccfa4a707636ac3f..85bbf76a1bdbcea751f514f34b8ee6765baa427f 100644 (file)
--- a/src/lib/openjpip/ihdrbox_manager.c
+++ b/src/lib/openjpip/ihdrbox_manager.c
@@ -1,5 +1,5 @@
 /*
- * $Id: ihdrbox_manager.c 44 2011-02-15 12:32:29Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq

diff --git a/src/lib/openjpip/ihdrbox_manager.h b/src/lib/openjpip/ihdrbox_manager.h
index 9fa9a830158512f64a348db26dfefe5a53ab4043..1e112ff37f65c00a1383d27915261b0fba42462b 100644 (file)
--- a/src/lib/openjpip/ihdrbox_manager.h
+++ b/src/lib/openjpip/ihdrbox_manager.h
@@ -1,5 +1,5 @@
 /*
- * $Id: ihdrbox_manager.h 44 2011-02-15 12:32:29Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq

diff --git a/src/lib/openjpip/imgreg_manager.c b/src/lib/openjpip/imgreg_manager.c
index 3a713c32a7360847a90b28e499212c5c169f17ae..15b24a4614b04cb33d17abce3d12f57dfd199863 100644 (file)
--- a/src/lib/openjpip/imgreg_manager.c
+++ b/src/lib/openjpip/imgreg_manager.c
@@ -1,5 +1,5 @@
 /*
- * $Id: imgreg_manager.c 44 2011-02-15 12:32:29Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq

diff --git a/src/lib/openjpip/imgreg_manager.h b/src/lib/openjpip/imgreg_manager.h
index 7967120b55ecf4ff3fc7ed5358b82ed9199bbc32..cca4df178dd65b699f13112d915e069447bfda6a 100644 (file)
--- a/src/lib/openjpip/imgreg_manager.h
+++ b/src/lib/openjpip/imgreg_manager.h
@@ -1,5 +1,5 @@
 /*
- * $Id: imgreg_manager.h 44 2011-02-15 12:32:29Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq

diff --git a/src/lib/openjpip/imgsock_manager.c b/src/lib/openjpip/imgsock_manager.c
index 612cb3786b060f8468b2b240c22a3bc18b39154f..b3b200c6a8f632668362984bf2fa14234da14d4d 100644 (file)
--- a/src/lib/openjpip/imgsock_manager.c
+++ b/src/lib/openjpip/imgsock_manager.c
@@ -1,5 +1,5 @@
 /*
- * $Id: imgsock_manager.c 54 2011-05-10 13:22:47Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq

diff --git a/src/lib/openjpip/imgsock_manager.h b/src/lib/openjpip/imgsock_manager.h
index 044bdc530b57db4122356e491008a042afbad20b..88ab1d33d586476eae6d1f262f17f86ec9a2dd79 100644 (file)
--- a/src/lib/openjpip/imgsock_manager.h
+++ b/src/lib/openjpip/imgsock_manager.h
@@ -1,5 +1,5 @@
 /*
- * $Id: imgsock_manager.h 54 2011-05-10 13:22:47Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq

diff --git a/src/lib/openjpip/index_manager.c b/src/lib/openjpip/index_manager.c
index 6f8357e9c338ba410660b4d786e7388e997a9484..e4812226ba2480b2f52e114f03abadf22c6ea0d5 100644 (file)
--- a/src/lib/openjpip/index_manager.c
+++ b/src/lib/openjpip/index_manager.c
@@ -1,5 +1,5 @@
 /*
- * $Id: index_manager.c 53 2011-05-09 16:55:39Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq

diff --git a/src/lib/openjpip/index_manager.h b/src/lib/openjpip/index_manager.h
index c1969facbcb83b68547e1410576125e252153271..a9f141c8e129c8e1ec8ae47e54171fc519f82e61 100644 (file)
--- a/src/lib/openjpip/index_manager.h
+++ b/src/lib/openjpip/index_manager.h
@@ -1,5 +1,5 @@
 /*
- * $Id: index_manager.h 53 2011-05-09 16:55:39Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq

diff --git a/src/lib/openjpip/jp2k_decoder.c b/src/lib/openjpip/jp2k_decoder.c
index 9d619b095d62ce2b8f19f786067ce8d3609e2217..4d731b7a03eab3978ba95360691fe1730013f7e9 100644 (file)
--- a/src/lib/openjpip/jp2k_decoder.c
+++ b/src/lib/openjpip/jp2k_decoder.c
@@ -1,5 +1,5 @@
 /*
- * $Id: jp2k_decoder.c 53 2011-05-09 16:55:39Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq

diff --git a/src/lib/openjpip/jp2k_decoder.h b/src/lib/openjpip/jp2k_decoder.h
index c999cdf1624f86b017586710f5369df6769aa271..a53b1537b30883040e54a91d1cee9ff49bce5091 100644 (file)
--- a/src/lib/openjpip/jp2k_decoder.h
+++ b/src/lib/openjpip/jp2k_decoder.h
@@ -1,5 +1,5 @@
 /*
- * $Id: jp2k_decoder.h 44 2011-02-15 12:32:29Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq

diff --git a/src/lib/openjpip/manfbox_manager.c b/src/lib/openjpip/manfbox_manager.c
index 3747246180207cb2061b1621346717ba0c830328..8743eb5df64e585f06a9ad6c5192c1d06c8bf4c5 100644 (file)
--- a/src/lib/openjpip/manfbox_manager.c
+++ b/src/lib/openjpip/manfbox_manager.c
@@ -1,5 +1,5 @@
 /*
- * $Id: manfbox_manager.c 44 2011-02-15 12:32:29Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq

diff --git a/src/lib/openjpip/manfbox_manager.h b/src/lib/openjpip/manfbox_manager.h
index ed4189e02752b223b872973fc2add353777a0537..04cf077543eec12f6813078c6ca71fd12bf09094 100644 (file)
--- a/src/lib/openjpip/manfbox_manager.h
+++ b/src/lib/openjpip/manfbox_manager.h
@@ -1,5 +1,5 @@
 /*
- * $Id: manfbox_manager.h 44 2011-02-15 12:32:29Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq

diff --git a/src/lib/openjpip/marker_manager.c b/src/lib/openjpip/marker_manager.c
index 766ecd6e5835ddcfded9dbb19a183c0ff7edf757..92ff8b13a40f95f05a70cc3edffa6cdb6e06f9b6 100644 (file)
--- a/src/lib/openjpip/marker_manager.c
+++ b/src/lib/openjpip/marker_manager.c
@@ -1,5 +1,5 @@
 /*
- * $Id: marker_manager.c 44 2011-02-15 12:32:29Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq

diff --git a/src/lib/openjpip/marker_manager.h b/src/lib/openjpip/marker_manager.h
index 68ea2a8bc408840702580faa79608037b9e7772e..4d01e35376478fc250e2ed81023a14e2bdae1d10 100644 (file)
--- a/src/lib/openjpip/marker_manager.h
+++ b/src/lib/openjpip/marker_manager.h
@@ -1,5 +1,5 @@
 /*
- * $Id: marker_manager.h 44 2011-02-15 12:32:29Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq

diff --git a/src/lib/openjpip/metadata_manager.c b/src/lib/openjpip/metadata_manager.c
index 12b61efcd2b8b214487878ac085b2af7a0a9e990..6cf32abdc7bc2a5abaae6a51eb26a85bcd395121 100644 (file)
--- a/src/lib/openjpip/metadata_manager.c
+++ b/src/lib/openjpip/metadata_manager.c
@@ -1,5 +1,5 @@
 /*
- * $Id: metadata_manager.c 53 2011-05-09 16:55:39Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq

diff --git a/src/lib/openjpip/metadata_manager.h b/src/lib/openjpip/metadata_manager.h
index 089b19a5cd123d440cb322516f3773bc35454daa..3bed8d0e93412f5974735d19c38e2ad8d09880f3 100644 (file)
--- a/src/lib/openjpip/metadata_manager.h
+++ b/src/lib/openjpip/metadata_manager.h
@@ -1,5 +1,5 @@
 /*
- * $Id: metadata_manager.h 44 2011-02-15 12:32:29Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq

diff --git a/src/lib/openjpip/mhixbox_manager.c b/src/lib/openjpip/mhixbox_manager.c
index b311126b9713cefef359882467fb495767aa8ab2..6dc72c4c4940bb1341608e1ab59f4fda1d9a5b22 100644 (file)
--- a/src/lib/openjpip/mhixbox_manager.c
+++ b/src/lib/openjpip/mhixbox_manager.c
@@ -1,5 +1,5 @@
 /*
- * $Id: mhixbox_manager.c 44 2011-02-15 12:32:29Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq

diff --git a/src/lib/openjpip/mhixbox_manager.h b/src/lib/openjpip/mhixbox_manager.h
index 5905b25f7a625f07d7b96074d4a9b4b023f83c54..2c6d51c7ffbaab2d0f1bf369dfdc70de01aea0b5 100644 (file)
--- a/src/lib/openjpip/mhixbox_manager.h
+++ b/src/lib/openjpip/mhixbox_manager.h
@@ -1,5 +1,5 @@
 /*
- * $Id: mhixbox_manager.h 44 2011-02-15 12:32:29Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq

diff --git a/src/lib/openjpip/msgqueue_manager.c b/src/lib/openjpip/msgqueue_manager.c
index 29b64a26d26a4b36c2281b7e2e4d3b237bdd8c16..31d3991f74d3daebb70d79b062f6033f9a0f864b 100644 (file)
--- a/src/lib/openjpip/msgqueue_manager.c
+++ b/src/lib/openjpip/msgqueue_manager.c
@@ -1,5 +1,5 @@
 /*
- * $Id: msgqueue_manager.c 53 2011-05-09 16:55:39Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq

diff --git a/src/lib/openjpip/msgqueue_manager.h b/src/lib/openjpip/msgqueue_manager.h
index e54f2dc16461a723fc5e59e9e6dd08be2350b926..40548d91e4a88db0546fc3431ad972102d7c5520 100644 (file)
--- a/src/lib/openjpip/msgqueue_manager.h
+++ b/src/lib/openjpip/msgqueue_manager.h
@@ -1,5 +1,5 @@
 /*
- * $Id: msgqueue_manager.h 53 2011-05-09 16:55:39Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq

diff --git a/src/lib/openjpip/placeholder_manager.c b/src/lib/openjpip/placeholder_manager.c
index 4a37a13be62993b6e6ab92d01a085b54a9de00c8..e3cadaa195bd71eefc0cdccd4940d79b3894da7f 100644 (file)
--- a/src/lib/openjpip/placeholder_manager.c
+++ b/src/lib/openjpip/placeholder_manager.c
@@ -1,5 +1,5 @@
 /*
- * $Id: placeholder_manager.c 53 2011-05-09 16:55:39Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq

diff --git a/src/lib/openjpip/placeholder_manager.h b/src/lib/openjpip/placeholder_manager.h
index ced20854991d46cc2d74a93f5d17c5bb063162c9..0177b68a2cb7576692cab5e385c7d65d8b43af58 100644 (file)
--- a/src/lib/openjpip/placeholder_manager.h
+++ b/src/lib/openjpip/placeholder_manager.h
@@ -1,5 +1,5 @@
 /*
- * $Id: placeholder_manager.h 44 2011-02-15 12:32:29Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq

diff --git a/src/lib/openjpip/query_parser.c b/src/lib/openjpip/query_parser.c
index 460a5eb6655263c7c3f34f772edf5bc409a9cfbe..20f38b698c2ff4f4f23f41802aaf6fdc65df4d0c 100644 (file)
--- a/src/lib/openjpip/query_parser.c
+++ b/src/lib/openjpip/query_parser.c
@@ -1,5 +1,5 @@
 /*
- * $Id: query_parser.c 53 2011-05-09 16:55:39Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq

diff --git a/src/lib/openjpip/query_parser.h b/src/lib/openjpip/query_parser.h
index d60cafe6bb39b07ddbc4abd3ca3b26a8681a1257..cea9ed235788deb1d96d26ecf737c3815d9f5e1e 100644 (file)
--- a/src/lib/openjpip/query_parser.h
+++ b/src/lib/openjpip/query_parser.h
@@ -1,5 +1,5 @@
 /*
- * $Id: query_parser.h 53 2011-05-09 16:55:39Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq

diff --git a/src/lib/openjpip/session_manager.c b/src/lib/openjpip/session_manager.c
index 5c1d7588aae7660b3655144effb7261eadf55b6e..5d9dd73edc4d3f2deadfd40a55203b684ee14ba3 100644 (file)
--- a/src/lib/openjpip/session_manager.c
+++ b/src/lib/openjpip/session_manager.c
@@ -1,5 +1,5 @@
 /*
- * $Id: session_manager.c 44 2011-02-15 12:32:29Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq

diff --git a/src/lib/openjpip/session_manager.h b/src/lib/openjpip/session_manager.h
index 03df4f4b4b62f2a82486500277e248807f3fc369..655d850652a68dedabe550de4f4039bfa3413647 100644 (file)
--- a/src/lib/openjpip/session_manager.h
+++ b/src/lib/openjpip/session_manager.h
@@ -1,5 +1,5 @@
 /*
- * $Id: session_manager.h 53 2011-05-09 16:55:39Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq

diff --git a/src/lib/openjpip/target_manager.c b/src/lib/openjpip/target_manager.c
index 8b4763a5da9d184cc97d0b09e5fe8475a839ebb0..72d2f564d3858c32d3a2f398ed1f7a791f854ce2 100644 (file)
--- a/src/lib/openjpip/target_manager.c
+++ b/src/lib/openjpip/target_manager.c
@@ -1,5 +1,5 @@
 /*
- * $Id: target_manager.c 44 2011-02-15 12:32:29Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq

diff --git a/src/lib/openjpip/target_manager.h b/src/lib/openjpip/target_manager.h
index 275adc4a2f4f1555da922a113f92f114eeac09c6..8525954812a396aa79092aea5cedf33abf1d16a0 100644 (file)
--- a/src/lib/openjpip/target_manager.h
+++ b/src/lib/openjpip/target_manager.h
@@ -1,5 +1,5 @@
 /*
- * $Id: target_manager.h 44 2011-02-15 12:32:29Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq