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

 locals
 	buf rb 8 ;ebp-8
 endl
-;#if defined(PNG_DEBUG) && (PNG_DEBUG > 0)
+if (PNG_DEBUG eq 1) & (PNG_DEBUG > 0)
 ;   PNG_CSTRING_FROM_CHUNK(buf, chunk_name);
 ;   png_debug2(0, "Writing %s chunk, length = %lu", buf, (unsigned long)length);
-;end if
+end if
 	mov edi,[png_ptr]
-	cmp edi,0
+	test edi,edi
-	je .end_f ;if (png_ptr == NULL) return
+	jz .end_f ;if (..==0) return
 if PNG_IO_STATE_SUPPORTED eq 1
 	; Inform the I/O callback that the chunk header is being written.
 	; PNG_IO_CHUNK_HDR requires a single I/O call.
 	mov dword[edi+png_struct.io_state], PNG_IO_WRITING or PNG_IO_CHUNK_HDR
-end if
 end if
 	; Write the length and the chunk name
-	mov ebx,ebp
+	; Write the length and the chunk name
-	sub ebx,8
+	lea ebx,[ebp-8]
 	stdcall png_save_uint_32, ebx, [length]
 	m2m dword[ebx+4],dword[chunk_name]
 	stdcall png_write_data, edi, ebx, 8
-	; Put the chunk name into png_ptr->chunk_name
-	m2m dword[edi+png_struct.chunk_name],dword[chunk_name]
 	; Put the chunk name into png_ptr->chunk_name
-	; Reset the crc and run it over the chunk name
+	m2m dword[edi+png_struct.chunk_name],dword[chunk_name]
 	stdcall png_reset_crc, edi
 	; Reset the crc and run it over the chunk name
 ;void (png_structrp png_ptr, uint_32 chunk_name, bytep data, png_size_t length)
 align 4
 proc png_write_complete_chunk uses edi, png_ptr:dword, chunk_name:dword, p3data:dword, length:dword
 	mov edi,[png_ptr]
-	cmp edi,0
+	test edi,edi
-	je .end_f ;if (..==0) return
+	jz .end_f ;if (..==0) return
 	; On 64-bit architectures 'length' may not fit in a uint_32.
 	cmp dword[length],PNG_UINT_31_MAX ;if(..>..)
 	jle @f
 			mov eax,[edx]
 			mov [next],eax
-			cmp eax,0
+			test eax,eax
-			jne .end1 ;if (..==0)
+			jnz .end1 ;if (..==0)
 				PNG_COMPRESSION_BUFFER_SIZE edi
 				stdcall png_malloc, edi, eax
 				mov [next],eax
-				cmp eax,0
+				test eax,eax
-				jne @f ;if (..==0)
+				jnz @f ;if (..==0)
 					mov esi,Z_MEM_ERROR
 					jmp .cycle0end
 ; edi - png_ptr
 align 4
 proc png_compress_IDAT uses eax ebx ecx edx, input:dword, input_len:dword, flush:dword
 	png_debug 1, 'in png_compress_IDAT'
 	cmp dword[edi+png_struct.zowner],png_IDAT
+	cmp dword[edi+png_struct.zowner],png_IDAT
 	je .end0 ;if (..!=..)
 		; First time.   Ensure we have a temporary buffer for compression and
 		; trim the buffer list if it has more than one entry to free memory.
 		; If 'WRITE_COMPRESSED_TEXT' is not set the list will never have been
 		; created at this point, but the check here is quick and safe.
 	;INPUT: from the row data
 		mov eax,ZLIB_IO_MAX
 		cmp eax,[input_len]
-		jle @f ;if (..>..)
+		jbe @f ;if (..>..)
 			mov eax,[input_len] ;safe because of the check
 		@@:
 		mov [edi+png_struct.zstream.avail_in],eax
 	sub ebx,81  ;ebx = &new_name
 	stdcall png_check_keyword, edi, [name], ebx
 	mov [name_len],eax
-	cmp eax,0
+	test eax,eax
-	jne @f ;if (..==0)
+	jnz @f ;if (..==0)
 		png_error edi, 'iCCP: invalid keyword'
 	@@:
 	inc dword[name_len]
 	sub ebx,82+sizeof.compression_state
 	stdcall png_check_keyword, edi, [key], ebx
 	mov [key_len],eax
-	cmp eax,0
+	test eax,eax
-	jne @f ;if (..==0)
+	jnz @f ;if (..==0)
 		png_error edi, 'iTXt: invalid keyword'
 	@@:
 	; Set the compression flag
 	sub ebx,84 ;ebx = &new_purpose
 	stdcall png_check_keyword, edi, [purpose], ebx
 	mov [purpose_len],eax
-	cmp eax,0
+	test eax,eax
-	jne @f ;if(..==0)
+	jnz @f ;if(..==0)
 		png_error edi, 'pCAL: invalid keyword'
 	@@:
 	inc dword[edi+png_struct.row_number]
 	; See if we are done
 	mov eax,[edi+png_struct.row_number]
