From 98682e1073211000495aa378e7da5bfb69b225c9 Mon Sep 17 00:00:00 2001
From: Mathieu Malaterre <mathieu.malaterre@gmail.com>
Date: Mon, 15 Oct 2012 15:47:56 +0000
Subject: [trunk] Remove some warnings about missing prototypes (gcc)

---
 src/lib/openjp2/function_list.h |  2 +-
 src/lib/openjp2/mct.h           |  4 ++--
 src/lib/openjp2/openjpeg.c      | 10 +++++-----
 src/lib/openjp2/t1.h            |  2 +-
 src/lib/openjp3d/bio.h          |  2 +-
 src/lib/openjp3d/cio.c          |  4 ++--
 src/lib/openjp3d/jp3d.c         |  4 ++--
 src/lib/openjp3d/jp3d_lib.h     |  2 +-
 src/lib/openjp3d/mqc.h          |  2 +-
 src/lib/openjp3d/openjp3d.h     |  2 +-
 src/lib/openjp3d/raw.h          |  2 +-
 src/lib/openjp3d/tcd.c          |  2 +-
 src/lib/openmj2/jpt.c           |  4 ++--
 13 files changed, 21 insertions(+), 21 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/openjp2/function_list.h b/src/lib/openjp2/function_list.h
index 0e27d75a..17a50051 100644
--- a/src/lib/openjp2/function_list.h
+++ b/src/lib/openjp2/function_list.h
@@ -73,7 +73,7 @@ typedef struct opj_procedure_list
  *
  * @return	the newly created validation list.
  */
-opj_procedure_list_t *  opj_procedure_list_create();
+opj_procedure_list_t *  opj_procedure_list_create(void);
 
 /**
  * Destroys a validation list.
diff --git a/src/lib/openjp2/mct.h b/src/lib/openjp2/mct.h
index 7758f0c3..5a87a78f 100644
--- a/src/lib/openjp2/mct.h
+++ b/src/lib/openjp2/mct.h
@@ -134,11 +134,11 @@ void opj_calculate_norms(   OPJ_FLOAT64 * pNorms,
 /**
 FIXME DOC 
 */
-const OPJ_FLOAT64 * opj_mct_get_mct_norms ();
+const OPJ_FLOAT64 * opj_mct_get_mct_norms (void);
 /**
 FIXME DOC 
 */
-const OPJ_FLOAT64 * opj_mct_get_mct_norms_real ();
+const OPJ_FLOAT64 * opj_mct_get_mct_norms_real (void);
 /* ----------------------------------------------------------------------- */
 /*@}*/
 
