]> git.pld-linux.org Git - packages/abiword.git/commitdiff
- downgrade magick plugin
authorArkadiusz Miśkiewicz <arekm@maven.pl>
Wed, 15 May 2002 17:20:22 +0000 (17:20 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Changed files:
    abiword-oldmagick.patch -> 1.1

abiword-oldmagick.patch [new file with mode: 0644]

diff --git a/abiword-oldmagick.patch b/abiword-oldmagick.patch
new file mode 100644 (file)
index 0000000..7a55109
--- /dev/null
@@ -0,0 +1,43 @@
+diff -urN abiword-plugins/wp/impexp/graphics/magick/xp/AbiMagick.cpp abiword-plugins-old/wp/impexp/graphics/magick/xp/AbiMagick.cpp
+--- abiword-plugins/wp/impexp/graphics/magick/xp/AbiMagick.cpp Mon Apr 29 19:45:35 2002
++++ abiword-plugins-old/wp/impexp/graphics/magick/xp/AbiMagick.cpp     Wed Mar 27 19:31:42 2002
+@@ -44,16 +44,11 @@
+ static Magick::Image ImageFromPNGByteBuf ( const UT_ByteBuf * pBB )
+ {
+   Magick::Blob inBlob ( pBB->getPointer (0), pBB->getLength () );
+-
+-  // not Magick::Image ( inBlob ) which doesn't work on win32 for some reason
+-  Magick::Image img ;
+-  img.read ( inBlob ) ;
+-
+-  return img ;
++  return Magick::Image ( inBlob );
+ }
+-static UT_Error PNGByteBufFromImage ( Magick::Image & inImage,
+-                                    UT_ByteBuf ** outByteBuf )
++static void PNGByteBufFromImage ( Magick::Image & inImage,
++                                UT_ByteBuf ** outByteBuf )
+ {
+   Magick::Blob outBlob;
+   inImage.write ( &outBlob, "png" );
+@@ -63,8 +58,6 @@
+   buf->append ( (const UT_Byte*)outBlob.data (), outBlob.length () );
+   *outByteBuf = buf ;
+-
+-  return UT_OK ;
+ }
+ // -----------------------------------------------------------------------
+@@ -128,7 +121,9 @@
+   {
+     try
+       {       
+-      return PNGByteBufFromImage ( ImageFromPNGByteBuf ( pBB ), ppBB ) ;
++      Magick::Image img ( ImageFromPNGByteBuf ( pBB ) ) ;
++      PNGByteBufFromImage ( img, ppBB ) ;
++      return UT_OK;
+       }
+     catch (...)
+       {
This page took 0.209006 seconds and 4 git commands to generate.