summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2012-11-16 00:52:14 +0000
committerjoerg <joerg@pkgsrc.org>2012-11-16 00:52:14 +0000
commit955a8fb8f3c1096033df55a1db7907a4afc45f39 (patch)
treecbea53d5594d3ac9a526851f0ef721d7786b2127 /graphics
parentc95a5a500021e835156fda0f03c10f90a4f373bf (diff)
downloadpkgsrc-955a8fb8f3c1096033df55a1db7907a4afc45f39.tar.gz
Don't redeclare a local variable.
Diffstat (limited to 'graphics')
-rw-r--r--graphics/libkexiv2-kde3/distinfo4
-rw-r--r--graphics/libkexiv2-kde3/patches/patch-aa13
2 files changed, 14 insertions, 3 deletions
diff --git a/graphics/libkexiv2-kde3/distinfo b/graphics/libkexiv2-kde3/distinfo
index 53b20341978..8c7d6b390c1 100644
--- a/graphics/libkexiv2-kde3/distinfo
+++ b/graphics/libkexiv2-kde3/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2012/03/19 23:01:43 markd Exp $
+$NetBSD: distinfo,v 1.2 2012/11/16 00:52:14 joerg Exp $
SHA1 (libkexiv2-0.1.9.tar.bz2) = 252243b105f0f0e0565219b61aed6f223cbb4000
RMD160 (libkexiv2-0.1.9.tar.bz2) = c4d68e36a69de29b31eb2ceecac6d7e370d68213
Size (libkexiv2-0.1.9.tar.bz2) = 432834 bytes
-SHA1 (patch-aa) = da9d931b52bebb21148e3445051fa5b19baa164c
+SHA1 (patch-aa) = 26d85a4df2a0d44810215ac9c127f39c64938b4a
diff --git a/graphics/libkexiv2-kde3/patches/patch-aa b/graphics/libkexiv2-kde3/patches/patch-aa
index 4357785e31a..c42c93ee9eb 100644
--- a/graphics/libkexiv2-kde3/patches/patch-aa
+++ b/graphics/libkexiv2-kde3/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2012/03/19 23:01:43 markd Exp $
+$NetBSD: patch-aa,v 1.2 2012/11/16 00:52:14 joerg Exp $
--- libkexiv2/libkexiv2/kexiv2.cpp.orig 2009-02-27 08:39:37.000000000 +0000
+++ libkexiv2/libkexiv2/kexiv2.cpp
@@ -23,6 +23,17 @@ $NetBSD: patch-aa,v 1.1.1.1 2012/03/19 23:01:43 markd Exp $
namespace KExiv2Iface
{
+@@ -800,8 +814,8 @@ bool KExiv2::setExifThumbnail(const QIma
+ QBuffer buffer(data);
+ buffer.open(IO_WriteOnly);
+ thumb.save(&buffer, "JPEG");
+- Exiv2::ExifThumb thumb(d->exifMetadata);
+- thumb.setJpegThumbnail((Exiv2::byte *)data.data(), data.size());
++ Exiv2::ExifThumb thumb2(d->exifMetadata);
++ thumb2.setJpegThumbnail((Exiv2::byte *)data.data(), data.size());
+ #else
+ KTempFile thumbFile(QString(), "KExiv2ExifThumbnail");
+ thumbFile.setAutoDelete(true);
@@ -1603,7 +1617,11 @@ QString KExiv2::getExifTagTitle(const ch
{
std::string exifkey(exifTagName);