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

 ; into the info struct for writing into the file.  This abstracts the
 ; info struct and allows us to change the structure in the future.
-;void (png_structrp png_ptr, png_inforp info_ptr, png_const_color_16p background)
+;void (png_structrp png_ptr, png_inforp info_ptr, png_color_16p background)
 align 4
-proc png_set_bKGD, png_ptr:dword, info_ptr:dword, background:dword
+proc png_set_bKGD uses ecx edi esi, png_ptr:dword, info_ptr:dword, background:dword
+	png_debug1 1, 'in %s storage function', 'bKGD'
+	cmp dword[png_ptr],0
+	je .end_f
+	mov edi,[info_ptr]
-	png_debug1 1, 'in %s storage function', 'bKGD'
+	cmp edi,0
+	je .end_f
+	mov esi,[background]
+	cmp esi,0
-;   if (png_ptr == NULL || info_ptr == NULL || background == NULL)
+	je .end_f ;if (..==0 || ..==0 || ..==0) return
-;      return;
+	or dword[edi+png_info_def.valid],PNG_INFO_bKGD
+	add edi,png_info_def.background
 	mov ecx,sizeof.png_color_16
-;   info_ptr->background = *background;
+	rep movsb
-;   info_ptr->valid |= PNG_INFO_bKGD;
-	ret
+.end_f:
-endp
+	ret
 endp
 ;if PNG_cHRM_SUPPORTED
 ;void (png_structrp png_ptr, png_inforp info_ptr,
 ;   if (png_colorspace_set_endpoints(png_ptr, &info_ptr->colorspace,
 ;       &XYZ, 2) != 0)
 ;      info_ptr->colorspace.flags |= PNG_COLORSPACE_FROM_cHRM;
-	stdcall png_colorspace_sync_info, edi, esi;
+	stdcall png_colorspace_sync_info, edi, esi
 .end_f:
 	ret
 endp
 ;       png_fixed(png_ptr, blue_Z, "cHRM Blue Z"));
 	ret
 endp
-;end if /* cHRM */
 ;void (png_structrp png_ptr, png_inforp info_ptr, png_fixed_point file_gamma)
 align 4
 proc png_set_gAMA_fixed uses eax edi esi, png_ptr:dword, info_ptr:dword, file_gamma:dword
 	png_debug1 1, 'in %s storage function', 'gAMA'
 	stdcall png_set_gAMA_fixed, [png_ptr], [info_ptr], eax
 	ret
 endp
-;void (png_structrp png_ptr, png_inforp info_ptr,
+;void (png_structrp png_ptr, png_inforp info_ptr, png_uint_16p hist)
-;    png_const_uint_16p hist)
 align 4
 proc png_set_hIST uses edi esi, png_ptr:dword, info_ptr:dword, hist:dword
 ;   int i;
 	; Check that the type matches the specification.
 	cmp dword[type],0
 	jl @f
 	cmp dword[type],3
-	jg @f ;if (..<0 || ..>3)
+	jle .end0 ;if (..<0 || ..>3)
-		jmp .end0
 	@@:
 		png_error edi, 'Invalid pCAL equation type'
 	.end0:
-	cmp dword[type],0
+	cmp dword[nparams],0
 	jl @f
-	cmp dword[type],255
+	cmp dword[nparams],255
-	jg @f ;if (..<0 || ..>255)
-		jmp .end1
+	jle .end1 ;if (..<0 || ..>255)
 	@@:
 		png_error edi, 'Invalid pCAL parameter count'
 	.end1:
 ;   info_ptr->valid |= PNG_INFO_pHYs;
 	ret
 endp
-;void (png_structrp png_ptr, png_inforp info_ptr,
+;void (png_structrp png_ptr, png_inforp info_ptr, png_colorp palette, int num_palette)
-;    png_const_colorp palette, int num_palette)
 align 4
 proc png_set_PLTE uses eax edi esi, png_ptr:dword, info_ptr:dword, palette:dword, num_palette:dword
 ;   uint_32 max_palette_length;
 .end_f:
 	ret
 endp
-;void (png_structrp png_ptr, png_inforp info_ptr,
+;void (png_structrp png_ptr, png_inforp info_ptr, png_color_8p sig_bit)
-;    png_const_color_8p sig_bit)
 align 4
 proc png_set_sBIT, png_ptr:dword, info_ptr:dword, sig_bit:dword
 	png_debug1 1, 'in %s storage function', 'sBIT'
 	or dword[esi+png_info_def.valid],PNG_INFO_iCCP
 	ret
 endp
