patch is already upstreamed
This commit is contained in:
parent
3f7eb834a3
commit
ab58bb8973
|
@ -1,31 +0,0 @@
|
||||||
From 112051a709f83f13ca2b9ab63007d4a41b0a9beb Mon Sep 17 00:00:00 2001
|
|
||||||
From: Dirk Lemstra <dirk@lemstra.org>
|
|
||||||
Date: Sun, 22 Nov 2020 18:11:37 +0100
|
|
||||||
Subject: [PATCH] Moved swapping to the correct position.
|
|
||||||
|
|
||||||
---
|
|
||||||
coders/tiff.c | 9 +++++----
|
|
||||||
1 file changed, 5 insertions(+), 4 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/coders/tiff.c b/coders/tiff.c
|
|
||||||
index dba08138c8..fff2e79d4c 100644
|
|
||||||
--- a/coders/tiff.c
|
|
||||||
+++ b/coders/tiff.c
|
|
||||||
@@ -640,12 +640,13 @@ static MagickBooleanType TIFFGetProfiles(TIFF *tiff,Image *image)
|
|
||||||
{
|
|
||||||
const TIFFField
|
|
||||||
*field;
|
|
||||||
-
|
|
||||||
- if (TIFFIsByteSwapped(tiff) != 0)
|
|
||||||
- TIFFSwabArrayOfLong((uint32 *) profile,(size_t) length);
|
|
||||||
field=TIFFFieldWithTag(tiff,TIFFTAG_RICHTIFFIPTC);
|
|
||||||
if (TIFFFieldDataType(field) == TIFF_LONG)
|
|
||||||
- status=ReadProfile(image,"iptc",profile,4L*length);
|
|
||||||
+ {
|
|
||||||
+ if (TIFFIsByteSwapped(tiff) != 0)
|
|
||||||
+ TIFFSwabArrayOfLong((uint32 *) profile,(size_t) length);
|
|
||||||
+ status=ReadProfile(image,"iptc",profile,4L*length);
|
|
||||||
+ }
|
|
||||||
else
|
|
||||||
status=ReadProfile(image,"iptc",profile,length);
|
|
||||||
}
|
|
|
@ -19,11 +19,6 @@ License: ImageMagick
|
||||||
Url: https://legacy.imagemagick.org/
|
Url: https://legacy.imagemagick.org/
|
||||||
Source0: https://www.imagemagick.org/download/releases/%{name}-%{VER}-%{Patchlevel}.tar.xz
|
Source0: https://www.imagemagick.org/download/releases/%{name}-%{VER}-%{Patchlevel}.tar.xz
|
||||||
|
|
||||||
# Fix segfaults on s390x with rubygem-acitvestorage test suite.
|
|
||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1993193
|
|
||||||
# https://github.com/ImageMagick/ImageMagick6/commit/112051a709f83f13ca2b9ab63007d4a41b0a9beb
|
|
||||||
#Patch0: ImageMagick-6.9.11-42-Moved-swapping-to-the-correct-position.patch
|
|
||||||
|
|
||||||
BuildRequires: pkgconfig(bzip2), pkgconfig(freetype2), pkgconfig(libjpeg), pkgconfig(libpng)
|
BuildRequires: pkgconfig(bzip2), pkgconfig(freetype2), pkgconfig(libjpeg), pkgconfig(libpng)
|
||||||
BuildRequires: pkgconfig(libtiff-4), giflib-devel, pkgconfig(zlib), perl-devel >= 5.8.1
|
BuildRequires: pkgconfig(libtiff-4), giflib-devel, pkgconfig(zlib), perl-devel >= 5.8.1
|
||||||
BuildRequires: perl-generators
|
BuildRequires: perl-generators
|
||||||
|
|
Loading…
Reference in New Issue