Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id 11E1F7A1FE for ; Thu, 9 Feb 2017 00:22:37 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id BA9D385634; Thu, 9 Feb 2017 00:22:36 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 4A7FD8562E for ; Thu, 9 Feb 2017 00:22:36 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id DbVzXsh9E0RQ for ; Thu, 9 Feb 2017 00:22:35 +0000 (UTC) Received: from cvs.NetBSD.org (unknown [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id A138E85583 for ; Thu, 9 Feb 2017 00:22:35 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 9F61BFBA3; Thu, 9 Feb 2017 00:22:35 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_14865997559580" MIME-Version: 1.0 Date: Thu, 9 Feb 2017 00:22:35 +0000 From: "Joerg Sonnenberger" Subject: CVS commit: pkgsrc/graphics/gimmage To: pkgsrc-changes@NetBSD.org Reply-To: joerg@netbsd.org X-Mailer: log_accum Message-Id: <20170209002235.9F61BFBA3@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_14865997559580 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: joerg Date: Thu Feb 9 00:22:35 UTC 2017 Modified Files: pkgsrc/graphics/gimmage: distinfo Added Files: pkgsrc/graphics/gimmage/patches: patch-src_ImageEventBox.cpp Log Message: Use bool operator for determining nullness. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 pkgsrc/graphics/gimmage/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/graphics/gimmage/patches/patch-src_ImageEventBox.cpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_14865997559580 Content-Disposition: inline Content-Length: 2836 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/graphics/gimmage/distinfo diff -u pkgsrc/graphics/gimmage/distinfo:1.4 pkgsrc/graphics/gimmage/distinfo:1.5 --- pkgsrc/graphics/gimmage/distinfo:1.4 Tue Nov 3 21:33:59 2015 +++ pkgsrc/graphics/gimmage/distinfo Thu Feb 9 00:22:35 2017 @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.4 2015/11/03 21:33:59 agc Exp $ +$NetBSD: distinfo,v 1.5 2017/02/09 00:22:35 joerg Exp $ SHA1 (gimmage-0.2.3.tar.gz) = 732dee063553b787b65a0a5bd3d207bdb5d01df1 RMD160 (gimmage-0.2.3.tar.gz) = d3fd105390e21548cf9c83b199681b53616f3640 SHA512 (gimmage-0.2.3.tar.gz) = ff8fdf860d4712502e6e8656a14e5327a5b89af49f312e54de5f0e80cd6e406214a61228c79ad643c2640268d5eacfd760c83acbebdc7fa9b6e7c094728be167 Size (gimmage-0.2.3.tar.gz) = 193777 bytes SHA1 (patch-aa) = ddb740f723e266d8fc6b37743ef43e6c1095c7ab +SHA1 (patch-src_ImageEventBox.cpp) = db11a729e755b5c580bfa618e34acfe422a440c6 Added files: Index: pkgsrc/graphics/gimmage/patches/patch-src_ImageEventBox.cpp diff -u /dev/null pkgsrc/graphics/gimmage/patches/patch-src_ImageEventBox.cpp:1.1 --- /dev/null Thu Feb 9 00:22:35 2017 +++ pkgsrc/graphics/gimmage/patches/patch-src_ImageEventBox.cpp Thu Feb 9 00:22:35 2017 @@ -0,0 +1,40 @@ +$NetBSD: patch-src_ImageEventBox.cpp,v 1.1 2017/02/09 00:22:35 joerg Exp $ + +--- src/ImageEventBox.cpp.orig 2017-01-08 18:51:01.889096829 +0000 ++++ src/ImageEventBox.cpp +@@ -149,7 +149,7 @@ void ImageEventBox::LoadImage( const Gli + void ImageEventBox::ScaleImage( double scalefactor, + Gdk::InterpType interp_type) + { +- if(ImagePixbuf_Original != 0 && loaded == true) ++ if(ImagePixbuf_Original && loaded == true) + { + int new_width = (int)(scalefactor * (double)ImagePixbuf_Original->get_width()); + int new_height = (int)(scalefactor * (double)ImagePixbuf_Original->get_height()); +@@ -176,7 +176,7 @@ void ImageEventBox::ScaleImage( int widt + double * scalefactor, + Gdk::InterpType interp_type) + { +- if(ImagePixbuf_Original != 0 && loaded == true) ++ if(ImagePixbuf_Original && loaded == true) + { + double ratioh = (double)height/(double)ImagePixbuf_Original->get_height(); + double ratiow = (double)width/(double)ImagePixbuf_Original->get_width(); +@@ -206,7 +206,7 @@ void ImageEventBox::ScaleImage2( int wid + double * scalefactor, + Gdk::InterpType interp_type) + { +- if(ImagePixbuf_Original != 0 && loaded == true) ++ if(ImagePixbuf_Original && loaded == true) + { + if( width <= ImagePixbuf_Original->get_width() || height <= ImagePixbuf_Original->get_height() ) + { +@@ -242,7 +242,7 @@ void ImageEventBox::ScaleImage2( int wid + // the rotation of the image + void ImageEventBox::RotateImage(Gdk::PixbufRotation rotateby) + { +- if(ImagePixbuf_Original != 0 && loaded == true) ++ if(ImagePixbuf_Original && loaded == true) + { + try + { --_----------=_14865997559580--