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

 proc png_set_bgr uses edi, png_ptr:dword
 	png_debug 1, 'in png_set_bgr'
 	mov edi,[png_ptr]
-	cmp edi,0
+	test edi,edi
-	je @f ;if (..==0) return
+	jz @f ;if (..==0) return
 		or dword[edi+png_struct.transformations], PNG_BGR
 	@@:
 	ret
 endp
 proc png_set_swap uses edi, png_ptr:dword
 	png_debug 1, 'in png_set_swap'
 	mov edi,[png_ptr]
-	cmp edi,0
+	test edi,edi
-	je @f ;if (..==0) return
+	jz @f ;if (..==0) return
 	cmp byte[edi+png_struct.bit_depth],16
 	jne @f ;if (..==..)
 		or dword[edi+png_struct.transformations], PNG_SWAP_BYTES
 proc png_set_packing uses edi, png_ptr:dword
 	png_debug 1, 'in png_set_packing'
 	mov edi,[png_ptr]
-	cmp edi,0
+	test edi,edi
-	je @f ;if (..==0) return
+	jz @f ;if (..==0) return
 	cmp byte[edi+png_struct.bit_depth],8
 	jge @f ;if (..<..)
 		or dword[edi+png_struct.transformations], PNG_PACK
 proc png_set_packswap uses edi, png_ptr:dword
 	png_debug 1, 'in png_set_packswap'
 	mov edi,[png_ptr]
-	cmp edi,0
+	test edi,edi
-	je @f ;if (..==0) return
+	jz @f ;if (..==0) return
 	cmp byte[edi+png_struct.bit_depth],8
 	jge @f ;if (..<..)
 		or dword[edi+png_struct.transformations], PNG_PACKSWAP
 proc png_set_shift uses ecx edi, png_ptr:dword, true_bits:dword
 	png_debug 1, 'in png_set_shift'
 	mov edi,[png_ptr]
-	cmp edi,0
+	test edi,edi
-	je @f ;if (..==0) return
+	jz @f ;if (..==0) return
 	or dword[edi+png_struct.transformations], PNG_SHIFT
 	mov ecx,sizeof.png_color_8
 	mov edi,[edi+png_struct.shift]
 proc png_set_interlace_handling uses edi, png_ptr:dword
 	png_debug 1, 'in png_set_interlace handling'
 	mov edi,[png_ptr]
-	cmp edi,0
+	test edi,edi
-	je @f
+	jz @f
 	cmp byte[edi+png_struct.interlaced],0
 	je @f ;if(..!=0 && ..!=0)
 		or dword[edi+png_struct.transformations], PNG_INTERLACE
 		mov eax,7
 		jmp .end_f
 proc png_set_filler uses eax edi, png_ptr:dword, filler:dword, filler_loc:dword
 	png_debug 1, 'in png_set_filler'
 	mov edi,[png_ptr]
-	cmp edi,0
+	test edi,edi
-	je .end_f ;if (..==0) return
+	jz .end_f ;if (..==0) return
 	; In libpng 1.6 it is possible to determine whether this is a read or write
 	; operation and therefore to do more checking here for a valid call.
 proc png_set_add_alpha uses eax edi, png_ptr:dword, filler:dword, filler_loc:dword
 	png_debug 1, 'in png_set_add_alpha'
 	mov edi,[png_ptr]
-	cmp edi,0
+	test edi,edi
-	je .end_f ;if (..==0) return
+	jz .end_f ;if (..==0) return
 	stdcall png_set_filler, edi, [filler], [filler_loc]
 	; The above may fail to do anything.
 	mov eax,[edi+png_struct.transformations]
 proc png_set_swap_alpha uses edi, png_ptr:dword
 	png_debug 1, 'in png_set_swap_alpha'
 	mov edi,[png_ptr]
-	cmp edi,0
+	test edi,edi
-	je .end_f ;if (..==0) return
+	jz .end_f ;if (..==0) return
 		or dword[edi+png_struct.transformations], PNG_SWAP_ALPHA
 .end_f:
 	ret
 endp
 proc png_set_invert_alpha uses edi, png_ptr:dword
 	png_debug 1, 'in png_set_invert_alpha'
 	mov edi,[png_ptr]
-	cmp edi,0
+	test edi,edi
-	je .end_f ;if (..==0) return
+	jz .end_f ;if (..==0) return
 		or dword[edi+png_struct.transformations], PNG_INVERT_ALPHA
 .end_f:
 	ret
 endp
 proc png_set_invert_mono uses edi, png_ptr:dword
 	png_debug 1, 'in png_set_invert_mono'
 	mov edi,[png_ptr]
