[Libreoffice-commits] .: 2 commits - basegfx/inc basegfx/source solenv/bin

[Korrawit Pruegsanusak]

 basegfx/inc/basegfx/range/b2drange.hxx       |    6 ++++++
 basegfx/inc/basegfx/tools/unopolypolygon.hxx |    3 +++
 basegfx/source/range/b2drange.cxx            |    7 +++++++
 basegfx/source/tools/unopolypolygon.cxx      |    5 +++++
 solenv/bin/build.pl                          |    6 +++---
 5 files changed, 24 insertions(+), 3 deletions(-)

New commits:
commit 274772b5ae92f1f368f7102f1b1817a0cb106912
Author: Korrawit Pruegsanusak <detective.conan.1412 at gmail.com>
Date:   Wed Feb 8 15:42:15 2012 +0700

    use $ENV{GNUMAKE} instead of constant 'make'

diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index 9d280d0..e85f3e6 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -1514,10 +1514,10 @@ sub cancel_build {
     print STDERR "-----------------------------------------------------------------------\n";
     print STDERR "To rebuild a specific module:\n";
     print STDERR "\n";
-    print STDERR "make $module.clean #optional\n";
-    print STDERR "make $module\n";
+    print STDERR "$ENV{GNUMAKE} $module.clean #optional\n";
+    print STDERR "$ENV{GNUMAKE} $module\n";
     print STDERR "\n";
-    print STDERR "when the problem is isolated and fixed re-run 'make'\n";
+    print STDERR "when the problem is isolated and fixed, re-run '$ENV{GNUMAKE}'\n";
     zenity_message("LibreOffice Build Failed!");
     zenity_close();
 
commit a330f38093e2643a26239557050561afae9ff23d
Author: Korrawit Pruegsanusak <detective.conan.1412 at gmail.com>
Date:   Wed Feb 8 21:02:18 2012 +0700

    Recover some methods needed by windows directx
    
    This partially reverts b3c3e116ff0eb9b550b73d3901395c042e31d192

diff --git a/basegfx/inc/basegfx/range/b2drange.hxx b/basegfx/inc/basegfx/range/b2drange.hxx
index 7d7edb0..b8a51ae 100644
--- a/basegfx/inc/basegfx/range/b2drange.hxx
+++ b/basegfx/inc/basegfx/range/b2drange.hxx
@@ -292,6 +292,12 @@ namespace basegfx
         MyBasicRange        maRangeY;
     };
 
+    /** Round double to nearest integer for 2D range
+
+        @return the nearest integer for this range
+    */
+    BASEGFX_DLLPUBLIC B2IRange fround(const B2DRange& rRange);
+
     /** Compute the set difference of the two given ranges
 
         This method calculates the symmetric difference (aka XOR)
diff --git a/basegfx/inc/basegfx/tools/unopolypolygon.hxx b/basegfx/inc/basegfx/tools/unopolypolygon.hxx
index 558ab7e..ca04b7a 100644
--- a/basegfx/inc/basegfx/tools/unopolypolygon.hxx
+++ b/basegfx/inc/basegfx/tools/unopolypolygon.hxx
@@ -95,6 +95,9 @@ namespace unotools
                                              sal_Int32 nPointIndex,
                                              sal_Int32 nNumberOfPoints ) const;
 
+        /// Get cow copy of internal polygon. not thread-safe outside this object.
+        B2DPolyPolygon getPolyPolygonUnsafe() const;
+
         /// Called whenever internal polypolygon gets modified
         virtual void modifying() const {}
 
diff --git a/basegfx/source/range/b2drange.cxx b/basegfx/source/range/b2drange.cxx
index 5884b7e..2da38ce 100644
--- a/basegfx/source/range/b2drange.cxx
+++ b/basegfx/source/range/b2drange.cxx
@@ -60,6 +60,13 @@ namespace basegfx
         }
     }
 
+    B2IRange fround(const B2DRange& rRange)
+    {
+        return rRange.isEmpty() ?
+            B2IRange() :
+            B2IRange(fround(rRange.getMinimum()),
+                     fround(rRange.getMaximum()));
+    }
 } // end of namespace basegfx
 
 // eof
diff --git a/basegfx/source/tools/unopolypolygon.cxx b/basegfx/source/tools/unopolypolygon.cxx
index 2ffaabd..80203c2 100644
--- a/basegfx/source/tools/unopolypolygon.cxx
+++ b/basegfx/source/tools/unopolypolygon.cxx
@@ -445,6 +445,11 @@ namespace unotools
         return aSubsetPoly;
     }
 
+    B2DPolyPolygon UnoPolyPolygon::getPolyPolygonUnsafe() const
+    {
+        return maPolyPoly;
+    }
+
 #define IMPLEMENTATION_NAME "gfx::internal::UnoPolyPolygon"
 #define SERVICE_NAME "com.sun.star.rendering.PolyPolygon2D"
     ::rtl::OUString SAL_CALL UnoPolyPolygon::getImplementationName() throw( uno::RuntimeException )