fix bmp loader advances

SVN revision: 21401
This commit is contained in:
Carsten Haitzler 2006-03-19 08:46:16 +00:00
parent 4cdee67f92
commit 8e83a0d122
1 changed files with 3 additions and 3 deletions

View File

@ -646,9 +646,10 @@ load(ImlibImage * im, ImlibProgressFunction progress,
{
r = ((unsigned short)(*buffer_ptr) & rmask) >> rshift;
g = ((unsigned short)(*buffer_ptr) & gmask) >> gshift;
b = ((unsigned short)(*(buffer_ptr++)) & bmask) >>
b = ((unsigned short)(*(buffer_ptr)) & bmask) >>
bshift;
*ptr++ = 0xff000000 | (r << 16) | (g << 8) | b;
buffer_ptr += 2;
}
ptr -= w * 2;
buffer_ptr += skip;
@ -723,8 +724,7 @@ load(ImlibImage * im, ImlibProgressFunction progress,
g = ((unsigned long)(*buffer_ptr) & gmask) >> gshift;
b = ((unsigned long)(*buffer_ptr) & bmask) >> bshift;
*ptr++ = 0xff000000 | (r << 16) | (g << 8) | b;
r = *(buffer_ptr++);
r = *(buffer_ptr++);
buffer_ptr+=4;
}
ptr -= w * 2;
buffer_ptr += skip;