WebSVN – Kolibri OS – Diff – /programs/develop/libraries/libs-dev/libimg/libimg.asm

 ;;================================================================================================;;
-;;//// libimg.asm //// (c) mike.dld, 2007-2008 ///////////////////////////////////////////////////;;
+;;//// libimg.asm //// (c) mike.dld, 2007-2008, (c) diamond, 2009 ////////////////////////////////;;
 ;;================================================================================================;;
 ;;                                                                                                ;;
 ;; This file is part of Common development libraries (Libs-Dev).                                  ;;
 ;;                                                                                                ;;
 ;; Libs-Dev is free software: you can redistribute it and/or modify it under the terms of the GNU ;;
-;; General Public License as published by the Free Software Foundation, either version 3 of the   ;;
+;; Lesser General Public License as published by the Free Software Foundation, either version 2.1 ;;
-;; License, or (at your option) any later version.                                                ;;
+;; of the License, or (at your option) any later version.                                         ;;
 ;;                                                                                                ;;
 ;; Libs-Dev is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without  ;;
 ;; even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU  ;;
-;; General Public License for more details.                                                       ;;
+;; Lesser General Public License for more details.                                                ;;
 ;;                                                                                                ;;
-;; You should have received a copy of the GNU General Public License along with Libs-Dev. If not, ;;
+;; You should have received a copy of the GNU Lesser General Public License along with Libs-Dev.  ;;
-;; see .                                                            ;;
+;; If not, see .                                                    ;;
 ;;                                                                                                ;;
 ;;================================================================================================;;
 public @EXPORT as 'EXPORTS'
 include '../../../../struct.inc'
 include '../../../../proc32.inc'
 include '../../../../macros.inc'
-purge section,mov;add,sub
+purge section,mov,add,sub
 include 'libimg.inc'
+section '.flat' code readable align 16
 section '.flat' code readable align 16
 include 'bmp/bmp.asm'
-include 'bmp/bmp.asm'
+include 'gif/gif.asm'
-include 'gif/gif.asm'
+include 'jpeg/jpeg.asm'
 	mov	[mem.alloc], eax
 	mov	[mem.free], ebx
 	mov	[mem.realloc], ecx
 	mov	[dll.load], edx
+	call	img.initialize.jpeg
   .ok:	xor	eax,eax
 	ret
 endp
 	push	eax
 	mov	eax, [esi + Image.Width]
 	stosd
 	mov	eax, [esi + Image.Height]
 	stosd
+	mov	eax, [esi + Image.Type]
+	dec	eax
+	jz	.bpp8
+	dec	eax
+	jz	.bpp24
+	dec	eax
+	jnz	.error_pop
+; 32 BPP -> 24 BPP
 	mov	esi, [esi + Image.Data]
     @@: dec	ecx
 	js	@f
     @@: pop	eax
 	pop	edi esi
+	ret
+.bpp24:
+; 24 BPP -> 24 BPP
+	lea	ecx, [ecx*3 + 3]
+	mov	esi, [esi + Image.Data]
+	shr	ecx, 2
+	rep	movsd
+	pop	eax
+	pop	edi esi
+	ret
+.bpp8:
+; 8 BPP -> 24 BPP
+	push	ebx
+	mov	ebx, [esi + Image.Palette]
+	mov	esi, [esi + Image.Data]
+@@:
+	movzx	eax, byte [esi]
+	add	esi, 1
+	mov	eax, [ebx + eax*4]
+	mov	[edi], eax
+	add	edi, 3
+	sub	ecx, 1
+	jnz	@b
+	pop	ebx
+	pop	eax
+	pop	edi esi
+	ret
+  .error_pop:
-	ret
+  	pop	eax
   .error:
 	xor	eax, eax
 	pop	edi esi
     @@: stdcall [ebx + FormatsTableEntry.Is], [_data], [_length]
 	or	eax, eax
 	jnz	@f
 	add	ebx, sizeof.FormatsTableEntry
 	cmp	dword[ebx], 0
