[trunk] Remove some warnings about missing prototypes (gcc)

6 files changed, 23 insertions, 17 deletions

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index e01834a6..9e53f366 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -50,6 +50,8 @@ add_test(tte2 ${EXECUTABLE_OUTPUT_PATH}/test_tile_encoder 3 2048 2048 1024 1024
 add_test(tte3 ${EXECUTABLE_OUTPUT_PATH}/test_tile_encoder 1 2048 2048 1024 1024 8 1 tte3.j2k)
 add_test(tte4 ${EXECUTABLE_OUTPUT_PATH}/test_tile_encoder 1  256  256  128  128 8 0 tte4.j2k)
 add_test(tte5 ${EXECUTABLE_OUTPUT_PATH}/test_tile_encoder 1  512  512  256  256 8 0 tte5.j2k)
+#add_test(tte6 ${EXECUTABLE_OUTPUT_PATH}/test_tile_encoder 1 8192 8192  512  512 8 0 tte6.j2k)
+#add_test(tte7 ${EXECUTABLE_OUTPUT_PATH}/test_tile_encoder 1 32768 32768 512  512 8 0 tte7.jp2)
 
 add_executable(test_tile_decoder test_tile_decoder.c)
 target_link_libraries(test_tile_decoder ${OPENJPEG_LIBRARY_NAME})
@@ -60,6 +62,10 @@ add_test(ttd1 ${EXECUTABLE_OUTPUT_PATH}/test_tile_decoder 0 0 1024 1024 tte1.j2k
 set_property(TEST ttd1 APPEND PROPERTY DEPENDS tte1)
 add_test(ttd2 ${EXECUTABLE_OUTPUT_PATH}/test_tile_decoder 0 0 1024 1024 tte2.jp2)
 set_property(TEST ttd2 APPEND PROPERTY DEPENDS tte2)
+#add_test(ttd6 ${EXECUTABLE_OUTPUT_PATH}/test_tile_decoder 0 0  512  512 tte6.j2k)
+#set_property(TEST ttd6 APPEND PROPERTY DEPENDS tte6)
+#add_test(ttd7 ${EXECUTABLE_OUTPUT_PATH}/test_tile_decoder 0 0  512  512 tte7.jp2)
+#set_property(TEST ttd7 APPEND PROPERTY DEPENDS tte7)
 
 # No image send to the dashboard if lib PNG is not available.
 if(NOT HAVE_LIBPNG)
diff --git a/tests/compareRAWimages.c b/tests/compareRAWimages.c
index 0421bebf..53e423b8 100644
--- a/tests/compareRAWimages.c
+++ b/tests/compareRAWimages.c
@@ -62,7 +62,7 @@ void compareRAWimages_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)
 {
 	int sizemembasefile, sizememtestfile;
 	int index;
diff --git a/tests/compare_dump_files.c b/tests/compare_dump_files.c
index e503d120..fa477495 100644
--- a/tests/compare_dump_files.c
+++ b/tests/compare_dump_files.c
@@ -50,7 +50,7 @@ typedef struct test_cmp_parameters
 /*******************************************************************************
  * Command line help function
  *******************************************************************************/
-void compare_dump_files_help_display(void) {
+static void compare_dump_files_help_display(void) {
   fprintf(stdout,"\nList of parameters for the compare_dump_files function  \n");
   fprintf(stdout,"\n");
   fprintf(stdout,"  -b \t REQUIRED \t filename to the reference/baseline dump file \n");
@@ -60,7 +60,7 @@ void compare_dump_files_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)
 {
   int sizemembasefile, sizememtestfile;
   int index;
diff --git a/tests/j2k_random_tile_access.c b/tests/j2k_random_tile_access.c
index d8b70f15..6fb7e26a 100644
--- a/tests/j2k_random_tile_access.c
+++ b/tests/j2k_random_tile_access.c
@@ -48,7 +48,7 @@
 #include "format_defs.h"
 
 /* -------------------------------------------------------------------------- */
-int get_file_format(const char *filename) {
+static int get_file_format(const char *filename) {
 	unsigned int i;
 	static const char *extension[] = {"pgx", "pnm", "pgm", "ppm", "bmp","tif", "raw", "tga", "png", "j2k", "jp2", "jpt", "j2c", "jpc" };
 	static const int format[] = { PGX_DFMT, PXM_DFMT, PXM_DFMT, PXM_DFMT, BMP_DFMT, TIF_DFMT, RAW_DFMT, TGA_DFMT, PNG_DFMT, J2K_CFMT, JP2_CFMT, JPT_CFMT, J2K_CFMT, J2K_CFMT };
@@ -72,21 +72,21 @@ int get_file_format(const char *filename) {
 /**
 sample error callback expecting a FILE* client object
 */
-void error_callback(const char *msg, void *client_data) {
+static void error_callback(const char *msg, void *client_data) {
 	FILE *stream = (FILE*)client_data;
 	fprintf(stream, "[ERROR] %s", msg);
 }
 /**
 sample warning callback expecting a FILE* client object
 */
-void warning_callback(const char *msg, void *client_data) {
+static void warning_callback(const char *msg, void *client_data) {
 	FILE *stream = (FILE*)client_data;
 	fprintf(stream, "[WARNING] %s", msg);
 }
 /**
 sample debug callback expecting no client object
 */
-void info_callback(const char *msg, void *client_data) {
+static void info_callback(const char *msg, void *client_data) {
 	(void)client_data;
 	fprintf(stdout, "[INFO] %s", msg);
 }
diff --git a/tests/test_tile_decoder.c b/tests/test_tile_decoder.c
index 8ff7ad28..6691cd4e 100644
--- a/tests/test_tile_decoder.c
+++ b/tests/test_tile_decoder.c
@@ -139,35 +139,35 @@ static int infile_format(const char *fname)
 /**
   sample error callback expecting a FILE* client object
  */
-void error_callback_file(const char *msg, void *client_data) {
+static void error_callback_file(const char *msg, void *client_data) {
         FILE *stream = (FILE*)client_data;
         fprintf(stream, "[ERROR] %s", msg);
 }
 /**
   sample warning callback expecting a FILE* client object
  */
-void warning_callback_file(const char *msg, void *client_data) {
+static void warning_callback_file(const char *msg, void *client_data) {
         FILE *stream = (FILE*)client_data;
         fprintf(stream, "[WARNING] %s", msg);
 }
 /**
   sample error debug callback expecting no client object
  */
-void error_callback(const char *msg, void *client_data) {
+static void error_callback(const char *msg, void *client_data) {
         (void)client_data;
         fprintf(stdout, "[ERROR] %s", msg);
 }
 /**
   sample warning debug callback expecting no client object
  */
-void warning_callback(const char *msg, void *client_data) {
+static void warning_callback(const char *msg, void *client_data) {
         (void)client_data;
         fprintf(stdout, "[WARNING] %s", msg);
 }
 /**
   sample debug callback expecting no client object
  */
-void info_callback(const char *msg, void *client_data) {
+static void info_callback(const char *msg, void *client_data) {
         (void)client_data;
         fprintf(stdout, "[INFO] %s", msg);
 }
diff --git a/tests/test_tile_encoder.c b/tests/test_tile_encoder.c
index 160391b0..a405d86e 100644
--- a/tests/test_tile_encoder.c
+++ b/tests/test_tile_encoder.c
@@ -38,35 +38,35 @@
 /**
 sample error callback expecting a FILE* client object
 */
-void error_callback_file(const char *msg, void *client_data) {
+static void error_callback_file(const char *msg, void *client_data) {
 	FILE *stream = (FILE*)client_data;
 	fprintf(stream, "[ERROR] %s", msg);
 }
 /**
 sample warning callback expecting a FILE* client object
 */
-void warning_callback_file(const char *msg, void *client_data) {
+static void warning_callback_file(const char *msg, void *client_data) {
 	FILE *stream = (FILE*)client_data;
 	fprintf(stream, "[WARNING] %s", msg);
 }
 /**
 sample error debug callback expecting no client object
 */
-void error_callback(const char *msg, void *client_data) {
+static void error_callback(const char *msg, void *client_data) {
 	(void)client_data;
 	fprintf(stdout, "[ERROR] %s", msg);
 }
 /**
 sample warning debug callback expecting no client object
 */
-void warning_callback(const char *msg, void *client_data) {
+static void warning_callback(const char *msg, void *client_data) {
 	(void)client_data;
 	fprintf(stdout, "[WARNING] %s", msg);
 }
 /**
 sample debug callback expecting no client object
 */
-void info_callback(const char *msg, void *client_data) {
+static void info_callback(const char *msg, void *client_data) {
 	(void)client_data;
 	fprintf(stdout, "[INFO] %s", msg);
 }