sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-11-28 00:06:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix build problems with GRASS 6.5 GEOS support and #1723

Browse Source 
git-svn-id: http://svn.osgeo.org/qgis/trunk@10893 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
jef 2009-06-09 06:57:55 +00:00
parent f3567a0113
commit c45c93c47e
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/core/qgssymbol.sip
View File

@ -72,7 +72,7 @@ class QgsSymbol
/** Get QImage representation of point symbol with current settings /** Get QImage representation of point symbol with current settings
* and scaled (can be slow when scale != 1.0) * 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, bool selected = false,
QColor selectionColor = Qt::yellow, QColor selectionColor = Qt::yellow,
double scale = 1.0, double scale = 1.0,

4
src/core/symbology/qgssymbol.h
View File

@ -101,13 +101,13 @@ class CORE_EXPORT QgsSymbol
/** Get QImage representation of point symbol with current settings /** 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 ); bool selected = false, QColor selectionColor = Qt::yellow );
/** Get QImage representation of point symbol with current settings /** Get QImage representation of point symbol with current settings
* and scaled (can be slow when scale != 1.0) * 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, bool selected = false,
QColor selectionColor = Qt::yellow, QColor selectionColor = Qt::yellow,
double scale = 1.0, double scale = 1.0,

1
src/plugins/grass/CMakeLists.txt
View File

@ -142,6 +142,7 @@ INCLUDE_DIRECTORIES(
${GRASS_INCLUDE_DIR} ${GRASS_INCLUDE_DIR}
${GDAL_INCLUDE_DIR} ${GDAL_INCLUDE_DIR}
${PROJ_INCLUDE_DIR} ${PROJ_INCLUDE_DIR}
${GEOS_INCLUDE_DIR}
qtermwidget qtermwidget
) )

1
src/providers/grass/CMakeLists.txt
View File

@ -27,6 +27,7 @@ INCLUDE_DIRECTORIES (
${GRASS_INCLUDE_DIR} ${GRASS_INCLUDE_DIR}
${GDAL_INCLUDE_DIR} ${GDAL_INCLUDE_DIR}
${PROJ_INCLUDE_DIR} ${PROJ_INCLUDE_DIR}
${GEOS_INCLUDE_DIR}
) )