fix windows build

jef-n · jef-n · commit b6d833142932 · 2014-06-13T16:41:00.000+02:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -311,6 +311,7 @@ IF (PEDANTIC)
     ADD_DEFINITIONS( /wd4100 )  # unused formal parameters
     ADD_DEFINITIONS( /wd4127 )  # constant conditional expressions (used in Qt template classes)
     ADD_DEFINITIONS( /wd4231 )  # nonstandard extension used : 'identifier' before template explicit instantiation (used in Qt template classes)
+    ADD_DEFINITIONS( /wd4244 )  # conversion from '...' to '...' possible loss of data
     ADD_DEFINITIONS( /wd4251 )  # needs to have dll-interface to be used by clients of class (occurs in Qt template classes)
     ADD_DEFINITIONS( /wd4275 )  # non dll-interface class '...' used as base for dll-interface class '...'
     ADD_DEFINITIONS( /wd4505 )  # unreferenced local function has been removed (QgsRasterDataProvider::extent)
diff --git a/python/core/qgsgeometry.sip b/python/core/qgsgeometry.sip
@@ -440,14 +440,11 @@ class QgsGeometry
      * @note python binding added in 1.6
      **/
     void validateGeometry( QList<QgsGeometry::Error> &errors /Out/ );
+
+    /** compute the unary union on a list of geometries. May be faster than an iterative union on a set of geometries.
+        @param geometryList a list of QgsGeometry* as input
+        @returns the new computed QgsGeometry, or null
+    */
+    static QgsGeometry *unaryUnion( const QList<QgsGeometry*>& geometryList ) /Factory/;
 }; // class QgsGeometry
 
-/** namespace where QgsGeometry-based algorithms lie */
-namespace QgsGeometryAlgorithms
-{
-  /** compute the unary union on a list of geometries. May be faster than an iterative union on a set of geometries.
-      @param geometryList a list of QgsGeometry* as input
-      @returns the new computed QgsGeometry, or null
-  */
-  QgsGeometry* unaryUnion( const QList<QgsGeometry*>& geometryList );
-};
diff --git a/src/core/qgsgeometry.cpp b/src/core/qgsgeometry.cpp
@@ -6397,10 +6397,7 @@ QgsGeometry* QgsGeometry::convertToPolygon( bool destMultipart )
   }
 }
 
-namespace QgsGeometryAlgorithms
-{
-
-QgsGeometry* unaryUnion( const QList<QgsGeometry*>& geometryList )
+QgsGeometry *QgsGeometry::unaryUnion( const QList<QgsGeometry*> &geometryList )
 {
   QList<GEOSGeometry*> geoms;
   foreach( QgsGeometry* g, geometryList )
@@ -6414,5 +6411,3 @@ QgsGeometry* unaryUnion( const QList<QgsGeometry*>& geometryList )
   ret->fromGeos( unioned );
   return ret;
 }
-
-}// QgsGeometryAlgorithms
diff --git a/src/core/qgsgeometry.h b/src/core/qgsgeometry.h
@@ -486,6 +486,12 @@ class CORE_EXPORT QgsGeometry
      **/
     void validateGeometry( QList<Error> &errors );
 
+    /** compute the unary union on a list of geometries. May be faster than an iterative union on a set of geometries.
+        @param geometryList a list of QgsGeometry* as input
+        @returns the new computed QgsGeometry, or null
+    */
+    static QgsGeometry *unaryUnion( const QList<QgsGeometry*>& geometryList );
+
   private:
     // Private variables
 
@@ -679,14 +685,4 @@ class CORE_EXPORT QgsConstWkbPtr
     inline operator const unsigned char *() const { return mP; }
 };
 
-/** namespace where QgsGeometry-based algorithms lie */
-namespace QgsGeometryAlgorithms
-{
-  /** compute the unary union on a list of geometries. May be faster than an iterative union on a set of geometries.
-      @param geometryList a list of QgsGeometry* as input
-      @returns the new computed QgsGeometry, or null
-  */
-  QgsGeometry* unaryUnion( const QList<QgsGeometry*>& geometryList );
-}
-
 #endif
diff --git a/src/core/symbology-ng/qgsinvertedpolygonrenderer.cpp b/src/core/symbology-ng/qgsinvertedpolygonrenderer.cpp
@@ -224,7 +224,7 @@ void QgsInvertedPolygonRenderer::stopRender( QgsRenderContext& context )
     if ( mPreprocessingEnabled )
     {
       // compute the unary union on the polygons
-      QScopedPointer<QgsGeometry> unioned( QgsGeometryAlgorithms::unaryUnion( cit->geometries ) );
+      QScopedPointer<QgsGeometry> unioned( QgsGeometry::unaryUnion( cit->geometries ) );
       // compute the difference with the extent
       QScopedPointer<QgsGeometry> rect( QgsGeometry::fromPolygon( mExtentPolygon ) );
       QgsGeometry *final = rect->difference( const_cast<QgsGeometry*>(unioned.data()) );

Original file line number	Diff line number	Diff line change
`@@ -6397,10 +6397,7 @@ QgsGeometry* QgsGeometry::convertToPolygon( bool destMultipart )`
`6397`	`6397`	`}`
`6398`	`6398`	`}`
`6399`	`6399`
`6400`		`-namespace QgsGeometryAlgorithms`
`6401`		`-{`
`6402`		`-`
`6403`		`-QgsGeometry* unaryUnion( const QList<QgsGeometry*>& geometryList )`
	`6400`	`+QgsGeometry QgsGeometry::unaryUnion( const QList<QgsGeometry> &geometryList )`
`6404`	`6401`	`{`
`6405`	`6402`	`QList<GEOSGeometry*> geoms;`
`6406`	`6403`	`foreach( QgsGeometry* g, geometryList )`
`@@ -6414,5 +6411,3 @@ QgsGeometry* unaryUnion( const QList<QgsGeometry*>& geometryList )`
`6414`	`6411`	`ret->fromGeos( unioned );`
`6415`	`6412`	`return ret;`
`6416`	`6413`	`}`
`6417`		`-`
`6418`		`-}// QgsGeometryAlgorithms`
Original file line number	Diff line number	Diff line change
`@@ -224,7 +224,7 @@ void QgsInvertedPolygonRenderer::stopRender( QgsRenderContext& context )`
`224`	`224`	`if ( mPreprocessingEnabled )`
`225`	`225`	`{`
`226`	`226`	`// compute the unary union on the polygons`
`227`		`- QScopedPointer<QgsGeometry> unioned( QgsGeometryAlgorithms::unaryUnion( cit->geometries ) );`
	`227`	`+ QScopedPointer<QgsGeometry> unioned( QgsGeometry::unaryUnion( cit->geometries ) );`
`228`	`228`	`// compute the difference with the extent`
`229`	`229`	`QScopedPointer<QgsGeometry> rect( QgsGeometry::fromPolygon( mExtentPolygon ) );`
`230`	`230`	`QgsGeometry final = rect->difference( const_cast<QgsGeometry>(unioned.data()) );`