Fix #11455 (Crash when setting transparency for WMS layer)

wonder-sk · wonder-sk · commit c9e05f9800d1 · 2014-10-22T17:39:14.000+07:00
Layer transparency instance was not copied when renderers were cloned.
diff --git a/src/core/raster/qgsmultibandcolorrenderer.cpp b/src/core/raster/qgsmultibandcolorrenderer.cpp
@@ -57,7 +57,7 @@ QgsRasterInterface * QgsMultiBandColorRenderer::clone() const
   }
   renderer->setOpacity( mOpacity );
   renderer->setAlphaBand( mAlphaBand );
-  renderer->setRasterTransparency( mRasterTransparency );
+  renderer->setRasterTransparency( new QgsRasterTransparency( *mRasterTransparency ) );
 
   return renderer;
 }
diff --git a/src/core/raster/qgspalettedrasterrenderer.cpp b/src/core/raster/qgspalettedrasterrenderer.cpp
@@ -51,7 +51,7 @@ QgsRasterInterface * QgsPalettedRasterRenderer::clone() const
   QgsPalettedRasterRenderer * renderer = new QgsPalettedRasterRenderer( 0, mBand, rgbArray(), mNColors );
   renderer->setOpacity( mOpacity );
   renderer->setAlphaBand( mAlphaBand );
-  renderer->setRasterTransparency( mRasterTransparency );
+  renderer->setRasterTransparency( new QgsRasterTransparency( *mRasterTransparency ) );
   renderer->mLabels = mLabels;
   return renderer;
 }
diff --git a/src/core/raster/qgssinglebandcolordatarenderer.cpp b/src/core/raster/qgssinglebandcolordatarenderer.cpp
@@ -16,6 +16,7 @@
  ***************************************************************************/
 
 #include "qgssinglebandcolordatarenderer.h"
+#include "qgsrastertransparency.h"
 #include "qgsrasterviewport.h"
 #include <QDomDocument>
 #include <QDomElement>
@@ -36,7 +37,7 @@ QgsRasterInterface * QgsSingleBandColorDataRenderer::clone() const
   QgsSingleBandColorDataRenderer * renderer = new QgsSingleBandColorDataRenderer( 0, mBand );
   renderer->setOpacity( mOpacity );
   renderer->setAlphaBand( mAlphaBand );
-  renderer->setRasterTransparency( mRasterTransparency );
+  renderer->setRasterTransparency( new QgsRasterTransparency( *mRasterTransparency ) );
   return renderer;
 }
 
diff --git a/src/core/raster/qgssinglebandgrayrenderer.cpp b/src/core/raster/qgssinglebandgrayrenderer.cpp
@@ -37,7 +37,7 @@ QgsRasterInterface * QgsSingleBandGrayRenderer::clone() const
   QgsSingleBandGrayRenderer * renderer = new QgsSingleBandGrayRenderer( 0, mGrayBand );
   renderer->setOpacity( mOpacity );
   renderer->setAlphaBand( mAlphaBand );
-  renderer->setRasterTransparency( mRasterTransparency );
+  renderer->setRasterTransparency( new QgsRasterTransparency( *mRasterTransparency ) );
   renderer->setGradient( mGradient );
   if ( mContrastEnhancement )
   {
diff --git a/src/core/raster/qgssinglebandpseudocolorrenderer.cpp b/src/core/raster/qgssinglebandpseudocolorrenderer.cpp
@@ -63,7 +63,7 @@ QgsRasterInterface * QgsSingleBandPseudoColorRenderer::clone() const
 
   renderer->setOpacity( mOpacity );
   renderer->setAlphaBand( mAlphaBand );
-  renderer->setRasterTransparency( mRasterTransparency );
+  renderer->setRasterTransparency( new QgsRasterTransparency( *mRasterTransparency ) );
 
   return renderer;
 }

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ QgsRasterInterface * QgsMultiBandColorRenderer::clone() const`
`57`	`57`	`}`
`58`	`58`	`renderer->setOpacity( mOpacity );`
`59`	`59`	`renderer->setAlphaBand( mAlphaBand );`
`60`		`- renderer->setRasterTransparency( mRasterTransparency );`
	`60`	`+ renderer->setRasterTransparency( new QgsRasterTransparency( *mRasterTransparency ) );`
`61`	`61`
`62`	`62`	`return renderer;`
`63`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ QgsRasterInterface * QgsPalettedRasterRenderer::clone() const`
`51`	`51`	`QgsPalettedRasterRenderer * renderer = new QgsPalettedRasterRenderer( 0, mBand, rgbArray(), mNColors );`
`52`	`52`	`renderer->setOpacity( mOpacity );`
`53`	`53`	`renderer->setAlphaBand( mAlphaBand );`
`54`		`- renderer->setRasterTransparency( mRasterTransparency );`
	`54`	`+ renderer->setRasterTransparency( new QgsRasterTransparency( *mRasterTransparency ) );`
`55`	`55`	`renderer->mLabels = mLabels;`
`56`	`56`	`return renderer;`
`57`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ QgsRasterInterface * QgsSingleBandGrayRenderer::clone() const`
`37`	`37`	`QgsSingleBandGrayRenderer * renderer = new QgsSingleBandGrayRenderer( 0, mGrayBand );`
`38`	`38`	`renderer->setOpacity( mOpacity );`
`39`	`39`	`renderer->setAlphaBand( mAlphaBand );`
`40`		`- renderer->setRasterTransparency( mRasterTransparency );`
	`40`	`+ renderer->setRasterTransparency( new QgsRasterTransparency( *mRasterTransparency ) );`
`41`	`41`	`renderer->setGradient( mGradient );`
`42`	`42`	`if ( mContrastEnhancement )`
`43`	`43`	`{`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ QgsRasterInterface * QgsSingleBandPseudoColorRenderer::clone() const`
`63`	`63`
`64`	`64`	`renderer->setOpacity( mOpacity );`
`65`	`65`	`renderer->setAlphaBand( mAlphaBand );`
`66`		`- renderer->setRasterTransparency( mRasterTransparency );`
	`66`	`+ renderer->setRasterTransparency( new QgsRasterTransparency( *mRasterTransparency ) );`
`67`	`67`
`68`	`68`	`return renderer;`
`69`	`69`	`}`