libimg: fix in to_rgb2, version bump

git-svn-id: svn://kolibrios.org@1015 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Evgeny Grechnikov (Diamond) 2009-01-31 03:30:53 +00:00
parent f49c184a7d
commit 0768664fe0

View File

@ -218,11 +218,15 @@ proc img._.do_rgb ;/////////////////////////////////////////////////////////////
; 32 BPP -> 24 BPP ; 32 BPP -> 24 BPP
mov esi, [esi + Image.Data] mov esi, [esi + Image.Data]
@@: dec ecx @@:
js @f mov eax, [esi]
movsd mov [edi], ax
dec edi shr eax, 16
jmp @b mov [edi+2], al
add esi, 4
add edi, 3
sub ecx, 1
jnz @b
@@: @@:
ret ret
@ -244,7 +248,9 @@ proc img._.do_rgb ;/////////////////////////////////////////////////////////////
movzx eax, byte [esi] movzx eax, byte [esi]
add esi, 1 add esi, 1
mov eax, [ebx + eax*4] mov eax, [ebx + eax*4]
mov [edi], eax mov [edi], ax
shr eax, 16
mov [edi+2], al
add edi, 3 add edi, 3
sub ecx, 1 sub ecx, 1
jnz @b jnz @b
@ -1154,7 +1160,7 @@ align 4
export \ export \
lib_init , 'lib_init' , \ lib_init , 'lib_init' , \
0x00010002 , 'version' , \ 0x00010003 , 'version' , \
img.is_img , 'img.is_img' , \ img.is_img , 'img.is_img' , \
img.info , 'img.info' , \ img.info , 'img.info' , \
img.from_file , 'img.from_file' , \ img.from_file , 'img.from_file' , \