Weight RGB values by alpha

wesnoth · Nov 6, 2017 · e226ef3 · e226ef3
1 parent 8f730f2
commit e226ef3
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/src/sdl/utils.cpp b/src/sdl/utils.cpp
@@ -1622,22 +1622,28 @@ surface blur_alpha_surface(const surface &surf, int depth)
 		Average() : alpha(), red(), green(), blue()
 		{}
 		Average& operator+=(const Pixel& pix){
-			red   += pix.red;
-			green += pix.green;
-			blue  += pix.blue;
+			red   += pix.alpha * pix.red;
+			green += pix.alpha * pix.green;
+			blue  += pix.alpha * pix.blue;
 			alpha += pix.alpha;
 			return *this;
 		}
 		Average& operator-=(const Pixel& pix){
-			red   -= pix.red;
-			green -= pix.green;
-			blue  -= pix.blue;
+			red   -= pix.alpha * pix.red;
+			green -= pix.alpha * pix.green;
+			blue  -= pix.alpha * pix.blue;
 			alpha -= pix.alpha;
 			return *this;
 		}
 		Uint32 operator()(unsigned num){
 			const Uint32 ff = 0xff;
-			return (std::min(alpha/num,ff) << 24) | (std::min(red/num,ff) << 16) | (std::min(green/num,ff) << 8) | std::min(blue/num,ff);
+			if(!alpha){
+				return 0;
+			}
+			return (std::min(alpha/num,ff) << 24)
+			    | (std::min(red/alpha,ff) << 16)
+			    | (std::min(green/alpha,ff) << 8)
+			    | std::min(blue/alpha,ff);
 		}
 	};