fix 55a1778 with patched qt on osgeo4w

qgis · Jul 5, 2011 · 513255ba0ad9352d3710bc78848bed065e9f6c87 · 513255b
1 parent 6d90708
commit 513255ba0ad9352d3710bc78848bed065e9f6c87
Unified Split

Showing with 6 additions and 8 deletions.

+2 −3 src/app/composer/qgscomposer.cpp

+4 −5 src/mapserver/qgswmsserver.cpp
diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
@@ -494,7 +494,7 @@ class QgsPaintEngineHack : public QPaintEngine
       gccaps |= ( QPaintEngine::PrimitiveTransform
                   // | QPaintEngine::PatternTransform
                   | QPaintEngine::PixmapTransform
-                  // | QPaintEngine::PatternBrush
+                  | QPaintEngine::PatternBrush
                   // | QPaintEngine::LinearGradientFill
                   // | QPaintEngine::RadialGradientFill
                   // | QPaintEngine::ConicalGradientFill
@@ -552,11 +552,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 );

diff --git a/src/mapserver/qgswmsserver.cpp b/src/mapserver/qgswmsserver.cpp
@@ -326,12 +326,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;
@@ -350,7 +350,7 @@ class QgsPaintEngineHack : public QPaintEngine
       gccaps |= ( QPaintEngine::PrimitiveTransform
                   // | QPaintEngine::PatternTransform
                   | QPaintEngine::PixmapTransform
-                  // | QPaintEngine::PatternBrush
+                  | QPaintEngine::PatternBrush
                   // | QPaintEngine::LinearGradientFill
                   // | QPaintEngine::RadialGradientFill
                   // | QPaintEngine::ConicalGradientFill
@@ -466,11 +466,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 );