Merge branch 'bugfix-10897' into release-6.0.2

runrevmark · runrevmark · commit 22f0489b1460 · 2013-05-20T15:13:24.000+01:00
diff --git a/engine/src/cmdsf.cpp b/engine/src/cmdsf.cpp
@@ -823,7 +823,12 @@ Exec_stat MCExport::exec(MCExecPoint &ep)
 			return ES_ERROR;
 		}
 	}
-
+	
+	// MW-2013-05-20: [[ Bug 10897 ]] Object snapshot returns a premultipled
+	//   bitmap, which needs to be processed before compression. This flag
+	//   indicates to do this processing later on in the method.
+	bool t_needs_unpremultiply;
+	t_needs_unpremultiply = false;
 	if (sformat == EX_SNAPSHOT)
 	{
 		char *srect = NULL;
@@ -921,6 +926,10 @@ Exec_stat MCExport::exec(MCExecPoint &ep)
 				MCeerror -> add(EE_EXPORT_EMPTYRECT, line, pos);
 				return ES_ERROR;
 			}
+			
+			// MW-2013-05-20: [[ Bug 10897 ]] The 'snapshot' command produces a premultiplied bitmap
+			//   so mark it to be unpremultiplied for later on.
+			t_needs_unpremultiply = true;
 		}
 		else
 		{
@@ -1011,6 +1020,9 @@ Exec_stat MCExport::exec(MCExecPoint &ep)
 	else
 	{
 		/* UNCHECKED */ MCImageBitmapCreateWithOldBitmap(t_img, t_bitmap);
+		// MW-2013-05-20: [[ Bug 10897 ]] Make sure we unpremultiply if needed.
+		if (t_needs_unpremultiply)
+			MCImageBitmapUnpremultiply(t_bitmap);
 		MCImageBitmapCheckTransparency(t_bitmap);
 		MCscreen->destroyimage(t_img);
 		t_dither = !MCtemplateimage->getflag(F_DONT_DITHER);

Original file line number	Diff line number	Diff line change
`@@ -823,7 +823,12 @@ Exec_stat MCExport::exec(MCExecPoint &ep)`
`823`	`823`	`return ES_ERROR;`
`824`	`824`	`}`
`825`	`825`	`}`
`826`		`-`
	`826`	`+`
	`827`	`+ // MW-2013-05-20: [[ Bug 10897 ]] Object snapshot returns a premultipled`
	`828`	`+ // bitmap, which needs to be processed before compression. This flag`
	`829`	`+ // indicates to do this processing later on in the method.`
	`830`	`+ bool t_needs_unpremultiply;`
	`831`	`+ t_needs_unpremultiply = false;`
`827`	`832`	`if (sformat == EX_SNAPSHOT)`
`828`	`833`	`{`
`829`	`834`	`char *srect = NULL;`
`@@ -921,6 +926,10 @@ Exec_stat MCExport::exec(MCExecPoint &ep)`
`921`	`926`	`MCeerror -> add(EE_EXPORT_EMPTYRECT, line, pos);`
`922`	`927`	`return ES_ERROR;`
`923`	`928`	`}`
	`929`	`+`
	`930`	`+ // MW-2013-05-20: [[ Bug 10897 ]] The 'snapshot' command produces a premultiplied bitmap`
	`931`	`+ // so mark it to be unpremultiplied for later on.`
	`932`	`+ t_needs_unpremultiply = true;`
`924`	`933`	`}`
`925`	`934`	`else`
`926`	`935`	`{`
`@@ -1011,6 +1020,9 @@ Exec_stat MCExport::exec(MCExecPoint &ep)`
`1011`	`1020`	`else`
`1012`	`1021`	`{`
`1013`	`1022`	`/* UNCHECKED */ MCImageBitmapCreateWithOldBitmap(t_img, t_bitmap);`
	`1023`	`+ // MW-2013-05-20: [[ Bug 10897 ]] Make sure we unpremultiply if needed.`
	`1024`	`+ if (t_needs_unpremultiply)`
	`1025`	`+ MCImageBitmapUnpremultiply(t_bitmap);`
`1014`	`1026`	`MCImageBitmapCheckTransparency(t_bitmap);`
`1015`	`1027`	`MCscreen->destroyimage(t_img);`
`1016`	`1028`	`t_dither = !MCtemplateimage->getflag(F_DONT_DITHER);`