-	jnz	@f
+	jnz	@b
 	jmp	.error
     @@: stdcall [ebx + FormatsTableEntry.Decode], [_data], [_length]
   .error:
 	xor	eax, eax
 	ret
 endp
 ;;================================================================================================;;
-proc img.create _width, _height ;/////////////////////////////////////////////////////////////////;;
+proc img.create _width, _height, _type ;//////////////////////////////////////////////////////////;;
 ;;------------------------------------------------------------------------------------------------;;
 ;? --- TBD ---                                                                                    ;;
 ;;------------------------------------------------------------------------------------------------;;
 ;> --- TBD ---                                                                                    ;;
 	stdcall img._.new
 	or	eax, eax
+	jz	.error
+	mov	ecx, [_type]
-	jz	.error
+	mov	[eax + Image.Type], ecx
 	push	eax
 	stdcall img._.resize_data, eax, [_width], [_height]
 	or	eax, eax
 	jz	.error.2
 	pop	eax
-	ret
+	jmp	.ret
+  .error.2:
-  .error.2:
+;       pop     eax
-;       pop     eax
+	stdcall img._.delete; eax
-	stdcall img._.delete; eax
+	xor	eax, eax
 	xor	eax, eax
 ;;================================================================================================;;
 locals
   scanline_len dd ?
 endl
+	push	ebx esi edi
-	push	esi edi
+	mov	ebx, [_img]
-	stdcall img._.validate, [_img]
+	stdcall img._.validate, ebx
 	or	eax, eax
-	jnz	.error
+	jnz	.error
-	mov	esi, [_img]
-	mov	ecx, [esi + Image.Height]
+	mov	ecx, [ebx + Image.Height]
-	mov	eax, [esi + Image.Width]
+	mov	eax, [ebx + Image.Width]
-	shl	eax, 2
-	mov	[scanline_len], eax
 	call	img._.get_scanline_len
-	push	esi
+	mov	[scanline_len], eax
 	test	[_flip_kind], FLIP_VERTICAL
 	jz	.dont_flip_vert
 	imul	eax, ecx
 	sub	eax, [scanline_len]
 	shr	ecx, 1
-	mov	esi, [esi + Image.Data]
+	mov	esi, [ebx + Image.Data]
+	lea	edi, [esi + eax]
 	lea	edi, [esi + eax]
+  .next_line_vert:
-  .next_line_vert:
+	push	ecx
-	push	ecx
+	mov	ecx, [scanline_len]
 	push	ecx
+	shr	ecx, 2
+    @@: mov	eax, [esi]
+	xchg	eax, [edi]
+	mov	[esi], eax
+	add	esi, 4
+	add	edi, 4
+	sub	ecx, 1
+	jnz	@b
+	pop	ecx
+	and	ecx, 3
+	jz	.cont_line_vert
-	mov	ecx, [scanline_len]
+    @@:
-	shr	ecx, 2
+	mov	al, [esi]
+	xchg	al, [edi]
-    @@: lodsd
+	mov	[esi], al
-	xchg	eax, [edi]
+	add	esi, 1
-	mov	[esi - 4], eax
+	add	edi, 1
-	add	edi, 4
+	dec	ecx
-	dec	ecx
+	jnz	@b
-	jnz	@b
+    .cont_line_vert:
-	pop	ecx
-	mov	eax, [scanline_len]
-	shl	eax, 1
+	pop	ecx
-	sub	edi, eax
+	mov	eax, [scanline_len]
-	dec	ecx
+	shl	eax, 1
-	jnz	.next_line_vert
+	sub	edi, eax
+	dec	ecx
-  .dont_flip_vert:
+	jnz	.next_line_vert
+  .dont_flip_vert:
+	test	[_flip_kind], FLIP_HORIZONTAL
+	jz	.exit
+	mov	ecx, [ebx + Image.Height]
+	mov	eax, [ebx + Image.Type]
 	mov	esi, [ebx + Image.Data]
-	pop	esi
+	mov	edi, [scanline_len]
 	add	edi, esi
     @@: mov	eax, [esi]
 	xchg	eax, [edi]
 	mov	[esi], eax
 	add	esi, 4
 	add	edi, -4
