pool/ImageMagick
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 62334 from home:jnweiger:branches:graphics

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/62334
OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=56
This commit is contained in:
Klaas Freitag 2011-02-23 16:53:30 +00:00 committed by Git OBS Bridge
parent 8fa0439a07
commit 7fee334d38
3 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ImageMagick.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Feb 21 14:51:56 UTC 2011 - jw@novell.com
- added patch for crash reading png with exif
[bnc#673789]
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Feb 14 10:09:28 CET 2011 - pgajdos@suse.cz Mon Feb 14 10:09:28 CET 2011 - pgajdos@suse.cz

8
ImageMagick.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package ImageMagick (Version 6.6.5.8) # spec file for package ImageMagick
# #
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -30,7 +30,7 @@ License: Public Domain, Freeware
Group: Productivity/Graphics/Other Group: Productivity/Graphics/Other
AutoReqProv: on AutoReqProv: on
Version: 6.6.5.8 Version: 6.6.5.8
Release: 2 Release: 3
%define source_version 6.6.5-8 %define source_version 6.6.5-8
%define libver 4 %define libver 4
Summary: Viewer and Converter for Images Summary: Viewer and Converter for Images
@ -42,6 +42,7 @@ Source2: xtp-%{xtp_version}.tar.bz2
Source3: baselibs.conf Source3: baselibs.conf
Patch1: ImageMagick-%{version}-examples.patch Patch1: ImageMagick-%{version}-examples.patch
Patch2: ImageMagick-%{version}-doc.patch Patch2: ImageMagick-%{version}-doc.patch
Patch3: survive-exif.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%package -n perl-PerlMagick %package -n perl-PerlMagick
@ -119,6 +120,7 @@ rm -rf xtp-%{xtp_version}
%setup -n ImageMagick-%{source_version} -b 2 %setup -n ImageMagick-%{source_version} -b 2
%patch1 %patch1
%patch2 %patch2
%patch3 -p1
%build %build
%define system_ltdl 0 %define system_ltdl 0

20
survive-exif.patch Normal file
View File

@ -0,0 +1,20 @@
--- ImageMagick-6.6.7-8/magick/property.c.orig 2010-12-24 14:44:32.000000000 +0100
+++ ImageMagick-6.6.7-8/magick/property.c 2011-02-21 15:09:40.008402000 +0100
@@ -2012,9 +2012,14 @@ MagickExport const char *GetImagePropert
{
if (GetEXIFProperty(image,property) != MagickFalse)
{
- p=(const char *) GetValueFromSplayTree((SplayTreeInfo *)
- image->properties,property);
- return(p);
+ // FIXME: GetEXIFProperty should have return MagickFalse, if it failed, no?
+ // I see here a false positive of exif:Orientation, which exiftool does not see.
+ if (image->properties)
+ {
+ p=(const char *) GetValueFromSplayTree((SplayTreeInfo *)
+ image->properties,property);
+ return(p);
+ }
}
}
break;