This commit was generated by cvs2svn to compensate for changes in r257,

which included commits to RCS files with non-trunk default branches.

git-svn-id: http://svn.ghostscript.com/ghostpcl/trunk/ghostpcl@258 06663e23-700e-0410-b217-a244a6096597

1 files changed, 62 insertions, 57 deletions

diff --git a/gs/src/szlibd.c b/gs/src/szlibd.c
index 6a210d16a..55e849340 100644
--- a/gs/src/szlibd.c
+++ b/gs/src/szlibd.c
@@ -1,20 +1,20 @@
 /* Copyright (C) 1995, 1996, 1997 Aladdin Enterprises.  All rights reserved.
-  
-  This file is part of Aladdin Ghostscript.
-  
-  Aladdin Ghostscript is distributed with NO WARRANTY OF ANY KIND.  No author
-  or distributor accepts any responsibility for the consequences of using it,
-  or for whether it serves any particular purpose or works at all, unless he
-  or she says so in writing.  Refer to the Aladdin Ghostscript Free Public
-  License (the "License") for full details.
-  
-  Every copy of Aladdin Ghostscript must include a copy of the License,
-  normally in a plain ASCII text file named PUBLIC.  The License grants you
-  the right to copy, modify and redistribute Aladdin Ghostscript, but only
-  under certain conditions described in the License.  Among other things, the
-  License requires that the copyright notice and this notice be preserved on
-  all copies.
-*/
+
+   This file is part of Aladdin Ghostscript.
+
+   Aladdin Ghostscript is distributed with NO WARRANTY OF ANY KIND.  No author
+   or distributor accepts any responsibility for the consequences of using it,
+   or for whether it serves any particular purpose or works at all, unless he
+   or she says so in writing.  Refer to the Aladdin Ghostscript Free Public
+   License (the "License") for full details.
+
+   Every copy of Aladdin Ghostscript must include a copy of the License,
+   normally in a plain ASCII text file named PUBLIC.  The License grants you
+   the right to copy, modify and redistribute Aladdin Ghostscript, but only
+   under certain conditions described in the License.  Among other things, the
+   License requires that the copyright notice and this notice be preserved on
+   all copies.
+ */
 
 /* szlibd.c */
 /* zlib decoding (decompression) filter stream */
@@ -28,67 +28,72 @@
 
 /* Initialize the filter. */
 private int
-s_zlibD_init(stream_state *st)
-{	szs->zalloc = (alloc_func)s_zlib_alloc;
-	szs->zfree = (free_func)s_zlib_free;
-	szs->opaque = (voidpf)(st->memory ? st->memory : &gs_memory_default);
-	if ( inflateInit2(szs,
-			  (ss->no_wrapper ? -ss->windowBits : ss->windowBits))
-	     != Z_OK
-	   )
-	  return ERRC;		/****** WRONG ******/
-	return 0;
+s_zlibD_init(stream_state * st)
+{
+    szs->zalloc = (alloc_func) s_zlib_alloc;
+    szs->zfree = (free_func) s_zlib_free;
+    szs->opaque = (voidpf) (st->memory ? st->memory : &gs_memory_default);
+    if (inflateInit2(szs,
+		     (ss->no_wrapper ? -ss->windowBits : ss->windowBits))
+	!= Z_OK
+	)
+	return ERRC;
+/****** WRONG ******/
+    return 0;
 }
 
 /* Reinitialize the filter. */
 private int
-s_zlibD_reset(stream_state *st)
-{	if ( inflateReset(szs) != Z_OK )
-	  return ERRC;		/****** WRONG ******/
-	return 0;
+s_zlibD_reset(stream_state * st)
+{
+    if (inflateReset(szs) != Z_OK)
+	return ERRC;
+/****** WRONG ******/
+    return 0;
 }
 
 /* Process a buffer */
 private int
-s_zlibD_process(stream_state *st, stream_cursor_read *pr,
-  stream_cursor_write *pw, bool ignore_last)
-{	const byte *p = pr->ptr;
-	int status;
+s_zlibD_process(stream_state * st, stream_cursor_read * pr,
+		stream_cursor_write * pw, bool ignore_last)
+{
+    const byte *p = pr->ptr;
+    int status;
 
-	/* Detect no input or full output so that we don't get */
-	/* a Z_BUF_ERROR return. */
-	if ( pw->ptr == pw->limit )
-	  return 1;
-	if ( pr->ptr == pr->limit )
-	  return 0;
-	szs->next_in = (Bytef *)p + 1;
-	szs->avail_in = pr->limit - p;
-	szs->next_out = pw->ptr + 1;
-	szs->avail_out = pw->limit - pw->ptr;
-	status = inflate(szs, Z_PARTIAL_FLUSH);
-	pr->ptr = szs->next_in - 1;
-	pw->ptr = szs->next_out - 1;
-	switch ( status )
-	  {
-	  case Z_OK:
+    /* Detect no input or full output so that we don't get */
+    /* a Z_BUF_ERROR return. */
+    if (pw->ptr == pw->limit)
+	return 1;
+    if (pr->ptr == pr->limit)
+	return 0;
+    szs->next_in = (Bytef *) p + 1;
+    szs->avail_in = pr->limit - p;
+    szs->next_out = pw->ptr + 1;
+    szs->avail_out = pw->limit - pw->ptr;
+    status = inflate(szs, Z_PARTIAL_FLUSH);
+    pr->ptr = szs->next_in - 1;
+    pw->ptr = szs->next_out - 1;
+    switch (status) {
+	case Z_OK:
 	    return (pw->ptr == pw->limit ? 1 : pr->ptr > p ? 0 : 1);
-	  case Z_STREAM_END:
+	case Z_STREAM_END:
 	    return EOFC;
-	  default:
+	default:
 	    return ERRC;
-	  }
+    }
 }
 
 /* Release the stream */
 private void
-s_zlibD_release(stream_state *st)
-{	inflateEnd(szs);
+s_zlibD_release(stream_state * st)
+{
+    inflateEnd(szs);
 }
 
 /* Stream template */
 const stream_template s_zlibD_template =
-{	&st_zlib_state, s_zlibD_init, s_zlibD_process, 1, 1, s_zlibD_release,
-	s_zlib_set_defaults, s_zlibD_reset
+{&st_zlib_state, s_zlibD_init, s_zlibD_process, 1, 1, s_zlibD_release,
+ s_zlib_set_defaults, s_zlibD_reset
 };
 
 #undef ss