[trunk] FolderReorgProposal task: fix jpip doxygen

Update issue 177

4 files changed, 73 insertions, 157 deletions

diff --git a/src/bin/jpip/CMakeLists.txt b/src/bin/jpip/CMakeLists.txt
index 6a411a03..6106e0d2 100644
--- 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
index 0f64715e..00000000
--- 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
index 138fc8ac..00000000
--- 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 4bb8b354..55ec2182 100644
--- 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[])
 {