1 diff -urN abiword-plugins/wp/impexp/graphics/magick/xp/AbiMagick.cpp abiword-plugins-old/wp/impexp/graphics/magick/xp/AbiMagick.cpp
2 --- abiword-plugins/wp/impexp/graphics/magick/xp/AbiMagick.cpp Mon Apr 29 19:45:35 2002
3 +++ abiword-plugins-old/wp/impexp/graphics/magick/xp/AbiMagick.cpp Wed Mar 27 19:31:42 2002
5 static Magick::Image ImageFromPNGByteBuf ( const UT_ByteBuf * pBB )
7 Magick::Blob inBlob ( pBB->getPointer (0), pBB->getLength () );
9 - // not Magick::Image ( inBlob ) which doesn't work on win32 for some reason
11 - img.read ( inBlob ) ;
14 + return Magick::Image ( inBlob );
17 -static UT_Error PNGByteBufFromImage ( Magick::Image & inImage,
18 - UT_ByteBuf ** outByteBuf )
19 +static void PNGByteBufFromImage ( Magick::Image & inImage,
20 + UT_ByteBuf ** outByteBuf )
23 inImage.write ( &outBlob, "png" );
25 buf->append ( (const UT_Byte*)outBlob.data (), outBlob.length () );
32 // -----------------------------------------------------------------------
37 - return PNGByteBufFromImage ( ImageFromPNGByteBuf ( pBB ), ppBB ) ;
38 + Magick::Image img ( ImageFromPNGByteBuf ( pBB ) ) ;
39 + PNGByteBufFromImage ( img, ppBB ) ;