Merge remote branch 'origin/master' into raster-pipes-2

blazek · blazek · commit 9352fa1e849b · 2012-07-01T12:06:59.000+02:00
diff --git a/src/core/qgsexpression.h b/src/core/qgsexpression.h
@@ -261,12 +261,12 @@ class CORE_EXPORT QgsExpression
     {
         // YEAR const value taken from postgres query
         // SELECT EXTRACT(EPOCH FROM interval '1 year')
-        static const double YEARS = 31557600;
-        static const double MONTHS = 60 * 60 * 24 * 30;
-        static const double WEEKS = 60 * 60 * 24 * 7;
-        static const double DAY = 60 * 60 * 24;
-        static const double HOUR = 60 * 60;
-        static const double MINUTE = 60;
+        static const int YEARS = 31557600;
+        static const int MONTHS = 60 * 60 * 24 * 30;
+        static const int WEEKS = 60 * 60 * 24 * 7;
+        static const int DAY = 60 * 60 * 24;
+        static const int HOUR = 60 * 60;
+        static const int MINUTE = 60;
       public:
         Interval( double seconds = 0 ) { mSeconds = seconds; }
         ~Interval();
diff --git a/src/core/symbology-ng/qgssymbollayerv2utils.cpp b/src/core/symbology-ng/qgssymbollayerv2utils.cpp
@@ -988,8 +988,6 @@ bool QgsSymbolLayerV2Utils::hasExternalGraphic( QDomElement &element )
   {
     return false;
   }
-
-  return false;
 }
 
 bool QgsSymbolLayerV2Utils::hasWellKnownMark( QDomElement &element )
@@ -1163,7 +1161,7 @@ bool QgsSymbolLayerV2Utils::convertPolygonSymbolizerToPointMarker( QDomElement &
     QString name, format;
     int markIndex = -1;
     QColor fillColor, borderColor;
-    double borderWidth = 1, size, angle = 0.0;
+    double borderWidth = 1.0, size = 0.0, angle = 0.0;
     QPointF anchor, offset;
 
     // Fill element can contain a GraphicFill element
@@ -1324,7 +1322,7 @@ bool QgsSymbolLayerV2Utils::convertPolygonSymbolizerToPointMarker( QDomElement &
         map["fill"] = fillColor.name();
         map["outline"] = borderColor.name();
         map["outline-width"] = QString::number( borderWidth );
-        if ( size > 0 )
+        if ( !doubleNear( size, 0.0 ) )
           map["size"] = QString::number( size );
         if ( !doubleNear( angle, 0.0 ) )
           map["angle"] = QString::number( angle );
