diff options
| author | lofi <lofi@FreeBSD.org> | 2007-08-08 15:33:09 +0000 |
|---|---|---|
| committer | lofi <lofi@FreeBSD.org> | 2007-08-08 15:33:09 +0000 |
| commit | d9b891cf357beda433022eaba5a7b387145e72e2 (patch) | |
| tree | 6317880bf3cf66446dab4475ce556f8ec956d6cf | |
| parent | c80f30c7fc52f6941b8abd41ca604f57bf75cdc1 (diff) | |
| download | FreeBSD-ports-d9b891cf357beda433022eaba5a7b387145e72e2.zip FreeBSD-ports-d9b891cf357beda433022eaba5a7b387145e72e2.tar.gz | |
Don't crash on invalid JPEG metadata.
PR: ports/114367
Approved by: maintainer timeout (4 weeks)
| -rw-r--r-- | graphics/gwenview-kde4/Makefile | 2 | ||||
| -rw-r--r-- | graphics/gwenview-kde4/files/patch-src-imageutils-jpegcontent.cpp | 15 | ||||
| -rw-r--r-- | graphics/gwenview/Makefile | 2 | ||||
| -rw-r--r-- | graphics/gwenview/files/patch-src-imageutils-jpegcontent.cpp | 15 |
4 files changed, 32 insertions, 2 deletions
diff --git a/graphics/gwenview-kde4/Makefile b/graphics/gwenview-kde4/Makefile index 30d0b74..e9de42f 100644 --- a/graphics/gwenview-kde4/Makefile +++ b/graphics/gwenview-kde4/Makefile @@ -7,7 +7,7 @@ PORTNAME= gwenview PORTVERSION= 1.4.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics kde MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/graphics/gwenview-kde4/files/patch-src-imageutils-jpegcontent.cpp b/graphics/gwenview-kde4/files/patch-src-imageutils-jpegcontent.cpp new file mode 100644 index 0000000..f1bea03 --- /dev/null +++ b/graphics/gwenview-kde4/files/patch-src-imageutils-jpegcontent.cpp @@ -0,0 +1,15 @@ +--- src/imageutils/jpegcontent.cpp.orig Fri Jul 6 18:37:46 2007 ++++ src/imageutils/jpegcontent.cpp Fri Jul 6 18:38:24 2007 +@@ -255,11 +255,11 @@ + Exiv2::Image::AutoPtr image; + try { + image = Exiv2::ImageFactory::open((unsigned char*)data.data(), data.size()); ++ image->readMetadata(); + } catch (Exiv2::Error&) { + kdError() << "Could not load image with Exiv2\n"; + return false; + } +- image->readMetadata(); + + d->mExifData = image->exifData(); + d->mComment = QString::fromUtf8( image->comment().c_str() ); diff --git a/graphics/gwenview/Makefile b/graphics/gwenview/Makefile index 30d0b74..e9de42f 100644 --- a/graphics/gwenview/Makefile +++ b/graphics/gwenview/Makefile @@ -7,7 +7,7 @@ PORTNAME= gwenview PORTVERSION= 1.4.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics kde MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/graphics/gwenview/files/patch-src-imageutils-jpegcontent.cpp b/graphics/gwenview/files/patch-src-imageutils-jpegcontent.cpp new file mode 100644 index 0000000..f1bea03 --- /dev/null +++ b/graphics/gwenview/files/patch-src-imageutils-jpegcontent.cpp @@ -0,0 +1,15 @@ +--- src/imageutils/jpegcontent.cpp.orig Fri Jul 6 18:37:46 2007 ++++ src/imageutils/jpegcontent.cpp Fri Jul 6 18:38:24 2007 +@@ -255,11 +255,11 @@ + Exiv2::Image::AutoPtr image; + try { + image = Exiv2::ImageFactory::open((unsigned char*)data.data(), data.size()); ++ image->readMetadata(); + } catch (Exiv2::Error&) { + kdError() << "Could not load image with Exiv2\n"; + return false; + } +- image->readMetadata(); + + d->mExifData = image->exifData(); + d->mComment = QString::fromUtf8( image->comment().c_str() ); |
