Skip to content

Commit 513255b

Browse files
committed
fix 55a1778 with patched qt on osgeo4w
1 parent 6d90708 commit 513255b

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

src/app/composer/qgscomposer.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@ class QgsPaintEngineHack : public QPaintEngine
494494
gccaps |= ( QPaintEngine::PrimitiveTransform
495495
// | QPaintEngine::PatternTransform
496496
| QPaintEngine::PixmapTransform
497-
// | QPaintEngine::PatternBrush
497+
| QPaintEngine::PatternBrush
498498
// | QPaintEngine::LinearGradientFill
499499
// | QPaintEngine::RadialGradientFill
500500
// | QPaintEngine::ConicalGradientFill
@@ -552,11 +552,10 @@ void QgsComposer::on_mActionExportAsPDF_triggered()
552552
printer.setPaperSize( QSizeF( mComposition->paperWidth(), mComposition->paperHeight() ), QPrinter::Millimeter );
553553

554554
QPaintEngine *engine = printer.paintEngine();
555-
if ( engine && engine->hasFeature( QPaintEngine::PatternTransform ) )
555+
if ( engine )
556556
{
557557
QgsPaintEngineHack *hack = static_cast<QgsPaintEngineHack*>( engine );
558558
hack->fixFlags();
559-
Q_ASSERT( !engine->hasFeature( QPaintEngine::PatternTransform ) );
560559
}
561560

562561
print( printer );

src/mapserver/qgswmsserver.cpp

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -326,12 +326,12 @@ QDomDocument QgsWMSServer::getStyle()
326326
std::map<QString, QString>::const_iterator style_it = mParameterMap.find( "STYLE" );
327327
if ( style_it == mParameterMap.end() )
328328
{
329-
throw QgsMapServiceException( "StyleNotSpecified", "Style is manadatory for GetStyle operation" );
329+
throw QgsMapServiceException( "StyleNotSpecified", "Style is mandatory for GetStyle operation" );
330330
}
331331
std::map<QString, QString>::const_iterator layer_it = mParameterMap.find( "LAYER" );
332332
if ( layer_it == mParameterMap.end() )
333333
{
334-
throw QgsMapServiceException( "LayerNotSpecified", "Layer is manadatory for GetStyle operation" );
334+
throw QgsMapServiceException( "LayerNotSpecified", "Layer is mandatory for GetStyle operation" );
335335
}
336336

337337
QString styleName = style_it->second;
@@ -350,7 +350,7 @@ class QgsPaintEngineHack : public QPaintEngine
350350
gccaps |= ( QPaintEngine::PrimitiveTransform
351351
// | QPaintEngine::PatternTransform
352352
| QPaintEngine::PixmapTransform
353-
// | QPaintEngine::PatternBrush
353+
| QPaintEngine::PatternBrush
354354
// | QPaintEngine::LinearGradientFill
355355
// | QPaintEngine::RadialGradientFill
356356
// | QPaintEngine::ConicalGradientFill
@@ -466,11 +466,10 @@ QByteArray* QgsWMSServer::getPrint( const QString& formatString )
466466
QRectF paperRectPixel = printer.pageRect( QPrinter::DevicePixel );
467467

468468
QPaintEngine *engine = printer.paintEngine();
469-
if ( engine->hasFeature( QPaintEngine::PatternTransform ) )
469+
if ( engine )
470470
{
471471
QgsPaintEngineHack *hack = static_cast<QgsPaintEngineHack*>( engine );
472472
hack->fixFlags();
473-
Q_ASSERT( !engine->hasFeature( QPaintEngine::PatternTransform ) );
474473
}
475474

476475
QPainter p( &printer );

0 commit comments

Comments
 (0)