zlib 1.2.3.1v1.2.3.1

author: Mark Adler <madler@alumni.caltech.edu> 2011-09-09 23:25:27 -0700
committer: Mark Adler <madler@alumni.caltech.edu> 2011-09-09 23:25:27 -0700
commit: b1c19ca6d82c98a8be6cd9cad7a9c5fa5e8e634e (patch)
tree: f0eeb8f52d07819f417411da5104c9d743dd46de /contrib
parent: abf180a067223611620dd97dd5681df7c7fa7c9b (diff)
download: zlib-1.2.3.1.tar.gz
zlib-1.2.3.1.tar.bz2
zlib-1.2.3.1.zip
3 files changed, 9 insertions, 9 deletions
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
+  FILEVERSION    1,2,3,1
-  PRODUCTVERSION 1,2,3,0
+  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"
author	Mark Adler <madler@alumni.caltech.edu>	2011-09-09 23:25:27 -0700
committer	Mark Adler <madler@alumni.caltech.edu>	2011-09-09 23:25:27 -0700
commit	b1c19ca6d82c98a8be6cd9cad7a9c5fa5e8e634e (patch)
tree	f0eeb8f52d07819f417411da5104c9d743dd46de /contrib
parent	abf180a067223611620dd97dd5681df7c7fa7c9b (diff)
download	zlib-1.2.3.1.tar.gz zlib-1.2.3.1.tar.bz2 zlib-1.2.3.1.zip

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 @@
9	#define MAXBITS 15	9	#define MAXBITS 15
10		10
11	const char inflate9_copyright[] =	11	const char inflate9_copyright[] =
12	" inflate9 1.2.3 Copyright 1995-2005 Mark Adler ";	12	" inflate9 1.2.3.1 Copyright 1995-2005 Mark Adler ";
13	/*	13	/*
14	If you use the zlib library in a product, an acknowledgment is welcome	14	If you use the zlib library in a product, an acknowledgment is welcome
15	in the documentation of your product. If for some reason you cannot	15	in the documentation of your product. If for some reason you cannot
@@ -64,7 +64,7 @@ unsigned short FAR *work;
64	static const unsigned short lext[31] = { /* Length codes 257..285 extra */	64	static const unsigned short lext[31] = { /* Length codes 257..285 extra */
65	128, 128, 128, 128, 128, 128, 128, 128, 129, 129, 129, 129,	65	128, 128, 128, 128, 128, 128, 128, 128, 129, 129, 129, 129,
66	130, 130, 130, 130, 131, 131, 131, 131, 132, 132, 132, 132,	66	130, 130, 130, 130, 131, 131, 131, 131, 132, 132, 132, 132,
67	133, 133, 133, 133, 144, 201, 196};	67	133, 133, 133, 133, 144, 74, 196};
68	static const unsigned short dbase[32] = { /* Distance codes 0..31 base */	68	static const unsigned short dbase[32] = { /* Distance codes 0..31 base */
69	1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49,	69	1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49,
70	65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073,	70	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:
644	movd mm0,ebp	644	movd mm0,ebp
645	mov ebp,ebx	645	mov ebp,ebx
646	; 896 "inffast.S"	646	; 896 "inffast.S"
647	movd mm4,[esp+0]	647	movd mm4,dword ptr [esp+0]
648	movq mm3,mm4	648	movq mm3,mm4
649	movd mm5,[esp+4]	649	movd mm5,dword ptr [esp+4]
650	movq mm2,mm5	650	movq mm2,mm5
651	pxor mm1,mm1	651	pxor mm1,mm1
652	mov ebx, [esp+8]	652	mov ebx, [esp+8]
@@ -660,7 +660,7 @@ L_do_loop_mmx:
660	ja L_get_length_code_mmx	660	ja L_get_length_code_mmx
661		661
662	movd mm6,ebp	662	movd mm6,ebp
663	movd mm7,[esi]	663	movd mm7,dword ptr [esi]
664	add esi,4	664	add esi,4
665	psllq mm7,mm6	665	psllq mm7,mm6
666	add ebp,32	666	add ebp,32
@@ -717,7 +717,7 @@ L_decode_distance_mmx:
717	ja L_get_dist_code_mmx	717	ja L_get_dist_code_mmx
718		718
719	movd mm6,ebp	719	movd mm6,ebp
720	movd mm7,[esi]	720	movd mm7,dword ptr [esi]
721	add esi,4	721	add esi,4
722	psllq mm7,mm6	722	psllq mm7,mm6
723	add ebp,32	723	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 @@
2		2
3	#define IDR_VERSION1 1	3	#define IDR_VERSION1 1
4	IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE	4	IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
5	FILEVERSION 1,2,3,0	5	FILEVERSION 1,2,3,1
6	PRODUCTVERSION 1,2,3,0	6	PRODUCTVERSION 1,2,3,1
7	FILEFLAGSMASK VS_FFI_FILEFLAGSMASK	7	FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
8	FILEFLAGS 0	8	FILEFLAGS 0
9	FILEOS VOS_DOS_WINDOWS32	9	FILEOS VOS_DOS_WINDOWS32
@@ -17,7 +17,7 @@ BEGIN
17		17
18	BEGIN	18	BEGIN
19	VALUE "FileDescription", "zlib data compression library\0"	19	VALUE "FileDescription", "zlib data compression library\0"
20	VALUE "FileVersion", "1.2.3.0\0"	20	VALUE "FileVersion", "1.2.3.1\0"
21	VALUE "InternalName", "zlib\0"	21	VALUE "InternalName", "zlib\0"
22	VALUE "OriginalFilename", "zlib.dll\0"	22	VALUE "OriginalFilename", "zlib.dll\0"
23	VALUE "ProductName", "ZLib.DLL\0"	23	VALUE "ProductName", "ZLib.DLL\0"