@@ -326,12 +326,12 @@ QDomDocument QgsWMSServer::getStyle()
326
326
std::map<QString, QString>::const_iterator style_it = mParameterMap .find ( " STYLE" );
327
327
if ( style_it == mParameterMap .end () )
328
328
{
329
- throw QgsMapServiceException ( " StyleNotSpecified" , " Style is manadatory for GetStyle operation" );
329
+ throw QgsMapServiceException ( " StyleNotSpecified" , " Style is mandatory for GetStyle operation" );
330
330
}
331
331
std::map<QString, QString>::const_iterator layer_it = mParameterMap .find ( " LAYER" );
332
332
if ( layer_it == mParameterMap .end () )
333
333
{
334
- throw QgsMapServiceException ( " LayerNotSpecified" , " Layer is manadatory for GetStyle operation" );
334
+ throw QgsMapServiceException ( " LayerNotSpecified" , " Layer is mandatory for GetStyle operation" );
335
335
}
336
336
337
337
QString styleName = style_it->second ;
@@ -350,7 +350,7 @@ class QgsPaintEngineHack : public QPaintEngine
350
350
gccaps |= ( QPaintEngine::PrimitiveTransform
351
351
// | QPaintEngine::PatternTransform
352
352
| QPaintEngine::PixmapTransform
353
- // | QPaintEngine::PatternBrush
353
+ | QPaintEngine::PatternBrush
354
354
// | QPaintEngine::LinearGradientFill
355
355
// | QPaintEngine::RadialGradientFill
356
356
// | QPaintEngine::ConicalGradientFill
@@ -466,11 +466,10 @@ QByteArray* QgsWMSServer::getPrint( const QString& formatString )
466
466
QRectF paperRectPixel = printer.pageRect ( QPrinter::DevicePixel );
467
467
468
468
QPaintEngine *engine = printer.paintEngine ();
469
- if ( engine-> hasFeature ( QPaintEngine::PatternTransform ) )
469
+ if ( engine )
470
470
{
471
471
QgsPaintEngineHack *hack = static_cast <QgsPaintEngineHack*>( engine );
472
472
hack->fixFlags ();
473
- Q_ASSERT ( !engine->hasFeature ( QPaintEngine::PatternTransform ) );
474
473
}
475
474
476
475
QPainter p ( &printer );
0 commit comments