-;void (png_structrp png_ptr, png_inforp info_ptr,
+;void (png_structrp png_ptr, png_inforp info_ptr, png_textp text_ptr, int num_text)
-;    png_const_textp text_ptr, int num_text)
 align 4
 proc png_set_text uses eax edi, png_ptr:dword, info_ptr:dword, text_ptr:dword, num_text:dword
 	mov edi,[png_ptr]
 	stdcall png_set_text_2, edi, [info_ptr], [text_ptr], [num_text]
 	ret
 endp
 ;int (png_structrp png_ptr, png_inforp info_ptr,
-;    png_const_textp text_ptr, int num_text)
+;    png_textp text_ptr, int num_text)
 align 4
 proc png_set_text_2, png_ptr:dword, info_ptr:dword, text_ptr:dword, num_text:dword
 ;   int i;
 .end_f:
 	ret
 endp
-;void (png_structrp png_ptr, png_inforp info_ptr, png_const_timep mod_time)
+;void (png_structrp png_ptr, png_inforp info_ptr, png_timep mod_time)
 align 4
 proc png_set_tIME uses eax ebx ecx edi esi, png_ptr:dword, info_ptr:dword, mod_time:dword
 	png_debug1 1, 'in %s storage function', 'tIME'
 	ret
 endp
 ;void (png_structrp png_ptr, png_inforp info_ptr,
-;    bytep trans_alpha, int num_trans, png_const_color_16p trans_color)
+;    bytep trans_alpha, int num_trans, png_color_16p trans_color)
 align 4
 proc png_set_tRNS, png_ptr:dword, info_ptr:dword, trans_alpha:dword, num_trans:dword, trans_color:dword
 	png_debug1 1, 'in %s storage function', 'tRNS'
 endp
 ;if PNG_sPLT_SUPPORTED
 ;void (png_structrp png_ptr,
-;    png_inforp info_ptr, png_const_sPLT_tp entries, int nentries)
+;    png_inforp info_ptr, png_sPLT_tp entries, int nentries)
 ;  entries        - array of png_sPLT_t structures
 ;                   to be added to the list of palettes
 ;      memcpy(np->entries, entries->entries,
 ;          entries->nentries * sizeof (png_sPLT_entry));
-;      /* Note that 'continue' skips the advance of the out pointer and out
+	; Note that 'continue' skips the advance of the out pointer and out
 	; count, so an invalid entry is not added.
 ;      info_ptr->valid |= PNG_INFO_sPLT;
 align 4
 proc check_location, png_ptr:dword, location:dword
 ;   location &= (PNG_HAVE_IHDR|PNG_HAVE_PLTE|PNG_AFTER_IDAT);
-;   /* New in 1.6.0; copy the location and check it.  This is an API
+	; New in 1.6.0; copy the location and check it.  This is an API
 	; change; previously the app had to use the
 	; png_set_unknown_chunk_location API below for each chunk.
 ;   if (location == 0 && (png_ptr->mode & PNG_IS_READ_STRUCT) == 0)
 ;      location = (byte)(png_ptr->mode &
 ;          (PNG_HAVE_IHDR|PNG_HAVE_PLTE|PNG_AFTER_IDAT));
 ;   }
-;   /* This need not be an internal error - if the app calls
+	; This need not be an internal error - if the app calls
 	; png_set_unknown_chunks on a read pointer it must get the location right.
 ;   if (location == 0)
 ;      png_error(png_ptr, "invalid location in png_set_unknown_chunks");
-;   /* Now reduce the location to the top-most set bit by removing each least
+	; Now reduce the location to the top-most set bit by removing each least
 	; significant bit in turn.
 	ret
 endp
 ;void (png_structrp png_ptr,
-;    png_inforp info_ptr, png_const_unknown_chunkp unknowns, int num_unknowns)
+;    png_inforp info_ptr, png_unknown_chunkp unknowns, int num_unknowns)
 align 4
 proc png_set_unknown_chunks uses edi esi, png_ptr:dword, info_ptr:dword, unknowns:dword, num_unknowns:dword
 ;   png_unknown_chunkp np;
 ;         return;
 ;      }
 ;#ifndef __COVERITY__
-;      /* Some compilers complain that this is always false.  However, it
+	; Some compilers complain that this is always false.  However, it
 	; can be true when integer overflow happens.
 ;      if (size > ZLIB_IO_MAX)
 ;      if (bad_character == 0)
 ;         bad_character = 32;
 ;   }
-;   /* Terminate the keyword */
+	; Terminate the keyword
 ;   *new_key = 0;
 ;   if (key_len == 0)

Subversion Repositories Kolibri OS

(root)/programs/develop/libraries/libs-dev/libimg/png/libpng/pngset.asm – Rev 6733 → 6779