fix sip bindings

qgis · May 29, 2015 · aeb0e71 · aeb0e71
1 parent 0e55b3b
commit aeb0e71
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/python/core/geometry/qgscircularstringv2.sip b/python/core/geometry/qgscircularstringv2.sip
@@ -52,5 +52,9 @@ class QgsCircularStringV2: public QgsCurveV2
     bool pointAt( int i, QgsPointV2& vertex, QgsVertexId::VertexType& type ) const;
 
     void sumUpArea( double& sum ) const;
+
     bool hasCurvedSegments() const;
+
+  private:
+    void segmentize( const QgsPointV2& p1, const QgsPointV2& p2, const QgsPointV2& p3, QList<QgsPointV2>& points ) const;
 };
diff --git a/src/analysis/vector/qgszonalstatistics.h b/src/analysis/vector/qgszonalstatistics.h
@@ -68,7 +68,7 @@ class ANALYSIS_EXPORT QgsZonalStatistics
         {
           reset();
         }
-        void reset() { sum = 0; count = 0; max = DBL_MIN; min = DBL_MAX; valueCount.clear(); values.clear(); }
+        void reset() { sum = 0; count = 0; max = FLT_MIN; min = FLT_MAX; valueCount.clear(); values.clear(); }
         void addValue( float value, double weight = 1.0 )
         {
           if ( weight < 1.0 )

diff --git a/src/gui/attributetable/qgsattributetablemodel.h b/src/gui/attributetable/qgsattributetablemodel.h
@@ -265,7 +265,7 @@ class GUI_EXPORT QgsAttributeTableModel: public QAbstractTableModel
      * Launched when eatures have been deleted
      * @param fids feature ids
      */
-    virtual void featuresDeleted( QgsFeatureIds fid );
+    virtual void featuresDeleted( QgsFeatureIds fids );
     /**
      * Launched when a feature has been added
      * @param fid feature id