-	dec	ecx
+	sub	ecx, 1
 	jnz	@b
 	pop	edi esi ecx
 	add	esi, [scanline_len]
 	add	edi, [scanline_len]
 	dec	ecx
+	jnz	.next_line_horz
+	jmp	.exit
+.bpp8.2:
+	dec	edi
+  .next_line_horz8:
+	push	ecx esi edi
+	mov	ecx, [scanline_len]
+	shr	ecx, 1
+    @@: mov	al, [esi]
+	mov	dl, [edi]
+	mov	[edi], al
+	mov	[esi], dl
+	add	esi, 1
+	sub	edi, 1
+	sub	ecx, 1
+	jnz	@b
+	pop	edi esi ecx
+	add	esi, [scanline_len]
+	add	edi, [scanline_len]
+	dec	ecx
+	jnz	.next_line_horz8
+	jmp	.exit
+.bpp24.2:
+	sub	edi, 3
+  .next_line_horz32:
+	push	ecx esi edi
+	mov	ecx, [ebx + Image.Width]
+	shr	ecx, 1
+    @@:
+	mov	al, [esi]
+	mov	dl, [edi]
+	mov	[edi], al
+	mov	[esi], dl
+	mov	al, [esi+1]
+	mov	dl, [edi+1]
+	mov	[edi+1], al
+	mov	[esi+1], dl
+	mov	al, [esi+2]
+	mov	dl, [edi+2]
+	mov	[edi+2], al
+	mov	[esi+2], dl
+	add	esi, 3
+	sub	edi, 3
+	sub	ecx, 1
+	jnz	@b
+	pop	edi esi ecx
+	add	esi, [scanline_len]
+	add	edi, [scanline_len]
+	dec	ecx
-	jnz	.next_line_horz
+	jnz	.next_line_horz32
   .exit:
 	xor	eax, eax
 	inc	eax
-	pop	edi esi
+	pop	edi esi ebx
 	ret
   .error:
 	xor	eax, eax
-	pop	edi esi
+	pop	edi esi ebx
 	ret
 endl
 	mov	[line_buffer], 0
+	push	ebx esi edi
-	push	ebx esi edi
+	mov	ebx, [_img]
-	stdcall img._.validate, [_img]
+	stdcall img._.validate, ebx
 	or	eax, eax
 	jnz	.error
 	cmp	[_rotate_kind], ROTATE_180
 	je	.flip
 	jmp	.exit
-  .rotate_ccw_low:
-	mov	ebx, [_img]
+  .rotate_ccw_low:
 	mov	eax, [ebx + Image.Height]
 	mov	[scanline_pixels_new], eax
-	shl	eax, 2
+	call	img._.get_scanline_len
 	mov	[scanline_len_new], eax
 	invoke	mem.alloc, eax
 	or	eax, eax
 	jz	.error
 	mov	[line_buffer], eax
 	mov	eax, [ebx + Image.Width]
-	mov	ecx, [ebx + Image.Width]
+	mov	ecx, eax
-	lea	eax, [ecx * 4]
+	call	img._.get_scanline_len
 	mov	[scanline_len_old], eax
+	mov	eax, [scanline_len_new]
+	imul	eax, ecx
+	add	eax, [ebx + Image.Data]
+	mov	[pixels_ptr], eax
-	mov	eax, [scanline_len_new]
+	cmp	[ebx + Image.Type], Image.bpp8
-	imul	eax, ecx
+	jz	.rotate_ccw8
-	add	eax, [ebx + Image.Data]
+	cmp	[ebx + Image.Type], Image.bpp24
-	mov	[pixels_ptr], eax
+	jz	.rotate_ccw24
   .next_column_ccw_low:
 	rep	movsd
 	pop	ecx
