- fixed [bnc#717871] -- imagemagick display wrong order
* scene.patch OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=96
This commit is contained in:
parent
b5aa5ac645
commit
af60adce6a
3
ImageMagick-6.7.2-7.tar.bz2
Normal file
3
ImageMagick-6.7.2-7.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:b16f2b3984bd1098fc1586d26f41201c40cbd89db4617df9e76e3ce612d2b336
|
||||||
|
size 10222109
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:8c524d30abd0e2a216adf6d3f840c29e16a89a9e387d1f528d3981477d2a9fa7
|
|
||||||
size 10237928
|
|
26
ImageMagick-6.7.2.7-scene.patch
Normal file
26
ImageMagick-6.7.2.7-scene.patch
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
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,8 +1,8 @@
|
|||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Oct 6 12:47:38 UTC 2011 - pgajdos@suse.com
|
Thu Oct 6 12:47:38 UTC 2011 - pgajdos@suse.com
|
||||||
|
|
||||||
- update to 6.7.2.9: fixes [bnc#717871] -- imagemagick display
|
- fixed [bnc#717871] -- imagemagick display wrong order
|
||||||
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
|
||||||
|
@ -84,7 +84,7 @@ BuildRequires: libwebp-devel
|
|||||||
|
|
||||||
%define xtp_version 5.4.3
|
%define xtp_version 5.4.3
|
||||||
%define mfr_version 6.7.2
|
%define mfr_version 6.7.2
|
||||||
%define mfr_revision 9
|
%define mfr_revision 7
|
||||||
%define source_version %{mfr_version}-%{mfr_revision}
|
%define source_version %{mfr_version}-%{mfr_revision}
|
||||||
License: Public Domain, Freeware
|
License: Public Domain, Freeware
|
||||||
Group: Productivity/Graphics/Other
|
Group: Productivity/Graphics/Other
|
||||||
@ -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"' #
|
||||||
@ -506,4 +508,10 @@ HTML documentation for ImageMagick library and scene examples.
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
Loading…
x
Reference in New Issue
Block a user