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

[Michael Stahl]

 cppcanvas/source/inc/implrenderer.hxx    |    2 +-
 cppcanvas/source/mtfrenderer/emfplus.cxx |    6 +++---
 pyuno/source/module/pyuno.cxx            |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 24b449b7fcaaee20ef8feebfd64fc761535f77a8
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Mar 9 15:35:36 2012 +0100

    cppcanvas: processEMFPlus: fix valgrind warning:
    
    When reading EmfPlusRecordTypeDrawImagePoints, handle the variant where
    points are stored as 16-bit integers instead of floats correctly.
    Found via valgrind on loading bugdoc from fdo#42252.

diff --git a/cppcanvas/source/inc/implrenderer.hxx b/cppcanvas/source/inc/implrenderer.hxx
index d41d504..034af02 100644
--- a/cppcanvas/source/inc/implrenderer.hxx
+++ b/cppcanvas/source/inc/implrenderer.hxx
@@ -215,7 +215,7 @@ static float GetSwapFloat( SvStream& rSt )
 
             /* EMF+ */
             void ReadRectangle (SvStream& s, float& x, float& y, float &width, float& height, sal_uInt32 flags = 0);
-            void ReadPoint (SvStream& s, float& x, float& y, sal_uInt32 flags = 0);
+            void ReadPoint (SvStream& s, float& x, float& y, sal_uInt32 flags);
             void MapToDevice (double &x, double &y);
             ::basegfx::B2DPoint Map (double ix, double iy);
             ::basegfx::B2DSize MapSize (double iwidth, double iheight);
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 953a0c8..4c92728 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -1406,9 +1406,9 @@ namespace cppcanvas
                             if (unknown == 3) { // it probably means number of points defining destination rectangle
                                 float x1, y1, x2, y2, x3, y3;
 
-                                ReadPoint (rMF, x1, y1);
-                                ReadPoint (rMF, x2, y2);
-                                ReadPoint (rMF, x3, y3);
+                                ReadPoint (rMF, x1, y1, flags);
+                                ReadPoint (rMF, x2, y2, flags);
+                                ReadPoint (rMF, x3, y3, flags);
 
                                 BitmapEx aBmp( image.graphic.GetBitmapEx () );
                                 const Rectangle aCropRect (::vcl::unotools::pointFromB2DPoint (Map (sx, sy)),
commit 06484b6946ac6a974c24af6624fb75bbe298c1e8
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Mar 9 11:28:28 2012 +0100

    fdo#46926: fix the fix for Python 3
    
    Thanks to Maxime de Roucy for the hint that the "cmpfunc" type doesn't exist.

diff --git a/pyuno/source/module/pyuno.cxx b/pyuno/source/module/pyuno.cxx
index 555fefd..d51ad3b 100644
--- a/pyuno/source/module/pyuno.cxx
+++ b/pyuno/source/module/pyuno.cxx
@@ -661,7 +661,7 @@ static PyTypeObject PyUNOType =
     (printfunc) 0,
     (getattrfunc) PyUNO_getattr,
     (setattrfunc) PyUNO_setattr,
-    (cmpfunc) 0,
+    /* this type does not exist in Python 3: (cmpfunc) */ 0,
     (reprfunc) PyUNO_repr,
     0,
     0,