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

Accepting request 38821 from graphics

Browse Source 
checked in (request 38821)

OBS-URL: https://build.opensuse.org/request/show/38821
OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=29
This commit is contained in:
OBS User autobuild 2010-04-26 15:52:20 +00:00 committed by Git OBS Bridge
parent a5da976dac
commit 349d336433
3 changed files with 0 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
ImageMagick-6.6.1.0-units.patch
View File

@ -1,55 +0,0 @@
Index: ImageMagick-6.6.1-0/magick/image.c
===================================================================
--- ImageMagick-6.6.1-0.orig/magick/image.c
+++ ImageMagick-6.6.1-0/magick/image.c
@@ -3959,6 +3959,9 @@ MagickExport MagickBooleanType SyncImage
MagickStatusType
flags;
+ ResolutionType
+ units;
+
/*
Sync image options.
*/
@@ -4150,16 +4153,18 @@ MagickExport MagickBooleanType SyncImage
option);
option=GetImageOption(image_info,"units");
if (option != (const char *) NULL)
- image->units=(ResolutionType) ParseMagickOption(MagickResolutionOptions,
+ units=(ResolutionType) ParseMagickOption(MagickResolutionOptions,
MagickFalse,option);
- if (image_info->units != UndefinedResolution)
+ else
+ units = image_info->units;
+ if (units != UndefinedResolution)
{
- if (image->units != image_info->units)
+ if (image->units != units)
switch (image->units)
{
case PixelsPerInchResolution:
{
- if (image_info->units == PixelsPerCentimeterResolution)
+ if (units == PixelsPerCentimeterResolution)
{
image->x_resolution/=2.54;
image->y_resolution/=2.54;
@@ -4168,7 +4173,7 @@ MagickExport MagickBooleanType SyncImage
}
case PixelsPerCentimeterResolution:
{
- if (image_info->units == PixelsPerInchResolution)
+ if (units == PixelsPerInchResolution)
{
image->x_resolution*=2.54;
image->y_resolution*=2.54;
@@ -4178,7 +4183,7 @@ MagickExport MagickBooleanType SyncImage
default:
break;
}
- image->units=image_info->units;
+ image->units=units;
}
option=GetImageOption(image_info,"white-point");
if (option != (const char *) NULL)

6
ImageMagick.changes
View File

@ -1,9 +1,3 @@
-------------------------------------------------------------------
Mon Apr 26 13:30:55 CEST 2010 - pgajdos@suse.cz
- fixed units in the output [bnc#598714]
* units.patch
-------------------------------------------------------------------
Wed Apr 7 14:51:13 CEST 2010 - ro@suse.de

2
ImageMagick.spec
View File

@ -40,7 +40,6 @@ Source2: xtp-%{xtp_version}.tar.bz2
Source3: baselibs.conf
Patch1: ImageMagick-%{version}-examples.patch
Patch2: ImageMagick-%{version}-doc.patch
Patch3: ImageMagick-%{version}-units.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%package -n perl-PerlMagick
@ -118,7 +117,6 @@ rm -rf xtp-%{xtp_version}
%setup -n ImageMagick-%{source_version} -b 2
%patch1
%patch2
%patch3 -p1
%build
%define system_ltdl 0