| FazBrowse GitHub Viewer | Trending | | Home |
| Tools: [Download Repo ZIP] [Original HTTPS Page] |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -385,6 +385,11 @@ config("minizip_warnings") { | |||
| 385 | 385 | } | |
| 386 | 386 | ||
| 387 | 387 | static_library("minizip") { | |
| 388 | + include_dirs = [ | ||
| 389 | + ".", | ||
| 390 | + "//third_party/zlib", | ||
| 391 | + ] | ||
| 392 | + | ||
| 388 | 393 | sources = [ | |
| 389 | 394 | "contrib/minizip/ioapi.c", | |
| 390 | 395 | "contrib/minizip/ioapi.h", | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -23,6 +23,11 @@ check_include_file(stddef.h HAVE_STDDEF_H) | |||
| 23 | 23 | ||
| 24 | 24 | option(ENABLE_SIMD_OPTIMIZATIONS "Enable all SIMD optimizations" OFF) | |
| 25 | 25 | option(ENABLE_SIMD_AVX512 "Enable SIMD AXV512 optimizations" OFF) | |
| 26 | + option(USE_ZLIB_RABIN_KARP_HASH "Enable bitstream compatibility with canonical zlib" OFF) | ||
| 27 | + | ||
| 28 | + if (USE_ZLIB_RABIN_KARP_HASH) | ||
| 29 | + add_definitions(-DUSE_ZLIB_RABIN_KARP_ROLLING_HASH) | ||
| 30 | + endif() | ||
| 26 | 31 | ||
| 27 | 32 | # TODO(cavalcantii): add support for other OSes (e.g. Android, fuchsia, osx) | |
| 28 | 33 | # and architectures (e.g. Arm). | |
@@ -238,3 +243,12 @@ enable_language(CXX) | |||
| 238 | 243 | set(CMAKE_CXX_STANDARD 14) # workaround for older compilers (e.g. g++ 5.4). | |
| 239 | 244 | add_executable(zlib_bench contrib/bench/zlib_bench.cc) | |
| 240 | 245 | target_link_libraries(zlib_bench zlib) | |
| 246 | + | ||
| 247 | + #============================================================================ | ||
| 248 | + # Minigzip tool | ||
| 249 | + #============================================================================ | ||
| 250 | + add_executable(minizip_bin contrib/minizip/minizip.c contrib/minizip/ioapi.c | ||
| 251 | + contrib/minizip/ioapi.h contrib/minizip/unzip.c | ||
| 252 | + contrib/minizip/unzip.h contrib/minizip/zip.c contrib/minizip/zip.h | ||
| 253 | + ) | ||
| 254 | + target_link_libraries(minizip_bin zlib) | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -90,9 +90,9 @@ uLong ZEXPORT adler32_z(uLong adler, const Bytef *buf, z_size_t len) { | |||
| 90 | 90 | return adler | (sum2 << 16); | |
| 91 | 91 | } | |
| 92 | 92 | ||
| 93 | - #if defined(ADLER32_SIMD_SSSE3) | ||
| 93 | + #if defined(ADLER32_SIMD_SSSE3) || defined(ADLER32_SIMD_NEON) | ||
| 94 | 94 | /* | |
| 95 | - * Use SSSE3 to compute the adler32. Since this routine can be | ||
| 95 | + * Use SIMD to compute the adler32. Since this function can be | ||
| 96 | 96 | * freely used, check CPU features here. zlib convention is to | |
| 97 | 97 | * call adler32(0, NULL, 0), before making calls to adler32(). | |
| 98 | 98 | * So this is a good early (and infrequent) place to cache CPU | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -3,6 +3,7 @@ Short Name: minizip | |||
| 3 | 3 | URL: https://github.com/madler/zlib/tree/master/contrib/minizip | |
| 4 | 4 | Version: 1.2.12 | |
| 5 | 5 | License: Zlib | |
| 6 | + License File: //third_party/zlib/LICENSE | ||
| 6 | 7 | Security Critical: yes | |
| 7 | 8 | Shipped: yes | |
| 8 | 9 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -43,7 +43,7 @@ | |||
| 43 | 43 | ||
| 44 | 44 | #include <stdio.h> | |
| 45 | 45 | #include <stdlib.h> | |
| 46 | - #include "third_party/zlib/zlib.h" | ||
| 46 | + #include "zlib.h" | ||
| 47 | 47 | ||
| 48 | 48 | #if defined(USE_FILE32API) | |
| 49 | 49 | #define fopen64 fopen | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -8,7 +8,7 @@ | |||
| 8 | 8 | #include <stdio.h> | |
| 9 | 9 | #include <stdlib.h> | |
| 10 | 10 | #include <string.h> | |
| 11 | - #include "third_party/zlib/zlib.h" | ||
| 11 | + #include "zlib.h" | ||
| 12 | 12 | #include "unzip.h" | |
| 13 | 13 | ||
| 14 | 14 | #define READ_8(adr) ((unsigned char)*(adr)) | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -12,7 +12,7 @@ extern "C" { | |||
| 12 | 12 | #endif | |
| 13 | 13 | ||
| 14 | 14 | #ifndef _ZLIB_H | |
| 15 | - #include "third_party/zlib/zlib.h" | ||
| 15 | + #include "zlib.h" | ||
| 16 | 16 | #endif | |
| 17 | 17 | ||
| 18 | 18 | #include "unzip.h" | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -68,7 +68,7 @@ | |||
| 68 | 68 | #include <stdlib.h> | |
| 69 | 69 | #include <string.h> | |
| 70 | 70 | ||
| 71 | - #include "third_party/zlib/zlib.h" | ||
| 71 | + #include "zlib.h" | ||
| 72 | 72 | #include "unzip.h" | |
| 73 | 73 | ||
| 74 | 74 | #ifdef STDC | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -48,7 +48,7 @@ extern "C" { | |||
| 48 | 48 | #endif | |
| 49 | 49 | ||
| 50 | 50 | #ifndef _ZLIB_H | |
| 51 | - #include "third_party/zlib/zlib.h" | ||
| 51 | + #include "zlib.h" | ||
| 52 | 52 | #endif | |
| 53 | 53 | ||
| 54 | 54 | #ifndef _ZLIBIOAPI_H | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -26,7 +26,7 @@ | |||
| 26 | 26 | #include <stdlib.h> | |
| 27 | 27 | #include <string.h> | |
| 28 | 28 | #include <time.h> | |
| 29 | - #include "third_party/zlib/zlib.h" | ||
| 29 | + #include "zlib.h" | ||
| 30 | 30 | #include "zip.h" | |
| 31 | 31 | ||
| 32 | 32 | #ifdef STDC | |
| Back | FazBrowse Home | New Git URL |
0 commit comments