Received: by mail.netbsd.org (Postfix, from userid 605) id 81FE584D71; Sun, 3 May 2020 14:49:31 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 0854084D65 for ; Sun, 3 May 2020 14:49:31 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id XCGA6nwxcEbQ for ; Sun, 3 May 2020 14:49:30 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 74FA184D3C for ; Sun, 3 May 2020 14:49:30 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 6A247FB27; Sun, 3 May 2020 14:49:30 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_158851737031950" MIME-Version: 1.0 Date: Sun, 3 May 2020 14:49:30 +0000 From: "Roland Illig" Subject: CVS commit: pkgsrc/lang/STk To: pkgsrc-changes@NetBSD.org Reply-To: rillig@netbsd.org X-Mailer: log_accum Message-Id: <20200503144930.6A247FB27@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_158851737031950 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: rillig Date: Sun May 3 14:49:30 UTC 2020 Modified Files: pkgsrc/lang/STk: distinfo Added Files: pkgsrc/lang/STk/patches: patch-Extensions_jpeg.c Log Message: lang/STk: fix array index using char To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 pkgsrc/lang/STk/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/lang/STk/patches/patch-Extensions_jpeg.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_158851737031950 Content-Disposition: inline Content-Length: 2037 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/STk/distinfo diff -u pkgsrc/lang/STk/distinfo:1.11 pkgsrc/lang/STk/distinfo:1.12 --- pkgsrc/lang/STk/distinfo:1.11 Tue Dec 29 23:34:43 2015 +++ pkgsrc/lang/STk/distinfo Sun May 3 14:49:30 2020 @@ -1,9 +1,10 @@ -$NetBSD: distinfo,v 1.11 2015/12/29 23:34:43 dholland Exp $ +$NetBSD: distinfo,v 1.12 2020/05/03 14:49:30 rillig Exp $ SHA1 (STk-4.0.1.tar.gz) = 50dc98c2b64db1c9cca54411cb406feb4cb57600 RMD160 (STk-4.0.1.tar.gz) = 58ad3c66f77a6ab33db5d4ca9f2510d50b6b6f0d SHA512 (STk-4.0.1.tar.gz) = c849077edac124f28e2a3531d818234416e143aab994e9ba55c4bbce90bdc8c0d40c3fbe9dd5af6bfe8a10892fe72dac7215a05cb95574ba03426175b26f9c47 Size (STk-4.0.1.tar.gz) = 3673684 bytes +SHA1 (patch-Extensions_jpeg.c) = 4a962c74ae68e5ea1b838255e466b2274b397ea2 SHA1 (patch-aa) = 9fc50b3a2167dba7515270f7a9d8fd20bcb8e5c9 SHA1 (patch-ab) = 3d50bb10bc3bd3d34509d2557f52df367373f3d2 SHA1 (patch-ac) = 1cf5e558abf54488580b6f1631491280039bb45c Added files: Index: pkgsrc/lang/STk/patches/patch-Extensions_jpeg.c diff -u /dev/null pkgsrc/lang/STk/patches/patch-Extensions_jpeg.c:1.1 --- /dev/null Sun May 3 14:49:30 2020 +++ pkgsrc/lang/STk/patches/patch-Extensions_jpeg.c Sun May 3 14:49:30 2020 @@ -0,0 +1,18 @@ +$NetBSD: patch-Extensions_jpeg.c,v 1.1 2020/05/03 14:49:30 rillig Exp $ + +jpeg.c:774:17: error: array subscript has type 'char' [-Werror=char-subscripts] + getbits(8, qt[zz[i]]); + +Since zz only contains small numbers, the code is ok. + +--- Extensions/jpeg.c.orig 1998-01-03 12:46:25.000000000 +0000 ++++ Extensions/jpeg.c +@@ -198,7 +198,7 @@ static unsigned char JPEG_CAC_HuffVals[] + #define JPEG_EXTEND(v, t) \ + ((v) < (1 << (t-1) ) ? (v) + (((-1) << t) + 1) : (v)) + +-static const char zz[] = { 0, 1, 8, 16, 9, 2, 3, 10, 17, 24, 32, 25, 18, ++static const unsigned char zz[] = { 0, 1, 8, 16, 9, 2, 3, 10, 17, 24, 32, 25, 18, + 11, 4, 5, 12, 19, 26, 33, 40, 48, 41, 34, + 27, 20, 13, 6, 7, 14, 21, 28, 35, 42, 49, + 56, 57, 50, 43, 36, 29, 22, 15, 23, 30, --_----------=_158851737031950--