+	jmp	.next_column_ccw_low
+.rotate_ccw8:
+  .next_column_ccw_low8:
+	dec	ecx
+	js	.exchange_dims
+	push	ecx
+	mov	edx, [scanline_len_old]
+	add	[scanline_len_old], -1
+	mov	ecx, [scanline_pixels_new]
+	mov	esi, [ebx + Image.Data]
+	mov	edi, [line_buffer]
+    @@: mov	al, [esi]
+	mov	[edi], al
+	add	esi, edx
+	add	edi, 1
+	sub	ecx, 1
+	jnz	@b
+	mov	eax, [scanline_pixels_new]
+	mov	edi, [ebx + Image.Data]
+	lea	esi, [edi + 1]
+	mov	edx, [scanline_len_old]
+    @@: mov	ecx, edx
+	shr	ecx, 2
+	rep	movsd
+	mov	ecx, edx
+	and	ecx, 3
+	rep	movsb
+	add	esi, 1
+	sub	eax, 1
+	jnz	@b
+	mov	eax, [scanline_len_new]
+	sub	[pixels_ptr], eax
+	mov	ecx, [scanline_pixels_new]
+	mov	esi, [line_buffer]
+	mov	edi, [pixels_ptr]
+	mov	edx, ecx
+	shr	ecx, 2
+	rep	movsd
+	mov	ecx, edx
+	and	ecx, 3
+	rep	movsb
+	pop	ecx
+	jmp	.next_column_ccw_low8
+.rotate_ccw24:
+  .next_column_ccw_low24:
+	dec	ecx
+	js	.exchange_dims
+	push	ecx
+	mov	edx, [scanline_len_old]
+	add	[scanline_len_old], -3
+	mov	ecx, [scanline_pixels_new]
+	mov	esi, [ebx + Image.Data]
+	mov	edi, [line_buffer]
+    @@: mov	al, [esi]
+	mov	[edi], al
+	mov	al, [esi+1]
+	mov	[edi+1], al
+	mov	al, [esi+2]
+	mov	[edi+2], al
+	add	esi, edx
+	add	edi, 3
+	sub	ecx, 1
+	jnz	@b
+	mov	eax, [scanline_pixels_new]
+	mov	edi, [ebx + Image.Data]
+	lea	esi, [edi + 3]
+	mov	edx, [scanline_len_old]
+    @@: mov	ecx, edx
+	shr	ecx, 2
+	rep	movsd
+	mov	ecx, edx
+	and	ecx, 3
+	rep	movsb
+	add	esi, 3
+	sub	eax, 1
+	jnz	@b
+	mov	eax, [scanline_len_new]
+	sub	[pixels_ptr], eax
+	mov	ecx, eax
+	mov	esi, [line_buffer]
+	mov	edi, [pixels_ptr]
+	shr	ecx, 2
+	rep	movsd
+	mov	ecx, eax
+	and	ecx, 3
+	rep	movsb
+	pop	ecx
-	jmp	.next_column_ccw_low
+	jmp	.next_column_ccw_low24
   .rotate_cw_low:
-	mov	ebx, [_img]
+  .rotate_cw_low:
 	mov	eax, [ebx + Image.Height]
 	mov	[scanline_pixels_new], eax
-	shl	eax, 2
+	call	img._.get_scanline_len
 	mov	[scanline_len_new], eax
 	invoke	mem.alloc, eax
 	or	eax, eax
 	jz	.error
+	mov	[line_buffer], eax
 	mov	[line_buffer], eax
 	mov	eax, [ebx + Image.Width]
-	mov	ecx, [ebx + Image.Width]
+	mov	ecx, eax
-	lea	eax, [ecx * 4]
+	call	img._.get_scanline_len
 	mov	[scanline_len_old], eax
+	mov	eax, [scanline_len_new]
+	imul	eax, ecx
+	add	eax, [ebx + Image.Data]
+	mov	[pixels_ptr], eax
-	mov	eax, [scanline_len_new]
+	cmp	[ebx + Image.Type], Image.bpp8
-	imul	eax, ecx
+	jz	.rotate_cw8
-	add	eax, [ebx + Image.Data]
+	cmp	[ebx + Image.Type], Image.bpp24
 	rep	movsd
 	pop	ecx