-;png_debug1 2, '  row_number = %d', eax
-;png_debug1 2, '  num_rows = %d', [edi+png_struct.num_rows]
 	cmp eax,[edi+png_struct.num_rows]
 	jl .end_f ;if (..<..) return
 if PNG_WRITE_INTERLACING_SUPPORTED eq 1
 	row_bytes dd ? ;png_size_t ;= row_info->rowbytes
 endl
 pushad
 	mov edi,[png_ptr]
-if PNG_WRITE_FILTER_SUPPORTED eq 1
+if PNG_WRITE_FILTER_SUPPORTED eq 0
-	mov eax,[edi+png_struct.rowbytes]
+mov eax,[edi+png_struct.row_number]
+png_debug1 2, '  (3)= %d', eax
+	mov eax,[edi+png_struct.rowbytes]
 	inc eax
 	stdcall png_write_filtered_row, edi, [edi+png_struct.row_buf], eax
-else
+mov eax,[edi+png_struct.row_number]
+png_debug1 2, '  (4)= %d', eax
+else
 	mov esi,[row_info]
-	mov eax,[edi+png_struct.do_filter]
+	movzx eax,byte[edi+png_struct.do_filter]
 	mov [filter_to_do],eax
 	mov eax,[esi+png_row_info.rowbytes]
 	mov [row_bytes],eax
 	png_debug 1, 'in png_write_find_filter'
 	mov eax,[edi+png_struct.row_buf]
 	mov [best_row],eax
-	cmp PNG_SIZE_MAX/128, dword[row_bytes]
+	cmp dword[row_bytes],PNG_SIZE_MAX/128
-	jg @f ;if (..<=..)
+	jl @f ;if (..>=..)
 		; Overflow can occur in the calculation, just select the lowest set
 		; filter.
 		jge .end1 ;if (..<..)
 			mov [mins],eax
 			mov eax,[edi+png_struct.try_row]
 			mov [best_row],eax
-			cmp eax,0
+			test eax,eax
-			je .end1 ;if (..!=0)
+			jz .end1 ;if (..!=0)
 				mov eax,[edi+png_struct.tst_row]
 				mov [edi+png_struct.try_row],eax
 				mov eax,[best_row]
 				mov [edi+png_struct.tst_row],eax
 	.end1:
 		jge .end2 ;if (..<..)
 			mov [mins],eax
 			mov eax,[edi+png_struct.try_row]
 			mov [best_row],eax
-			cmp eax,0
+			test eax,eax
-			je .end2 ;if (..!=0)
+			jz .end2 ;if (..!=0)
 				mov eax,[edi+png_struct.tst_row]
 				mov [edi+png_struct.try_row],eax
 				mov eax,[best_row]
 				mov [edi+png_struct.tst_row],eax
 	.end2:
 		jge .end3 ;if (..<..)
 			mov [mins],eax
 			mov eax,[edi+png_struct.try_row]
 			mov [best_row],eax
-			cmp eax,0
+			test eax,eax
-			je .end3 ;if (..!=0)
+			jz .end3 ;if (..!=0)
 				mov eax,[edi+png_struct.tst_row]
 				mov [edi+png_struct.try_row],eax
 				mov eax,[best_row]
 				mov [edi+png_struct.tst_row],eax
 	.end3:
 if 0 ;;; tmp
 	; Paeth filter
 	mov eax,[filter_to_do]
 	cmp eax,PNG_FILTER_PAETH
 	jne @f ;if (..==..)
 		; It's the only filter so no testing is needed
 		stdcall png_setup_paeth_row_only, edi, [bpp], [row_bytes]
 		jge .end4 ;if (..<..)
 			mov [mins],eax
 			mov eax,[edi+png_struct.try_row]
 			mov [best_row],eax
-			cmp eax,0
+			test eax,eax
-			je .end4 ;if (..!=0)
+			jz .end4 ;if (..!=0)
 				mov eax,[edi+png_struct.tst_row]
 				mov [edi+png_struct.try_row],eax
 				mov eax,[best_row]
 				mov [edi+png_struct.tst_row],eax
 	.end4:
 end if
 	; Do the actual writing of the filtered row data from the chosen filter.
 	mov eax,[esi+png_row_info.rowbytes]
 	inc eax
 	stdcall png_write_filtered_row, edi, [best_row], eax
 end if ;WRITE_FILTER
 popad
 if PNG_WRITE_FILTER_SUPPORTED eq 1
 	; Swap the current and previous rows
 	mov eax,[edi+png_struct.prev_row]
-	cmp eax,0
+	test eax,eax
-	je @f ;if (..!=0)
+	jz @f ;if (..!=0)
 		;eax = tptr
 		mov ebx,[edi+png_struct.row_buf]
 		mov [edi+png_struct.prev_row],ebx
 		mov [edi+png_struct.row_buf],eax
 	@@:

Subversion Repositories Kolibri OS

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