[QGIS Commit] r11212 - in trunk/qgis/src: plugins/interpolation
providers/osm
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Thu Jul 30 07:50:07 EDT 2009
Author: jef
Date: 2009-07-30 07:50:05 -0400 (Thu, 30 Jul 2009)
New Revision: 11212
Modified:
trunk/qgis/src/plugins/interpolation/DualEdgeTriangulation.cc
trunk/qgis/src/plugins/interpolation/qgsinterpolationdialog.cpp
trunk/qgis/src/plugins/interpolation/qgstininterpolator.cpp
trunk/qgis/src/providers/osm/CMakeLists.txt
trunk/qgis/src/providers/osm/osmhandler.cpp
trunk/qgis/src/providers/osm/osmprovider.cpp
trunk/qgis/src/providers/osm/osmrenderer.cpp
trunk/qgis/src/providers/osm/osmstyle.cpp
Log:
fix warnings (possibly fixing one bug) and build errors on windows
Modified: trunk/qgis/src/plugins/interpolation/DualEdgeTriangulation.cc
===================================================================
--- trunk/qgis/src/plugins/interpolation/DualEdgeTriangulation.cc 2009-07-30 11:30:33 UTC (rev 11211)
+++ trunk/qgis/src/plugins/interpolation/DualEdgeTriangulation.cc 2009-07-30 11:50:05 UTC (rev 11212)
@@ -3081,7 +3081,12 @@
return false;
}
- bool alreadyVisitedEdges[mHalfEdge.size()];
+ bool *alreadyVisitedEdges = new bool[mHalfEdge.size()];
+ if( !alreadyVisitedEdges )
+ {
+ QgsDebugMsg( "out of memory" );
+ return false;
+ }
for ( int i = 0; i < mHalfEdge.size(); ++i )
{
@@ -3124,6 +3129,8 @@
alreadyVisitedEdges[i] = true;
}
+ delete [] alreadyVisitedEdges;
+
return true;
}
Modified: trunk/qgis/src/plugins/interpolation/qgsinterpolationdialog.cpp
===================================================================
--- trunk/qgis/src/plugins/interpolation/qgsinterpolationdialog.cpp 2009-07-30 11:30:33 UTC (rev 11211)
+++ trunk/qgis/src/plugins/interpolation/qgsinterpolationdialog.cpp 2009-07-30 11:50:05 UTC (rev 11212)
@@ -144,7 +144,7 @@
}
else
{
- currentLayerData.mInputType == QgsInterpolator::POINTS;
+ currentLayerData.mInputType = QgsInterpolator::POINTS;
}
inputLayerList.push_back( currentLayerData );
}
Modified: trunk/qgis/src/plugins/interpolation/qgstininterpolator.cpp
===================================================================
--- trunk/qgis/src/plugins/interpolation/qgstininterpolator.cpp 2009-07-30 11:30:33 UTC (rev 11211)
+++ trunk/qgis/src/plugins/interpolation/qgstininterpolator.cpp 2009-07-30 11:50:05 UTC (rev 11212)
@@ -25,6 +25,11 @@
#include "qgsvectorlayer.h"
#include <QProgressDialog>
+#ifdef WIN32
+#include <float.h>
+#define isnan(f) _isnan(f)
+#endif
+
QgsTINInterpolator::QgsTINInterpolator( const QList<LayerData>& inputData, bool showProgressDialog ): QgsInterpolator( inputData ), mTriangulation( 0 ), \
mTriangleInterpolator( 0 ), mIsInitialized( false ), mShowProgressDialog( showProgressDialog )
{
Modified: trunk/qgis/src/providers/osm/CMakeLists.txt
===================================================================
--- trunk/qgis/src/providers/osm/CMakeLists.txt 2009-07-30 11:30:33 UTC (rev 11211)
+++ trunk/qgis/src/providers/osm/CMakeLists.txt 2009-07-30 11:50:05 UTC (rev 11212)
@@ -28,6 +28,12 @@
${GEOS_INCLUDE_DIR}
)
+IF (WITH_INTERNAL_SPATIALITE)
+ INCLUDE_DIRECTORIES(BEFORE ../../core/spatialite/headers/spatialite)
+ELSE (WITH_INTERNAL_SPATIALITE)
+ INCLUDE_DIRECTORIES(${SQLITE3_INCLUDE_DIR})
+ENDIF (WITH_INTERNAL_SPATIALITE)
+
ADD_LIBRARY (osmprovider MODULE ${OSM_SRCS} ${OSM_MOC_SRCS})
TARGET_LINK_LIBRARIES (osmprovider
Modified: trunk/qgis/src/providers/osm/osmhandler.cpp
===================================================================
--- trunk/qgis/src/providers/osm/osmhandler.cpp 2009-07-30 11:30:33 UTC (rev 11211)
+++ trunk/qgis/src/providers/osm/osmhandler.cpp 2009-07-30 11:50:05 UTC (rev 11212)
@@ -378,5 +378,6 @@
{
// first commit all database actions connected to xml parsing
sqlite3_exec(mDatabase, "COMMIT;", 0, 0, 0);
+ return true;
}
Modified: trunk/qgis/src/providers/osm/osmprovider.cpp
===================================================================
--- trunk/qgis/src/providers/osm/osmprovider.cpp 2009-07-30 11:30:33 UTC (rev 11211)
+++ trunk/qgis/src/providers/osm/osmprovider.cpp 2009-07-30 11:50:05 UTC (rev 11212)
@@ -557,7 +557,6 @@
int selId;
const char* selTimestamp;
const char* selUser;
- int selWayMemberCount;
QgsGeometry *theGeometry = NULL;
bool fetchMoreRows = true;
int rc=-1;
@@ -1043,7 +1042,6 @@
double selLat = sqlite3_column_double(stmtSelectMembers,0);
double selLon = sqlite3_column_double(stmtSelectMembers,1);
- int selNodeId = sqlite3_column_int(stmtSelectMembers,2);
if (selLat<minLat) minLat = selLat;
if (selLon<minLon) minLon = selLon;
@@ -1086,7 +1084,6 @@
double selLat = sqlite3_column_double(stmtSelectMembers,0);
double selLon = sqlite3_column_double(stmtSelectMembers,1);
- int selNodeId = sqlite3_column_int(stmtSelectMembers,2);
if (selLat<minLat) minLat = selLat;
if (selLon<minLon) minLon = selLon;
@@ -1222,6 +1219,8 @@
// commit actions
sqlite3_exec(mDatabase,"COMMIT;",0,0,0);
+
+ return true;
}
Modified: trunk/qgis/src/providers/osm/osmrenderer.cpp
===================================================================
--- trunk/qgis/src/providers/osm/osmrenderer.cpp 2009-07-30 11:30:33 UTC (rev 11211)
+++ trunk/qgis/src/providers/osm/osmrenderer.cpp 2009-07-30 11:50:05 UTC (rev 11212)
@@ -103,9 +103,6 @@
{
QPen pen = osmstyle.get_pen(tags);
QColor penColor = pen.color();
- int red = penColor.red();
- int green = penColor.green();
- int blue = penColor.blue();
p->setPen( osmstyle.get_pen(tags) );
p->setOpacity(1.0);
}
Modified: trunk/qgis/src/providers/osm/osmstyle.cpp
===================================================================
--- trunk/qgis/src/providers/osm/osmstyle.cpp 2009-07-30 11:30:33 UTC (rev 11211)
+++ trunk/qgis/src/providers/osm/osmstyle.cpp 2009-07-30 11:50:05 UTC (rev 11212)
@@ -137,7 +137,6 @@
double widthScale = 1.0;
bool selected = false;
QColor mSelectionColor(255,255,0);
- double rasterScaleFactor = 1.0;
QgsSymbol sym(QGis::Point);
sym.setNamedPointSymbol(QString("svg:%1%2").arg(QgsApplication::svgPath()).arg(name));
More information about the QGIS-commit
mailing list