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

 proc png_set_sig_bytes uses eax edi, png_ptr:dword, num_bytes:dword
 	png_debug 1, 'in png_set_sig_bytes'
 	mov edi,[png_ptr]
-	cmp edi,0
+	or edi,edi
-	je .end_f ;if (..==0) return
+	jz .end_f ;if (..==0) return
 	mov eax,[num_bytes]
 	cmp eax,0
 	jge @f
 ;voidpf (voidpf png_ptr, uInt items, uInt size)
 align 4
 proc png_zalloc uses edx ecx, png_ptr:dword, items:dword, size:dword
-	cmp dword[png_ptr],0
-	jne @f
-		xor eax,eax
+	xor eax,eax
+	cmp dword[png_ptr],eax
-		jmp .end_f ;if (..==0) return 0
+	je .end_f ;if (..==0) return 0
-	@@:
 	xor eax,eax
 	not eax
 	xor edx,edx
 	mov ecx,[size]
 	div ecx
 	safe_length dd ?
 endl
 	mov edi,[png_ptr]
 	PNG_CHUNK_ANCILLARY [edi+png_struct.chunk_name]
-	cmp eax,0 ;if (..!=0)
+	or eax,eax ;if (..!=0)
-	je @f
+	jz @f
 		mov eax,[edi+png_struct.flags]
 		and eax,PNG_FLAG_CRC_ANCILLARY_MASK
 		cmp eax,PNG_FLAG_CRC_ANCILLARY_USE or PNG_FLAG_CRC_ANCILLARY_NOWARN
 		jne .end0 ;if (..==..)
 			mov dword[need_crc],0
 		jmp .end0
 end if
 	; Call the general version checker (shared with read and write code):
 		stdcall png_user_version_check, ebx, [user_png_ver]
-		cmp eax,0
+		or eax,eax
-		je .end0 ;if (..!=0)
+		jz .end0 ;if (..!=0)
 			stdcall png_malloc_warn, ebx, sizeof.png_struct
 			;eax = png_ptr
-			cmp eax,0
+			or eax,eax
-			je .end0 ;if (..!=0)
+			jz .end0 ;if (..!=0)
 				; png_ptr->zstream holds a back-pointer to the png_struct, so
 				; this can only be done now:
 				mov [ebx+png_struct.zstream.zalloc], png_zalloc
 ; Allocate the memory for an info_struct for the application.
 ;png_infop (png_structrp png_ptr)
 align 4
-proc png_create_info_struct uses ebx ecx edi, png_ptr:dword
+proc png_create_info_struct uses ecx edi, png_ptr:dword
 	png_debug 1, 'in png_create_info_struct'
-	;ebx - info_ptr dd ? ;png_inforp
-	mov edi,[png_ptr]
+	mov eax,[png_ptr]
-	cmp edi,0
+	or eax,eax
-	jne @f ;if (..==0) return 0
-		xor eax,eax
-		jmp .end_f
-	@@:
+	jz .end_f ;if (..==0) return 0
 	; Use the internal API that does not (or at least should not) error out, so
 	; that this call always returns ok.  The application typically sets up the
 	; error handling *after* creating the info_struct because this is the way it
 	; has always been done in 'example.asm'.
-	stdcall png_malloc_base, edi, sizeof.png_info_def
-	mov ebx,eax
+	stdcall png_malloc_base, eax, sizeof.png_info_def
 	or eax,eax
-	cmp eax,0
+	jz .end_f
-	je @f
+		push eax
 		mov edi,eax