+	jmp	.next_column_cw_low
+.rotate_cw8:
+  .next_column_cw_low8:
+	dec	ecx
+	js	.exchange_dims
+	push	ecx
+	mov	edx, [scanline_len_old]
+	add	[scanline_len_old], -1
+	mov	ecx, [scanline_pixels_new]
+	mov	esi, [pixels_ptr]
+	add	esi, -1
+	mov	edi, [line_buffer]
+    @@: mov	al, [esi]
+	mov	[edi], al
+	sub	esi, edx
+	add	edi, 1
+	sub	ecx, 1
+	jnz	@b
+	mov	eax, [scanline_pixels_new]
+	dec	eax
+	mov	edi, [ebx + Image.Data]
+	add	edi, [scanline_len_old]
+	lea	esi, [edi + 1]
+	mov	edx, [scanline_len_old]
+    @@: mov	ecx, edx
+	shr	ecx, 2
+	rep	movsd
+	mov	ecx, edx
+	and	ecx, 3
+	rep	movsb
+	add	esi, 1
+	sub	eax, 1
+	jnz	@b
+	mov	eax, [scanline_len_new]
+	sub	[pixels_ptr], eax
+	mov	ecx, eax
+	mov	esi, [line_buffer]
+	mov	edi, [pixels_ptr]
+	shr	ecx, 2
+	rep	movsd
+	mov	ecx, eax
+	and	ecx, 3
+	rep	movsb
+	pop	ecx
+	jmp	.next_column_cw_low8
+.rotate_cw24:
+  .next_column_cw_low24:
+	dec	ecx
+	js	.exchange_dims
+	push	ecx
+	mov	edx, [scanline_len_old]
+	add	[scanline_len_old], -3
+	mov	ecx, [scanline_pixels_new]
+	mov	esi, [pixels_ptr]
+	add	esi, -3
+	mov	edi, [line_buffer]
+    @@: mov	al, [esi]
+	mov	[edi], al
+	mov	al, [esi+1]
+	mov	[edi+1], al
+	mov	al, [esi+2]
+	mov	[edi+2], al
+	sub	esi, edx
+	add	edi, 3
+	sub	ecx, 1
+	jnz	@b
+	mov	eax, [scanline_pixels_new]
+	dec	eax
+	mov	edi, [ebx + Image.Data]
+	add	edi, [scanline_len_old]
+	lea	esi, [edi + 3]
+	mov	edx, [scanline_len_old]
+    @@: mov	ecx, edx
+	shr	ecx, 2
+	rep	movsd
+	mov	ecx, edx
+	and	ecx, 3
+	rep	movsb
+	add	esi, 3
+	sub	eax, 1
+	jnz	@b
+	mov	eax, [scanline_len_new]
+	sub	[pixels_ptr], eax
+	mov	ecx, eax
+	mov	esi, [line_buffer]
+	mov	edi, [pixels_ptr]
+	shr	ecx, 2
+	rep	movsd
+	mov	ecx, eax
+	and	ecx, 3
+	rep	movsb
+	pop	ecx
-	jmp	.next_column_cw_low
+	jmp	.next_column_cw_low24
   .flip:
 	jmp	.exit
 ;> --- TBD ---                                                                                    ;;
 ;;------------------------------------------------------------------------------------------------;;
 ;< eax = 0 / pointer to image                                                                     ;;
 ;;================================================================================================;;
 	invoke	mem.alloc, sizeof.Image
+	test	eax, eax
+	jz	@f
+	push	ecx
+	xor	ecx, ecx
+	mov	[eax + Image.Data], ecx
+	mov	[eax + Image.Type], ecx
+	mov	[eax + Image.Extended], ecx
+	mov	[eax + Image.Previous], ecx
+	mov	[eax + Image.Next], ecx
+	pop	ecx
+@@:
 	ret
 endp
 ;;================================================================================================;;
 ;;------------------------------------------------------------------------------------------------;;
 ;> --- TBD ---                                                                                    ;;
 ;;------------------------------------------------------------------------------------------------;;
 ;< --- TBD ---                                                                                    ;;
 ;;================================================================================================;;
