diff options
| author | Michael Nottebrock <lofi@FreeBSD.org> | 2007-08-08 15:33:09 +0000 |
|---|---|---|
| committer | Michael Nottebrock <lofi@FreeBSD.org> | 2007-08-08 15:33:09 +0000 |
| commit | faed9fac185902da2a39bdbe382d6c0c6f25c5a7 (patch) | |
| tree | f31f99cbe8bee6283e11765ba07a1a5b3ecde209 /graphics/gwenview | |
| parent | d6d2e6850fa64d2905da57a4504f4863be50120d (diff) | |
| download | ports-faed9fac185902da2a39bdbe382d6c0c6f25c5a7.tar.gz ports-faed9fac185902da2a39bdbe382d6c0c6f25c5a7.zip | |
Don't crash on invalid JPEG metadata.
PR: ports/114367
Approved by: maintainer timeout (4 weeks)
Notes
Notes:
svn path=/head/; revision=197345
Diffstat (limited to 'graphics/gwenview')
| -rw-r--r-- | graphics/gwenview/Makefile | 2 | ||||
| -rw-r--r-- | graphics/gwenview/files/patch-src-imageutils-jpegcontent.cpp | 15 |
2 files changed, 16 insertions, 1 deletions
diff --git a/graphics/gwenview/Makefile b/graphics/gwenview/Makefile index 30d0b7449132..e9de42fd1c19 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 000000000000..f1bea03ba798 --- /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() ); |