-		xor eax,eax
-		mov ecx,sizeof.png_info_def
-		rep stosb ;memset(...
+		xor eax,eax
-	@@:
+		mov ecx,sizeof.png_info_def
 		rep stosb ;memset(...
-	mov eax,ebx
+		pop eax
 .end_f:
 	cmp dword[png_ptr],0
 	je .end_f ;if (..==0) return
 	mov edi,[info_ptr_ptr]
-	cmp edi,0 ;if (..!=0)
+	or edi,edi ;if (..!=0)
-	je .end_f
+	jz .end_f
 		; Do this first in case of an error below; if the app implements its own
 		; memory management this can lead to png_free calling png_error, which
 		; will abort this routine and return control to the app error handler.
 		; An infinite loop may result if it then tries to free the same info
 proc png_data_freer uses edi esi, png_ptr:dword, info_ptr:dword, freer:dword, mask:dword
 	png_debug 1, 'in png_data_freer'
 	mov edi,[png_ptr]
-	cmp edi,0
+	or edi,edi
-	je .end_f
+	jz .end_f
 	mov esi,[info_ptr]
-	cmp esi,0
+	or esi,esi
-	je .end_f ;if (..==0 || ..==0) return
+	jz .end_f ;if (..==0 || ..==0) return
 ;   if (freer == PNG_DESTROY_WILL_FREE_DATA)
 ;      info_ptr->free_me |= mask;
 proc png_free_data uses eax edi esi, png_ptr:dword, info_ptr:dword, mask:dword, num:dword
 	png_debug 1, 'in png_free_data'
 	mov edi,[png_ptr]
-	cmp edi,0
+	or edi,edi
-	je .end_f
+	jz .end_f
 	mov esi,[info_ptr]
-	cmp esi,0
+	or esi,esi
-	je .end_f ;if (..==0 || ..==0) return
+	jz .end_f ;if (..==0 || ..==0) return
 if PNG_TEXT_SUPPORTED eq 1
 	; Free text item num or (if num == -1) all text items
 ;   if (info_ptr->text != 0 &&
 ;voidp (png_structrp png_ptr)
 align 4
 proc png_get_io_ptr, png_ptr:dword
 	mov eax,[png_ptr]
-	cmp eax,0
+	or eax,eax
-	je @f ;if (..==0) return 0
+	jz @f ;if (..==0) return 0
 		mov eax,[eax+png_struct.io_ptr]
 	@@:
 	ret
 endp
 proc png_init_io uses eax edi, png_ptr:dword, fp:dword
 	png_debug 1, 'in png_init_io'
 	mov edi,[png_ptr]
-	cmp edi,0
+	or edi,edi
-	je @f ;if (..==0) return
+	jz @f ;if (..==0) return
 		mov eax,[fp]
 		mov [edi+png_struct.io_ptr],eax
 	@@:
 	ret
 endp
 	; Check chunk_name and return "keep" value if it's on the list, else 0
 ;   bytep p, p_end;
 	mov edi,[png_ptr]
-	cmp edi,0
+	or edi,edi
-	je .end0
+	jz .end0
 	cmp dword[chunk_name],0
 	je .end0
 	cmp dword[edi+png_struct.num_chunk_list],0
 	je .end0
 		jmp @f
 ;int (png_structrp png_ptr)
 align 4
 proc png_reset_zstream, png_ptr:dword
 	mov eax,[png_ptr]
-	cmp eax,0
+	or eax,eax
-	jne @f ;if (..==0)
+	jnz @f ;if (..==0)
 		mov eax,Z_STREAM_ERROR
 		jmp .end_f
 	@@:
 	; WARNING: this resets the window bits to the maximum!
 	add eax,png_struct.zstream
 	stdcall inflateReset,eax
 ;void (png_structrp png_ptr, png_inforp info_ptr)
 align 4
 proc png_colorspace_sync uses ecx edi esi, png_ptr:dword, info_ptr:dword
 	mov edi,[info_ptr]
-	cmp edi,0
+	or edi,edi
-	je @f ;if (..==0) ;reduce code size; check here not in the caller
+	jz @f ;if (..==0) ;reduce code size; check here not in the caller
 		mov ecx,sizeof.png_colorspace
 		mov esi,[png_ptr]
 		add esi,png_struct.colorspace
 		add edi,png_info_def.colorspace
 		rep movsb
 	pos dd ? ;size_t
 	message rb 196 ;char[] ;see below for calculation
 endl
 	mov eax,[colorspace]
-	cmp eax,0
+	or eax,eax
-	je @f ;if (..!=0)
+	jz @f ;if (..!=0)
 		or word[eax+png_colorspace.flags], PNG_COLORSPACE_INVALID
 	@@:
 ;   pos = png_safecat(message, (sizeof message), 0, "profile '"); /* 9 chars */
 ;   pos = png_safecat(message, pos+79, pos, name); /* Truncate to 79 chars */
 		inc ebx
 	@@:
 end if
-	cmp ebx,0
+	or ebx,ebx
-	je @f
+	jz @f
 		png_error edi, 'Invalid IHDR data'
 	@@:
 	ret
 endp
 ;int (png_structrp png_ptr, int option, int onoff)
 align 4
 proc png_set_option uses ecx, png_ptr:dword, option:dword, onoff:dword
 	mov eax,[png_ptr]
-	cmp eax,0
+	or eax,eax
-	je @f
+	jz @f
 	mov ecx,[option]
 	cmp ecx,0
 	jl @f
 	cmp ecx,PNG_OPTION_NEXT
 	jge @f
 	bt ecx,0 ;cmp (ecx & 1), 0
 	; (if not inside an error handling context).  Otherwise assume
 	; png_safe_execute will call this API after the return.
 	mov ebx,[image]
-	cmp ebx,0
+	or ebx,ebx
-	je @f
+	jz @f
 	cmp dword[ebx+png_image.opaque],0
 	je @f
 	mov eax,[ebx+png_image.opaque]
 	cmp dword[eax+png_control.error_buf],0
 	jne @f ;if (..!=0 && ..!=0 && ..==0)

Subversion Repositories Kolibri OS

(root)/programs/develop/libraries/libs-dev/libimg/png/libpng/png.asm – Rev 8341 → 8408