enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

ok - finally - biran wang... you get your hacky bmp loader. 

SVN revision: 57668
This commit is contained in:
Carsten Haitzler 2011-03-10 12:11:42 +00:00
parent 0786e6c1bf
commit 1f2163eeba
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
legacy/evas/src/modules/loaders/bmp/evas_image_load_bmp.c
View File

@ -161,6 +161,7 @@ evas_image_load_file_head_bmp(Image_Entry *ie, const char *file, const char *key
if (!read_int(f, &tmp2)) goto close_file;
important_colors = tmp2; // number of important colors - 0 if all
if (image_size == 0) image_size = fsize - offset;
if ((comp == 0) && (bit_count == 32)) hasa = 1; // GIMP seems to store it this way
}
else if (head_size == 108) // Windows 95/NT4 + (v4)
{
@ -435,6 +436,7 @@ evas_image_load_file_data_bmp(Image_Entry *ie, const char *file, const char *key
if (!read_int(f, &tmp2)) goto close_file;
important_colors = tmp2; // number of important colors - 0 if all
if (image_size == 0) image_size = fsize - offset;
if ((comp == 0) && (bit_count == 32)) hasa = 1; // GIMP seems to store it this way
}
else if (head_size == 108) // Windows 95/NT4 + (v4)
{
@ -949,6 +951,7 @@ evas_image_load_file_data_bmp(Image_Entry *ie, const char *file, const char *key
}
else if (bit_count == 32)
{
int none_zero_alpha = 0;
pix = surface;
for (y = 0; y < h; y++)
{
@ -959,6 +962,7 @@ evas_image_load_file_data_bmp(Image_Entry *ie, const char *file, const char *key
g = p[1];
r = p[2];
a = p[3];
if (a) none_zero_alpha = 1;
if (!hasa) a = 0xff;
*pix = ARGB_JOIN(a, r, g, b);
p += 4;
@ -969,6 +973,17 @@ evas_image_load_file_data_bmp(Image_Entry *ie, const char *file, const char *key
if (fix > 0) p += 4 - fix; // align row read
if (p >= buffer_end) break;
}
if (!none_zero_alpha)
{
ie->flags.alpha = 0;
if (hasa)
{
unsigned int *pixend = pix + (w * h);
for (pix = surface; pix < pixend; pix++)
A_VAL(pix) = 0xff;
}
}
}
else
goto close_file;