-	cmp edi,0
+	test edi,edi
-	je .end_f ;if (..==0) return
+	jz .end_f ;if (..==0) return
 		or dword[edi+png_struct.transformations], PNG_INVERT_MONO
 .end_f:
 	ret
 endp
 ; Invert monochrome grayscale data
 ;void (png_row_infop row_info, bytep row)
 align 4
+proc png_do_invert uses eax ebx ecx edx, row_info:dword, row:dword
+	;ecx - i
+	;eax - rp
-proc png_do_invert, row_info:dword, row:dword
+	;edx - istop
-	png_debug 1, 'in png_do_invert'
+	png_debug 1, 'in png_do_invert'
-	; This test removed from libpng version 1.0.13 and 1.2.0:
-	;   if (row_info->bit_depth == 1 &&
+	mov ebx,[row_info]
-;   if (row_info->color_type == PNG_COLOR_TYPE_GRAY)
+	cmp byte[ebx+png_row_info.color_type],PNG_COLOR_TYPE_GRAY
-;   {
-;      bytep rp = row;
+	jne .end0
+	mov eax,[row]
+	mov edx,[ebx+png_row_info.rowbytes]
-;      png_size_t i;
+	xor ecx,ecx
-;      png_size_t istop = row_info->rowbytes;
+	jmp @f
+align 4
+	.cycle0:
-;      for (i = 0; i < istop; i++)
+		inc ecx
+	@@:
-;      {
+		cmp ecx,edx
-;         *rp = (byte)(~(*rp));
+		jae .end_f
-;         rp++;
+		not byte[eax]
-;      }
+		inc eax
-;   }
+		jmp .cycle0
+.end0:
+	cmp byte[ebx+png_row_info.color_type],PNG_COLOR_TYPE_GRAY_ALPHA
-;   else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA &&
+	jne .end1
-;      row_info->bit_depth == 8)
+	cmp byte[ebx+png_row_info.bit_depth],8
-;   {
-;      bytep rp = row;
+	jne .end1
+	mov eax,[row]
+	mov edx,[ebx+png_row_info.rowbytes]
+	xor ecx,ecx
+	jmp @f
+align 4
-;      png_size_t i;
+	.cycle1:
-;      png_size_t istop = row_info->rowbytes;
+		add ecx,2
+	@@:
-;      for (i = 0; i < istop; i += 2)
+		cmp ecx,edx
-;      {
+		jae .end_f
-;         *rp = (byte)(~(*rp));
+		not byte[eax]
-;         rp += 2;
+		add eax,2
-;      }
-;   }
+		jmp .cycle1
+.end1:
+if PNG_16BIT_SUPPORTED eq 1
-if PNG_16BIT_SUPPORTED eq 1
+	cmp byte[ebx+png_row_info.color_type],PNG_COLOR_TYPE_GRAY_ALPHA
-;   else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA &&
+	jne .end_f
-;      row_info->bit_depth == 16)
+	cmp byte[ebx+png_row_info.bit_depth],16
-;   {
-;      bytep rp = row;
+	jne .end_f
+	mov eax,[row]
-;      png_size_t i;
+	mov edx,[ebx+png_row_info.rowbytes]
-;      png_size_t istop = row_info->rowbytes;
+	xor ecx,ecx
+	jmp @f
+align 4
+	.cycle2:
-;      for (i = 0; i < istop; i += 4)
+		add ecx,4
-;      {
+	@@:
-;         *rp = (byte)(~(*rp));
+		cmp ecx,edx
-;         *(rp + 1) = (byte)(~(*(rp + 1)));
+		jae .end_f
-;         rp += 4;
+		not word[eax]
-;      }
+		add eax,4
+		jmp .cycle2
-;   }
+end if
-end if
+.end_f:
 	ret
 endp
 ;void (png_row_infop row_info, bytep row)
 align 4
 proc png_do_bgr, row_info:dword, row:dword
 	png_debug 1, 'in png_do_bgr'
 	;ebx - rp