-	push	ebx
+	push	ebx esi
 	mov	ebx, [_img]
 	mov	eax, [_height]
+; our memory is limited, [_width]*[_height] must not overflow
+; image with width or height greater than 65535 is most likely bogus
+	cmp	word [_width+2], 0
+	jnz	.error
+	cmp	word [_height+2], 0
+	jnz	.error
 	imul	eax, [_width]
+	test	eax, eax
+	jz	.error
+; do not allow images which require too many memory
+	cmp	eax, 4000000h
+	jae	.error
+	cmp	[ebx + Image.Type], Image.bpp8
+	jz	.bpp8
+	cmp	[ebx + Image.Type], Image.bpp24
+	jz	.bpp24
+.bpp32:
 	shl	eax, 2
+	jmp	@f
+.bpp24:
+	lea	eax, [eax*3]
+	jmp	@f
+.bpp8:
+	add	eax, 256*4	; for palette
+@@:
+	mov	esi, eax
 	invoke	mem.realloc, [ebx + Image.Data], eax
 	or	eax, eax
 	jz	.error
 	mov	[ebx + Image.Data], eax
 	push	[_width]
 	pop	[ebx + Image.Width]
 	push	[_height]
+	pop	[ebx + Image.Height]
+	cmp	[ebx + Image.Type], Image.bpp8
+	jnz	.ret
+	lea	esi, [eax + esi - 256*4]
+	mov	[ebx + Image.Palette], esi
-	pop	[ebx + Image.Height]
+	jmp	.ret
+  .error:
+	xor	eax, eax
-  .error:
+  .ret:
-	pop	ebx
+	pop	esi ebx
+	ret
+endp
+;;================================================================================================;;
+img._.get_scanline_len: ;/////////////////////////////////////////////////////////////////////////;;
+;;------------------------------------------------------------------------------------------------;;
+;? --- TBD ---                                                                                    ;;
+;;------------------------------------------------------------------------------------------------;;
+;> --- TBD ---                                                                                    ;;
+;;------------------------------------------------------------------------------------------------;;
+;< --- TBD ---                                                                                    ;;
+;;================================================================================================;;
+	cmp	[ebx + Image.Type], Image.bpp8
+	jz	.bpp8.1
+	cmp	[ebx + Image.Type], Image.bpp24
+	jz	.bpp24.1
+	shl	eax, 2
+	jmp	@f
+.bpp24.1:
+	lea	eax, [eax*3]
+.bpp8.1:
-	ret
+@@:
-endp
+	ret
   .bmp dd img.is.bmp, img.decode.bmp, img.encode.bmp
 ; .ico dd img.is.ico, img.decode.ico, img.encode.ico
 ; .cur dd img.is.cur, img.decode.cur, img.encode.cur
   .gif dd img.is.gif, img.decode.gif, img.encode.gif
 ; .png dd img.is.png, img.decode.png, img.encode.png
-; .jpg dd img.is.jpg, img.decode.jpg, img.encode.jpg
+  .jpg dd img.is.jpg, img.decode.jpg, img.encode.jpg
        dd 0
 ;;================================================================================================;;
 ;;////////////////////////////////////////////////////////////////////////////////////////////////;;
 ;;================================================================================================;;
-align 16
+align 4
 @EXPORT:
 	img.count	, 'img.count'	    , \
 	img.lock_bits	, 'img.lock_bits'   , \
 	img.unlock_bits , 'img.unlock_bits' , \
 	img.flip	, 'img.flip'	    , \
 	img.rotate	, 'img.rotate'
+section '.data' data readable writable align 16
+; uninitialized data - global constant tables
+; data for YCbCr -> RGB translation
+color_table_1		rd	256
+color_table_2		rd	256
+color_table_3		rd	256
+color_table_4		rd	256

Subversion Repositories Kolibri OS

(root)/programs/develop/libraries/libs-dev/libimg/libimg.asm – Rev 783 → 999