From ed339a8b358b0e4ec823e8de33d09eccce4b9e13 Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Mon, 16 Mar 2015 16:32:23 +0000 Subject: Update bundled zlib from 1.2.5 to 1.2.8 (latest version as of Mar 12, 2015). Source: http://zlib.net/ Current release: zlib 1.2.8 April 28, 2013. Update note: not all files included in zlib are also included in FLTK's zlib version. However, there are only two files that are different from the original zlib versions: - zlib/CMakeLists.txt - zlib/Makefile git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10624 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- zlib/infback.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'zlib/infback.c') diff --git a/zlib/infback.c b/zlib/infback.c index af3a8c965..f3833c2e4 100644 --- a/zlib/infback.c +++ b/zlib/infback.c @@ -1,5 +1,5 @@ /* infback.c -- inflate using a call-back interface - * Copyright (C) 1995-2009 Mark Adler + * Copyright (C) 1995-2011 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -42,10 +42,19 @@ int stream_size; return Z_STREAM_ERROR; strm->msg = Z_NULL; /* in case we return an error */ if (strm->zalloc == (alloc_func)0) { +#ifdef Z_SOLO + return Z_STREAM_ERROR; +#else strm->zalloc = zcalloc; strm->opaque = (voidpf)0; +#endif } - if (strm->zfree == (free_func)0) strm->zfree = zcfree; + if (strm->zfree == (free_func)0) +#ifdef Z_SOLO + return Z_STREAM_ERROR; +#else + strm->zfree = zcfree; +#endif state = (struct inflate_state FAR *)ZALLOC(strm, 1, sizeof(struct inflate_state)); if (state == Z_NULL) return Z_MEM_ERROR; @@ -246,7 +255,7 @@ out_func out; void FAR *out_desc; { struct inflate_state FAR *state; - unsigned char FAR *next; /* next input */ + z_const unsigned char FAR *next; /* next input */ unsigned char FAR *put; /* next output */ unsigned have, left; /* available input and output */ unsigned long hold; /* bit buffer */ @@ -394,7 +403,6 @@ void FAR *out_desc; PULLBYTE(); } if (here.val < 16) { - NEEDBITS(here.bits); DROPBITS(here.bits); state->lens[state->have++] = here.val; } -- cgit v1.2.3