Use pointer arithmetic to access window in deflate_quick/deflate_fast

diff --git a/deflate_fast.c b/deflate_fast.c
index fff1375690ce2f23c77b9e0632fedf0b914e68b9..4040e65dcb75a1bff42dea81a562d01e9941478e 100644 (file)
--- a/deflate_fast.c
+++ b/deflate_fast.c
@@ -45,9 +45,9 @@ Z_INTERNAL block_state deflate_fast(deflate_state *s, int flush) {
          */
         if (s->lookahead >= WANT_MIN_MATCH) {
 #if BYTE_ORDER == LITTLE_ENDIAN
-            uint32_t str_val = zng_memread_4(&window[s->strstart]);
+            uint32_t str_val = zng_memread_4(window + s->strstart);
 #else
-            uint32_t str_val = ZSWAP32(zng_memread_4(&window[s->strstart]));
+            uint32_t str_val = ZSWAP32(zng_memread_4(window + s->strstart));
 #endif
             Pos hash_head = quick_insert_value(s, s->strstart, str_val);
             int64_t dist = (int64_t)s->strstart - hash_head;

diff --git a/deflate_quick.c b/deflate_quick.c
index 372a929eff06d7bfe73da2fb7bae3074a9d92930..940b93b7fadec9efb4f4dacb0a5007badee07d4b 100644 (file)
--- a/deflate_quick.c
+++ b/deflate_quick.c
@@ -89,9 +89,9 @@ Z_INTERNAL block_state deflate_quick(deflate_state *s, int flush) {
 
         if (LIKELY(s->lookahead >= WANT_MIN_MATCH)) {
 #if BYTE_ORDER == LITTLE_ENDIAN
-            uint32_t str_val = zng_memread_4(&window[s->strstart]);
+            uint32_t str_val = zng_memread_4(window + s->strstart);
 #else
-            uint32_t str_val = ZSWAP32(zng_memread_4(&window[s->strstart]));
+            uint32_t str_val = ZSWAP32(zng_memread_4(window + s->strstart));
 #endif
             Pos hash_head = quick_insert_value(s, s->strstart, str_val);
             int64_t dist = (int64_t)s->strstart - hash_head;