diff --git a/src/lib/openjp2/openjpeg.c b/src/lib/openjp2/openjpeg.c
index e5055534..b0f4be39 100644
--- a/src/lib/openjp2/openjpeg.c
+++ b/src/lib/openjp2/openjpeg.c
@@ -199,13 +199,13 @@ opj_bool OPJ_CALLCONV opj_set_error_handler(opj_codec_t * p_codec,
 
 /* ---------------------------------------------------------------------- */
 
-OPJ_SIZE_T opj_read_from_file (void * p_buffer, OPJ_SIZE_T p_nb_bytes, FILE * p_file)
+static OPJ_SIZE_T opj_read_from_file (void * p_buffer, OPJ_SIZE_T p_nb_bytes, FILE * p_file)
 {
 	OPJ_SIZE_T l_nb_read = fread(p_buffer,1,p_nb_bytes,p_file);
 	return l_nb_read ? l_nb_read : -1;
 }
 
-OPJ_UINT64 opj_get_data_length_from_file (FILE * p_file)
+static OPJ_UINT64 opj_get_data_length_from_file (FILE * p_file)
 {
 	OPJ_OFF_T file_length = 0;
 
@@ -216,12 +216,12 @@ OPJ_UINT64 opj_get_data_length_from_file (FILE * p_file)
 	return file_length;
 }
 
-OPJ_SIZE_T opj_write_from_file (void * p_buffer, OPJ_SIZE_T p_nb_bytes, FILE * p_file)
+static OPJ_SIZE_T opj_write_from_file (void * p_buffer, OPJ_SIZE_T p_nb_bytes, FILE * p_file)
 {
 	return fwrite(p_buffer,1,p_nb_bytes,p_file);
 }
 
-OPJ_OFF_T opj_skip_from_file (OPJ_OFF_T p_nb_bytes, FILE * p_user_data)
+static OPJ_OFF_T opj_skip_from_file (OPJ_OFF_T p_nb_bytes, FILE * p_user_data)
 {
 	if (OPJ_FSEEK(p_user_data,p_nb_bytes,SEEK_CUR)) {
 		return -1;
@@ -230,7 +230,7 @@ OPJ_OFF_T opj_skip_from_file (OPJ_OFF_T p_nb_bytes, FILE * p_user_data)
 	return p_nb_bytes;
 }
 
-opj_bool opj_seek_from_file (OPJ_OFF_T p_nb_bytes, FILE * p_user_data)
+static opj_bool opj_seek_from_file (OPJ_OFF_T p_nb_bytes, FILE * p_user_data)
 {
 	if (OPJ_FSEEK(p_user_data,p_nb_bytes,SEEK_SET)) {
 		return OPJ_FALSE;
diff --git a/src/lib/openjp2/t1.h b/src/lib/openjp2/t1.h
index ab6c626d..09fbe0f6 100644
--- a/src/lib/openjp2/t1.h
+++ b/src/lib/openjp2/t1.h
@@ -143,7 +143,7 @@ opj_bool opj_t1_decode_cblks(   opj_t1_t* t1,
  * and initializes the look-up tables of the Tier-1 coder/decoder
  * @return a new T1 handle if successful, returns NULL otherwise
 */
-opj_t1_t* opj_t1_create();
+opj_t1_t* opj_t1_create(void);
 
 /**
  * Destroys a previously created T1 handle
diff --git a/src/lib/openjp3d/bio.h b/src/lib/openjp3d/bio.h
index 47010d46..2c91342f 100755
--- a/src/lib/openjp3d/bio.h
+++ b/src/lib/openjp3d/bio.h
@@ -63,7 +63,7 @@ typedef struct opj_bio {
 Create a new BIO handle 
 @return Returns a new BIO handle if successful, returns NULL otherwise
 */
-opj_bio_t* bio_create();
+opj_bio_t* bio_create(void);
 /**
 Destroy a previously created BIO handle
 @param bio BIO handle to destroy
diff --git a/src/lib/openjp3d/cio.c b/src/lib/openjp3d/cio.c
index 4ac64fd3..4e99c847 100755
--- a/src/lib/openjp3d/cio.c
+++ b/src/lib/openjp3d/cio.c
@@ -122,7 +122,7 @@ unsigned char *cio_getbp(opj_cio_t *cio) {
 /*
  * Write a byte.
  */
-bool cio_byteout(opj_cio_t *cio, unsigned char v) {
+static bool cio_byteout(opj_cio_t *cio, unsigned char v) {
 	if (cio->bp >= cio->end) {
 		opj_event_msg(cio->cinfo, EVT_ERROR, "write error\n");
 		return false;
@@ -134,7 +134,7 @@ bool cio_byteout(opj_cio_t *cio, unsigned char v) {
 /*
  * Read a byte.
  */
-unsigned char cio_bytein(opj_cio_t *cio) {
+static unsigned char cio_bytein(opj_cio_t *cio) {
 	if (cio->bp >= cio->end) {
 		opj_event_msg(cio->cinfo, EVT_ERROR, "read error\n");
 		return 0;
diff --git a/src/lib/openjp3d/jp3d.c b/src/lib/openjp3d/jp3d.c
index 5ab5d94b..593cda82 100755
--- a/src/lib/openjp3d/jp3d.c
+++ b/src/lib/openjp3d/jp3d.c
@@ -316,7 +316,7 @@ static void j3d_read_nlt(opj_j3d_t *j3d);
 
 /* ----------------------------------------------------------------------- */
 
-void j3d_dump_volume(FILE *fd, opj_volume_t * vol) {
+static void j3d_dump_volume(FILE *fd, opj_volume_t * vol) {
 	int compno;
 	fprintf(fd, "volume {\n");
 	fprintf(fd, "  x0=%d, y0=%d, z0=%d, x1=%d, y1=%d, z1=%d\n", vol->x0, vol->y0, vol->z0,vol->x1, vol->y1,  vol->z1);
@@ -332,7 +332,7 @@ void j3d_dump_volume(FILE *fd, opj_volume_t * vol) {
 	fprintf(fd, "}\n");
 }
 
-void j3d_dump_cp(FILE *fd, opj_volume_t * vol, opj_cp_t * cp) {
+static void j3d_dump_cp(FILE *fd, opj_volume_t * vol, opj_cp_t * cp) {
 	int tileno, compno, layno, bandno, resno, numbands;
 	fprintf(fd, "coding parameters {\n");
 	fprintf(fd, "  tx0=%d, ty0=%d, tz0=%d\n", cp->tx0, cp->ty0, cp->tz0);
diff --git a/src/lib/openjp3d/jp3d_lib.h b/src/lib/openjp3d/jp3d_lib.h
index a2fb05ba..dae43275 100755
--- a/src/lib/openjp3d/jp3d_lib.h
+++ b/src/lib/openjp3d/jp3d_lib.h
@@ -43,7 +43,7 @@ The functions in JP3D_LIB.C are internal utilities mainly used for memory manage
 Difference in successive opj_clock() calls tells you the elapsed time
 @return Returns time in seconds
 */
-double opj_clock();
+double opj_clock(void);
 
 /**
 Allocate a memory block with elements initialized to 0
diff --git a/src/lib/openjp3d/mqc.h b/src/lib/openjp3d/mqc.h
index 90253356..023bf415 100755
--- a/src/lib/openjp3d/mqc.h
+++ b/src/lib/openjp3d/mqc.h
@@ -78,7 +78,7 @@ typedef struct opj_mqc {
 Create a new MQC handle 
 @return Returns a new MQC handle if successful, returns NULL otherwise
 */
-opj_mqc_t* mqc_create();
+opj_mqc_t* mqc_create(void);
 /**
 Destroy a previously created MQC handle
 @param mqc MQC handle to destroy
diff --git a/src/lib/openjp3d/openjp3d.h b/src/lib/openjp3d/openjp3d.h
index d7ac42da..44fe1f70 100755
--- a/src/lib/openjp3d/openjp3d.h
+++ b/src/lib/openjp3d/openjp3d.h
@@ -560,7 +560,7 @@ extern "C" {
 ==========================================================
 */
 
-OPJ_API const char * OPJ_CALLCONV opj_version();
+OPJ_API const char * OPJ_CALLCONV opj_version(void);
 
 /* 
 ==========================================================
diff --git a/src/lib/openjp3d/raw.h b/src/lib/openjp3d/raw.h
index c26546ad..55e889da 100755
--- a/src/lib/openjp3d/raw.h
+++ b/src/lib/openjp3d/raw.h
@@ -66,7 +66,7 @@ typedef struct opj_raw {
 Create a new RAW handle 
 @return Returns a new RAW handle if successful, returns NULL otherwise
 */
-opj_raw_t* raw_create();
+opj_raw_t* raw_create(void);
 /**
 Destroy a previously created RAW handle
 @param raw RAW handle to destroy
diff --git a/src/lib/openjp3d/tcd.c b/src/lib/openjp3d/tcd.c
index 88b1bcf6..84c1ed1e 100755
--- a/src/lib/openjp3d/tcd.c
+++ b/src/lib/openjp3d/tcd.c
@@ -82,7 +82,7 @@ void tcd_dump(FILE *fd, opj_tcd_t *tcd, opj_tcd_volume_t * vol) {
 	fprintf(fd, "}\n");
 }
 
-void tilec_dump(FILE *fd, opj_tcd_tilecomp_t *tilec) {
+static void tilec_dump(FILE *fd, opj_tcd_tilecomp_t *tilec) {
 
 	int i=0,k;
 	int datalen;
diff --git a/src/lib/openmj2/jpt.c b/src/lib/openmj2/jpt.c
index a2566ea8..89b7565e 100644
--- a/src/lib/openmj2/jpt.c
+++ b/src/lib/openmj2/jpt.c
@@ -34,7 +34,7 @@
  * Store information (7 bits) in value
  *
  */
-unsigned int jpt_read_VBAS_info(opj_cio_t *cio, unsigned int value) {
+static unsigned int jpt_read_VBAS_info(opj_cio_t *cio, unsigned int value) {
 	unsigned char elmt;
 
 	elmt = cio_read(cio, 1);
@@ -69,7 +69,7 @@ void jpt_init_msg_header(opj_jpt_msg_header_t * header) {
  * Only parameters always present in message header
  *
  */
-void jpt_reinit_msg_header(opj_jpt_msg_header_t * header) {
+static void jpt_reinit_msg_header(opj_jpt_msg_header_t * header) {
 	header->Id = 0;		/* In-class Identifier    */
 	header->last_byte = 0;	/* Last byte information  */
 	header->Msg_offset = 0;	/* Message offset         */
-- 
cgit v1.2.3