Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Server adjustments (allow usage from build dir, new API)
  • Loading branch information
wonder-sk committed Jan 20, 2014
1 parent db18d83 commit 4bfba09
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 14 deletions.
13 changes: 1 addition & 12 deletions src/mapserver/qgis_map_serv.cpp
Expand Up @@ -169,18 +169,7 @@ int main( int argc, char * argv[] )
QgsApplication qgsapp( argc, argv, getenv( "DISPLAY" ) );

//Default prefix path may be altered by environment variable
char* prefixPath = getenv( "QGIS_PREFIX_PATH" );
if ( prefixPath )
{
QgsApplication::setPrefixPath( prefixPath, TRUE );
}
#if !defined(Q_OS_WIN)
else
{
// init QGIS's paths - true means that all path will be inited from prefix
QgsApplication::setPrefixPath( CMAKE_INSTALL_PREFIX, TRUE );
}
#endif
QgsApplication::init();

#if defined(MAPSERVER_SKIP_ECW)
QgsDebugMsg( "Skipping GDAL ECW drivers in server." );
Expand Down
2 changes: 1 addition & 1 deletion src/mapserver/qgsprojectparser.cpp
Expand Up @@ -2240,7 +2240,7 @@ QgsComposition* QgsProjectParser::initComposition( const QString& composerTempla
return 0;
}

QgsComposition* composition = new QgsComposition( mapRenderer ); //set resolution, paper size from composer element attributes
QgsComposition* composition = new QgsComposition( mapRenderer->mapSettings() ); //set resolution, paper size from composer element attributes
if ( !composition->readXML( compositionElem, *mXMLDoc ) )
{
delete composition;
Expand Down
2 changes: 1 addition & 1 deletion src/mapserver/qgswmsserver.cpp
Expand Up @@ -1461,7 +1461,7 @@ int QgsWMSServer::featureInfoFromVectorLayer( QgsVectorLayer* layer,
}

//check if feature is rendered at all
r2->startRender( renderContext, layer );
r2->startRender( renderContext, layer->pendingFields() );
bool renderV2 = r2->willRenderFeature( feature );
r2->stopRender( renderContext );
if ( !renderV2 )
Expand Down

0 comments on commit 4bfba09

Please sign in to comment.