Changeset 95239 in vbox for trunk/src/libs/zlib-1.2.12/deflate.h

Timestamp:

Jun 9, 2022 9:09:44 AM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

151769

Message:

libs/zlib: Upgrade to 1.2.12, bugref:8515

Location:

trunk/src/libs/zlib-1.2.12

Files:

• . (modified) (1 prop)
• deflate.h (modified) (4 diffs)

trunk/src/libs/zlib-1.2.12

@@ -20 +20 @@
 /branches/dsen/gui3/src/libs/zlib-1.2.11:79645-79692
 /trunk/src/src/libs/zlib-1.2.11:92342
+/vendor/zlib/1.2.12:151751
+/vendor/zlib/current:150724-151750

@@ -20 +20 @@
 /branches/dsen/gui3/src/libs/zlib-1.2.11:79645-79692
 /trunk/src/src/libs/zlib-1.2.11:92342
+/vendor/zlib/1.2.12:151751
+/vendor/zlib/current:150724-151750

trunk/src/libs/zlib-1.2.12/deflate.h

@@ -1 +1 @@
 /* deflate.h -- internal compression state
- * Copyright (C) 1995-2016 Jean-loup Gailly
+ * Copyright (C) 1995-2018 Jean-loup Gailly
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
@@ -218 +218 @@
      */
 
-    uchf *l_buf;          /* buffer for literals or lengths */
+    uchf *sym_buf;        /* buffer for distances and literals/lengths */
 
     uInt  lit_bufsize;
@@ -240 +240 @@
      */
 
-    uInt last_lit;      /* running index in l_buf */
-
-    ushf *d_buf;
-    /* Buffer for distances. To simplify the code, d_buf and l_buf have
-     * the same number of elements. To use different lengths, an extra flag
-     * array would be necessary.
-     */
+    uInt sym_next;      /* running index in sym_buf */
+    uInt sym_end;       /* symbol table full when sym_next reaches this */
 
     ulg opt_len;        /* bit length of current block with optimal trees */
@@ -326 +321 @@
 # define _tr_tally_lit(s, c, flush) \
   { uch cc = (c); \
-    s->d_buf[s->last_lit] = 0; \
-    s->l_buf[s->last_lit++] = cc; \
+    s->sym_buf[s->sym_next++] = 0; \
+    s->sym_buf[s->sym_next++] = 0; \
+    s->sym_buf[s->sym_next++] = cc; \
     s->dyn_ltree[cc].Freq++; \
-    flush = (s->last_lit == s->lit_bufsize-1); \
+    flush = (s->sym_next == s->sym_end); \
    }
 # define _tr_tally_dist(s, distance, length, flush) \
   { uch len = (uch)(length); \
     ush dist = (ush)(distance); \
-    s->d_buf[s->last_lit] = dist; \
-    s->l_buf[s->last_lit++] = len; \
+    s->sym_buf[s->sym_next++] = dist; \
+    s->sym_buf[s->sym_next++] = dist >> 8; \
+    s->sym_buf[s->sym_next++] = len; \
     dist--; \
     s->dyn_ltree[_length_code[len]+LITERALS+1].Freq++; \
     s->dyn_dtree[d_code(dist)].Freq++; \
-    flush = (s->last_lit == s->lit_bufsize-1); \
+    flush = (s->sym_next == s->sym_end); \
   }
 #else

@@ -20 +20 @@
 /branches/dsen/gui3/src/libs/zlib-1.2.11:79645-79692
 /trunk/src/src/libs/zlib-1.2.11:92342
+/vendor/zlib/1.2.12:151751
+/vendor/zlib/current:150724-151750