LogoopenSUSE Build Service > Projects
Sign Up | Log In

View File qt5.8.0-qtlocation-nonvoid.patch of Package mingw64-libqt5-opensource-5.8.0 (Project home:Ximi1970:Toolchains:Qt:MinGW)

diff -urN qt-everywhere-opensource-src-5.5.1.orig/qtlocation/src/3rdparty/poly2tri/common/shapes.cpp qt-everywhere-opensource-src-5.5.1/qtlocation/src/3rdparty/poly2tri/common/shapes.cpp
--- qt-everywhere-opensource-src-5.5.1.orig/qtlocation/src/3rdparty/poly2tri/common/shapes.cpp	2015-10-13 06:37:04.000000000 +0200
+++ qt-everywhere-opensource-src-5.5.1/qtlocation/src/3rdparty/poly2tri/common/shapes.cpp	2017-02-17 22:07:35.616688490 +0100
@@ -160,6 +160,7 @@
     return 2;
   }
   assert(0);
+  return -1;
 }
 
 int Triangle::EdgeIndex(const Point* p1, const Point* p2)
@@ -219,6 +220,7 @@
     return points_[1];
   }
   assert(0);
+  return nullptr;
 }
 
 // The point counter-clockwise to given point
@@ -232,6 +234,7 @@
     return points_[0];
   }
   assert(0);
+  return nullptr;
 }
 
 // The neighbor clockwise to given point
diff -urN qt-everywhere-opensource-src-5.5.1.orig/qtlocation/src/3rdparty/poly2tri/sweep/sweep.cpp qt-everywhere-opensource-src-5.5.1/qtlocation/src/3rdparty/poly2tri/sweep/sweep.cpp
--- qt-everywhere-opensource-src-5.5.1.orig/qtlocation/src/3rdparty/poly2tri/sweep/sweep.cpp	2015-10-13 06:37:04.000000000 +0200
+++ qt-everywhere-opensource-src-5.5.1/qtlocation/src/3rdparty/poly2tri/sweep/sweep.cpp	2017-02-17 22:11:12.056684310 +0100
@@ -769,6 +769,7 @@
   } else{
     //throw new RuntimeException("[Unsupported] Opposing point on constrained edge");
     assert(0);
+    return *ot.PointCCW(op);
   }
 }