File libetonyek-0.0.0-pi.patch of Package mingw32-libetonyek

Overview Repositories Revisions Requests Users Attributes Meta

File libetonyek-0.0.0-pi.patch of Package mingw32-libetonyek (Revision b844b243b7efc24d804e59a81f008f66)

Currently displaying revision b844b243b7efc24d804e59a81f008f66 , Show latest

--- a/src/lib/KEY2ParserUtils.cpp
+++ b/src/lib/KEY2ParserUtils.cpp
@@ -151,7 +151,7 @@ double KEY2ParserUtils::deg2rad(double value)
     value += 360;
 
   // convert
-  return boost::math::double_constants::pi / 180 * value;
+  return boost::math::constants::pi<double>() / 180 * value;
 }
 
 KEY2ParserUtils::KEY2ParserUtils()
--- a/src/lib/KEYShape.cpp
+++ b/src/lib/KEYShape.cpp
@@ -22,7 +22,7 @@
 #include "KEYTransformation.h"
 #include "KEYTypes.h"
 
-namespace m = boost::math::double_constants;
+namespace m = boost::math::constants;
 
 using std::deque;
 
@@ -137,7 +137,7 @@ deque<Point> rotatePoint(const Point &point, const unsigned n)
   deque<Point> points;
 
 
-  const double angle = m::two_pi / n;
+  const double angle = m::two_pi<double>() / n;
 
   points.push_back(point);
   for (unsigned i = 1; i < n; ++i)
