COMP: jasper compiles with the paranoid -pedantic option now

diff --git a/src/gdcmjasper/src/libjasper/include/jasper/jas_config.h.in b/src/gdcmjasper/src/libjasper/include/jasper/jas_config.h.in
index 687e9ecc1cbdda83c92c8ea4454cf64771fcafdf..cbd78ce91c531545a265b625b7a2637fed2005f4 100644 (file)
--- a/src/gdcmjasper/src/libjasper/include/jasper/jas_config.h.in
+++ b/src/gdcmjasper/src/libjasper/include/jasper/jas_config.h.in
@@ -175,8 +175,8 @@
 #cmakedefine GDCM_TYPE_CONVERT_UI64_TO_DOUBLE
 
 
-// On win32 there is no long long therefore use __int64 instead
-//
+/* On win32 there is no long long therefore use __int64 instead */
+
 #ifndef HAVE_SYS_TYPES_H
 typedef unsigned short     ushort;
 typedef unsigned int       uint;
@@ -187,7 +187,7 @@ typedef unsigned __int64   ulonglong;
 typedef __int64            longlong;
 #else
 #error this is not supposed to happen please report your compiler
-#endif //GDCM_TYPE_USE___INT64
+#endif /*GDCM_TYPE_USE___INT64*/
 #else
 #cmakedefine HAVE_GDCM_SIZEOF_UINT
 #cmakedefine HAVE_GDCM_SIZEOF_USHORT
@@ -213,9 +213,9 @@ typedef unsigned long      ulong;
 typedef unsigned char      uchar;
 typedef unsigned __int64   ulonglong;
 typedef __int64            longlong;
-#endif // GDCM_TYPE_USE_LONG_LONG
+#endif /* GDCM_TYPE_USE_LONG_LONG */
 /* #define  ssize_t    int */
-#endif // HAVE_SYS_TYPES_H
+#endif /* HAVE_SYS_TYPES_H */
 
 
 #cmakedefine JASPERSTATIC

diff --git a/src/gdcmjasper/src/libjasper/jpc/jpc_enc.c b/src/gdcmjasper/src/libjasper/jpc/jpc_enc.c
index 9a6916a93d396f84c9fecf2db73fffe3b5bf7970..839c56454c5cebf586adeb510c1107238cfed596 100644 (file)
--- a/src/gdcmjasper/src/libjasper/jpc/jpc_enc.c
+++ b/src/gdcmjasper/src/libjasper/jpc/jpc_enc.c
@@ -62,7 +62,7 @@
  */
 
 /*
- * $Id: jpc_enc.c,v 1.2 2005/06/07 19:22:42 malaterre Exp $
+ * $Id: jpc_enc.c,v 1.3 2005/06/08 17:39:37 malaterre Exp $
  */
 
 /******************************************************************************\
@@ -2505,7 +2505,7 @@ static jpc_enc_cblk_t *cblk_create(jpc_enc_cblk_t *cblk, jpc_enc_cp_t *cp, jpc_e
   uint_fast32_t cblkno;
   uint_fast32_t tlcblktlx;
   uint_fast32_t tlcblktly;
-  // unused:
+  /* unused:*/
   (void)cp;
 
   cblkno = cblk - prc->cblks;

diff --git a/src/gdcmjasper/src/libjasper/jpc/jpc_t1enc.c b/src/gdcmjasper/src/libjasper/jpc/jpc_t1enc.c
index cb7a19aab3d8ed58193ba2a2aa44b7ab9e7879a4..57f327c1924b10141597bd3138e4aaa4a6a5db82 100644 (file)
--- a/src/gdcmjasper/src/libjasper/jpc/jpc_t1enc.c
+++ b/src/gdcmjasper/src/libjasper/jpc/jpc_t1enc.c
@@ -64,7 +64,7 @@
 /*
  * Tier 1 Encoder
  *
- * $Id: jpc_t1enc.c,v 1.2 2005/06/07 19:22:42 malaterre Exp $
+ * $Id: jpc_t1enc.c,v 1.3 2005/06/08 17:39:37 malaterre Exp $
  */
 
 /******************************************************************************\
@@ -207,7 +207,7 @@ int jpc_enc_enccblk(jpc_enc_t *enc, jas_stream_t *out, jpc_enc_tcmpt_t *tcmpt, j
   int segsym;
   int termmode;
   int c;
-  // Unused vars:
+  /* Unused vars:*/
   (void)enc;
   (void)out;
 
@@ -651,7 +651,7 @@ static int jpc_encrefpass(jpc_mqenc_t *mqenc, int bitpos, int vcausalflag, jas_m
   jpc_fix_t *dp;
   jpc_fix_t *fp;
   int k;
-  // Unused:
+  /* Unused:*/
   (void)vcausalflag;
 
   *nmsedec = 0;
@@ -745,7 +745,7 @@ static int jpc_encrawrefpass(jpc_bitstream_t *out, int bitpos, int vcausalflag,
   jpc_fix_t *dvscanstart;
   jpc_fix_t *dp;
   jpc_fix_t *fp;
-  // Unused
+  /* Unused*/
   (void)vcausalflag;
 
   *nmsedec = 0;