CMake: add stronger warnings for openjp2 lib/bin by default, and error out on declaration-after-statement

And remove occurences of unused arguments in src/lib/openjp2

1 files changed, 9 insertions, 0 deletions

diff --git a/src/lib/openjp2/jp2.c b/src/lib/openjp2/jp2.c
index 84dd5004..536cc50e 100644
--- a/src/lib/openjp2/jp2.c
+++ b/src/lib/openjp2/jp2.c
@@ -44,6 +44,8 @@
 
 #define OPJ_BOX_SIZE    1024
 
+#define OPJ_UNUSED(x) (void)x
+
 /** @name Local static functions */
 /*@{*/
 
@@ -1818,6 +1820,8 @@ static OPJ_BOOL opj_jp2_write_jp(opj_jp2_t *jp2,
     assert(jp2 != 00);
     assert(p_manager != 00);
 
+    OPJ_UNUSED(jp2);
+
     /* write box length */
     opj_write_bytes(l_signature_data, 12, 4);
     /* writes box type */
@@ -2160,6 +2164,8 @@ static OPJ_BOOL opj_jp2_default_validation(opj_jp2_t * jp2,
     assert(cio != 00);
     assert(p_manager != 00);
 
+    OPJ_UNUSED(p_manager);
+
     /* JPEG2000 codec validation */
 
     /* STATE checking */
@@ -2826,6 +2832,9 @@ static OPJ_BOOL opj_jp2_setup_decoding_validation(opj_jp2_t *jp2,
     assert(jp2 != 00);
     assert(p_manager != 00);
 
+    OPJ_UNUSED(jp2);
+    OPJ_UNUSED(p_manager);
+
     /* DEVELOPER CORNER, add your custom validation procedure */
 
     return OPJ_TRUE;