fix build (followup 6de2828)

jef-n · jef-n · commit 85c811b144a6 · 2015-02-24T02:11:06.000+01:00
diff --git a/src/providers/wms/qgswmsprovider.cpp b/src/providers/wms/qgswmsprovider.cpp
@@ -598,7 +598,7 @@ QImage *QgsWmsProvider::draw( QgsRectangle const &viewExtent, int pixelWidth, in
 
       tileMode = mTileLayer->tileMode;
     }
-    else if ( mSettings.mMaxWidth != 0 && mSettings.mMaxHeight && != 0 )
+    else if ( mSettings.mMaxWidth != 0 && mSettings.mMaxHeight != 0 )
     {
       static QgsWmtsTileMatrix tempTm;
       tempTm.topLeft      = QgsPoint( mLayerExtent.xMinimum(), mLayerExtent.yMaximum() );
@@ -613,7 +613,7 @@ QImage *QgsWmsProvider::draw( QgsRectangle const &viewExtent, int pixelWidth, in
     else
     {
       QgsDebugMsg( "empty tile size" );
-      return mCacheImage;
+      return mCachedImage;
     }
 
     QgsDebugMsg( QString( "layer extent: %1,%2 %3x%4" )

Original file line number	Diff line number	Diff line change
`@@ -598,7 +598,7 @@ QImage *QgsWmsProvider::draw( QgsRectangle const &viewExtent, int pixelWidth, in`
`598`	`598`
`599`	`599`	`tileMode = mTileLayer->tileMode;`
`600`	`600`	`}`
`601`		`- else if ( mSettings.mMaxWidth != 0 && mSettings.mMaxHeight && != 0 )`
	`601`	`+ else if ( mSettings.mMaxWidth != 0 && mSettings.mMaxHeight != 0 )`
`602`	`602`	`{`
`603`	`603`	`static QgsWmtsTileMatrix tempTm;`
`604`	`604`	`tempTm.topLeft = QgsPoint( mLayerExtent.xMinimum(), mLayerExtent.yMaximum() );`
`@@ -613,7 +613,7 @@ QImage *QgsWmsProvider::draw( QgsRectangle const &viewExtent, int pixelWidth, in`
`613`	`613`	`else`
`614`	`614`	`{`
`615`	`615`	`QgsDebugMsg( "empty tile size" );`
`616`		`- return mCacheImage;`
	`616`	`+ return mCachedImage;`
`617`	`617`	`}`
`618`	`618`
`619`	`619`	`QgsDebugMsg( QString( "layer extent: %1,%2 %3x%4" )`