cleaning up for pull request

qgis · Nov 29, 2011 · 3aca9ef · 3aca9ef
1 parent 818ebb7
commit 3aca9ef
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/src/app/main.cpp b/src/app/main.cpp
@@ -190,9 +190,9 @@ QgsDebugMsg( QString( "Starting qgis main" ) );
 #endif  // _MSC_VER
 #endif  // WIN32
 
-#ifndef _MSC_VER
+#if !(defined(_MSC_VER) || defined(ANDROID))
   // Set up the custom qWarning/qDebug custom handler
-  //qInstallMsgHandler( myMessageOutput );
+  qInstallMsgHandler( myMessageOutput );
 #endif
 
   /////////////////////////////////////////////////////////////////

diff --git a/src/core/symbology-ng/qgsrendererv2.cpp b/src/core/symbology-ng/qgsrendererv2.cpp
@@ -54,8 +54,11 @@ unsigned char* QgsFeatureRendererV2::_getLineString( QPolygonF& pts, QgsRenderCo
 
   bool hasZValue = ( wkbType == QGis::WKBLineString25D );
   double x, y;
-  qreal z;
-
+  #ifdef ANDROID
+    qreal z;
+  #else
+    double z;
+  #endif //ANDROID
   const QgsCoordinateTransform* ct = context.coordinateTransform();
   const QgsMapToPixel& mtp = context.mapToPixel();
 
@@ -117,8 +120,11 @@ unsigned char* QgsFeatureRendererV2::_getPolygon( QPolygonF& pts, QList<QPolygon
 
   const QgsCoordinateTransform* ct = context.coordinateTransform();
   const QgsMapToPixel& mtp = context.mapToPixel();
-  qreal z = 0; // dummy variable for coordiante transform
-
+  #ifdef ANDROID
+    qreal z = 0; // dummy variable for coordiante transform
+  #else
+    double z = 0; // dummy variable for coordiante transform
+  #endif
   const QgsRectangle& e = context.extent();
   double cw = e.width() / 10; double ch = e.height() / 10;
   QgsRectangle clipRect( e.xMinimum() - cw, e.yMinimum() - ch, e.xMaximum() + cw, e.yMaximum() + ch );