From c87db09b6e68d8b8d582c2cbe25d9e51605b9afb Mon Sep 17 00:00:00 2001
From: IgorA <IgorA@kolibrios.org>
Date: Tue, 15 May 2018 16:43:23 +0000
Subject: [PATCH] libimg: fix save small png images

git-svn-id: svn://kolibrios.org@7279 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 .../libs-dev/libimg/png/libpng/pngwrite.asm   | 32 +++++++++++--------
 .../libraries/libs-dev/libimg/png/png.asm     |  4 +++
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/programs/develop/libraries/libs-dev/libimg/png/libpng/pngwrite.asm b/programs/develop/libraries/libs-dev/libimg/png/libpng/pngwrite.asm
index 8f0c41248c..3f1fc8f68d 100644
--- a/programs/develop/libraries/libs-dev/libimg/png/libpng/pngwrite.asm
+++ b/programs/develop/libraries/libs-dev/libimg/png/libpng/pngwrite.asm
@@ -2144,23 +2144,27 @@ endl
 	mov eax,[edx+png_image.format]
 	and eax,PNG_FORMAT_FLAG_ALPHA
 	jz .end0 ;if (..!=0)
-;      bytep row_end;
-;      int aindex;
 
 if PNG_SIMPLIFIED_WRITE_AFIRST_SUPPORTED eq 1
-;      if ((image->format & PNG_FORMAT_FLAG_AFIRST) != 0)
-;      {
-;         aindex = -1;
-;         ++input_row; /* To point to the first component */
-;         ++output_row;
-;      }
-
-;      else
+	mov eax,[edx+png_image.format]
+	and eax,PNG_FORMAT_FLAG_AFIRST
+	jz .end2 ;if (..!=0)
+		mov [aindex],-1
+		inc [input_row] ; To point to the first component
+		inc [output_row]
+		jmp @f
+	.end2: ;else
 end if
-;      aindex = channels;
+		mov eax,[channels]
+		mov [aindex],eax
+	.@@:
 
 	; Use row_end in place of a loop counter:
-;      row_end = output_row + image->width * (channels+1);
+	mov ecx,[channels]
+	inc ecx
+	imul ecx,[edx+png_image.width]
+	add ecx,[output_row]
+	;ecx = row_end
 
 ;      while (y-- > 0)
 ;      {
@@ -2755,11 +2759,11 @@ end if
 
 	.end9: ;else
 if 1 ;;; IDAT compress all (only 24 bit)
+		cmp dword[ebx+png_image.height],1
+		jl .end8
 		mov ecx,[edx+png_image_write_control.row_bytes]
 		inc ecx
 		imul ecx,[ebx+png_image.height]
-		cmp ecx,1
-		jl .end8
 		stdcall create_compress_IDAT, edi, [edx+png_image_write_control.first_row], ecx, [ebx+png_image.width], [ebx+png_image.height]
 else ;;; IDAT compress by lines
 		mov ecx,[ebx+png_image.height]
diff --git a/programs/develop/libraries/libs-dev/libimg/png/png.asm b/programs/develop/libraries/libs-dev/libimg/png/png.asm
index c103c87399..0e720dfe90 100644
--- a/programs/develop/libraries/libs-dev/libimg/png/png.asm
+++ b/programs/develop/libraries/libs-dev/libimg/png/png.asm
@@ -1119,6 +1119,10 @@ endl
 	imul ecx,3
 	mov edi,ecx
 	imul edi,[ebx+Image.Height]
+	cmp edi,4096
+	jge @f
+		mov edi,4096 ;minimum memory size
+	@@:
 	mov [encoded_file_size],edi
 	stdcall [mem.alloc],edi
 	test eax,eax