Accepting request 87029 from graphics
- fixed [bnc#717871] -- imagemagick display wrong order * scene.patch OBS-URL: https://build.opensuse.org/request/show/87029 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ImageMagick?expand=0&rev=72
This commit is contained in:
commit
f0ad22d6a9
27
ImageMagick-6.7.2.7-scene.patch
Normal file
27
ImageMagick-6.7.2.7-scene.patch
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
http://trac.imagemagick.org/changeset/5359
|
||||||
|
Index: magick/display.c
|
||||||
|
===================================================================
|
||||||
|
--- magick/display.c
|
||||||
|
+++ magick/display.c
|
||||||
|
@@ -14578,7 +14578,7 @@
|
||||||
|
Window name is the base of the filename.
|
||||||
|
*/
|
||||||
|
GetPathComponent(display_image->magick_filename,TailPath,filename);
|
||||||
|
- if (GetImageListLength(display_image) == 1)
|
||||||
|
+ if (display_image->scene == 0)
|
||||||
|
(void) FormatLocaleString(windows->image.name,MaxTextExtent,
|
||||||
|
"%s: %s",MagickPackageName,filename);
|
||||||
|
else
|
||||||
|
Index: wand/display.c
|
||||||
|
===================================================================
|
||||||
|
--- wand/display.c
|
||||||
|
+++ wand/display.c
|
||||||
|
@@ -667,6 +667,7 @@
|
||||||
|
state|=ExitState;
|
||||||
|
if (LocaleCompare(filename,"-") == 0)
|
||||||
|
state|=ExitState;
|
||||||
|
+ RemoveAllImageStack();
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
pend=image != (Image *) NULL ? MagickTrue : MagickFalse;
|
||||||
|
|
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Oct 6 12:47:38 UTC 2011 - pgajdos@suse.com
|
||||||
|
|
||||||
|
- fixed [bnc#717871] -- imagemagick display wrong order
|
||||||
|
* scene.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Sep 20 13:22:37 UTC 2011 - pgajdos@suse.com
|
Tue Sep 20 13:22:37 UTC 2011 - pgajdos@suse.com
|
||||||
|
|
||||||
|
@ -106,6 +106,7 @@ Patch2: ImageMagick-6.6.8.9-doc.patch
|
|||||||
# see http://www.imagemagick.org/discourse-server/viewtopic.php?f=2&t=18435&hilit=include
|
# see http://www.imagemagick.org/discourse-server/viewtopic.php?f=2&t=18435&hilit=include
|
||||||
# for upstream progress
|
# for upstream progress
|
||||||
Patch3: ImageMagick-6.6.9.1-inc-struct.diff
|
Patch3: ImageMagick-6.6.9.1-inc-struct.diff
|
||||||
|
Patch4: ImageMagick-6.7.2.7-scene.patch
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
Provides: imagemag = %{version}
|
Provides: imagemag = %{version}
|
||||||
Obsoletes: imagemag < %{version}
|
Obsoletes: imagemag < %{version}
|
||||||
@ -198,6 +199,7 @@ rm -rf xtp-%{xtp_version}
|
|||||||
%patch1
|
%patch1
|
||||||
%patch2
|
%patch2
|
||||||
%patch3 -p1
|
%patch3 -p1
|
||||||
|
%patch4
|
||||||
# remove together with inc-struct.diff ----
|
# remove together with inc-struct.diff ----
|
||||||
echo>header-test.c '#include "wand.h"' #
|
echo>header-test.c '#include "wand.h"' #
|
||||||
echo>wand.h '#include "wand/MagickWand.h"' #
|
echo>wand.h '#include "wand/MagickWand.h"' #
|
||||||
@ -504,4 +506,14 @@ HTML documentation for ImageMagick library and scene examples.
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
Loading…
x
Reference in New Issue
Block a user