From 8d0e5899b95a0613f0e60884c303fc70a0c4f15f Mon Sep 17 00:00:00 2001
From: Mathieu Malaterre <mathieu.malaterre@gmail.com>
Date: Mon, 19 Mar 2012 10:00:06 +0000
Subject: [PATCH] [trunk] Remove remaining of OPJ_INT64_F/OPJ_UINT64_F before
 move to C99 convention

---
 libopenjpeg/openjpeg.h   | 5 -----
 tests/comparePGXimages.c | 9 +++++----
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/libopenjpeg/openjpeg.h b/libopenjpeg/openjpeg.h
index 611a778b..7a420d8b 100644
--- a/libopenjpeg/openjpeg.h
+++ b/libopenjpeg/openjpeg.h
@@ -93,8 +93,6 @@ typedef int32_t  OPJ_INT32;
 typedef uint32_t OPJ_UINT32;
 typedef int64_t  OPJ_INT64;
 typedef uint64_t OPJ_UINT64;
-#define OPJ_INT64_F  "ll"
-#define OPJ_UINT64_F "ll"
 #else
 #if defined(_WIN32)
 typedef   signed __int8   OPJ_INT8;
@@ -105,8 +103,6 @@ typedef   signed __int32  OPJ_INT32;
 typedef unsigned __int32  OPJ_UINT32;
 typedef   signed __int64  OPJ_INT64;
 typedef unsigned __int64  OPJ_UINT64;
-#define OPJ_INT64_F  "I64"
-#define OPJ_UINT64_F "I64"
 #else
 #error unsupported platform
 #endif
@@ -114,7 +110,6 @@ typedef unsigned __int64  OPJ_UINT64;
 
 /* 64-bit file offset type */
 typedef OPJ_INT64 OPJ_OFF_T;
-#define OPJ_OFF_F OPJ_INT64_F
 
 /* Avoid compile-time warning because parameter is not used */
 #define OPJ_ARG_NOT_USED(x) (void)(x)
diff --git a/tests/comparePGXimages.c b/tests/comparePGXimages.c
index 36ddb835..be741141 100644
--- a/tests/comparePGXimages.c
+++ b/tests/comparePGXimages.c
@@ -93,7 +93,7 @@ void comparePGXimages_help_display(void) {
 /*******************************************************************************
  * Parse command line
  *******************************************************************************/
-int parse_cmdline_cmp(int argc, char **argv, test_cmp_parameters* param)
+static int parse_cmdline_cmp(int argc, char **argv, test_cmp_parameters* param)
 {
   char *MSElistvalues = NULL;  char *PEAKlistvalues= NULL;
   char *separatorList = NULL;
@@ -332,7 +332,7 @@ double* parseToleranceValues( char* inArg, const int nbcomp)
  * Create filenames from a filename by used separator and nb components
  * (begin to 0)
  *******************************************************************************/
-char* createMultiComponentsFilename(const char* inFilename, const int indexF, const char* separator)
+static char* createMultiComponentsFilename(const char* inFilename, const int indexF, const char* separator)
 {
   char s[255];
   char *outFilename, *ptr;
@@ -497,7 +497,7 @@ int imageToPNG(const opj_image_t* image, const char* filename, int num_comp_sele
 int main(int argc, char **argv)
 {
   test_cmp_parameters inParam;
-  int it_comp, itpxl;
+  OPJ_UINT32 it_comp, itpxl;
   int failed = 0;
   int nbFilenamePGXbase, nbFilenamePGXtest;
   char *filenamePNGtest= NULL, *filenamePNGbase = NULL, *filenamePNGdiff = NULL;
@@ -531,7 +531,8 @@ int main(int argc, char **argv)
          inParam.nr_flag, inParam.separator_base, inParam.separator_test);
 
   if ( (inParam.tabMSEvalues != NULL) && (inParam.tabPEAKvalues != NULL))
-  {
+    {
+    int it_comp;
     printf(" MSE values = [");
     for (it_comp = 0; it_comp < inParam.nbcomp; it_comp++)
       printf(" %f ", inParam.tabMSEvalues[it_comp]);