- updated to 6.6.7.9: fixes [bnc#673789]

OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=57
This commit is contained in:
Petr Gajdos 2011-02-23 19:15:00 +00:00 committed by Git OBS Bridge
parent 7fee334d38
commit ac846029b5
7 changed files with 10 additions and 27 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2b9611ed9ed66b49e9b8e5f91f1d2502f55725ae486b16b557ff889c9c0d74f8
size 8703988

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c156a20dfe2f7819d51ba6ea19faae96d1617abb7c08c055d3ce5ddd27700985
size 10132009

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Feb 23 20:14:56 CET 2011 - pgajdos@suse.cz
- updated to 6.6.7.9: fixes [bnc#673789]
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Feb 21 14:51:56 UTC 2011 - jw@novell.com Mon Feb 21 14:51:56 UTC 2011 - jw@novell.com

View File

@ -29,9 +29,9 @@ Provides: imagemag
License: Public Domain, Freeware License: Public Domain, Freeware
Group: Productivity/Graphics/Other Group: Productivity/Graphics/Other
AutoReqProv: on AutoReqProv: on
Version: 6.6.5.8 Version: 6.6.7.9
Release: 3 Release: 3
%define source_version 6.6.5-8 %define source_version 6.6.7-9
%define libver 4 %define libver 4
Summary: Viewer and Converter for Images Summary: Viewer and Converter for Images
Url: http://www.imagemagick.org Url: http://www.imagemagick.org
@ -42,7 +42,6 @@ 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
@ -120,7 +119,6 @@ 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

View File

@ -1,20 +0,0 @@
--- 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;