[Libreoffice-commits] core.git: sdext/source

Noel Grandin noel at peralex.com
Thu Feb 4 06:24:39 UTC 2016


 sdext/source/pdfimport/misc/pdfihelper.cxx       |    2 +-
 sdext/source/pdfimport/tree/drawtreevisiting.cxx |   11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

New commits:
commit 8ffd2c8dd032e718bc8c3d574cd47e82a2c07261
Author: Noel Grandin <noel at peralex.com>
Date:   Wed Jan 27 11:05:54 2016 +0200

    loplugin:fpcomparison in sdext/
    
    Change-Id: If2ae6c3399ef3aceffc2080fcd790e91dc594d9b
    Reviewed-on: https://gerrit.libreoffice.org/21864
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
    Tested-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/sdext/source/pdfimport/misc/pdfihelper.cxx b/sdext/source/pdfimport/misc/pdfihelper.cxx
index c1f7c41..65b4a85 100644
--- a/sdext/source/pdfimport/misc/pdfihelper.cxx
+++ b/sdext/source/pdfimport/misc/pdfihelper.cxx
@@ -54,7 +54,7 @@ void pdfi::FillDashStyleProps(PropertyMap& props, const std::vector<double>& das
 
     for (size_t i = 0; i < pairCount; i++)
     {
-        if (dotLengths[dotStage] != dashArray[i * 2])
+        if (!rtl::math::approxEqual(dotLengths[dotStage], dashArray[i * 2]))
         {
             dotStage++;
             if (dotStage == 3)
diff --git a/sdext/source/pdfimport/tree/drawtreevisiting.cxx b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
index a38050a..46ed9b4 100644
--- a/sdext/source/pdfimport/tree/drawtreevisiting.cxx
+++ b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
@@ -663,12 +663,11 @@ bool isSpaces(TextElement* pTextElem)
 
 bool notTransformed(const GraphicsContext& GC)
 {
-    return (
-        GC.Transformation.get(0,0) ==  100.00 &&
-        GC.Transformation.get(1,0) ==    0.00 &&
-        GC.Transformation.get(0,1) ==    0.00 &&
-        GC.Transformation.get(1,1) == -100.00
-       );
+    return
+        rtl::math::approxEqual(GC.Transformation.get(0,0), 100.00) &&
+        GC.Transformation.get(1,0) == 0.00 &&
+        GC.Transformation.get(0,1) == 0.00 &&
+        rtl::math::approxEqual(GC.Transformation.get(1,1), -100.00);
 }
 
 void DrawXmlOptimizer::optimizeTextElements(Element& rParent)


More information about the Libreoffice-commits mailing list