fix wmts (fixes #12241; followup 1e97b62)

qgis · Feb 24, 2015 · 251aca6 · 251aca6
1 parent 06e2186
commit 251aca6
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/src/providers/wms/qgswmsprovider.cpp b/src/providers/wms/qgswmsprovider.cpp
@@ -559,8 +559,9 @@ QImage *QgsWmsProvider::draw( QgsRectangle const &viewExtent, int pixelWidth, in
     //t.start();
 
   }
-  else if ( mSettings.mMaxWidth != 0 && mSettings.mMaxHeight != 0 )
+  else
   {
+    QgsDebugMsg( QString( "mTiled:%1 mMaxWidth:%2 mMaxHeight:%3" ).arg( mSettings.mTiled ).arg( mSettings.mMaxWidth ).arg( mSettings.mMaxHeight ) );
     mTileReqNo++;
 
     double vres = viewExtent.width() / pixelWidth;
@@ -598,7 +599,7 @@ QImage *QgsWmsProvider::draw( QgsRectangle const &viewExtent, int pixelWidth, in
 
       tileMode = mTileLayer->tileMode;
     }
-    else
+    else if ( mSettings.mMaxWidth != 0 && mSettings.mMaxHeight && != 0 )
     {
       static QgsWmtsTileMatrix tempTm;
       tempTm.topLeft      = QgsPoint( mLayerExtent.xMinimum(), mLayerExtent.yMaximum() );
@@ -610,6 +611,11 @@ QImage *QgsWmsProvider::draw( QgsRectangle const &viewExtent, int pixelWidth, in
 
       tileMode = WMSC;
     }
+    else
+    {
+      QgsDebugMsg( "empty tile size" );
+      return mCacheImage;
+    }
 
     QgsDebugMsg( QString( "layer extent: %1,%2 %3x%4" )
                  .arg( qgsDoubleToString( mLayerExtent.xMinimum() ) )
@@ -831,10 +837,6 @@ QImage *QgsWmsProvider::draw( QgsRectangle const &viewExtent, int pixelWidth, in
                       );
 #endif
   }
-  else
-  {
-    QgsDebugMsg( "empty tile size" );
-  }
 
   return mCachedImage;
 }