Skip to content

Commit

Permalink
fix build problems with GRASS 6.5 GEOS support and #1723
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.osgeo.org/qgis/trunk@10893 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed Jun 9, 2009
1 parent f3567a0 commit c45c93c
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion python/core/qgssymbol.sip
Expand Up @@ -72,7 +72,7 @@ class QgsSymbol
/** Get QImage representation of point symbol with current settings
* and scaled (can be slow when scale != 1.0)
*/
virtual QImage getPointSymbolAsImage( double widthScale = 1.,
virtual QImage getPointSymbolAsImage( double widthScale = 1.0,
bool selected = false,
QColor selectionColor = Qt::yellow,
double scale = 1.0,
Expand Down
4 changes: 2 additions & 2 deletions src/core/symbology/qgssymbol.h
Expand Up @@ -101,13 +101,13 @@ class CORE_EXPORT QgsSymbol

/** Get QImage representation of point symbol with current settings
*/
virtual QImage getCachedPointSymbolAsImage( double widthScale = 1.,
virtual QImage getCachedPointSymbolAsImage( double widthScale = 1.0,
bool selected = false, QColor selectionColor = Qt::yellow );

/** Get QImage representation of point symbol with current settings
* and scaled (can be slow when scale != 1.0)
*/
virtual QImage getPointSymbolAsImage( double widthScale = 1.,
virtual QImage getPointSymbolAsImage( double widthScale = 1.0,
bool selected = false,
QColor selectionColor = Qt::yellow,
double scale = 1.0,
Expand Down
1 change: 1 addition & 0 deletions src/plugins/grass/CMakeLists.txt
Expand Up @@ -142,6 +142,7 @@ INCLUDE_DIRECTORIES(
${GRASS_INCLUDE_DIR}
${GDAL_INCLUDE_DIR}
${PROJ_INCLUDE_DIR}
${GEOS_INCLUDE_DIR}
qtermwidget
)

Expand Down
1 change: 1 addition & 0 deletions src/providers/grass/CMakeLists.txt
Expand Up @@ -27,6 +27,7 @@ INCLUDE_DIRECTORIES (
${GRASS_INCLUDE_DIR}
${GDAL_INCLUDE_DIR}
${PROJ_INCLUDE_DIR}
${GEOS_INCLUDE_DIR}
)


Expand Down

0 comments on commit c45c93c

Please sign in to comment.