@@ -300,7 +300,7 @@ KEYPathPtr_t makeStarPath(const KEYSize &size, const unsigned points, const doub
   const deque<Point> outerPoints = rotatePoint(Point(0, -1), points);
 
   // create inner points
-  const double angle = m::two_pi / points;
+  const double angle = m::two_pi<double>() / points;
   deque<Point> innerPoints(outerPoints);
   transform(innerPoints, rotate(angle / 2) * scale(innerRadius, innerRadius));
 
--- a/src/test/KEYShapeTest.cpp
+++ b/src/test/KEYShapeTest.cpp
@@ -19,7 +19,7 @@
 namespace test
 {
 
-namespace m = boost::math::double_constants;
+namespace m = boost::math::constants;
 
 using libetonyek::KEYPath;
 using libetonyek::KEYPathPtr_t;
@@ -41,7 +41,7 @@ void KEYShapeTest::testMakePolygonPath()
 
   // triangle
   {
-    const double d = 25 * (2 - m::root_three);
+    const double d = 25 * (2 - m::root_three<double>());
 
     // FIXME: the shape is not scaled to whole width...
     KEYPath ref;
@@ -73,7 +73,7 @@ void KEYShapeTest::testMakePolygonPath()
 
   // octagon
   {
-    const double d = 25 * (2 - m::root_two);
+    const double d = 25 * (2 - m::root_two<double>());
 
     KEYPath ref;
     ref.appendMoveTo(50, 0);
--- a/src/test/KEYTransformationTest.cpp
+++ b/src/test/KEYTransformationTest.cpp
@@ -17,7 +17,7 @@
 namespace test
 {
 
-namespace m = boost::math::double_constants;
+namespace m = boost::math::constants;
 
 using libetonyek::KEYTransformation;
 
@@ -122,7 +122,7 @@ void KEYTransformationTest::testConstruction()
   CPPUNIT_ASSERT(flip(true, true) == KEYTransformation(-1, 0, 0, -1, 0, 0));
 
   // rotating
-  CPPUNIT_ASSERT(rotate(m::half_pi) == KEYTransformation(0, 1, -1, 0, 0, 0));
+  CPPUNIT_ASSERT(rotate(m::half_pi<double>()) == KEYTransformation(0, 1, -1, 0, 0, 0));
 
   // scaling
   CPPUNIT_ASSERT(scale(2, 1) == KEYTransformation(2, 0, 0, 1, 0, 0));
@@ -131,9 +131,9 @@ void KEYTransformationTest::testConstruction()
 
   // shearing
   // FIXME: find the problem and enable
-  // CPPUNIT_ASSERT(shear(m::pi / 4, 0) == KEYTransformation(1, 2, 0, 1, 0, 0));
-  // CPPUNIT_ASSERT(shear(0, m::pi / 4) == KEYTransformation(1, 0, 2, 1, 0, 0));
-  // CPPUNIT_ASSERT(shear(m::pi / 4, m::pi / 4) == KEYTransformation(1, 2, 2, 1, 0, 0));
+  // CPPUNIT_ASSERT(shear(m::pi<double>() / 4, 0) == KEYTransformation(1, 2, 0, 1, 0, 0));
+  // CPPUNIT_ASSERT(shear(0, m::pi<double>() / 4) == KEYTransformation(1, 0, 2, 1, 0, 0));
+  // CPPUNIT_ASSERT(shear(m::pi<double>() / 4, m::pi<double>() / 4) == KEYTransformation(1, 2, 2, 1, 0, 0));
 
   // translating
   CPPUNIT_ASSERT(translate(100, 0) == KEYTransformation(1, 0, 0, 1, 100, 0));
@@ -149,7 +149,7 @@ void KEYTransformationTest::testConstructionIdentity()
   CPPUNIT_ASSERT(origin(0, 0) == KEYTransformation());
   CPPUNIT_ASSERT(flip(false, false) == KEYTransformation());
   CPPUNIT_ASSERT(rotate(0) == KEYTransformation());
-  CPPUNIT_ASSERT(rotate(m::two_pi) == KEYTransformation());
+  CPPUNIT_ASSERT(rotate(m::two_pi<double>()) == KEYTransformation());
   CPPUNIT_ASSERT(scale(1, 1) == KEYTransformation());
   CPPUNIT_ASSERT(shear(0, 0) == KEYTransformation());
   CPPUNIT_ASSERT(translate(0, 0) == KEYTransformation());
@@ -185,10 +185,10 @@ void KEYTransformationTest::testConstructionFromGeometry()
     KEYGeometry g;
     g.naturalSize = KEYSize(100, 100);
     g.position = KEYPosition(0, 0);
-    g.angle = m::half_pi;
+    g.angle = m::half_pi<double>();
 
     const KEYTransformation tr = makeTransformation(g);
-    CPPUNIT_ASSERT(wrap(100, 100, rotate(m::half_pi)) == tr);
+    CPPUNIT_ASSERT(wrap(100, 100, rotate(m::half_pi<double>())) == tr);
   }
 
   {
@@ -215,10 +215,10 @@ void KEYTransformationTest::testConstructionFromGeometry()
     KEYGeometry g;
     g.naturalSize = KEYSize(100, 100);
     g.position = KEYPosition(200, 150);
-    g.angle = m::half_pi;
+    g.angle = m::half_pi<double>();
 
     const KEYTransformation tr = makeTransformation(g);
-    CPPUNIT_ASSERT(wrap(100, 100, rotate(m::half_pi) * translate(200, 150)) == tr);
+    CPPUNIT_ASSERT(wrap(100, 100, rotate(m::half_pi<double>()) * translate(200, 150)) == tr);
   }
 }
 
@@ -230,7 +230,7 @@ void KEYTransformationTest::testIdentities()
   CPPUNIT_ASSERT(origin(100, 50) == translate(-50, -25));
   CPPUNIT_ASSERT((flip(true, false) * flip(false, true)) == flip(true, true));
   CPPUNIT_ASSERT((flip(false, true) * flip(true, false)) == flip(true, true));
-  CPPUNIT_ASSERT((rotate(m::half_pi) * rotate(m::third_pi)) == (rotate(m::third_pi) * rotate(m::half_pi)));
+  CPPUNIT_ASSERT((rotate(m::half_pi<double>()) * rotate(m::third_pi<double>())) == (rotate(m::third_pi<double>()) * rotate(m::half_pi<double>())));
   CPPUNIT_ASSERT(scale(-1, -1) == flip(true, true));
   CPPUNIT_ASSERT((translate(10, 20) * translate(80, 40)) == (translate(80, 40) * translate(10, 20)));
   CPPUNIT_ASSERT((translate(1, 2) * scale(2, 2)) == (scale(2, 2) * translate(2, 4)));
@@ -247,7 +247,7 @@ void KEYTransformationTest::testInverseOperations()
   CPPUNIT_ASSERT(flip(false, true) * flip(false, true) == KEYTransformation());
   CPPUNIT_ASSERT(flip(true, true) * flip(true, true) == KEYTransformation());
 
-  CPPUNIT_ASSERT(rotate(m::pi) * rotate(-m::pi) == KEYTransformation());
+  CPPUNIT_ASSERT(rotate(m::pi<double>()) * rotate(-m::pi<double>()) == KEYTransformation());
 
   CPPUNIT_ASSERT(scale(2, 1) * scale(0.5, 1) == KEYTransformation());
   CPPUNIT_ASSERT(scale(1, 2) * scale(1, 0.5) == KEYTransformation());
--- a/src/test/KEYShapeTest.cpp
+++ b/src/test/KEYShapeTest.cpp
@@ -25,6 +25,8 @@ using libetonyek::KEYPath;
 using libetonyek::KEYPathPtr_t;
 using libetonyek::KEYSize;
 
+const double etonyek_root_three(1.73205080756887729352744634150587236694280525381038062805580697945193301690880003708114618675724857567562614142e+00);
+
 void KEYShapeTest::setUp()
 {
 }
@@ -41,7 +43,7 @@ void KEYShapeTest::testMakePolygonPath()
 
   // triangle
   {
-    const double d = 25 * (2 - m::root_three<double>());
+    const double d = 25 * (2 - etonyek_root_three);
 
     // FIXME: the shape is not scaled to whole width...
     KEYPath ref;
--- a/src/test/KEYTransformationTest.cpp
+++ b/src/test/KEYTransformationTest.cpp
@@ -21,6 +21,9 @@ namespace m = boost::math::constants;
 
 using libetonyek::KEYTransformation;
 
+const double etonyek_half_pi(1.57079632679489661923132169163975144209858469968755291048747229615390820314310449931401741267105853399107404326e+00);
+const double etonyek_third_pi(1.04719755119659774615421446109316762806572313312503527365831486410260546876206966620934494178070568932738269550e+00);
+
 namespace
 {
 
@@ -122,7 +125,7 @@ void KEYTransformationTest::testConstruction()
   CPPUNIT_ASSERT(flip(true, true) == KEYTransformation(-1, 0, 0, -1, 0, 0));
 
   // rotating
-  CPPUNIT_ASSERT(rotate(m::half_pi<double>()) == KEYTransformation(0, 1, -1, 0, 0, 0));
+  CPPUNIT_ASSERT(rotate(etonyek_half_pi) == KEYTransformation(0, 1, -1, 0, 0, 0));
 
   // scaling
   CPPUNIT_ASSERT(scale(2, 1) == KEYTransformation(2, 0, 0, 1, 0, 0));
@@ -185,10 +188,10 @@ void KEYTransformationTest::testConstructionFromGeometry()
     KEYGeometry g;
     g.naturalSize = KEYSize(100, 100);
     g.position = KEYPosition(0, 0);
-    g.angle = m::half_pi<double>();
+    g.angle = etonyek_half_pi;
 
     const KEYTransformation tr = makeTransformation(g);
-    CPPUNIT_ASSERT(wrap(100, 100, rotate(m::half_pi<double>())) == tr);
+    CPPUNIT_ASSERT(wrap(100, 100, rotate(etonyek_half_pi)) == tr);
   }
 
   {
@@ -215,10 +218,10 @@ void KEYTransformationTest::testConstructionFromGeometry()
     KEYGeometry g;
     g.naturalSize = KEYSize(100, 100);
     g.position = KEYPosition(200, 150);
-    g.angle = m::half_pi<double>();
+    g.angle = etonyek_half_pi;
 
     const KEYTransformation tr = makeTransformation(g);
-    CPPUNIT_ASSERT(wrap(100, 100, rotate(m::half_pi<double>()) * translate(200, 150)) == tr);
+    CPPUNIT_ASSERT(wrap(100, 100, rotate(etonyek_half_pi) * translate(200, 150)) == tr);
   }
 }
 
@@ -230,7 +233,7 @@ void KEYTransformationTest::testIdentities()
   CPPUNIT_ASSERT(origin(100, 50) == translate(-50, -25));
   CPPUNIT_ASSERT((flip(true, false) * flip(false, true)) == flip(true, true));
   CPPUNIT_ASSERT((flip(false, true) * flip(true, false)) == flip(true, true));
-  CPPUNIT_ASSERT((rotate(m::half_pi<double>()) * rotate(m::third_pi<double>())) == (rotate(m::third_pi<double>()) * rotate(m::half_pi<double>())));
+  CPPUNIT_ASSERT((rotate(etonyek_half_pi) * rotate(etonyek_third_pi)) == (rotate(etonyek_third_pi) * rotate(etonyek_half_pi)));
   CPPUNIT_ASSERT(scale(-1, -1) == flip(true, true));
   CPPUNIT_ASSERT((translate(10, 20) * translate(80, 40)) == (translate(80, 40) * translate(10, 20)));
   CPPUNIT_ASSERT((translate(1, 2) * scale(2, 2)) == (scale(2, 2) * translate(2, 4)));

Places

File libetonyek-0.0.0-pi.patch of Package mingw32-libetonyek (Revision b844b243b7efc24d804e59a81f008f66)

Places