Add rotation for PNG and GIF to GraphicNativeRotation.

Rotation for PNG and GIF format perform by exporting and importing
of the Graphic. This is a "fallback" way to perform graphic rotation
and the easiest to do for lossless raster formats.

Change-Id: I31efad9106b5cfbd1d7c6c5063726c455d05f934

1 files changed, 57 insertions, 3 deletions

diff --git a/vcl/source/filter/GraphicNativeTransform.cxx b/vcl/source/filter/GraphicNativeTransform.cxx
index 6115e9353947..9759592b8c96 100644
--- a/vcl/source/filter/GraphicNativeTransform.cxx
+++ b/vcl/source/filter/GraphicNativeTransform.cxx
@@ -20,6 +20,8 @@
 #include <vcl/GraphicNativeTransform.hxx>
 
 #include <vcl/gfxlink.hxx>
+#include <vcl/cvtgrf.hxx>
+
 
 #include "jpeg/Exif.hxx"
 #include "jpeg/JpegTransform.hxx"
@@ -31,7 +33,7 @@ GraphicNativeTransform::GraphicNativeTransform(Graphic& rGraphic) :
 GraphicNativeTransform::~GraphicNativeTransform()
 {}
 
-bool GraphicNativeTransform::Rotate(sal_uInt16 aRotation)
+bool GraphicNativeTransform::rotate(sal_uInt16 aRotation)
 {
     if (aRotation == 0)
         return true;
@@ -40,8 +42,60 @@ bool GraphicNativeTransform::Rotate(sal_uInt16 aRotation)
         return false;
 
     GfxLink aLink = mrGraphic.GetLink();
-    if ( aLink.GetType() != GFX_LINK_TYPE_NATIVE_JPG )
-        return false;
+    if ( aLink.GetType() == GFX_LINK_TYPE_NATIVE_JPG )
+    {
+        return rotateJPEG(aRotation);
+    }
+    else if ( aLink.GetType() == GFX_LINK_TYPE_NATIVE_SVG )
+    {
+        return rotateSVG(aRotation);
+    }
+    else if ( aLink.GetType() == GFX_LINK_TYPE_NATIVE_PNG )
+    {
+        return rotateGeneric(aRotation, CVT_PNG);
+    }
+    else if ( aLink.GetType() == GFX_LINK_TYPE_NATIVE_GIF )
+    {
+        return rotateGeneric(aRotation, CVT_PNG);
+    }
+    return false;
+}
+
+bool GraphicNativeTransform::rotateGeneric(sal_uInt16 aRotation, sal_uInt32 aType)
+{
+    BitmapEx aBitmap = mrGraphic.GetBitmapEx();
+    aBitmap.Rotate(aRotation, COL_BLACK);
+
+    SvMemoryStream aStream;
+    GraphicConverter::Export(aStream, aBitmap, aType);
+    aStream.Seek( STREAM_SEEK_TO_BEGIN );
+
+    Graphic aNewGraphic;
+    GraphicConverter::Import(aStream, aNewGraphic, aType);
+
+    mrGraphic = aNewGraphic;
+    return true;
+}
+
+bool GraphicNativeTransform::rotateSVG(sal_uInt16 aRotation)
+{
+    GDIMetaFile aGDIMetafile = mrGraphic.GetGDIMetaFile();
+    //aGDIMetafile.Rotate(aRotation);
+
+    SvMemoryStream aStream;
+    GraphicConverter::Export(aStream, aGDIMetafile, CVT_SVG);
+    aStream.Seek( STREAM_SEEK_TO_BEGIN );
+
+    Graphic aNewGraphic;
+    GraphicConverter::Import(aStream, aNewGraphic, CVT_SVG);
+
+    mrGraphic = aNewGraphic;
+    return true;
+}
+
+bool GraphicNativeTransform::rotateJPEG(sal_uInt16 aRotation)
+{
+    GfxLink aLink = mrGraphic.GetLink();
 
     sal_uInt32 aDataSize = aLink.GetDataSize();
     sal_uInt8* aInputBuffer = new sal_uInt8[aDataSize];