Fix hue/saturation changes for rasters causing debug noise when raste…

…r contains transparent pixels
qgis · Jan 14, 2014 · 4ba3e7c · 4ba3e7c
1 parent a31ebb4
commit 4ba3e7c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/src/core/raster/qgsbrightnesscontrastfilter.cpp b/src/core/raster/qgsbrightnesscontrastfilter.cpp
@@ -179,6 +179,11 @@ int QgsBrightnessContrastFilter::adjustColorComponent( int colorComponent, int a
     // Opaque pixel, do simpler math
     return qBound( 0, ( int )(((((( colorComponent / 255.0 ) - 0.5 ) * contrastFactor ) + 0.5 ) * 255 ) + brightness ), 255 );
   }
+  else if ( alpha == 0 )
+  {
+    // Totally transparent pixel
+    return 0;
+  }
   else
   {
     // Semi-transparent pixel. We need to adjust the math since we are using QGis::ARGB32_Premultiplied

diff --git a/src/core/raster/qgshuesaturationfilter.cpp b/src/core/raster/qgshuesaturationfilter.cpp
@@ -171,6 +171,13 @@ QgsRasterBlock * QgsHueSaturationFilter::block( int bandNo, QgsRectangle  const
     // Alpha must be taken from QRgb, since conversion from QRgb->QColor loses alpha
     alpha = qAlpha( myRgb );
 
+    if ( alpha == 0 )
+    {
+      // totally transparent, no changes required
+      outputBlock->setColor( i, myRgb );
+      continue;
+    }
+
     // Get rgb for color
     myColor.getRgb( &r, &g, &b );
     if ( alpha != 255 )