sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-14 00:07:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix windows build (followup 8f2a3ae)

Browse Source
This commit is contained in:
Juergen E. Fischer 2015-06-30 17:29:55 +02:00
parent 94a61c7d3c
commit 79d37c1a8b
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/analysis/raster/qgsalignraster.sip
View File

@ -130,7 +130,7 @@ class QgsAlignRaster
//! to determine suitable defaults for cell size and grid offset.
//!
//! @return true on success (may fail if it is not possible to reproject raster to given CRS)
bool setParametersFromRaster( const RasterInfo& rasterInfo, const QString& customCRSWkt = QString(), QSizeF customCellSize = QSizeF(), QPointF customGridOffset = QPointF( -1, -1 ) );
bool setParametersFromRaster( const QgsAlignRaster::RasterInfo& rasterInfo, const QString& customCRSWkt = QString(), QSizeF customCellSize = QSizeF(), QPointF customGridOffset = QPointF( -1, -1 ) );
//! Overridden variant for convenience, taking filename instead RasterInfo object.
//! See the other variant for details.
bool setParametersFromRaster( const QString& filename, const QString& customCRSWkt = QString(), QSizeF customCellSize = QSizeF(), QPointF customGridOffset = QPointF( -1, -1 ) );

2
src/analysis/raster/qgsalignraster.h
View File

@ -41,7 +41,7 @@ class ANALYSIS_EXPORT QgsAlignRaster
QgsAlignRaster();
//! Utility class for gathering information about rasters
struct RasterInfo
struct ANALYSIS_EXPORT RasterInfo
{
public:
//! Construct raster info with a path to a raster file

2
src/server/qgsserver.cpp
View File

@ -453,7 +453,7 @@ QByteArray QgsServer::handleRequest( const QString queryString ,
*/
if ( ! queryString.isEmpty() )
{
setenv( "QUERY_STRING", queryString.toUtf8( ), 1 );
putenv( QString( "QUERY_STRING=%1" ).arg( queryString ).toUtf8( ) );
}
int logLevel = QgsServerLogger::instance()->logLevel();