From 19552bad791e307a399b809f7ab30e989ba1f643 Mon Sep 17 00:00:00 2001
From: IgorA <IgorA@kolibrios.org>
Date: Tue, 28 Feb 2017 18:02:53 +0000
Subject: [PATCH] fix r6860, small change in 'libimg.obj'

git-svn-id: svn://kolibrios.org@6870 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 .../libraries/libs-dev/libimg/png/libpng/pngwrite.asm      | 7 ++++---
 programs/fs/kfar/trunk/zlib/trees.asm                      | 2 +-
 2 files changed, 5 insertions(+), 4 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 12679a5c88..0d788133b5 100644
--- a/programs/develop/libraries/libs-dev/libimg/png/libpng/pngwrite.asm
+++ b/programs/develop/libraries/libs-dev/libimg/png/libpng/pngwrite.asm
@@ -2941,7 +2941,7 @@ align 4
 	.cycle4:
 		mov dword[edi+png_struct.zstream.avail_out],16*1024
 
-		stdcall [deflate], esi, Z_FINISH ;Z_NO_FLUSH
+		stdcall [deflate], esi, Z_NO_FLUSH
 		cmp eax,Z_STREAM_ERROR
 		je .end1
 
@@ -2949,12 +2949,13 @@ align 4
 		sub ecx,[edi+png_struct.zstream.avail_out]
 		cmp dword[edi+png_struct.zstream.avail_out],0
 	je .cycle4 ;while (strm.avail_out == 0)
-if 0
 	mov dword[edi+png_struct.zstream.avail_out],16*1024
 	stdcall [deflate], esi, Z_FINISH
+	add ecx,16*1024
+	sub ecx,[edi+png_struct.zstream.avail_out]
 	cmp eax,Z_STREAM_ERROR
 	je .end1
-end if
+
 	stdcall [deflateEnd], esi
 
 if PNG_WRITE_OPTIMIZE_CMF_SUPPORTED eq 1
diff --git a/programs/fs/kfar/trunk/zlib/trees.asm b/programs/fs/kfar/trunk/zlib/trees.asm
index a07f1bf7dd..2ae2cbe7fb 100644
--- a/programs/fs/kfar/trunk/zlib/trees.asm
+++ b/programs/fs/kfar/trunk/zlib/trees.asm
@@ -663,7 +663,7 @@ align 4
 		imul eax,esi
 		add [edi+deflate_state.opt_len],eax
 		cmp dword[stree],0
-		jne .cycle1 ;if (..)
+		je .cycle1 ;if (..)
 			movzx eax,word[f]
 			mov esi,[stree]
 			movzx esi,word[esi+sizeof.ct_data*ecx+Len]