Merge pull request #501 from nyalldawson/color_control

Fix contrast, grayscale and colorize settings not applying to exported raster layers

Author: alexbruy

src/core/raster/qgsbrightnesscontrastfilter.cpp

@@ -38,6 +38,7 @@ QgsRasterInterface * QgsBrightnessContrastFilter::clone() const
   QgsDebugMsg( "Entered" );
   QgsBrightnessContrastFilter * filter = new QgsBrightnessContrastFilter( 0 );
   filter->setBrightness( mBrightness );
+  filter->setContrast( mContrast );
   return filter;
 }
 

src/core/raster/qgshuesaturationfilter.cpp

@@ -41,6 +41,10 @@ QgsRasterInterface * QgsHueSaturationFilter::clone() const
   QgsDebugMsg( "Entered hue/saturation filter" );
   QgsHueSaturationFilter * filter = new QgsHueSaturationFilter( 0 );
   filter->setSaturation( mSaturation );
+  filter->setGrayscaleMode( mGrayscaleMode );
+  filter->setColorizeOn( mColorizeOn );
+  filter->setColorizeColor( mColorizeColor );
+  filter->setColorizeStrength( mColorizeStrength );
   return filter;
 }
 
@@ -361,8 +365,8 @@ void QgsHueSaturationFilter::readXML( const QDomElement& filterElem )
 
   mColorizeOn = ( bool )filterElem.attribute( "colorizeOn", "0" ).toInt();
   int mColorizeRed = filterElem.attribute( "colorizeRed", "255" ).toInt();
-  int mColorizeGreen = filterElem.attribute( "colorizeGreen", "0" ).toInt();
-  int mColorizeBlue = filterElem.attribute( "colorizeBlue", "0" ).toInt();
+  int mColorizeGreen = filterElem.attribute( "colorizeGreen", "128" ).toInt();
+  int mColorizeBlue = filterElem.attribute( "colorizeBlue", "128" ).toInt();
   setColorizeColor( QColor::fromRgb( mColorizeRed, mColorizeGreen, mColorizeBlue ) );
   mColorizeStrength = filterElem.attribute( "colorizeStrength", "100" ).toInt();