Skip to content
Permalink
Browse files

fix 55a1778 with patched qt on osgeo4w

  • Loading branch information
jef-n committed Jul 5, 2011
1 parent a6351e5 commit 8fbe182a6525b1fe2e3908dc0e244062c434d5e9
Showing with 6 additions and 8 deletions.
  1. +2 −3 src/app/composer/qgscomposer.cpp
  2. +4 −5 src/mapserver/qgswmsserver.cpp
@@ -504,7 +504,7 @@ class QgsPaintEngineHack : public QPaintEngine
gccaps |= ( QPaintEngine::PrimitiveTransform
// | QPaintEngine::PatternTransform
| QPaintEngine::PixmapTransform
// | QPaintEngine::PatternBrush
| QPaintEngine::PatternBrush
// | QPaintEngine::LinearGradientFill
// | QPaintEngine::RadialGradientFill
// | QPaintEngine::ConicalGradientFill
@@ -559,11 +559,10 @@ void QgsComposer::on_mActionExportAsPDF_triggered()
printer.setPaperSize( QSizeF( mComposition->paperWidth(), mComposition->paperHeight() ), QPrinter::Millimeter );

QPaintEngine *engine = printer.paintEngine();
if ( engine && engine->hasFeature( QPaintEngine::PatternTransform ) )
if ( engine )
{
QgsPaintEngineHack *hack = static_cast<QgsPaintEngineHack*>( engine );
hack->fixFlags();
Q_ASSERT( !engine->hasFeature( QPaintEngine::PatternTransform ) );
}

print( printer );
@@ -324,12 +324,12 @@ QDomDocument QgsWMSServer::getStyle()
std::map<QString, QString>::const_iterator style_it = mParameterMap.find( "STYLE" );
if ( style_it == mParameterMap.end() )
{
throw QgsMapServiceException( "StyleNotSpecified", "Style is manadatory for GetStyle operation" );
throw QgsMapServiceException( "StyleNotSpecified", "Style is mandatory for GetStyle operation" );
}
std::map<QString, QString>::const_iterator layer_it = mParameterMap.find( "LAYER" );
if ( layer_it == mParameterMap.end() )
{
throw QgsMapServiceException( "LayerNotSpecified", "Layer is manadatory for GetStyle operation" );
throw QgsMapServiceException( "LayerNotSpecified", "Layer is mandatory for GetStyle operation" );
}

QString styleName = style_it->second;
@@ -348,7 +348,7 @@ class QgsPaintEngineHack : public QPaintEngine
gccaps |= ( QPaintEngine::PrimitiveTransform
// | QPaintEngine::PatternTransform
| QPaintEngine::PixmapTransform
// | QPaintEngine::PatternBrush
| QPaintEngine::PatternBrush
// | QPaintEngine::LinearGradientFill
// | QPaintEngine::RadialGradientFill
// | QPaintEngine::ConicalGradientFill
@@ -458,11 +458,10 @@ QByteArray* QgsWMSServer::getPrint( const QString& formatString )
QRectF paperRectPixel = printer.pageRect( QPrinter::DevicePixel );

QPaintEngine *engine = printer.paintEngine();
if ( engine->hasFeature( QPaintEngine::PatternTransform ) )
if ( engine )
{
QgsPaintEngineHack *hack = static_cast<QgsPaintEngineHack*>( engine );
hack->fixFlags();
Q_ASSERT( !engine->hasFeature( QPaintEngine::PatternTransform ) );
}

QPainter p( &printer );

0 comments on commit 8fbe182

Please sign in to comment.
You can’t perform that action at this time.