Remove some warnings when building

[openjpeg.git] / src / bin / mj2 / opj_mj2_wrap.c

diff --git a/src/bin/mj2/opj_mj2_wrap.c b/src/bin/mj2/opj_mj2_wrap.c
index efc08d3d8033198142ba0ec195e00b25704bff62..7daa147f3c36b747ac7b4a8003c54dc4caaf3ce6 100644 (file)
--- a/src/bin/mj2/opj_mj2_wrap.c
+++ b/src/bin/mj2/opj_mj2_wrap.c
@@ -1,6 +1,11 @@
 /*
- * Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2007, Professor Benoit Macq
+ * The copyright in this software is being made available under the 2-clauses 
+ * BSD License, included below. This software may be subject to other third 
+ * party and contributor rights, including patent rights, and no such rights
+ * are granted under this license.
+ *
+ * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2014, Professor Benoit Macq
  * Copyright (c) 2003-2007, Francois-Olivier Devaux 
  * All rights reserved.
  *
@@ -85,9 +90,7 @@ static int test_image(const char *fname, mj2_cparameters_t *cp)
 
        cio = opj_cio_open((opj_common_ptr)dinfo, src, src_len);
 
-#if 0 /* MM: FIXME */
        image = opj_decode(dinfo, cio);
-#endif
 
        free(src); cio->buffer = NULL;
        opj_cio_close(cio);
@@ -183,21 +186,21 @@ fin:
 /**
 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 a FILE* client object
 */
-void info_callback(const char *msg, void *client_data) {
+static void info_callback(const char *msg, void *client_data) {
        FILE *stream = (FILE*)client_data;
        fprintf(stream, "[INFO] %s", msg);
 }