+	;ecx - i
+	;esi - row_width
+pushad
-;   if ((row_info->color_type & PNG_COLOR_MASK_COLOR) != 0)
+	mov edi,[row_info]
+	movzx eax,byte[edi+png_row_info.color_type]
+	and eax,PNG_COLOR_MASK_COLOR
-;   {
+	je .end_f
-;      uint_32 row_width = row_info->width;
+	mov esi,[edi+png_row_info.width]
-;      if (row_info->bit_depth == 8)
+	cmp byte[edi+png_row_info.bit_depth],8
-;      {
+	jne .end0
-;         if (row_info->color_type == PNG_COLOR_TYPE_RGB)
+	cmp byte[edi+png_row_info.color_type],PNG_COLOR_TYPE_RGB
-;         {
+	jne .end1
-;            bytep rp;
+	xor ecx,ecx
+	mov ebx,[row]
-;            uint_32 i;
+	jmp @f
+align 4
+	.cycle0:
+		inc ecx
+		add ebx,3
+	@@:
-;            for (i = 0, rp = row; i < row_width; i++, rp += 3)
+		cmp ecx,esi
-;            {
+		jae .end_f
-;               byte save = *rp;
+		mov dl,[ebx]
-;               *rp = *(rp + 2);
+		mov al,[ebx+2]
-;               *(rp + 2) = save;
+		mov [ebx],al
-;            }
+		mov [ebx+2],dl
-;         }
+		jmp .cycle0
+.end1:
-;         else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+	cmp byte[edi+png_row_info.color_type],PNG_COLOR_TYPE_RGB_ALPHA
-;         {
+	jne .end_f
-;            bytep rp;
+	xor ecx,ecx
-;            uint_32 i;
+	mov ebx,[row]
+	jmp @f
+align 4
+	.cycle1:
+		inc ecx
+		add ebx,4
+	@@:
-;            for (i = 0, rp = row; i < row_width; i++, rp += 4)
+		cmp ecx,esi
-;            {
-;               byte save = *rp;
+		jae .end_f
-;               *rp = *(rp + 2);
+		mov dl,[ebx]
-;               *(rp + 2) = save;
+		mov al,[ebx+2]
-;            }
+		mov [ebx],al
-;         }
+		mov [ebx+2],dl
-;      }
+		jmp .cycle1
+.end0:
 if PNG_16BIT_SUPPORTED eq 1
-;      else if (row_info->bit_depth == 16)
+	cmp byte[edi+png_row_info.bit_depth],16
-;      {
+	jne .end_f
-;         if (row_info->color_type == PNG_COLOR_TYPE_RGB)
+	cmp byte[edi+png_row_info.color_type],PNG_COLOR_TYPE_RGB
-;         {
+	jne .end2
-;            bytep rp;
+	xor ecx,ecx
-;            uint_32 i;
+	mov ebx,[row]
+	jmp @f
-;            for (i = 0, rp = row; i < row_width; i++, rp += 6)
+align 4
-;            {
+	.cycle2:
+		inc ecx
-;               byte save = *rp;
+		add ebx,6
-;               *rp = *(rp + 4);
+	@@:
+		cmp ecx,esi
-;               *(rp + 4) = save;
+		jae .end_f
-;               save = *(rp + 1);
+		mov dx,[ebx]
-;               *(rp + 1) = *(rp + 5);
+		mov ax,[ebx+4]
-;               *(rp + 5) = save;
+		mov [ebx],ax
-;            }
+		mov [ebx+4],dx
-;         }
+		jmp .cycle2
+.end2:
-;         else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+	cmp byte[edi+png_row_info.color_type],PNG_COLOR_TYPE_RGB_ALPHA
-;         {
+	jne .end_f
-;            bytep rp;
+	xor ecx,ecx
-;            uint_32 i;
+	mov ebx,[row]
+	jmp @f
-;            for (i = 0, rp = row; i < row_width; i++, rp += 8)
+align 4
-;            {
+	.cycle3:
-;               byte save = *rp;
+		inc ecx
-;               *rp = *(rp + 4);
+		add ebx,8
-;               *(rp + 4) = save;
+	@@:
+		cmp ecx,esi
-;               save = *(rp + 1);
+		jae .end_f
-;               *(rp + 1) = *(rp + 5);
+		mov dx,[ebx]
-;               *(rp + 5) = save;
+		mov ax,[ebx+4]
-;            }
+		mov [ebx],ax
-;         }
+		mov [ebx+4],dx
-;      }
+		jmp .cycle3
 end if
-;   }
+.end_f:
+popad
 	ret
 endp
 ; Added at libpng-1.5.10
 ;void (png_structrp png_ptr, png_row_infop row_info)
 proc png_set_user_transform_info uses eax edi, png_ptr:dword, user_transform_ptr:dword, user_transform_depth:dword, user_transform_channels:dword
 	png_debug 1, 'in png_set_user_transform_info'
 	mov edi,[png_ptr]
-	cmp edi,0
+	test edi,edi
-	je .end_f
+	jz .end_f
 if PNG_READ_USER_TRANSFORM_SUPPORTED eq 1
 	mov eax,[edi+png_struct.mode]
 	and eax,PNG_IS_READ_STRUCT

Subversion Repositories Kolibri OS

(root)/programs/develop/libraries/libs-dev/libimg/png/libpng/pngtrans.asm – Rev 6797 → 6891