CVS commit: pkgsrc/graphics/jasper

["Havard Eidnes" <he%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   he
Date:           Fri Dec 16 13:05:58 UTC 2016

Modified Files:
        pkgsrc/graphics/jasper: distinfo
        pkgsrc/graphics/jasper/patches: patch-src_libjasper_jp2_jp2__dec.c

Log Message:
Add a cast so that this builds with the compiler in NetBSD 7.0 as well.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/graphics/jasper/distinfo
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/graphics/jasper/patches/patch-src_libjasper_jp2_jp2__dec.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/jasper/distinfo
diff -u pkgsrc/graphics/jasper/distinfo:1.21 pkgsrc/graphics/jasper/distinfo:1.22
--- pkgsrc/graphics/jasper/distinfo:1.21        Fri Dec 16 09:44:44 2016
+++ pkgsrc/graphics/jasper/distinfo     Fri Dec 16 13:05:58 2016
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2016/12/16 09:44:44 he Exp $
+$NetBSD: distinfo,v 1.22 2016/12/16 13:05:58 he Exp $
 
 SHA1 (jasper-1.900.29.tar.gz) = 6d50e5ea9e822ad5f88f4451819acab2e3b47f8e
 RMD160 (jasper-1.900.29.tar.gz) = 4ae47353f3dc086b3a11eff86ec7fb57d598c6fb
@@ -8,7 +8,7 @@ SHA1 (patch-configure) = 14039911be04b88
 SHA1 (patch-src_libjasper_base_jas__seq.c) = a0208cd0271388ae0fdc2e359da3223a35a7ae14
 SHA1 (patch-src_libjasper_base_jas__stream.c) = 2e9ad538ab2c0191063fef06202949b435b0085e
 SHA1 (patch-src_libjasper_jp2_jp2__cod.c) = bfbe752e105d75fbad71a01080013c7a5a8645d8
-SHA1 (patch-src_libjasper_jp2_jp2__dec.c) = 3cbf3a6355168aaa60a68ff8042f7cb4f6d847c4
+SHA1 (patch-src_libjasper_jp2_jp2__dec.c) = df04d8af9004fb133d4ae1429ecda77197fc3e77
 SHA1 (patch-src_libjasper_jp2_jp2__enc.c) = 4f23040e7039514bbbc60360121f1820e82017cc
 SHA1 (patch-src_libjasper_jpc_jpc__dec.c) = f76765ff7656af6b44cd4035b26656909abe45f9
 SHA1 (patch-src_libjasper_jpc_jpc__enc.c) = 10fbe41e67da4f2575fb541013833ed85992efea

Index: pkgsrc/graphics/jasper/patches/patch-src_libjasper_jp2_jp2__dec.c
diff -u pkgsrc/graphics/jasper/patches/patch-src_libjasper_jp2_jp2__dec.c:1.3 pkgsrc/graphics/jasper/patches/patch-src_libjasper_jp2_jp2__dec.c:1.4
--- pkgsrc/graphics/jasper/patches/patch-src_libjasper_jp2_jp2__dec.c:1.3       Fri Dec 16 09:44:44 2016
+++ pkgsrc/graphics/jasper/patches/patch-src_libjasper_jp2_jp2__dec.c   Fri Dec 16 13:05:58 2016
@@ -1,10 +1,19 @@
-$NetBSD: patch-src_libjasper_jp2_jp2__dec.c,v 1.3 2016/12/16 09:44:44 he Exp $
+$NetBSD: patch-src_libjasper_jp2_jp2__dec.c,v 1.4 2016/12/16 13:05:58 he Exp $
 
 Only output debug info if debuglevel >= 1.
+And .. cast argument to jas_iccprof_createfrombuf() to match.
 
 --- src/libjasper/jp2/jp2_dec.c.orig   2016-11-16 15:03:41.000000000 +0000
 +++ src/libjasper/jp2/jp2_dec.c
-@@ -302,7 +302,9 @@ jas_image_t *jp2_decode(jas_stream_t *in
+@@ -295,14 +295,16 @@ jas_image_t *jp2_decode(jas_stream_t *in
+               jas_image_setclrspc(dec->image, jp2_getcs(&dec->colr->data.colr));
+               break;
+       case JP2_COLR_ICC:
+-              iccprof = jas_iccprof_createfrombuf(dec->colr->data.colr.iccp,
++              iccprof = jas_iccprof_createfrombuf((jas_uchar *)dec->colr->data.colr.iccp,
+                 dec->colr->data.colr.iccplen);
+               if (!iccprof) {
+                       jas_eprintf("error: failed to parse ICC profile\n");
                        goto error;
                }
                jas_iccprof_gethdr(iccprof, &icchdr);