Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fix windows build (followup 8f2a3ae)
  • Loading branch information
jef-n committed Jun 30, 2015
1 parent 94a61c7 commit 79d37c1
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion python/analysis/raster/qgsalignraster.sip
Expand Up @@ -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 ) );
Expand Down
2 changes: 1 addition & 1 deletion src/analysis/raster/qgsalignraster.h
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/server/qgsserver.cpp
Expand Up @@ -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();
Expand Down

0 comments on commit 79d37c1

Please sign in to comment.