[Libreoffice-commits] .: 2 commits - cppcanvas/source

[Radek Doulík]

 cppcanvas/source/mtfrenderer/emfplus.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 8e92501541dfc374803cde0dec90939cde37348a
Author: Radek Doulik <rodo at novell.com>
Date:   Wed Apr 18 15:40:05 2012 +0200

    added debug message for unsupported cases

diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx
index b5ce688..d4a99ec 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -1447,6 +1447,8 @@ namespace cppcanvas
                             } else {
                                 EMFP_DEBUG (printf ("EMF+ DrawImagePoints TODO (fixme)\n"));
                             }
+                        } else {
+                            EMFP_DEBUG (printf ("EMF+ DrawImagePoints TODO (fixme) - possibly unsupported source units for crop rectangle\n"));
                         }
                         break;
                     }
commit 695d82b63dc5e332f5fb9574c8e5f089369dfcd8
Author: Radek Doulik <rodo at novell.com>
Date:   Wed Apr 18 15:36:33 2012 +0200

    SrcRect for SrcUnit = 2 is in pixels, don't Map it

diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 0d8005c..b5ce688 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -1420,8 +1420,8 @@ namespace cppcanvas
                                 ReadPoint (rMF, x3, y3, flags);
 
                                 BitmapEx aBmp( image.graphic.GetBitmapEx () );
-                                const Rectangle aCropRect (::vcl::unotools::pointFromB2DPoint (Map (sx, sy)),
-                                                           ::vcl::unotools::sizeFromB2DSize (MapSize(sw, sh)));
+                                const Rectangle aCropRect (::vcl::unotools::pointFromB2DPoint (basegfx::B2DPoint (sx, sy)),
+                                                           ::vcl::unotools::sizeFromB2DSize (basegfx::B2DSize(sw, sh)));
                                 aBmp.Crop( aCropRect );