Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 2388 → Rev 2733

/programs/develop/libraries/libs-dev/libimg/xcf/composite_mmx.asm
387,13 → 387,15
 
punpcklbw mm2, mm0
punpcklbw mm3, mm0
movq mm5, [xcf._.mmx_00ff]
movq mm4, mm5
movq mm4, [xcf._.mmx_00ff]
movq mm5, mm4
psubw mm5, mm3
movq mm3, mm4
psubw mm4, mm2
psubw mm3, mm5
pmullw mm3, mm4
psrlw mm3, 8
paddw mm3, mm5
pmullw mm4, mm5
psrlw mm4, 8
psubw mm3, mm4
 
ret
endp
 
/programs/develop/libraries/libs-dev/libimg/xcf/composite_sse.asm
583,13 → 583,14
 
punpcklbw xmm2, xmm0
punpcklbw xmm3, xmm0
movdqu xmm5, xword[xcf._.xmm_00ff]
movdqa xmm4, xmm5
movdqu xmm4, xword[xcf._.xmm_00ff]
movdqa xmm5, xmm4
psubw xmm5, xmm3
movdqa xmm3, xmm4
psubw xmm4, xmm2
psubw xmm3, xmm5
pmullw xmm3, xmm4
psrlw xmm3, 8
paddw xmm3, xmm5
pmullw xmm4, xmm5
psrlw xmm4, 8
psubw xmm3, xmm4
ret
endp
 
/programs/develop/libraries/libs-dev/libimg/xcf/xcf.asm
130,7 → 130,7
 
.process_grayscale:
 
stdcall img.create, ebx, edx, Image.bpp8
stdcall img.create, ebx, edx, Image.bpp8i
mov [retvalue], eax
test eax, eax
jz .error
160,7 → 160,7
 
.process_indexed:
 
stdcall img.create, ebx, edx, Image.bpp8
stdcall img.create, ebx, edx, Image.bpp8i
mov [retvalue], eax
test eax, eax
jz .error
217,7 → 217,7
dec [layer_count]
jnz .still
 
cmp [ebx + Image.Type], Image.bpp8
cmp [ebx + Image.Type], Image.bpp8i
jne .quit
stdcall xcf._.pack_8a, ebx
jmp .quit
372,7 → 372,7
bswap eax
add esi, eax
 
stdcall img.create, [channel_width], [channel_height], Image.bpp8
stdcall img.create, [channel_width], [channel_height], Image.bpp8i
mov ebx, eax
test ebx, ebx
jz .quit
443,7 → 443,7
mov [layer_height], eax
lodsd
bswap eax
mov edx, Image.bpp16
mov edx, Image.bpp8a
mov [color_step], 1
cmp eax, 2
jge @f
899,7 → 899,7
imul eax, [img_y1]
add eax, [img_x1]
shl eax, 1
cmp [edx + Image.Width], Image.bpp16
cmp [edx + Image.Width], Image.bpp8a
je @f
shl eax, 1
@@:
909,7 → 909,7
imul eax, [bottom_y1]
add eax, [bottom_x1]
shl eax, 1
cmp [ebx + Image.Width], Image.bpp8
cmp [ebx + Image.Width], Image.bpp8i
je @f
shl eax, 1
@@:
919,7 → 919,7
mov eax, [edx + Image.Width]
sub eax, [copy_width]
shl eax, 1
cmp [edx + Image.Width], Image.bpp16
cmp [edx + Image.Width], Image.bpp8a
je @f
shl eax, 1
@@:
928,7 → 928,7
mov eax, [ebx + Image.Width]
sub eax, [copy_width]
shl eax, 1
cmp [ebx + Image.Width], Image.bpp8
cmp [ebx + Image.Width], Image.bpp8i
je @f
shl eax, 1
@@:
938,7 → 938,7
jne .not_first
mov ecx, [copy_width]
imul ecx, [copy_height]
cmp [ebx + Image.Type], Image.bpp8
cmp [ebx + Image.Type], Image.bpp8i
je .bpp8a
.bpp32:
rep movsd
997,7 → 997,7
@@:
 
 
cmp [ebx + Image.Type], Image.bpp8
cmp [ebx + Image.Type], Image.bpp8i
jne @f
stdcall xcf._.merge_8a, [copy_width], [copy_height], [img_total_bpl], [bottom_total_bpl]
jmp .done