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

 ;;================================================================================================;;
 ;;                                                                                                ;;
 ;; 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 .                                                    ;;
 ;;                                                                                                ;;
 ;;================================================================================================;;
 ;;                                                                                                ;;
 ;; References:                                                                                    ;;
 ;;   1. GIF LITE v3.0 (2004-2007)                                                                 ;;
 ;< eax = 0 (error) or pointer to image                                                            ;;
 ;;================================================================================================;;
 locals
   img		     dd ?
   global_color_table dd ?
+  global_color_table_size dd ?
 endl
+	push	ebx
-	push	ebx
+; img.is.gif is called by caller (img.decode)
-	stdcall img.is.gif, [_data], [_length]
+;	stdcall img.is.gif, [_data], [_length]
+;	or	eax, eax
-	or	eax, eax
+;	jz	.error
-	jz	.error
-	mov	ebx, [_data]
-;       cmp     [ebx + bmp.Header.info.Compression], bmp.BI_RGB
-;       je      @f
 ;       mov     eax, [ebx + bmp.Header.file.Size]
-;       cmp     eax, [_length]
+	mov	[global_color_table_size], 0
-;       jne     .error
+	mov	ebx, [_data]
 	test	[ebx + gif.Header.lsd.Packed], gif.LSD.Packed.GlobalColorTableFlag
 	jz	@f
 	lea	eax, [ebx + sizeof.gif.Header]
-	mov	[global_color_table], eax
-	mov	cl, [ebx + gif.Header.lsd.Packed]
+	mov	[global_color_table], eax
-	and	cl, gif.LSD.Packed.SizeOfGlobalColorTableMask
+	mov	cl, [ebx + gif.Header.lsd.Packed]
+	and	cl, gif.LSD.Packed.SizeOfGlobalColorTableMask
 	shr	cl, gif.LSD.Packed.SizeOfGlobalColorTableShift
-	inc	cl
+	mov	eax, 2
-	mov	eax, 1
+	shl	eax, cl
-	shl	eax, cl
+	mov	[global_color_table_size], eax
 	stdcall img._.new
 	or	eax, eax
 	jz	.error
 	mov	edx, [img]
 	mov	[eax + Image.Previous], edx
+	test	edx, edx
+	jz	@f
+	mov	[edx + Image.Next], eax
+@@:
 	mov	[img], eax
 	mov	edx, eax
+	mov	[eax + Image.Type], Image.bpp8
-	mov	ecx, sizeof.gif.Image
-	invoke	mem.alloc, ecx
+	invoke	mem.alloc, sizeof.gif.Image
 	or	eax, eax
 	jz	.error
 	mov	[edx + Image.Extended], eax
 	movzx	ecx, [ebx + gif.ImageDescriptor.Height]
 	stdcall img._.resize_data, [img], eax, ecx
 	or	eax, eax
 	jz	.error
-	xor	ecx, ecx
+	mov	esi, ebx
+	mov	edi, [edx + Image.Extended]
+	mov	ecx, sizeof.gif.ImageDescriptor
+	rep	movsb
+	mov	edi, [edx + Image.Palette]
+	mov	esi, [global_color_table]
-	mov	eax, [edx + Image.Extended]
+	mov	ecx, [global_color_table_size]
 	test	[ebx + gif.ImageDescriptor.Packed], gif.ID.Packed.LocalColorTableFlag
+	jz	@f
-	jz	@f
+	lea	esi, [ebx + sizeof.gif.ImageDescriptor]
 	mov	cl, [ebx + gif.ImageDescriptor.Packed]
 	and	cl, gif.ID.Packed.SizeOfLocalColorTableMask
-	shr	cl, gif.ID.Packed.SizeOfLocalColorTableShift
-	inc	cl
+	shr	cl, gif.ID.Packed.SizeOfLocalColorTableShift
-	mov	eax, 1
+	mov	eax, 2
 	shl	eax, cl
-	lea	ecx, [eax * sizeof.gif.RgbTriplet]
+	mov	ecx, eax
-	lea	eax, [ecx + sizeof.gif.Image]
-	invoke	mem.realloc, [edx + Image.Extended], eax
+	lea	eax, [eax*3]
+	add	ebx, eax
-	or	eax, eax
+@@:
-	jz	.error
+	lodsd
-	mov	[edx + Image.Extended], eax
+	dec	esi
-    @@: mov	esi, ebx
-	lea	edi, [eax + sizeof.gif.GraphicsControlExtension]
+	bswap	eax
-	add	ecx, sizeof.gif.ImageDescriptor
+	shr	eax, 8
-	rep	movsb
-	mov	eax, [global_color_table]
-	test	[ebx + gif.ImageDescriptor.Packed], gif.ID.Packed.LocalColorTableFlag
+	stosd
-	jz	@f
+	loop	@b
-	lea	eax, [ebx + sizeof.gif.ImageDescriptor]
-    @@: mov	ebx, esi
+	add	ebx, sizeof.gif.ImageDescriptor
-	stdcall ._.process_image, eax
+	stdcall ._.process_image
   .decoded:
 	or	eax, eax
     @@: mov	eax, [img]
 	ret
+  .error:
+	mov	eax, [img]
+	test	eax, eax
+	jz	@f
 	stdcall	img.destroy, eax
-  .error:
+@@:
 	xor	eax, eax
 	pop	ebx
 	pop	edx
 	ret
 endp
 ;;================================================================================================;;
-proc img.decode.gif._.process_image _color_table ;////////////////////////////////////////////////;;
+proc img.decode.gif._.process_image ;/////////////////////////////////////////////////////////////;;
 ;;------------------------------------------------------------------------------------------------;;
 ;? --- TBD ---                                                                                    ;;
 ;;------------------------------------------------------------------------------------------------;;
 ;> ebx = raw image data                                                                           ;;
 	mov	ecx, [edx + Image.Width]
 	mov	[width], ecx
 	mov	eax, [edx + Image.Height]
-	imul	eax, ecx
-;       lea     eax, [eax * 3]
-	shl	eax, 2
+	imul	eax, ecx
 	mov	[img_end], eax
 	inc	eax
 	mov	[row_end], eax
 	and	[pass], 0
 	mov	eax, [edx + Image.Extended]
 	test	[eax + gif.Image.info.Packed], gif.ID.Packed.InterleaceFlag
-	jz	@f
-;       lea     ecx, [ecx * 3]
-	shl	ecx, 2
+	jz	@f
 	mov	[row_end], ecx
 	shl	ebx, 16
 	mov	bx, [esp]
   .loop2:
-	pop	ax
-	lea	esi, [eax * 3]
-	add	esi, [_color_table]
-	mov	esi, [esi]
+	pop	ax
-	bswap	esi
-	shr	esi, 8
-	mov	[edi], esi
-	add	edi, 4
+	stosb
 	cmp	edi, [row_end]
-	jb	.norowend
-	mov	eax, [width]
-;       lea     eax, [eax * 3]
+	jb	.norowend
-	shl	eax, 2
+	mov	eax, [width]
 	push	eax
 	sub	edi, eax
 	add	eax, eax

Subversion Repositories Kolibri OS

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