From b1c19ca6d82c98a8be6cd9cad7a9c5fa5e8e634e Mon Sep 17 00:00:00 2001 From: Mark Adler Date: Fri, 9 Sep 2011 23:25:27 -0700 Subject: zlib 1.2.3.1 --- contrib/infback9/inftree9.c | 4 ++-- contrib/masmx86/inffas32.asm | 8 ++++---- contrib/vstudio/vc7/zlib.rc | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'contrib') diff --git a/contrib/infback9/inftree9.c b/contrib/infback9/inftree9.c index 0993f75..658f87f 100644 --- a/contrib/infback9/inftree9.c +++ b/contrib/infback9/inftree9.c @@ -9,7 +9,7 @@ #define MAXBITS 15 const char inflate9_copyright[] = - " inflate9 1.2.3 Copyright 1995-2005 Mark Adler "; + " inflate9 1.2.3.1 Copyright 1995-2005 Mark Adler "; /* If you use the zlib library in a product, an acknowledgment is welcome in the documentation of your product. If for some reason you cannot @@ -64,7 +64,7 @@ unsigned short FAR *work; static const unsigned short lext[31] = { /* Length codes 257..285 extra */ 128, 128, 128, 128, 128, 128, 128, 128, 129, 129, 129, 129, 130, 130, 130, 130, 131, 131, 131, 131, 132, 132, 132, 132, - 133, 133, 133, 133, 144, 201, 196}; + 133, 133, 133, 133, 144, 74, 196}; static const unsigned short dbase[32] = { /* Distance codes 0..31 base */ 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073, diff --git a/contrib/masmx86/inffas32.asm b/contrib/masmx86/inffas32.asm index 4a20512..05c46dd 100644 --- a/contrib/masmx86/inffas32.asm +++ b/contrib/masmx86/inffas32.asm @@ -644,9 +644,9 @@ L_init_mmx: movd mm0,ebp mov ebp,ebx ; 896 "inffast.S" - movd mm4,[esp+0] + movd mm4,dword ptr [esp+0] movq mm3,mm4 - movd mm5,[esp+4] + movd mm5,dword ptr [esp+4] movq mm2,mm5 pxor mm1,mm1 mov ebx, [esp+8] @@ -660,7 +660,7 @@ L_do_loop_mmx: ja L_get_length_code_mmx movd mm6,ebp - movd mm7,[esi] + movd mm7,dword ptr [esi] add esi,4 psllq mm7,mm6 add ebp,32 @@ -717,7 +717,7 @@ L_decode_distance_mmx: ja L_get_dist_code_mmx movd mm6,ebp - movd mm7,[esi] + movd mm7,dword ptr [esi] add esi,4 psllq mm7,mm6 add ebp,32 diff --git a/contrib/vstudio/vc7/zlib.rc b/contrib/vstudio/vc7/zlib.rc index 72cb8b4..c27d0fa 100644 --- a/contrib/vstudio/vc7/zlib.rc +++ b/contrib/vstudio/vc7/zlib.rc @@ -2,8 +2,8 @@ #define IDR_VERSION1 1 IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE - FILEVERSION 1,2,3,0 - PRODUCTVERSION 1,2,3,0 + FILEVERSION 1,2,3,1 + PRODUCTVERSION 1,2,3,1 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS 0 FILEOS VOS_DOS_WINDOWS32 @@ -17,7 +17,7 @@ BEGIN BEGIN VALUE "FileDescription", "zlib data compression library\0" - VALUE "FileVersion", "1.2.3.0\0" + VALUE "FileVersion", "1.2.3.1\0" VALUE "InternalName", "zlib\0" VALUE "OriginalFilename", "zlib.dll\0" VALUE "ProductName", "ZLib.DLL\0" -- cgit v1.2.3-55-g6feb