fixed array tests compilation and a bug in obj array test

[wxWidgets.git] / src / zlib / inffast.c

diff --git a/src/zlib/inffast.c b/src/zlib/inffast.c
index d387b586bdf783783e508826e0aaf189b5b1950d..0e41957fef11d73b5f2b636efc4c5c59b26e5af4 100644 (file)
--- a/src/zlib/inffast.c
+++ b/src/zlib/inffast.c
@@ -1,5 +1,5 @@
 /* inffast.c -- process literals and length/distance pairs fast
 /* inffast.c -- process literals and length/distance pairs fast

- * Copyright (C) 1995-1998 Mark Adler
+ * Copyright (C) 1995-2002 Mark Adler

  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 


@@ -97,28 +97,41 @@ z_streamp z;
 
             /* do the copy */
             m -= c;
 
             /* do the copy */
             m -= c;

-            if ((uInt)(q - s->window) >= d)     /* offset before dest */
-            {                                   /*  just copy */

               r = q - d;
               r = q - d;

-              *q++ = *r++;  c--;        /* minimum count is three, */
-              *q++ = *r++;  c--;        /*  so unroll loop a little */
-            }
-            else                        /* else offset after destination */
+            if (r < s->window)                  /* wrap if needed */

             {
             {

-              e = d - (uInt)(q - s->window); /* bytes from offset to end */
-              r = s->end - e;           /* pointer to offset */
-              if (c > e)                /* if source crosses, */
+              do {
+                r += s->end - s->window;        /* force pointer in window */
+              } while (r < s->window);          /* covers invalid distances */
+              e = s->end - r;
+              if (c > e)

               {
               {

-                c -= e;                 /* copy to end of window */
+                c -= e;                         /* wrapped copy */

                 do {
                   *q++ = *r++;
                 } while (--e);
                 do {
                   *q++ = *r++;
                 } while (--e);

-                r = s->window;          /* copy rest from start of window */
+                r = s->window;
+                do {
+                    *q++ = *r++;
+                } while (--c);
+              }
+              else                              /* normal copy */
+              {
+                *q++ = *r++;  c--;
+                *q++ = *r++;  c--;
+                do {
+                    *q++ = *r++;
+                } while (--c);

               }
             }
               }
             }

-            do {                        /* copy all or what's left */
+            else                                /* normal copy */
+            {
+              *q++ = *r++;  c--;
+              *q++ = *r++;  c--;
+              do {

               *q++ = *r++;
             } while (--c);
               *q++ = *r++;
             } while (--c);

+            }

             break;
           }
           else if ((e & 64) == 0)
             break;
           }
           else if ((e & 64) == 0)