luisgulo/gambas-source-code
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[GB.IMAGE]

Browse source 
* NEW: Image.DrawAlpha() can work with images having different formats.


git-svn-id: svn://localhost/gambas/trunk@3562 867c0c6c-44f3-4631-809d-bfa615b0a4ec
This commit is contained in:
Benoît Minisini 2011-02-12 18:59:14 +00:00
parent bb9894be86
commit b7d101f636
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
main/lib/image/image.c
View file

@ -890,11 +890,11 @@ void IMAGE_bitblt(GB_IMG *dst, int dx, int dy, GB_IMG *src, int sx, int sy, int
void IMAGE_draw_alpha(GB_IMG *dst, int dx, int dy, GB_IMG *src, int sx, int sy, int sw, int sh) void IMAGE_draw_alpha(GB_IMG *dst, int dx, int dy, GB_IMG *src, int sx, int sy, int sw, int sh)
{ {
if (dst->format != src->format) /*if (dst->format != src->format)
{ {
GB.Error("The source image and the destination image must have the same format"); GB.Error("The source image and the destination image must have the same format");
return; return;
} }*/
if (!GB_IMAGE_FMT_IS_32_BITS(dst->format)) if (!GB_IMAGE_FMT_IS_32_BITS(dst->format))
{ {
@ -925,17 +925,18 @@ void IMAGE_draw_alpha(GB_IMG *dst, int dx, int dy, GB_IMG *src, int sx, int sy,
const int dd = dst->width - sw; const int dd = dst->width - sw;
const int ds = src->width - sw; const int ds = src->width - sw;
uint cs, cd; uint cs, cd;
int format = src->format; int sformat = src->format;
int dformat = dst->format;
int t; int t;
while (sh--) while (sh--)
{ {
for (t = sw; t--; d++,s++) for (t = sw; t--; d++,s++)
{ {
cs = BGRA_from_format(*s, format); cs = BGRA_from_format(*s, sformat);
cd = BGRA_from_format(*d, format); cd = BGRA_from_format(*d, dformat);
if (ALPHA(cs) < ALPHA(cd)) if (ALPHA(cs) < ALPHA(cd))
*d = BGRA_to_format(RGBA(RED(cd), GREEN(cd), BLUE(cd), ALPHA(cs)), format); *d = BGRA_to_format(RGBA(RED(cd), GREEN(cd), BLUE(cd), ALPHA(cs)), dformat);
} }
d += dd; d += dd;