commit ImageMagick for openSUSE:Factory
![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community, here is the log from the commit of package ImageMagick for openSUSE:Factory checked in at Mon Apr 26 17:52:19 CEST 2010. -------- --- ImageMagick/ImageMagick.changes 2010-04-07 14:51:22.000000000 +0200 +++ /mounts/work_src_done/STABLE/ImageMagick/ImageMagick.changes 2010-04-26 13:40:14.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Apr 26 13:30:55 CEST 2010 - pgajdos@suse.cz + +- fixed units in the output [bnc#598714] + * units.patch + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- ImageMagick-6.6.1.0-units.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ImageMagick.spec ++++++ --- /var/tmp/diff_new_pack.RV2mcf/_old 2010-04-26 17:52:08.000000000 +0200 +++ /var/tmp/diff_new_pack.RV2mcf/_new 2010-04-26 17:52:08.000000000 +0200 @@ -30,7 +30,7 @@ Group: Productivity/Graphics/Other AutoReqProv: on Version: 6.6.1.0 -Release: 1 +Release: 2 %define source_version 6.6.1-0 %define libver 3 Summary: Viewer and Converter for Images @@ -40,6 +40,7 @@ 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 @@ -117,6 +118,7 @@ %setup -n ImageMagick-%{source_version} -b 2 %patch1 %patch2 +%patch3 -p1 %build %define system_ltdl 0 ++++++ ImageMagick-6.6.1.0-units.patch ++++++ 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) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de