Merge pull request #627 from mayeut/appveyor

Add Appveyor

diff --git a/src/bin/common/color.c b/src/bin/common/color.c
index 3b0eb97bab5d4051e72bb5dc74e185c30d28d927..0f2b8daca74e4deeb9c7f75fa137a20ebc726e71 100644 (file)
--- a/src/bin/common/color.c
+++ b/src/bin/common/color.c
@@ -617,7 +617,7 @@ void color_cielab_to_rgb(opj_image_t *image)
                
                default_type = (unsigned int)row[1];
                
-               if(default_type == 0x44454600)// DEF : default
+               if(default_type == 0x44454600)/* DEF : default */
                {
                        rl = 100; ra = 170; rb = 200;
                        ol = 0;
@@ -679,9 +679,9 @@ void color_cielab_to_rgb(opj_image_t *image)
        }
        
        fprintf(stderr,"%s:%d:\n\tenumCS %d not handled. Ignoring.\n", __FILE__,__LINE__, enumcs);
-}// color_apply_conversion()
+}/* color_apply_conversion() */
 
-#endif // OPJ_HAVE_LIBLCMS2 || OPJ_HAVE_LIBLCMS1
+#endif /* OPJ_HAVE_LIBLCMS2 || OPJ_HAVE_LIBLCMS1 */
 
 void color_cmyk_to_rgb(opj_image_t *image)
 {
@@ -732,11 +732,11 @@ void color_cmyk_to_rgb(opj_image_t *image)
                memcpy(&(image->comps[i]), &(image->comps[i+1]), sizeof(image->comps[i]));
        }
 
-}// color_cmyk_to_rgb()
+}/* color_cmyk_to_rgb() */
 
-//
-// This code has been adopted from sjpx_openjpeg.c of ghostscript
-//
+/*
+ * This code has been adopted from sjpx_openjpeg.c of ghostscript
+ */
 void color_esycc_to_rgb(opj_image_t *image)
 {
        int y, cb, cr, sign1, sign2, val;
@@ -785,4 +785,4 @@ void color_esycc_to_rgb(opj_image_t *image)
        }
        image->color_space = OPJ_CLRSPC_SRGB;
 
-}// color_esycc_to_rgb()
+}/* color_esycc_to_rgb() */

diff --git a/src/lib/openjp2/dwt.c b/src/lib/openjp2/dwt.c
index 4ad99ed98c3ef99c00fc743f6b5de6688e6f0aa6..eead5865de144ca8925aae80b8379feb8bc5c9b9 100644 (file)
--- a/src/lib/openjp2/dwt.c
+++ b/src/lib/openjp2/dwt.c
@@ -741,8 +741,8 @@ static void opj_v4dwt_decode_step1(opj_v4_t* w, OPJ_INT32 count, const OPJ_FLOAT
 
 static void opj_v4dwt_decode_step2(opj_v4_t* l, opj_v4_t* w, OPJ_INT32 k, OPJ_INT32 m, OPJ_FLOAT32 c)
 {
-       OPJ_FLOAT32* restrict fl = (OPJ_FLOAT32*) l;
-       OPJ_FLOAT32* restrict fw = (OPJ_FLOAT32*) w;
+       OPJ_FLOAT32* fl = (OPJ_FLOAT32*) l;
+       OPJ_FLOAT32* fw = (OPJ_FLOAT32*) w;
        OPJ_INT32 i;
        for(i = 0; i < m; ++i){
                OPJ_FLOAT32 tmp1_1 = fl[0];

diff --git a/src/lib/openjp3d/jp3d.c b/src/lib/openjp3d/jp3d.c
index f445fb36d9a81d58aef649a48adff451af622799..9e060df741ae35e1e04a6e23d55fbce8ca17f2d2 100644 (file)
--- a/src/lib/openjp3d/jp3d.c
+++ b/src/lib/openjp3d/jp3d.c
@@ -1008,6 +1008,7 @@ static void j3d_write_qcx(opj_j3d_t *j3d, int compno) {
        
        cio_write(cio, tccp->qntsty + (tccp->numgbits << 5), 1);        /* Sqcx : Table A28 de 15444-1*/
        
+       numbands = 0; // compiler warning
        if (j3d->cinfo->codec_format == CODEC_J2K)
         numbands = tccp->qntsty == J3D_CCP_QNTSTY_SIQNT ? 1 : tccp->numresolution[0] * 3 - 2; 
        else if (j3d->cinfo->codec_format == CODEC_J3D) {

diff --git a/src/lib/openjpwl/jpwl.c b/src/lib/openjpwl/jpwl.c
index 79d0e04c607497e40f4b66bf9da85697ed6a3250..99a34990fbd3759caf6e4cdfc9e4ed07325bc53a 100644 (file)
--- a/src/lib/openjpwl/jpwl.c
+++ b/src/lib/openjpwl/jpwl.c
@@ -1296,7 +1296,7 @@ opj_bool jpwl_check_tile(opj_j2k_t *j2k, opj_tcd_t *tcd, int tileno) {
                                                         opj_event_msg(j2k->cinfo, JPWL_ASSUME ? EVT_WARNING : EVT_ERROR,
                                                                 "JPWL: wrong x-cord of block origin %d => x-prec is (%d, %d)\n",
                                                                 block->x0, prec->x0, prec->x1);
-                                                        if (!JPWL_ASSUME || JPWL_ASSUME)
+                                                        if (!JPWL_ASSUME)
                                                                 return OPJ_FALSE;
                                                 };
                                         }