From 4fe5eaad99bc2ee202585cce62a05264d2ba5ac3 Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Tue, 29 Nov 2016 09:55:13 +0100 Subject: [PATCH 01/81] Bump version to v0.4.0 --- CMakeLists.txt | 4 ++-- README.md | 6 +++--- appveyor.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2dde660..38d7548 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,8 +38,8 @@ include(CMakeDependentOption) project(gmio) set(GMIO_VERSION_MAJOR 0) -set(GMIO_VERSION_MINOR 3) -set(GMIO_VERSION_PATCH 2) +set(GMIO_VERSION_MINOR 4) +set(GMIO_VERSION_PATCH 0) set(GMIO_VERSION ${GMIO_VERSION_MAJOR}.${GMIO_VERSION_MINOR}.${GMIO_VERSION_PATCH}) diff --git a/README.md b/README.md index 20bb877..7082478 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ [![Coverage Status](https://coveralls.io/repos/fougue/gmio/badge.svg?branch=master&service=github)](https://coveralls.io/github/fougue/gmio?branch=master) [![License](https://img.shields.io/badge/license-BSD%202--clause-blue.svg)](https://github.com/fougue/gmio/blob/master/LICENSE.txt) -[![Version](https://img.shields.io/badge/version-v0.3.2-blue.svg?style=flat)](https://github.com/fougue/gmio/releases) +[![Version](https://img.shields.io/badge/version-v0.4.0-blue.svg?style=flat)](https://github.com/fougue/gmio/releases) C library for geometry input/output @@ -29,7 +29,7 @@ Main highlights: * [x] Progress report about the I/O operation Current version only supports the STereoLithography format(STL), see module -[gmio_stl](http://www.fougue.pro/docs/gmio/0.3/group__gmio__stl.html#details) +[gmio_stl](http://www.fougue.pro/docs/gmio/0.4/group__gmio__stl.html#details) Building gmio @@ -43,7 +43,7 @@ Read the [Build instructions](https://github.com/fougue/gmio/wiki/2.-Build-instr Documentation ============= -The HTML reference manual generated by Doxygen is [here](http://www.fougue.pro/docs/gmio/0.3) +The HTML reference manual generated by Doxygen is [here](http://www.fougue.pro/docs/gmio/0.4) There is also a [wiki](https://github.com/fougue/gmio/wiki) diff --git a/appveyor.yml b/appveyor.yml index 756b9cc..7d94b39 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 0.3_build{build} +version: 0.4_build{build} os: Visual Studio 2013 From 941a015bfb2e2f7334c48f3c5961dcff3afde816 Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Wed, 13 Jul 2016 11:46:28 +0200 Subject: [PATCH 02/81] gmio_stl: rename functions/structs in stl_infos.h (_get -> _probe) Rename : * Func gmio_stl_infos_get() -> gmio_stl_infos_probe() * Func gmio_stla_infos_get_streamsize() -> gmio_stla_infos_probe_streamsize() * Struct gmio_stl_infos_get_options -> gmio_stl_infos_probe_options GitHub issue #3 --- benchmarks/benchmark_gmio/main.c | 20 +++++++++---------- examples/stl_get_infos.c | 4 ++-- examples/stl_read_file.c | 2 +- .../{stla_infos_get.c => stla_infos_probe.c} | 6 +++--- .../{stla_infos_get.h => stla_infos_probe.h} | 10 +++++----- .../{stlb_infos_get.c => stlb_infos_probe.c} | 6 +++--- .../{stlb_infos_get.h => stlb_infos_probe.h} | 10 +++++----- src/gmio_stl/stl_format.c | 2 +- src/gmio_stl/stl_global.h | 6 +++--- src/gmio_stl/stl_infos.c | 20 +++++++++---------- src/gmio_stl/stl_infos.h | 20 +++++++++---------- src/gmio_stl/stl_io_options.h | 2 +- tests/test_stl_infos.c | 2 +- tests/test_stl_io.c | 6 +++--- 14 files changed, 58 insertions(+), 58 deletions(-) rename src/gmio_stl/internal/{stla_infos_get.c => stla_infos_probe.c} (98%) rename src/gmio_stl/internal/{stla_infos_get.h => stla_infos_probe.h} (89%) rename src/gmio_stl/internal/{stlb_infos_get.c => stlb_infos_probe.c} (96%) rename src/gmio_stl/internal/{stlb_infos_get.h => stlb_infos_probe.h} (90%) diff --git a/benchmarks/benchmark_gmio/main.c b/benchmarks/benchmark_gmio/main.c index 749da26..178343b 100644 --- a/benchmarks/benchmark_gmio/main.c +++ b/benchmarks/benchmark_gmio/main.c @@ -229,7 +229,7 @@ static void bmk_gmio_stl_readwrite_conv(const void* filepath) fclose(outfile); } -void bmk_gmio_stl_infos_get_all(const void* filepath) +void bmk_gmio_stl_infos_probe_all(const void* filepath) { static bool already_exec = false; FILE* file = fopen(filepath, "rb"); @@ -237,10 +237,10 @@ void bmk_gmio_stl_infos_get_all(const void* filepath) if (file != NULL) { struct gmio_stream stream = gmio_stream_stdio(file); struct gmio_stl_infos infos = {0}; - gmio_stl_infos_get(&infos, &stream, GMIO_STL_INFO_FLAG_ALL, NULL); + gmio_stl_infos_probe(&infos, &stream, GMIO_STL_INFO_FLAG_ALL, NULL); if (!already_exec) { - printf("stl_infos_get(ALL)\n" + printf("stl_infos_probe(ALL)\n" " File: %s\n" " Size: %uKo\n" " Facets: %u\n", @@ -258,7 +258,7 @@ void bmk_gmio_stl_infos_get_all(const void* filepath) fclose(file); } -void bmk_gmio_stl_infos_get_size(const void* filepath) +void bmk_gmio_stl_infos_probe_size(const void* filepath) { static bool already_exec = false; FILE* file = fopen(filepath, "rb"); @@ -266,10 +266,10 @@ void bmk_gmio_stl_infos_get_size(const void* filepath) if (file != NULL) { struct gmio_stream stream = gmio_stream_stdio(file); struct gmio_stl_infos infos = {0}; - gmio_stl_infos_get(&infos, &stream, GMIO_STL_INFO_FLAG_SIZE, NULL); + gmio_stl_infos_probe(&infos, &stream, GMIO_STL_INFO_FLAG_SIZE, NULL); if (!already_exec) { - printf("stl_infos_get(SIZE)\n" + printf("stl_infos_probe(SIZE)\n" " File: %s\n" " Size: %uKo\n", (const char*)filepath, @@ -294,11 +294,11 @@ int main(int argc, char** argv) { "readwrite_conv()", bmk_gmio_stl_readwrite_conv, NULL, NULL, NULL }, - { "stl_infos_get(ALL)", - bmk_gmio_stl_infos_get_all, NULL, + { "stl_infos_probe(ALL)", + bmk_gmio_stl_infos_probe_all, NULL, NULL, NULL }, - { "stl_infos_get(size)", - bmk_gmio_stl_infos_get_size, NULL, + { "stl_infos_probe(size)", + bmk_gmio_stl_infos_probe_size, NULL, NULL, NULL }, {0} }; diff --git a/examples/stl_get_infos.c b/examples/stl_get_infos.c index b3bf891..618caf8 100644 --- a/examples/stl_get_infos.c +++ b/examples/stl_get_infos.c @@ -2,7 +2,7 @@ * * Example: get informations about an STL file * - * Informations that can be retrieved by gmio_stl_infos_get() are: + * Informations that can be retrieved by gmio_stl_infos_probe() are: * - STL format of the input stream * - Count of facets(triangles) * - Size of the STL contents in bytes @@ -53,7 +53,7 @@ int main(int argc, char** argv) struct gmio_stream stream = gmio_stream_stdio(file); struct gmio_stl_infos infos = {0}; /* Retrieve STL informations, using default options(NULL) */ - error = gmio_stl_infos_get( + error = gmio_stl_infos_probe( &infos, &stream, GMIO_STL_INFO_FLAG_ALL, NULL); printf("File: %s\n", filepath); if (error == GMIO_ERROR_OK) diff --git a/examples/stl_read_file.c b/examples/stl_read_file.c index 652d80b..3fcdf17 100644 --- a/examples/stl_read_file.c +++ b/examples/stl_read_file.c @@ -51,7 +51,7 @@ static void my_3d_mesh__copy_triangle( * precisely known. * To overcome this: * - instead of just using general gmio_stl_read(), call - * call gmio_stl_infos_get(GMIO_STL_INFO_FLAG_FACET_COUNT) and then + * call gmio_stl_infos_probe(GMIO_STL_INFO_FLAG_FACET_COUNT) and then * gmio_stla_read() * - or just grow the capacity of your mesh, here the triangle array * is grown by 12.5% */ diff --git a/src/gmio_stl/internal/stla_infos_get.c b/src/gmio_stl/internal/stla_infos_probe.c similarity index 98% rename from src/gmio_stl/internal/stla_infos_get.c rename to src/gmio_stl/internal/stla_infos_probe.c index 316348d..e37fa43 100644 --- a/src/gmio_stl/internal/stla_infos_get.c +++ b/src/gmio_stl/internal/stla_infos_probe.c @@ -27,7 +27,7 @@ ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ****************************************************************************/ -#include "stla_infos_get.h" +#include "stla_infos_probe.h" #include "../../gmio_core/error.h" #include "../../gmio_core/internal/helper_memblock.h" @@ -73,11 +73,11 @@ static size_t gmio_stringstream_read__flagsize( return len_read; } -int gmio_stla_infos_get( +int gmio_stla_infos_probe( struct gmio_stl_infos* infos, struct gmio_stream* stream, unsigned flags, - const struct gmio_stl_infos_get_options* opts) + const struct gmio_stl_infos_probe_options* opts) { const bool flag_facet_count = (flags & GMIO_STL_INFO_FLAG_FACET_COUNT) != 0; diff --git a/src/gmio_stl/internal/stla_infos_get.h b/src/gmio_stl/internal/stla_infos_probe.h similarity index 89% rename from src/gmio_stl/internal/stla_infos_get.h rename to src/gmio_stl/internal/stla_infos_probe.h index e737983..169575a 100644 --- a/src/gmio_stl/internal/stla_infos_get.h +++ b/src/gmio_stl/internal/stla_infos_probe.h @@ -27,16 +27,16 @@ ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ****************************************************************************/ -#ifndef GMIO_INTERNAL_STLA_INFOS_GET_H -#define GMIO_INTERNAL_STLA_INFOS_GET_H +#ifndef GMIO_INTERNAL_STLA_INFOS_PROBE_H +#define GMIO_INTERNAL_STLA_INFOS_PROBE_H #include "../stl_infos.h" /*! Find infos from a STL ASCII stream */ -int gmio_stla_infos_get( +int gmio_stla_infos_probe( struct gmio_stl_infos* infos, struct gmio_stream* stream, unsigned flags, - const struct gmio_stl_infos_get_options* opts); + const struct gmio_stl_infos_probe_options* opts); -#endif /* GMIO_INTERNAL_STLA_INFOS_GET_H */ +#endif /* GMIO_INTERNAL_STLA_INFOS_PROBE_H */ diff --git a/src/gmio_stl/internal/stlb_infos_get.c b/src/gmio_stl/internal/stlb_infos_probe.c similarity index 96% rename from src/gmio_stl/internal/stlb_infos_get.c rename to src/gmio_stl/internal/stlb_infos_probe.c index 3e0d880..ae10c07 100644 --- a/src/gmio_stl/internal/stlb_infos_get.c +++ b/src/gmio_stl/internal/stlb_infos_probe.c @@ -27,7 +27,7 @@ ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ****************************************************************************/ -#include "stlb_infos_get.h" +#include "stlb_infos_probe.h" #include "../../gmio_core/error.h" #include "../../gmio_core/internal/byte_swap.h" @@ -45,11 +45,11 @@ static enum gmio_endianness gmio_stl_format_to_endianness( return GMIO_ENDIANNESS_UNKNOWN; } -int gmio_stlb_infos_get( +int gmio_stlb_infos_probe( struct gmio_stl_infos* infos, struct gmio_stream* stream, unsigned flags, - const struct gmio_stl_infos_get_options* opts) + const struct gmio_stl_infos_probe_options* opts) { if (flags != 0) { const enum gmio_endianness byte_order = diff --git a/src/gmio_stl/internal/stlb_infos_get.h b/src/gmio_stl/internal/stlb_infos_probe.h similarity index 90% rename from src/gmio_stl/internal/stlb_infos_get.h rename to src/gmio_stl/internal/stlb_infos_probe.h index 5858b67..7d73a27 100644 --- a/src/gmio_stl/internal/stlb_infos_get.h +++ b/src/gmio_stl/internal/stlb_infos_probe.h @@ -27,21 +27,21 @@ ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ****************************************************************************/ -#ifndef GMIO_INTERNAL_STLB_INFOS_GET_H -#define GMIO_INTERNAL_STLB_INFOS_GET_H +#ifndef GMIO_INTERNAL_STLB_INFOS_PROBE_H +#define GMIO_INTERNAL_STLB_INFOS_PROBE_H #include "../stl_infos.h" #include "../../gmio_core/endian.h" /*! Finds infos from a STL binary stream */ -int gmio_stlb_infos_get( +int gmio_stlb_infos_probe( struct gmio_stl_infos* infos, struct gmio_stream* stream, unsigned flags, - const struct gmio_stl_infos_get_options* opts); + const struct gmio_stl_infos_probe_options* opts); /*! Returns the size(in bytes) of the whole STL binary data given some facet * count */ gmio_streamsize_t gmio_stlb_infos_size(uint32_t facet_count); -#endif /* GMIO_INTERNAL_STLB_INFOS_GET_H */ +#endif /* GMIO_INTERNAL_STLB_INFOS_PROBE_H */ diff --git a/src/gmio_stl/stl_format.c b/src/gmio_stl/stl_format.c index 0928612..06b22f5 100644 --- a/src/gmio_stl/stl_format.c +++ b/src/gmio_stl/stl_format.c @@ -32,7 +32,7 @@ #include "stl_triangle.h" #include "stlb_header.h" #include "internal/stlb_byte_swap.h" -#include "internal/stlb_infos_get.h" +#include "internal/stlb_infos_probe.h" #include "../gmio_core/endian.h" #include "../gmio_core/internal/byte_codec.h" diff --git a/src/gmio_stl/stl_global.h b/src/gmio_stl/stl_global.h index 1ac319a..3b8bfd5 100644 --- a/src/gmio_stl/stl_global.h +++ b/src/gmio_stl/stl_global.h @@ -80,10 +80,10 @@ * * * Infos on contents - * gmio_stl_infos_get()
- * gmio_stla_infos_get_streamsize() + * gmio_stl_infos_probe()
+ * gmio_stla_infos_probe_streamsize() * gmio_stl_infos
- * gmio_stl_infos_get_options + * gmio_stl_infos_probe_options * * * Detect format diff --git a/src/gmio_stl/stl_infos.c b/src/gmio_stl/stl_infos.c index a302254..228addd 100644 --- a/src/gmio_stl/stl_infos.c +++ b/src/gmio_stl/stl_infos.c @@ -34,14 +34,14 @@ #include "../gmio_core/internal/helper_stream.h" #include "stl_error.h" #include "stl_format.h" -#include "internal/stla_infos_get.h" -#include "internal/stlb_infos_get.h" +#include "internal/stla_infos_probe.h" +#include "internal/stlb_infos_probe.h" -int gmio_stl_infos_get( +int gmio_stl_infos_probe( struct gmio_stl_infos* infos, struct gmio_stream* stream, unsigned flags, - const struct gmio_stl_infos_get_options* opts) + const struct gmio_stl_infos_probe_options* opts) { int error = GMIO_ERROR_OK; const struct gmio_streampos begin_streampos = gmio_streampos(stream, NULL); @@ -49,7 +49,7 @@ int gmio_stl_infos_get( gmio_memblock_helper(opts != NULL ? &opts->stream_memblock : NULL); enum gmio_stl_format format = opts != NULL ? opts->format_hint : GMIO_STL_FORMAT_UNKNOWN; - struct gmio_stl_infos_get_options ovrdn_opts = {0}; + struct gmio_stl_infos_probe_options ovrdn_opts = {0}; if (opts != NULL) ovrdn_opts = *opts; @@ -71,11 +71,11 @@ int gmio_stl_infos_get( /* Dispatch to the sub-function */ switch (format) { case GMIO_STL_FORMAT_ASCII: - error = gmio_stla_infos_get(infos, stream, flags, &ovrdn_opts); + error = gmio_stla_infos_probe(infos, stream, flags, &ovrdn_opts); break; case GMIO_STL_FORMAT_BINARY_LE: case GMIO_STL_FORMAT_BINARY_BE: - error = gmio_stlb_infos_get(infos, stream, flags, &ovrdn_opts); + error = gmio_stlb_infos_probe(infos, stream, flags, &ovrdn_opts); break; default: error = GMIO_STL_ERROR_UNKNOWN_FORMAT; @@ -88,13 +88,13 @@ label_end: return error; } -gmio_streamsize_t gmio_stla_infos_get_streamsize( +gmio_streamsize_t gmio_stla_infos_probe_streamsize( struct gmio_stream *stream, struct gmio_memblock *stream_memblock) { struct gmio_stl_infos infos = {0}; - struct gmio_stl_infos_get_options options = {0}; + struct gmio_stl_infos_probe_options options = {0}; options.stream_memblock = *stream_memblock; options.format_hint = GMIO_STL_FORMAT_ASCII; - gmio_stl_infos_get(&infos, stream, GMIO_STL_INFO_FLAG_SIZE, &options); + gmio_stl_infos_probe(&infos, stream, GMIO_STL_INFO_FLAG_SIZE, &options); return infos.size; } diff --git a/src/gmio_stl/stl_infos.h b/src/gmio_stl/stl_infos.h index c2f1df9..a258f61 100644 --- a/src/gmio_stl/stl_infos.h +++ b/src/gmio_stl/stl_infos.h @@ -42,7 +42,7 @@ #include "stlb_header.h" #include -/*! Informations retrieved by gmio_stl_infos_get() */ +/*! Informations retrieved by gmio_stl_infos_probe() */ struct gmio_stl_infos { /*! STL format of the input stream */ @@ -58,14 +58,14 @@ struct gmio_stl_infos /*! STL ascii only: name of the solid * - * The pointer has to be set before calling gmio_stl_infos_get() + * The pointer has to be set before calling gmio_stl_infos_probe() * \sa stla_solidname_maxlen */ char* stla_solidname; /*! STL ascii only: maximum length(capacity) of stla_solidname * - * The value has to be set before calling gmio_stl_infos_get() + * The value has to be set before calling gmio_stl_infos_probe() * \sa stla_solidname */ size_t stla_solidname_maxlen; @@ -100,8 +100,8 @@ enum gmio_stl_info_flag GMIO_STL_INFO_FLAG_ALL = 0xFFFF }; -/*! Options of function gmio_stl_infos_get() */ -struct gmio_stl_infos_get_options +/*! Options of function gmio_stl_infos_probe() */ +struct gmio_stl_infos_probe_options { /*! See gmio_stl_read_options::stream_memblock */ struct gmio_memblock stream_memblock; @@ -110,7 +110,7 @@ struct gmio_stl_infos_get_options * automatically guessed */ enum gmio_stl_format format_hint; - /*! Restrict gmio_stl_infos_get() to not read further this limit(in bytes) + /*! Restrict gmio_stl_infos_probe() to not read further this limit(in bytes) * * \warning Not yet supported */ @@ -133,15 +133,15 @@ GMIO_C_LINKAGE_BEGIN * * \return Error code (see gmio_core/error.h and stl_error.h) */ -GMIO_API int gmio_stl_infos_get( +GMIO_API int gmio_stl_infos_probe( struct gmio_stl_infos* infos, struct gmio_stream* stream, unsigned flags, - const struct gmio_stl_infos_get_options* options); + const struct gmio_stl_infos_probe_options* options); /*! Returns the size(in bytes) of the next STL ascii solid in \p stream * - * It is a facade over gmio_stl_infos_get() for gmio_stl_infos::size only + * It is a facade over gmio_stl_infos_probe() for gmio_stl_infos::size only * * Pointer to this function can be given to * gmio_stl_read_options::func_stla_get_streamsize() and is useful when @@ -151,7 +151,7 @@ GMIO_API int gmio_stl_infos_get( * \pre stream != NULL * \pre stream_memblock != NULL */ -GMIO_API gmio_streamsize_t gmio_stla_infos_get_streamsize( +GMIO_API gmio_streamsize_t gmio_stla_infos_probe_streamsize( struct gmio_stream* stream, struct gmio_memblock* stream_memblock); diff --git a/src/gmio_stl/stl_io_options.h b/src/gmio_stl/stl_io_options.h index b69ee6f..423acf0 100644 --- a/src/gmio_stl/stl_io_options.h +++ b/src/gmio_stl/stl_io_options.h @@ -73,7 +73,7 @@ struct gmio_stl_read_options * The resulting stream size is passed to * gmio_task_iface::func_handle_progress() as the \p max_value argument. * - * \sa gmio_stla_infos_get_streamsize() + * \sa gmio_stla_infos_probe_streamsize() */ gmio_streamsize_t (*func_stla_get_streamsize)( struct gmio_stream* stream, diff --git a/tests/test_stl_infos.c b/tests/test_stl_infos.c index 438d1bf..c8343c4 100644 --- a/tests/test_stl_infos.c +++ b/tests/test_stl_infos.c @@ -51,7 +51,7 @@ static const char* __tstl__test_stl_infos( infos.stla_solidname = stla_solid_name; infos.stla_solidname_maxlen = sizeof(stla_solid_name) - 1; - error = gmio_stl_infos_get(&infos, &stream, GMIO_STL_INFO_FLAG_ALL, NULL); + error = gmio_stl_infos_probe(&infos, &stream, GMIO_STL_INFO_FLAG_ALL, NULL); if (testcase->expected_size == -1) expected_size = gmio_stream_size(&stream); diff --git a/tests/test_stl_io.c b/tests/test_stl_io.c index b95188a..845689d 100644 --- a/tests/test_stl_io.c +++ b/tests/test_stl_io.c @@ -333,7 +333,7 @@ static const char* __tstl__test_stl_read_multi_solid( struct gmio_stream stream = gmio_stream_stdio(infile); struct gmio_stl_read_options roptions = {0}; struct gmio_stl_mesh_creator null_creator = {0}; - roptions.func_stla_get_streamsize = gmio_stla_infos_get_streamsize; + roptions.func_stla_get_streamsize = gmio_stla_infos_probe_streamsize; while (gmio_no_error(error) && !gmio_stream_at_end(&stream)) { error = gmio_stl_read(&stream, &null_creator, &roptions); if (gmio_no_error(error)) @@ -435,8 +435,8 @@ static void generate_stlb_tests_models() struct gmio_stream istream = gmio_stream_stdio(infile); struct gmio_stream ostream = gmio_stream_stdio(outfile); struct gmio_stl_read_options ropts = {0}; - ropts.func_stla_get_streamsize = gmio_stla_infos_get_streamsize; - while (gmio_no_error(read_error) && !gmio_stream_at_end(&istream)) { + ropts.func_stla_get_streamsize = gmio_stla_infos_probe_streamsize; + while (gmio_no_error(read_error)) { struct gmio_stl_data data = {0}; struct gmio_stl_mesh_creator creator = gmio_stl_data_mesh_creator(&data); struct gmio_stl_mesh mesh = {0}; From 1bc3a98c5c5677294ce80cc7dd3b912924525431 Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Wed, 13 Jul 2016 12:30:30 +0200 Subject: [PATCH 03/81] gmio_stl: add "overload" function gmio_stl_infos_probe_file() GitHub issue #4 --- benchmarks/benchmark_gmio/main.c | 64 +++++++++++++------------------- examples/stl_get_infos.c | 25 +++++-------- src/gmio_stl/stl_global.h | 1 + src/gmio_stl/stl_infos.c | 16 ++++++++ src/gmio_stl/stl_infos.h | 18 +++++++++ 5 files changed, 70 insertions(+), 54 deletions(-) diff --git a/benchmarks/benchmark_gmio/main.c b/benchmarks/benchmark_gmio/main.c index 178343b..e10afec 100644 --- a/benchmarks/benchmark_gmio/main.c +++ b/benchmarks/benchmark_gmio/main.c @@ -232,53 +232,41 @@ static void bmk_gmio_stl_readwrite_conv(const void* filepath) void bmk_gmio_stl_infos_probe_all(const void* filepath) { static bool already_exec = false; - FILE* file = fopen(filepath, "rb"); + const char* cfilepath = (const char*)filepath; + struct gmio_stl_infos infos = {0}; - if (file != NULL) { - struct gmio_stream stream = gmio_stream_stdio(file); - struct gmio_stl_infos infos = {0}; - gmio_stl_infos_probe(&infos, &stream, GMIO_STL_INFO_FLAG_ALL, NULL); - - if (!already_exec) { - printf("stl_infos_probe(ALL)\n" - " File: %s\n" - " Size: %uKo\n" - " Facets: %u\n", - (const char*)filepath, - infos.size / 1024, - infos.facet_count); - if (infos.format == GMIO_STL_FORMAT_ASCII) - printf(" [STLA]Solid name: %s\n", infos.stla_solidname); - else if (infos.format & GMIO_STL_FORMAT_TAG_BINARY) - printf(" [STLB]Header: %80.80s\n", infos.stlb_header.data); - } - already_exec = true; + gmio_stl_infos_probe_file(&infos, cfilepath, GMIO_STL_INFO_FLAG_ALL, NULL); + if (!already_exec) { + printf("stl_infos_probe(ALL)\n" + " File: %s\n" + " Size: %uKo\n" + " Facets: %u\n", + cfilepath, + infos.size / 1024, + infos.facet_count); + if (infos.format == GMIO_STL_FORMAT_ASCII) + printf(" [STLA]Solid name: %s\n", infos.stla_solidname); + else if (infos.format & GMIO_STL_FORMAT_TAG_BINARY) + printf(" [STLB]Header: %80.80s\n", infos.stlb_header.data); } - - fclose(file); + already_exec = true; } void bmk_gmio_stl_infos_probe_size(const void* filepath) { static bool already_exec = false; - FILE* file = fopen(filepath, "rb"); + const char* cfilepath = (const char*)filepath; + struct gmio_stl_infos infos = {0}; - if (file != NULL) { - struct gmio_stream stream = gmio_stream_stdio(file); - struct gmio_stl_infos infos = {0}; - gmio_stl_infos_probe(&infos, &stream, GMIO_STL_INFO_FLAG_SIZE, NULL); - - if (!already_exec) { - printf("stl_infos_probe(SIZE)\n" - " File: %s\n" - " Size: %uKo\n", - (const char*)filepath, - infos.size / 1024); - } - already_exec = true; + gmio_stl_infos_probe_file(&infos, cfilepath, GMIO_STL_INFO_FLAG_SIZE, NULL); + if (!already_exec) { + printf("stl_infos_probe(SIZE)\n" + " File: %s\n" + " Size: %uKo\n", + cfilepath, + infos.size / 1024); } - - fclose(file); + already_exec = true; } int main(int argc, char** argv) diff --git a/examples/stl_get_infos.c b/examples/stl_get_infos.c index 618caf8..818a6ee 100644 --- a/examples/stl_get_infos.c +++ b/examples/stl_get_infos.c @@ -47,22 +47,15 @@ int main(int argc, char** argv) int error = 0; if (argc > 1) { const char* filepath = argv[1]; - FILE* file = fopen(filepath, "rb"); - - if (file != NULL) { - struct gmio_stream stream = gmio_stream_stdio(file); - struct gmio_stl_infos infos = {0}; - /* Retrieve STL informations, using default options(NULL) */ - error = gmio_stl_infos_probe( - &infos, &stream, GMIO_STL_INFO_FLAG_ALL, NULL); - printf("File: %s\n", filepath); - if (error == GMIO_ERROR_OK) - print_stl_infos(&infos); - else - fprintf(stderr, "gmio error: 0x%X\n", error); - - fclose(file); - } + struct gmio_stl_infos infos = {0}; + /* Retrieve STL informations, using default options(NULL) */ + const int error = gmio_stl_infos_probe_file( + &infos, filepath, GMIO_STL_INFO_FLAG_ALL, NULL); + printf("File: %s\n", filepath); + if (error == GMIO_ERROR_OK) + print_stl_infos(&infos); + else + fprintf(stderr, "gmio error: 0x%X\n", error); } return error; } diff --git a/src/gmio_stl/stl_global.h b/src/gmio_stl/stl_global.h index 3b8bfd5..788bfa3 100644 --- a/src/gmio_stl/stl_global.h +++ b/src/gmio_stl/stl_global.h @@ -81,6 +81,7 @@ * * Infos on contents * gmio_stl_infos_probe()
+ * gmio_stl_infos_probe_file()
* gmio_stla_infos_probe_streamsize() * gmio_stl_infos
* gmio_stl_infos_probe_options diff --git a/src/gmio_stl/stl_infos.c b/src/gmio_stl/stl_infos.c index 228addd..3dfdeb0 100644 --- a/src/gmio_stl/stl_infos.c +++ b/src/gmio_stl/stl_infos.c @@ -88,6 +88,22 @@ label_end: return error; } +int gmio_stl_infos_probe_file( + struct gmio_stl_infos *infos, + const char *filepath, + unsigned flags, + const struct gmio_stl_infos_probe_options *options) +{ + FILE* file = fopen(filepath, "rb"); + if (file != NULL) { + struct gmio_stream stream = gmio_stream_stdio(file); + const int error = gmio_stl_infos_probe(infos, &stream, flags, options); + fclose(file); + return error; + } + return GMIO_ERROR_STDIO; +} + gmio_streamsize_t gmio_stla_infos_probe_streamsize( struct gmio_stream *stream, struct gmio_memblock *stream_memblock) { diff --git a/src/gmio_stl/stl_infos.h b/src/gmio_stl/stl_infos.h index a258f61..5f6d9bb 100644 --- a/src/gmio_stl/stl_infos.h +++ b/src/gmio_stl/stl_infos.h @@ -139,6 +139,24 @@ GMIO_API int gmio_stl_infos_probe( unsigned flags, const struct gmio_stl_infos_probe_options* options); +/*! Finds informations about STL contents from a file + * + * This is just a facility function over gmio_stl_infos_probe(). The internal + * object is created to read file at \p filepath. + * + * \pre infos != NULL + * \pre filepath != \c NULL \n + * The file is opened with \c fopen() so \p filepath shall follow the file + * name specifications of the running environment + * + * \sa gmio_stl_infos_probe(), gmio_stream_stdio(FILE*) + */ +GMIO_API int gmio_stl_infos_probe_file( + struct gmio_stl_infos* infos, + const char* filepath, + unsigned flags, + const struct gmio_stl_infos_probe_options* options); + /*! Returns the size(in bytes) of the next STL ascii solid in \p stream * * It is a facade over gmio_stl_infos_probe() for gmio_stl_infos::size only From ec5ea263d419ac8a5497298ea860731e6528377a Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Mon, 25 Jul 2016 12:26:46 +0200 Subject: [PATCH 04/81] gmio_core: function gmio_stringstream_default_func_read() cannot be "inline" --- src/gmio_core/internal/stringstream.c | 7 +++++++ src/gmio_core/internal/stringstream.h | 10 +--------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/gmio_core/internal/stringstream.c b/src/gmio_core/internal/stringstream.c index ebfd3ba..9064ea6 100644 --- a/src/gmio_core/internal/stringstream.c +++ b/src/gmio_core/internal/stringstream.c @@ -53,6 +53,13 @@ void gmio_stringstream_init_pos(struct gmio_stringstream *sstream) gmio_stringstream_next_char(sstream); } +size_t gmio_stringstream_default_func_read( + void* cookie, struct gmio_stream* stream, char* ptr, size_t len) +{ + GMIO_UNUSED(cookie); + return gmio_stream_read(stream, ptr, 1, len); +} + enum gmio_eat_word_error gmio_stringstream_eat_word( struct gmio_stringstream *sstream, struct gmio_string *str) diff --git a/src/gmio_core/internal/stringstream.h b/src/gmio_core/internal/stringstream.h index b5901cf..dd9b8d4 100644 --- a/src/gmio_core/internal/stringstream.h +++ b/src/gmio_core/internal/stringstream.h @@ -73,7 +73,7 @@ struct gmio_stringstream gmio_stringstream( void gmio_stringstream_init_pos(struct gmio_stringstream* sstream); /*! Default function for gmio_stringstream::func_stream_read */ -GMIO_INLINE size_t gmio_stringstream_default_func_read( +size_t gmio_stringstream_default_func_read( void* cookie, struct gmio_stream* stream, char* ptr, size_t len); /*! Returns the char where the iterator is currently pointing at */ @@ -144,7 +144,6 @@ GMIO_INLINE float gmio_to_float32(const char* str); */ #include "c99_stdlib_compat.h" -#include "helper_stream.h" #include "string_ascii_utils.h" #if GMIO_STR2FLOAT_LIB == GMIO_STR2FLOAT_LIB_IRRLICHT # include "fast_atof.h" @@ -163,13 +162,6 @@ const char* gmio_stringstream_current_char( NULL; } -size_t gmio_stringstream_default_func_read( - void* cookie, struct gmio_stream* stream, char* ptr, size_t len) -{ - GMIO_UNUSED(cookie); - return gmio_stream_read(stream, ptr, 1, len); -} - const char *gmio_stringstream_next_char(struct gmio_stringstream *sstream) { ++(sstream->strbuff_at); From 1168ef04edb9614c085954eb0a225188a18385ca Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Thu, 27 Oct 2016 17:42:24 +0200 Subject: [PATCH 05/81] gmio_core,stl: refactor basic error checking --- src/gmio_core/internal/error_check.c | 50 +++++++++++++++++++ src/gmio_core/internal/error_check.h | 42 ++++++++++++++++ .../{stl_rw_common.c => stl_error_check.c} | 19 +------ .../{stl_rw_common.h => stl_error_check.h} | 16 ++---- src/gmio_stl/internal/stla_infos_probe.c | 4 +- src/gmio_stl/internal/stla_write.c | 3 +- src/gmio_stl/internal/stlb_write.c | 3 +- src/gmio_stl/stla_read.c | 2 +- src/gmio_stl/stlb_read.c | 3 +- tests/CMakeLists.txt | 3 +- tests/main_test_core.c | 1 + tests/main_test_stl.c | 2 +- tests/test_core_internal.c | 42 ++++++++++++++++ tests/test_stl_internal.c | 43 +--------------- 14 files changed, 154 insertions(+), 79 deletions(-) create mode 100644 src/gmio_core/internal/error_check.c create mode 100644 src/gmio_core/internal/error_check.h rename src/gmio_stl/internal/{stl_rw_common.c => stl_error_check.c} (80%) rename src/gmio_stl/internal/{stl_rw_common.h => stl_error_check.h} (84%) diff --git a/src/gmio_core/internal/error_check.c b/src/gmio_core/internal/error_check.c new file mode 100644 index 0000000..d3db92e --- /dev/null +++ b/src/gmio_core/internal/error_check.c @@ -0,0 +1,50 @@ +/**************************************************************************** +** Copyright (c) 2016, Fougue Ltd. +** All rights reserved. +** +** Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions +** are met: +** +** 1. Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** +** 2. Redistributions in binary form must reproduce the above +** copyright notice, this list of conditions and the following +** disclaimer in the documentation and/or other materials provided +** with the distribution. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +****************************************************************************/ + +#include "error_check.h" + +#include "../error.h" +#include "../memblock.h" + +bool gmio_check_memblock(int *error, const struct gmio_memblock* mblock) +{ + if (mblock == NULL || mblock->ptr == NULL) + *error = GMIO_ERROR_NULL_MEMBLOCK; + else if (mblock->size == 0) + *error = GMIO_ERROR_INVALID_MEMBLOCK_SIZE; + return gmio_no_error(*error); +} + +bool gmio_check_memblock_size( + int *error, const struct gmio_memblock *mblock, size_t minsize) +{ + if (gmio_check_memblock(error, mblock) && mblock->size < minsize) + *error = GMIO_ERROR_INVALID_MEMBLOCK_SIZE; + return gmio_no_error(*error); +} diff --git a/src/gmio_core/internal/error_check.h b/src/gmio_core/internal/error_check.h new file mode 100644 index 0000000..4d7ef52 --- /dev/null +++ b/src/gmio_core/internal/error_check.h @@ -0,0 +1,42 @@ +/**************************************************************************** +** Copyright (c) 2016, Fougue Ltd. +** All rights reserved. +** +** Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions +** are met: +** +** 1. Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** +** 2. Redistributions in binary form must reproduce the above +** copyright notice, this list of conditions and the following +** disclaimer in the documentation and/or other materials provided +** with the distribution. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +****************************************************************************/ + +#ifndef GMIO_INTERNAL_ERROR_CHECK_H +#define GMIO_INTERNAL_ERROR_CHECK_H + +#include "../global.h" +#include +struct gmio_memblock; + +bool gmio_check_memblock( + int* error, const struct gmio_memblock* mblock); +bool gmio_check_memblock_size( + int* error, const struct gmio_memblock* mblock, size_t minsize); + +#endif /* GMIO_INTERNAL_ERROR_CHECK_H */ diff --git a/src/gmio_stl/internal/stl_rw_common.c b/src/gmio_stl/internal/stl_error_check.c similarity index 80% rename from src/gmio_stl/internal/stl_rw_common.c rename to src/gmio_stl/internal/stl_error_check.c index bc7367d..ea2db7b 100644 --- a/src/gmio_stl/internal/stl_rw_common.c +++ b/src/gmio_stl/internal/stl_error_check.c @@ -27,29 +27,12 @@ ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ****************************************************************************/ -#include "stl_rw_common.h" +#include "stl_error_check.h" #include "../../gmio_core/error.h" #include "../stl_error.h" #include "../stl_io.h" -bool gmio_check_memblock(int *error, const struct gmio_memblock* mblock) -{ - if (mblock == NULL || mblock->ptr == NULL) - *error = GMIO_ERROR_NULL_MEMBLOCK; - else if (mblock->size == 0) - *error = GMIO_ERROR_INVALID_MEMBLOCK_SIZE; - return gmio_no_error(*error); -} - -bool gmio_check_memblock_size( - int *error, const struct gmio_memblock *mblock, size_t minsize) -{ - if (gmio_check_memblock(error, mblock) && mblock->size < minsize) - *error = GMIO_ERROR_INVALID_MEMBLOCK_SIZE; - return gmio_no_error(*error); -} - bool gmio_stl_check_mesh(int *error, const struct gmio_stl_mesh* mesh) { if (mesh == NULL diff --git a/src/gmio_stl/internal/stl_rw_common.h b/src/gmio_stl/internal/stl_error_check.h similarity index 84% rename from src/gmio_stl/internal/stl_rw_common.h rename to src/gmio_stl/internal/stl_error_check.h index cbf44f1..6eefae9 100644 --- a/src/gmio_stl/internal/stl_rw_common.h +++ b/src/gmio_stl/internal/stl_error_check.h @@ -29,26 +29,16 @@ /* TODO : documentation */ -#ifndef GMIO_INTERNAL_STL_RW_COMMON_H -#define GMIO_INTERNAL_STL_RW_COMMON_H - -#include "stl_funptr_typedefs.h" +#ifndef GMIO_INTERNAL_STL_ERROR_CHECK_H +#define GMIO_INTERNAL_STL_ERROR_CHECK_H #include "../../gmio_core/global.h" #include "../../gmio_core/endian.h" -struct gmio_memblock; struct gmio_stl_mesh; -bool gmio_check_memblock(int* error, const struct gmio_memblock* mblock); - -bool gmio_check_memblock_size( - int* error, const struct gmio_memblock* mblock, size_t minsize); - bool gmio_stl_check_mesh(int* error, const struct gmio_stl_mesh* mesh); - bool gmio_stla_check_float32_precision(int* error, uint8_t prec); - bool gmio_stlb_check_byteorder(int* error, enum gmio_endianness byte_order); -#endif /* GMIO_INTERNAL_STLB_RW_COMMON_H */ +#endif /* GMIO_INTERNAL_STL_ERROR_CHECK_H */ diff --git a/src/gmio_stl/internal/stla_infos_probe.c b/src/gmio_stl/internal/stla_infos_probe.c index e37fa43..00440db 100644 --- a/src/gmio_stl/internal/stla_infos_probe.c +++ b/src/gmio_stl/internal/stla_infos_probe.c @@ -30,12 +30,14 @@ #include "stla_infos_probe.h" #include "../../gmio_core/error.h" +#include "../../gmio_core/internal/error_check.h" +#include "../../gmio_core/internal/helper_stream.h" #include "../../gmio_core/internal/helper_memblock.h" #include "../../gmio_core/internal/min_max.h" #include "../../gmio_core/internal/stringstream.h" #include "../stl_error.h" #include "stla_parsing.h" -#include "stl_rw_common.h" +#include "stl_error_check.h" #include diff --git a/src/gmio_stl/internal/stla_write.c b/src/gmio_stl/internal/stla_write.c index a83a0aa..59ec59e 100644 --- a/src/gmio_stl/internal/stla_write.c +++ b/src/gmio_stl/internal/stla_write.c @@ -30,12 +30,13 @@ #include "stla_write.h" #include "stl_funptr_typedefs.h" -#include "stl_rw_common.h" +#include "stl_error_check.h" #include "../stl_error.h" #include "../../gmio_core/error.h" #include "../../gmio_core/task_iface.h" #include "../../gmio_core/text_format.h" +#include "../../gmio_core/internal/error_check.h" #include "../../gmio_core/internal/helper_memblock.h" #include "../../gmio_core/internal/helper_stream.h" #include "../../gmio_core/internal/helper_task_iface.h" diff --git a/src/gmio_stl/internal/stlb_write.c b/src/gmio_stl/internal/stlb_write.c index f2635e8..64cde63 100644 --- a/src/gmio_stl/internal/stlb_write.c +++ b/src/gmio_stl/internal/stlb_write.c @@ -30,7 +30,7 @@ #include "stlb_write.h" #include "stl_funptr_typedefs.h" -#include "stl_rw_common.h" +#include "stl_error_check.h" #include "stlb_byte_swap.h" #include "../stl_error.h" #include "../stl_io.h" @@ -38,6 +38,7 @@ #include "../../gmio_core/error.h" #include "../../gmio_core/internal/byte_codec.h" +#include "../../gmio_core/internal/error_check.h" #include "../../gmio_core/internal/helper_memblock.h" #include "../../gmio_core/internal/helper_task_iface.h" #include "../../gmio_core/internal/min_max.h" diff --git a/src/gmio_stl/stla_read.c b/src/gmio_stl/stla_read.c index b696436..bb8cfff 100644 --- a/src/gmio_stl/stla_read.c +++ b/src/gmio_stl/stla_read.c @@ -32,7 +32,7 @@ #include "stl_error.h" #include "internal/helper_stl_mesh_creator.h" #include "internal/stl_funptr_typedefs.h" -#include "internal/stl_rw_common.h" +#include "internal/stl_error_check.h" #include "internal/stla_parsing.h" #include "../gmio_core/error.h" diff --git a/src/gmio_stl/stlb_read.c b/src/gmio_stl/stlb_read.c index 44b709a..b71fcc4 100644 --- a/src/gmio_stl/stlb_read.c +++ b/src/gmio_stl/stlb_read.c @@ -32,13 +32,14 @@ #include "stl_error.h" #include "internal/helper_stl_mesh_creator.h" #include "internal/stl_funptr_typedefs.h" -#include "internal/stl_rw_common.h" +#include "internal/stl_error_check.h" #include "internal/stlb_byte_swap.h" #include "../gmio_core/endian.h" #include "../gmio_core/error.h" #include "../gmio_core/internal/byte_swap.h" #include "../gmio_core/internal/convert.h" +#include "../gmio_core/internal/error_check.h" #include "../gmio_core/internal/helper_memblock.h" #include "../gmio_core/internal/helper_stream.h" #include "../gmio_core/internal/helper_task_iface.h" diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 4651296..9518771 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -50,6 +50,7 @@ if(GMIO_BUILD_SHARED_LIBS) # exports all symbols) set(GMIO_TEST_CORE_SRC ${GMIO_TEST_CORE_SRC} + ../src/gmio_core/internal/error_check.c ../src/gmio_core/internal/locale_utils.c ../src/gmio_core/internal/numeric_utils.c ../src/gmio_core/internal/stringstream.c) @@ -72,7 +73,7 @@ if(GMIO_BUILD_SHARED_LIBS) ${GMIO_TEST_STL_SRC} ../src/gmio_core/internal/locale_utils.c ../src/gmio_core/internal/numeric_utils.c - ../src/gmio_stl/internal/stl_rw_common.c) + ../src/gmio_stl/internal/stl_error_check.c) endif() add_executable(test_stl EXCLUDE_FROM_ALL ${GMIO_TEST_STL_SRC}) diff --git a/tests/main_test_core.c b/tests/main_test_core.c index 96333d6..c6339dc 100644 --- a/tests/main_test_core.c +++ b/tests/main_test_core.c @@ -50,6 +50,7 @@ const char* all_tests() UTEST_RUN(test_internal__byte_codec); UTEST_RUN(test_internal__fast_atof); UTEST_RUN(test_internal__locale_utils); + UTEST_RUN(test_internal__error_check); UTEST_RUN(test_internal__safe_cast); UTEST_RUN(test_internal__stringstream); UTEST_RUN(test_internal__string_ascii_utils); diff --git a/tests/main_test_stl.c b/tests/main_test_stl.c index af87ca7..aed68f2 100644 --- a/tests/main_test_stl.c +++ b/tests/main_test_stl.c @@ -58,7 +58,7 @@ const char* all_tests() UTEST_RUN(test_stl_triangle_packing); UTEST_RUN(test_stl_triangle_compute_normal); - UTEST_RUN(test_stl_internal__rw_common); + UTEST_RUN(test_stl_internal__error_check); UTEST_RUN(test_stl_infos); diff --git a/tests/test_core_internal.c b/tests/test_core_internal.c index 339af55..6298436 100644 --- a/tests/test_core_internal.c +++ b/tests/test_core_internal.c @@ -35,6 +35,7 @@ #include "../src/gmio_core/internal/byte_codec.h" #include "../src/gmio_core/internal/byte_swap.h" #include "../src/gmio_core/internal/convert.h" +#include "../src/gmio_core/internal/error_check.h" #include "../src/gmio_core/internal/fast_atof.h" #include "../src/gmio_core/internal/locale_utils.h" #include "../src/gmio_core/internal/numeric_utils.h" @@ -382,3 +383,44 @@ static const char* test_internal__locale_utils() gmio_lc_numeric_restore(); return error_str; } + +static const char* test_internal__error_check() +{ + /* gmio_check_memblock() */ + { + int error = GMIO_ERROR_OK; + uint8_t buff[128] = {0}; + struct gmio_memblock mblock = {0}; + + UTEST_ASSERT(!gmio_check_memblock(&error, NULL)); + UTEST_ASSERT(error == GMIO_ERROR_NULL_MEMBLOCK); + + UTEST_ASSERT(!gmio_check_memblock(&error, &mblock)); + UTEST_ASSERT(error == GMIO_ERROR_NULL_MEMBLOCK); + + mblock = gmio_memblock(buff, 0, NULL); + UTEST_ASSERT(!gmio_check_memblock(&error, &mblock)); + UTEST_ASSERT(error == GMIO_ERROR_INVALID_MEMBLOCK_SIZE); + + /* Verify that gmio_check_memblock() doesn't touch error when in case of + * success */ + mblock = gmio_memblock(buff, sizeof(buff), NULL); + UTEST_ASSERT(!gmio_check_memblock(&error, &mblock)); + UTEST_ASSERT(error == GMIO_ERROR_INVALID_MEMBLOCK_SIZE); + + error = GMIO_ERROR_OK; + UTEST_ASSERT(gmio_check_memblock(&error, &mblock)); + UTEST_ASSERT(error == GMIO_ERROR_OK); + } + + /* gmio_check_memblock_size() */ + { + uint8_t buff[128] = {0}; + struct gmio_memblock mblock = gmio_memblock(buff, sizeof(buff), NULL); + int error = GMIO_ERROR_OK; + UTEST_ASSERT(!gmio_check_memblock_size(&error, &mblock, 2*sizeof(buff))); + UTEST_ASSERT(error == GMIO_ERROR_INVALID_MEMBLOCK_SIZE); + } + + return NULL; +} diff --git a/tests/test_stl_internal.c b/tests/test_stl_internal.c index 8d92e24..471fb4b 100644 --- a/tests/test_stl_internal.c +++ b/tests/test_stl_internal.c @@ -32,53 +32,14 @@ #include "stl_utils.h" #include "../src/gmio_core/error.h" -#include "../src/gmio_stl/internal/stl_rw_common.h" +#include "../src/gmio_stl/internal/stl_error_check.h" #include "../src/gmio_stl/stl_error.h" #include "../src/gmio_stl/stl_io.h" #include -static const char* test_stl_internal__rw_common() +static const char* test_stl_internal__error_check() { - /* gmio_check_memblock() */ - { - int error = GMIO_ERROR_OK; - uint8_t buff[128] = {0}; - struct gmio_memblock mblock = {0}; - - UTEST_ASSERT(!gmio_check_memblock(&error, NULL)); - UTEST_ASSERT(error == GMIO_ERROR_NULL_MEMBLOCK); - - UTEST_ASSERT(!gmio_check_memblock(&error, &mblock)); - UTEST_ASSERT(error == GMIO_ERROR_NULL_MEMBLOCK); - - mblock = gmio_memblock(buff, 0, NULL); - UTEST_ASSERT(!gmio_check_memblock(&error, &mblock)); - UTEST_ASSERT(error == GMIO_ERROR_INVALID_MEMBLOCK_SIZE); - - /* Verify that gmio_check_memblock() doesn't touch error when in case of - * success */ - mblock = gmio_memblock(buff, sizeof(buff), NULL); - UTEST_ASSERT(!gmio_check_memblock(&error, &mblock)); - UTEST_ASSERT(error == GMIO_ERROR_INVALID_MEMBLOCK_SIZE); - - error = GMIO_ERROR_OK; - UTEST_ASSERT(gmio_check_memblock(&error, &mblock)); - UTEST_ASSERT(error == GMIO_ERROR_OK); - } - - /* gmio_check_memblock_size() */ - { - uint8_t buff[1024] = {0}; - struct gmio_memblock mblock = - gmio_memblock(buff, GMIO_STLB_MIN_CONTENTS_SIZE / 2, NULL); - int error = GMIO_ERROR_OK; - - UTEST_ASSERT(!gmio_check_memblock_size( - &error, &mblock, GMIO_STLB_MIN_CONTENTS_SIZE)); - UTEST_ASSERT(error == GMIO_ERROR_INVALID_MEMBLOCK_SIZE); - } - /* gmio_stl_check_mesh() */ { int error = GMIO_ERROR_OK; From 07d7dd75be45b2e98d6d73fd560ac9672f3ee3c5 Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Wed, 2 Nov 2016 11:53:48 +0100 Subject: [PATCH 06/81] gmio_core: move gmio_check_lc_numeric() into internal/error_check.h --- src/gmio_core/internal/error_check.c | 8 ++++++++ src/gmio_core/internal/error_check.h | 4 ++++ src/gmio_core/internal/locale_utils.c | 7 ------- src/gmio_core/internal/locale_utils.h | 4 ---- src/gmio_stl/internal/stla_write.c | 1 - src/gmio_stl/stla_read.c | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/gmio_core/internal/error_check.c b/src/gmio_core/internal/error_check.c index d3db92e..5969ec5 100644 --- a/src/gmio_core/internal/error_check.c +++ b/src/gmio_core/internal/error_check.c @@ -29,6 +29,7 @@ #include "error_check.h" +#include "locale_utils.h" #include "../error.h" #include "../memblock.h" @@ -48,3 +49,10 @@ bool gmio_check_memblock_size( *error = GMIO_ERROR_INVALID_MEMBLOCK_SIZE; return gmio_no_error(*error); } + +bool gmio_check_lc_numeric(int *error) +{ + if (!gmio_lc_numeric_is_C()) + *error = GMIO_ERROR_BAD_LC_NUMERIC; + return gmio_no_error(*error); +} diff --git a/src/gmio_core/internal/error_check.h b/src/gmio_core/internal/error_check.h index 4d7ef52..adf0025 100644 --- a/src/gmio_core/internal/error_check.h +++ b/src/gmio_core/internal/error_check.h @@ -39,4 +39,8 @@ bool gmio_check_memblock( bool gmio_check_memblock_size( int* error, const struct gmio_memblock* mblock, size_t minsize); +/*! Checks gmio_lc_numeric_is_C(), if false sets \p *error to + * \c GMIO_ERROR_BAD_LC_NUMERIC*/ +bool gmio_check_lc_numeric(int* error); + #endif /* GMIO_INTERNAL_ERROR_CHECK_H */ diff --git a/src/gmio_core/internal/locale_utils.c b/src/gmio_core/internal/locale_utils.c index b77ed76..40bc8d1 100644 --- a/src/gmio_core/internal/locale_utils.c +++ b/src/gmio_core/internal/locale_utils.c @@ -49,13 +49,6 @@ bool gmio_lc_numeric_is_C() || gmio_ascii_stricmp(lc, "POSIX") == 0); } -bool gmio_check_lc_numeric(int *error) -{ - if (!gmio_lc_numeric_is_C()) - *error = GMIO_ERROR_BAD_LC_NUMERIC; - return gmio_no_error(*error); -} - static char global_lc_numeric[64] = {0}; void gmio_lc_numeric_save() diff --git a/src/gmio_core/internal/locale_utils.h b/src/gmio_core/internal/locale_utils.h index fd27838..f797f5d 100644 --- a/src/gmio_core/internal/locale_utils.h +++ b/src/gmio_core/internal/locale_utils.h @@ -34,9 +34,5 @@ const char* gmio_lc_numeric(); /*! Returns result of case-insensitive test LC_NUMERIC == "C|POSIX" */ bool gmio_lc_numeric_is_C(); -/*! Checks gmio_lc_numeric_is_C(), if false sets \p *error to - * \c GMIO_ERROR_BAD_LC_NUMERIC*/ -bool gmio_check_lc_numeric(int* error); - void gmio_lc_numeric_save(); void gmio_lc_numeric_restore(); diff --git a/src/gmio_stl/internal/stla_write.c b/src/gmio_stl/internal/stla_write.c index 59ec59e..bd5add7 100644 --- a/src/gmio_stl/internal/stla_write.c +++ b/src/gmio_stl/internal/stla_write.c @@ -40,7 +40,6 @@ #include "../../gmio_core/internal/helper_memblock.h" #include "../../gmio_core/internal/helper_stream.h" #include "../../gmio_core/internal/helper_task_iface.h" -#include "../../gmio_core/internal/locale_utils.h" #include "../../gmio_core/internal/min_max.h" #include "../../gmio_core/internal/safe_cast.h" diff --git a/src/gmio_stl/stla_read.c b/src/gmio_stl/stla_read.c index bb8cfff..38448ad 100644 --- a/src/gmio_stl/stla_read.c +++ b/src/gmio_stl/stla_read.c @@ -37,10 +37,10 @@ #include "../gmio_core/error.h" #include "../gmio_core/internal/c99_stdio_compat.h" +#include "../gmio_core/internal/error_check.h" #include "../gmio_core/internal/helper_memblock.h" #include "../gmio_core/internal/helper_stream.h" #include "../gmio_core/internal/helper_task_iface.h" -#include "../gmio_core/internal/locale_utils.h" #include "../gmio_core/internal/min_max.h" #include "../gmio_core/internal/safe_cast.h" #include "../gmio_core/internal/stringstream.h" From 4a10787a0d1cd3a6a62c2f4259bc571105814747 Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Mon, 28 Nov 2016 10:35:16 +0100 Subject: [PATCH 07/81] gmio_stl: simplify a bit by internally forcing non NULL read/write options --- src/gmio_stl/internal/stla_write.c | 60 ++++++++++++++---------------- src/gmio_stl/internal/stlb_write.c | 13 ++++--- src/gmio_stl/stla_read.c | 16 +++++--- 3 files changed, 45 insertions(+), 44 deletions(-) diff --git a/src/gmio_stl/internal/stla_write.c b/src/gmio_stl/internal/stla_write.c index bd5add7..9dabe48 100644 --- a/src/gmio_stl/internal/stla_write.c +++ b/src/gmio_stl/internal/stla_write.c @@ -195,8 +195,7 @@ int gmio_stla_write( const struct gmio_stl_write_options* opts) { /* Constants */ - const bool check_lcnum = - opts != NULL ? !opts->stla_dont_check_lc_numeric : true; + static const struct gmio_stl_write_options default_opts = {0}; const struct gmio_task_iface* task = opts != NULL ? &opts->task_iface : NULL; struct gmio_memblock_helper mblock_helper = gmio_memblock_helper(opts != NULL ? &opts->stream_memblock : NULL); @@ -204,10 +203,6 @@ int gmio_stla_write( const uint32_t total_facet_count = mesh != NULL ? mesh->triangle_count : 0; const uint32_t buffer_facet_count = gmio_size_to_uint32(mblock_size / GMIO_STLA_FACET_SIZE_P2); - const char* opt_solid_name = opts != NULL ? opts->stla_solid_name : NULL; - const char* solid_name = opt_solid_name != NULL ? opt_solid_name : ""; - const bool write_triangles_only = - opts != NULL ? opts->stl_write_triangles_only : false; /* Variables */ struct gmio_memblock* const mblock = &mblock_helper.memblock; @@ -216,33 +211,30 @@ int gmio_stla_write( int error = GMIO_ERROR_OK; struct gmio_vec3f_text_format vec_txtformat = {0}; - /* Initialize helper data for text formatting of vec3f coords */ - { - const uint8_t opt_f32_prec = - opts != NULL ? opts->stla_float32_prec : 9; - const enum gmio_float_text_format f32_format = - opts != NULL ? - opts->stla_float32_format : - GMIO_FLOAT_TEXT_FORMAT_DECIMAL_LOWERCASE; - vec_txtformat.coord_prec = opt_f32_prec != 0 ? opt_f32_prec : 9; - vec_txtformat.coord_format = f32_format; + /* Make options non NULL */ + opts = opts != NULL ? opts : &default_opts; - /* Create XYZ coords format string (for normal and vertex coords) */ - { - const uint8_t f32_prec = vec_txtformat.coord_prec; - const char f32_spec = gmio_float_text_format_to_specifier(f32_format); - char* buffpos = vec_txtformat.str_printf_format; - buffpos = gmio_write_stdio_format(buffpos, f32_spec, f32_prec); - buffpos = gmio_write_char(buffpos, ' '); - buffpos = gmio_write_stdio_format(buffpos, f32_spec, f32_prec); - buffpos = gmio_write_char(buffpos, ' '); - buffpos = gmio_write_stdio_format(buffpos, f32_spec, f32_prec); - *buffpos = 0; - } + /* Initialize helper data for text formatting of vec3f coords */ + vec_txtformat.coord_prec = + opts->stla_float32_prec != 0 ? opts->stla_float32_prec : 9; + vec_txtformat.coord_format = opts->stla_float32_format; + + /* Create XYZ coords format string (for normal and vertex coords) */ + { + const uint8_t f32_prec = vec_txtformat.coord_prec; + enum gmio_float_text_format f32_format = opts->stla_float32_format; + const char f32_spec = gmio_float_text_format_to_specifier(f32_format); + char* buffpos = vec_txtformat.str_printf_format; + buffpos = gmio_write_stdio_format(buffpos, f32_spec, f32_prec); + buffpos = gmio_write_char(buffpos, ' '); + buffpos = gmio_write_stdio_format(buffpos, f32_spec, f32_prec); + buffpos = gmio_write_char(buffpos, ' '); + buffpos = gmio_write_stdio_format(buffpos, f32_spec, f32_prec); + *buffpos = 0; } /* Check validity of input parameters */ - if (check_lcnum && !gmio_check_lc_numeric(&error)) + if (!opts->stla_dont_check_lc_numeric && !gmio_check_lc_numeric(&error)) goto label_end; if (!gmio_check_memblock_size(&error, mblock, GMIO_STLA_FACET_SIZE_P2)) goto label_end; @@ -252,10 +244,11 @@ int gmio_stla_write( goto label_end; /* Write solid declaration */ - if (!write_triangles_only) { + if (!opts->stl_write_triangles_only) { char* buffpos = mblock_ptr; buffpos = gmio_write_rawstr(buffpos, "solid "); - buffpos = gmio_write_rawstr_eol(buffpos, solid_name); + if (opts->stla_solid_name != NULL) + buffpos = gmio_write_rawstr_eol(buffpos, opts->stla_solid_name); if (!gmio_stream_flush_buffer(stream, mblock_ptr, buffpos)) { error = GMIO_ERROR_STREAM; goto label_end; @@ -306,10 +299,11 @@ int gmio_stla_write( } /* end for (ifacet) */ /* Write end of solid */ - if (gmio_no_error(error) && !write_triangles_only) { + if (gmio_no_error(error) && !opts->stl_write_triangles_only) { char* buffpos = mblock_ptr; buffpos = gmio_write_rawstr(buffpos, "endsolid "); - buffpos = gmio_write_rawstr_eol(buffpos, solid_name); + if (opts->stla_solid_name != NULL) + buffpos = gmio_write_rawstr_eol(buffpos, opts->stla_solid_name); if (!gmio_stream_flush_buffer(stream, mblock_ptr, buffpos)) error = GMIO_ERROR_STREAM; } diff --git a/src/gmio_stl/internal/stlb_write.c b/src/gmio_stl/internal/stlb_write.c index 64cde63..20cc745 100644 --- a/src/gmio_stl/internal/stlb_write.c +++ b/src/gmio_stl/internal/stlb_write.c @@ -107,6 +107,7 @@ int gmio_stlb_write( const struct gmio_stl_write_options* opts) { /* Constants */ + static const struct gmio_stl_write_options default_opts = {0}; const struct gmio_task_iface* task = opts != NULL ? &opts->task_iface : NULL; struct gmio_memblock_helper mblock_helper = gmio_memblock_helper(opts != NULL ? &opts->stream_memblock : NULL); @@ -116,10 +117,6 @@ int gmio_stlb_write( byte_order != GMIO_ENDIANNESS_HOST ? gmio_stlb_encode_facets_byteswap : gmio_stlb_encode_facets; - const bool write_triangles_only = - opts != NULL ? opts->stl_write_triangles_only : false; - const struct gmio_stlb_header* header = - opts != NULL ? &opts->stlb_header : NULL; /* Variables */ uint32_t i_facet = 0; /* Facet counter */ @@ -128,6 +125,9 @@ int gmio_stlb_write( void* const mblock_ptr = mblock_helper.memblock.ptr; int error = GMIO_ERROR_OK; + /* Make options non NULL */ + opts = opts != NULL ? opts : &default_opts; + /* Check validity of input parameters */ if (!gmio_check_memblock(&error, &mblock_helper.memblock)) goto label_end; @@ -136,8 +136,9 @@ int gmio_stlb_write( if (!gmio_stlb_check_byteorder(&error, byte_order)) goto label_end; - if (!write_triangles_only) { - error = gmio_stlb_header_write(stream, byte_order, header, facet_count); + if (!opts->stl_write_triangles_only) { + error = gmio_stlb_header_write( + stream, byte_order, &opts->stlb_header, facet_count); if (gmio_error(error)) goto label_end; } diff --git a/src/gmio_stl/stla_read.c b/src/gmio_stl/stla_read.c index 38448ad..852643c 100644 --- a/src/gmio_stl/stla_read.c +++ b/src/gmio_stl/stla_read.c @@ -129,8 +129,9 @@ int gmio_stla_read( struct gmio_stl_mesh_creator* mesh_creator, const struct gmio_stl_read_options* opts) { - const bool check_lcnum = - opts != NULL ? !opts->stla_dont_check_lc_numeric : true; + /* Constants */ + static const struct gmio_stl_read_options default_opts = {0}; + /* Variables */ struct gmio_memblock_helper mblock_helper = gmio_memblock_helper(opts != NULL ? &opts->stream_memblock : NULL); struct gmio_memblock* const mblock = &mblock_helper.memblock; @@ -138,17 +139,22 @@ int gmio_stla_read( struct gmio_stla_parse_data parse_data; int error = GMIO_ERROR_OK; - if (check_lcnum && !gmio_check_lc_numeric(&error)) + /* Make options non NULL */ + opts = opts != NULL ? opts : &default_opts; + + /* Check validity of input parameters */ + if (!opts->stla_dont_check_lc_numeric && !gmio_check_lc_numeric(&error)) goto label_end; + /* Initialize helper gmio_stla_parse_data object */ parse_data.token = unknown_token; parse_data.error = false; - parse_data.strstream_cookie.task = opts != NULL ? &opts->task_iface : NULL; + parse_data.strstream_cookie.task = &opts->task_iface; parse_data.strstream_cookie.stream_offset = 0; parse_data.strstream_cookie.stream_size = - opts != NULL && opts->func_stla_get_streamsize != NULL ? + opts->func_stla_get_streamsize != NULL ? opts->func_stla_get_streamsize(stream, mblock) : gmio_stream_size(stream); parse_data.strstream_cookie.is_stop_requested = false; From bd7f66504121f89df56a7908c54185b4cdaa549f Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Thu, 1 Dec 2016 09:40:15 +0100 Subject: [PATCH 08/81] 3rdparty: initial import of zlib --- CMakeLists.txt | 1 + src/3rdparty/zlib/CMakeLists.txt | 225 +++ src/3rdparty/zlib/ChangeLog | 1472 ++++++++++++++++ src/3rdparty/zlib/FAQ | 368 ++++ src/3rdparty/zlib/INDEX | 68 + src/3rdparty/zlib/README | 115 ++ src/3rdparty/zlib/adler32.c | 179 ++ src/3rdparty/zlib/compress.c | 80 + src/3rdparty/zlib/crc32.c | 425 +++++ src/3rdparty/zlib/crc32.h | 441 +++++ src/3rdparty/zlib/deflate.c | 1967 ++++++++++++++++++++++ src/3rdparty/zlib/deflate.h | 346 ++++ src/3rdparty/zlib/doc/algorithm.txt | 209 +++ src/3rdparty/zlib/doc/rfc1950.txt | 619 +++++++ src/3rdparty/zlib/doc/rfc1951.txt | 955 +++++++++++ src/3rdparty/zlib/doc/rfc1952.txt | 675 ++++++++ src/3rdparty/zlib/doc/txtvsbin.txt | 107 ++ src/3rdparty/zlib/gzclose.c | 25 + src/3rdparty/zlib/gzguts.h | 209 +++ src/3rdparty/zlib/gzlib.c | 634 +++++++ src/3rdparty/zlib/gzread.c | 594 +++++++ src/3rdparty/zlib/gzwrite.c | 577 +++++++ src/3rdparty/zlib/infback.c | 640 +++++++ src/3rdparty/zlib/inffast.c | 340 ++++ src/3rdparty/zlib/inffast.h | 11 + src/3rdparty/zlib/inffixed.h | 94 ++ src/3rdparty/zlib/inflate.c | 1512 +++++++++++++++++ src/3rdparty/zlib/inflate.h | 122 ++ src/3rdparty/zlib/inftrees.c | 306 ++++ src/3rdparty/zlib/inftrees.h | 62 + src/3rdparty/zlib/treebuild.xml | 116 ++ src/3rdparty/zlib/trees.c | 1226 ++++++++++++++ src/3rdparty/zlib/trees.h | 128 ++ src/3rdparty/zlib/uncompr.c | 59 + src/3rdparty/zlib/win32/DLL_FAQ.txt | 397 +++++ src/3rdparty/zlib/win32/README-WIN32.txt | 103 ++ src/3rdparty/zlib/win32/VisualC.txt | 3 + src/3rdparty/zlib/win32/zlib.def | 86 + src/3rdparty/zlib/win32/zlib1.rc | 40 + src/3rdparty/zlib/zconf.h.cmakein | 513 ++++++ src/3rdparty/zlib/zconf.h.in | 511 ++++++ src/3rdparty/zlib/zconf.h.included | 511 ++++++ src/3rdparty/zlib/zlib.h | 1768 +++++++++++++++++++ src/3rdparty/zlib/zlib.map | 83 + src/3rdparty/zlib/zlib.pc.cmakein | 13 + src/3rdparty/zlib/zlib.pc.in | 13 + src/3rdparty/zlib/zlib2ansi | 152 ++ src/3rdparty/zlib/zutil.c | 324 ++++ src/3rdparty/zlib/zutil.h | 253 +++ src/CMakeLists.txt | 22 +- src/gmio_core/error.h | 26 +- 51 files changed, 19722 insertions(+), 3 deletions(-) create mode 100644 src/3rdparty/zlib/CMakeLists.txt create mode 100644 src/3rdparty/zlib/ChangeLog create mode 100644 src/3rdparty/zlib/FAQ create mode 100644 src/3rdparty/zlib/INDEX create mode 100644 src/3rdparty/zlib/README create mode 100644 src/3rdparty/zlib/adler32.c create mode 100644 src/3rdparty/zlib/compress.c create mode 100644 src/3rdparty/zlib/crc32.c create mode 100644 src/3rdparty/zlib/crc32.h create mode 100644 src/3rdparty/zlib/deflate.c create mode 100644 src/3rdparty/zlib/deflate.h create mode 100644 src/3rdparty/zlib/doc/algorithm.txt create mode 100644 src/3rdparty/zlib/doc/rfc1950.txt create mode 100644 src/3rdparty/zlib/doc/rfc1951.txt create mode 100644 src/3rdparty/zlib/doc/rfc1952.txt create mode 100644 src/3rdparty/zlib/doc/txtvsbin.txt create mode 100644 src/3rdparty/zlib/gzclose.c create mode 100644 src/3rdparty/zlib/gzguts.h create mode 100644 src/3rdparty/zlib/gzlib.c create mode 100644 src/3rdparty/zlib/gzread.c create mode 100644 src/3rdparty/zlib/gzwrite.c create mode 100644 src/3rdparty/zlib/infback.c create mode 100644 src/3rdparty/zlib/inffast.c create mode 100644 src/3rdparty/zlib/inffast.h create mode 100644 src/3rdparty/zlib/inffixed.h create mode 100644 src/3rdparty/zlib/inflate.c create mode 100644 src/3rdparty/zlib/inflate.h create mode 100644 src/3rdparty/zlib/inftrees.c create mode 100644 src/3rdparty/zlib/inftrees.h create mode 100644 src/3rdparty/zlib/treebuild.xml create mode 100644 src/3rdparty/zlib/trees.c create mode 100644 src/3rdparty/zlib/trees.h create mode 100644 src/3rdparty/zlib/uncompr.c create mode 100644 src/3rdparty/zlib/win32/DLL_FAQ.txt create mode 100644 src/3rdparty/zlib/win32/README-WIN32.txt create mode 100644 src/3rdparty/zlib/win32/VisualC.txt create mode 100644 src/3rdparty/zlib/win32/zlib.def create mode 100644 src/3rdparty/zlib/win32/zlib1.rc create mode 100644 src/3rdparty/zlib/zconf.h.cmakein create mode 100644 src/3rdparty/zlib/zconf.h.in create mode 100644 src/3rdparty/zlib/zconf.h.included create mode 100644 src/3rdparty/zlib/zlib.h create mode 100644 src/3rdparty/zlib/zlib.map create mode 100644 src/3rdparty/zlib/zlib.pc.cmakein create mode 100644 src/3rdparty/zlib/zlib.pc.in create mode 100644 src/3rdparty/zlib/zlib2ansi create mode 100644 src/3rdparty/zlib/zutil.c create mode 100644 src/3rdparty/zlib/zutil.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 38d7548..c5eb028 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -75,6 +75,7 @@ option(GMIO_BUILD_TESTS_FAKE_SUPPORT "Build tests/fake_support target" OFF) if(CMAKE_C_COMPILER_IS_GCC_COMPATIBLE) option(GMIO_BUILD_TESTS_COVERAGE "Instrument testing code with code coverage" OFF) endif() +option(GMIO_USE_BUNDLED_ZLIB "Use bundled version of zlib in gmio" ON) # Declare variable GMIO_STR2FLOAT_LIB(library for string-to-float conversion) # - std: diff --git a/src/3rdparty/zlib/CMakeLists.txt b/src/3rdparty/zlib/CMakeLists.txt new file mode 100644 index 0000000..934bd21 --- /dev/null +++ b/src/3rdparty/zlib/CMakeLists.txt @@ -0,0 +1,225 @@ +cmake_minimum_required(VERSION 2.4.4) +set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON) + +project(zlib C) + +set(VERSION "1.2.8") + +option(ASM686 "Enable building i686 assembly implementation") +option(AMD64 "Enable building amd64 assembly implementation") + +set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables") +set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries") +set(INSTALL_INC_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "Installation directory for headers") +set(INSTALL_MAN_DIR "${CMAKE_INSTALL_PREFIX}/share/man" CACHE PATH "Installation directory for manual pages") +set(INSTALL_PKGCONFIG_DIR "${CMAKE_INSTALL_PREFIX}/share/pkgconfig" CACHE PATH "Installation directory for pkgconfig (.pc) files") + +include(CheckTypeSize) +include(CheckFunctionExists) +include(CheckIncludeFile) +include(CheckCSourceCompiles) +enable_testing() + +check_include_file(sys/types.h HAVE_SYS_TYPES_H) +check_include_file(stdint.h HAVE_STDINT_H) +check_include_file(stddef.h HAVE_STDDEF_H) + +# +# Check to see if we have large file support +# +set(CMAKE_REQUIRED_DEFINITIONS -D_LARGEFILE64_SOURCE=1) +# We add these other definitions here because CheckTypeSize.cmake +# in CMake 2.4.x does not automatically do so and we want +# compatibility with CMake 2.4.x. +if(HAVE_SYS_TYPES_H) + list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_SYS_TYPES_H) +endif() +if(HAVE_STDINT_H) + list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_STDINT_H) +endif() +if(HAVE_STDDEF_H) + list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_STDDEF_H) +endif() +check_type_size(off64_t OFF64_T) +if(HAVE_OFF64_T) + add_definitions(-D_LARGEFILE64_SOURCE=1) +endif() +set(CMAKE_REQUIRED_DEFINITIONS) # clear variable + +# +# Check for fseeko +# +check_function_exists(fseeko HAVE_FSEEKO) +if(NOT HAVE_FSEEKO) + add_definitions(-DNO_FSEEKO) +endif() + +# +# Check for unistd.h +# +check_include_file(unistd.h Z_HAVE_UNISTD_H) + +if(MSVC) + set(CMAKE_DEBUG_POSTFIX "d") + add_definitions(-D_CRT_SECURE_NO_DEPRECATE) + add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4127 /wd4131") + include_directories(${CMAKE_CURRENT_SOURCE_DIR}) +endif() + +if(NOT CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR) + # If we're doing an out of source build and the user has a zconf.h + # in their source tree... + if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h) + message(STATUS "Renaming") + message(STATUS " ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h") + message(STATUS "to 'zconf.h.included' because this file is included with zlib") + message(STATUS "but CMake generates it automatically in the build directory.") + file(RENAME ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h.included) + endif() +endif() + +set(ZLIB_PC ${CMAKE_CURRENT_BINARY_DIR}/zlib.pc) +configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/zlib.pc.cmakein + ${ZLIB_PC} @ONLY) +configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h.cmakein + ${CMAKE_CURRENT_BINARY_DIR}/zconf.h @ONLY) +include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}) + + +#============================================================================ +# zlib +#============================================================================ + +set(ZLIB_PUBLIC_HDRS + ${CMAKE_CURRENT_BINARY_DIR}/zconf.h + zlib.h +) +set(ZLIB_PRIVATE_HDRS + crc32.h + deflate.h + gzguts.h + inffast.h + inffixed.h + inflate.h + inftrees.h + trees.h + zutil.h +) +set(ZLIB_SRCS + adler32.c + compress.c + crc32.c + deflate.c + gzclose.c + gzlib.c + gzread.c + gzwrite.c + inflate.c + infback.c + inftrees.c + inffast.c + trees.c + uncompr.c + zutil.c +) + +if(NOT MINGW) + set(ZLIB_DLL_SRCS + win32/zlib1.rc # If present will override custom build rule below. + ) +endif() + +if(CMAKE_COMPILER_IS_GNUCC) + if(ASM686) + set(ZLIB_ASMS contrib/asm686/match.S) + elseif (AMD64) + set(ZLIB_ASMS contrib/amd64/amd64-match.S) + endif () + + if(ZLIB_ASMS) + add_definitions(-DASMV) + set_source_files_properties(${ZLIB_ASMS} PROPERTIES LANGUAGE C COMPILE_FLAGS -DNO_UNDERLINE) + endif() +endif() + +if(MSVC) + if(ASM686) + ENABLE_LANGUAGE(ASM_MASM) + set(ZLIB_ASMS + contrib/masmx86/inffas32.asm + contrib/masmx86/match686.asm + ) + elseif (AMD64) + ENABLE_LANGUAGE(ASM_MASM) + set(ZLIB_ASMS + contrib/masmx64/gvmat64.asm + contrib/masmx64/inffasx64.asm + ) + endif() + + if(ZLIB_ASMS) + add_definitions(-DASMV -DASMINF) + endif() +endif() + +# parse the full version number from zlib.h and include in ZLIB_FULL_VERSION +file(READ ${CMAKE_CURRENT_SOURCE_DIR}/zlib.h _zlib_h_contents) +string(REGEX REPLACE ".*#define[ \t]+ZLIB_VERSION[ \t]+\"([-0-9A-Za-z.]+)\".*" + "\\1" ZLIB_FULL_VERSION ${_zlib_h_contents}) + +if(MINGW) + # This gets us DLL resource information when compiling on MinGW. + if(NOT CMAKE_RC_COMPILER) + set(CMAKE_RC_COMPILER windres.exe) + endif() + + add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj + COMMAND ${CMAKE_RC_COMPILER} + -D GCC_WINDRES + -I ${CMAKE_CURRENT_SOURCE_DIR} + -I ${CMAKE_CURRENT_BINARY_DIR} + -o ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj + -i ${CMAKE_CURRENT_SOURCE_DIR}/win32/zlib1.rc) + set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj) +endif(MINGW) + +add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) +add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) +set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL) +set_target_properties(zlib PROPERTIES SOVERSION 1) + +if(NOT CYGWIN) + # This property causes shared libraries on Linux to have the full version + # encoded into their final filename. We disable this on Cygwin because + # it causes cygz-${ZLIB_FULL_VERSION}.dll to be created when cygz.dll + # seems to be the default. + # + # This has no effect with MSVC, on that platform the version info for + # the DLL comes from the resource file win32/zlib1.rc + set_target_properties(zlib PROPERTIES VERSION ${ZLIB_FULL_VERSION}) +endif() + +if(UNIX) + # On unix-like platforms the library is almost always called libz + set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z) + if(NOT APPLE) + set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"") + endif() +elseif(BUILD_SHARED_LIBS AND WIN32) + # Creates zlib1.dll when building shared library version + set_target_properties(zlib PROPERTIES SUFFIX "1.dll") +endif() + +if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL ) + install(TARGETS zlib zlibstatic + RUNTIME DESTINATION "${INSTALL_BIN_DIR}" + ARCHIVE DESTINATION "${INSTALL_LIB_DIR}" + LIBRARY DESTINATION "${INSTALL_LIB_DIR}" ) +endif() +if(NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL ) + install(FILES ${ZLIB_PUBLIC_HDRS} DESTINATION "${INSTALL_INC_DIR}") +endif() +if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL ) + install(FILES ${ZLIB_PC} DESTINATION "${INSTALL_PKGCONFIG_DIR}") +endif() diff --git a/src/3rdparty/zlib/ChangeLog b/src/3rdparty/zlib/ChangeLog new file mode 100644 index 0000000..f22aaba --- /dev/null +++ b/src/3rdparty/zlib/ChangeLog @@ -0,0 +1,1472 @@ + + ChangeLog file for zlib + +Changes in 1.2.8 (28 Apr 2013) +- Update contrib/minizip/iowin32.c for Windows RT [Vollant] +- Do not force Z_CONST for C++ +- Clean up contrib/vstudio [Ro§] +- Correct spelling error in zlib.h +- Fix mixed line endings in contrib/vstudio + +Changes in 1.2.7.3 (13 Apr 2013) +- Fix version numbers and DLL names in contrib/vstudio/*/zlib.rc + +Changes in 1.2.7.2 (13 Apr 2013) +- Change check for a four-byte type back to hexadecimal +- Fix typo in win32/Makefile.msc +- Add casts in gzwrite.c for pointer differences + +Changes in 1.2.7.1 (24 Mar 2013) +- Replace use of unsafe string functions with snprintf if available +- Avoid including stddef.h on Windows for Z_SOLO compile [Niessink] +- Fix gzgetc undefine when Z_PREFIX set [Turk] +- Eliminate use of mktemp in Makefile (not always available) +- Fix bug in 'F' mode for gzopen() +- Add inflateGetDictionary() function +- Correct comment in deflate.h +- Use _snprintf for snprintf in Microsoft C +- On Darwin, only use /usr/bin/libtool if libtool is not Apple +- Delete "--version" file if created by "ar --version" [Richard G.] +- Fix configure check for veracity of compiler error return codes +- Fix CMake compilation of static lib for MSVC2010 x64 +- Remove unused variable in infback9.c +- Fix argument checks in gzlog_compress() and gzlog_write() +- Clean up the usage of z_const and respect const usage within zlib +- Clean up examples/gzlog.[ch] comparisons of different types +- Avoid shift equal to bits in type (caused endless loop) +- Fix unintialized value bug in gzputc() introduced by const patches +- Fix memory allocation error in examples/zran.c [Nor] +- Fix bug where gzopen(), gzclose() would write an empty file +- Fix bug in gzclose() when gzwrite() runs out of memory +- Check for input buffer malloc failure in examples/gzappend.c +- Add note to contrib/blast to use binary mode in stdio +- Fix comparisons of differently signed integers in contrib/blast +- Check for invalid code length codes in contrib/puff +- Fix serious but very rare decompression bug in inftrees.c +- Update inflateBack() comments, since inflate() can be faster +- Use underscored I/O function names for WINAPI_FAMILY +- Add _tr_flush_bits to the external symbols prefixed by --zprefix +- Add contrib/vstudio/vc10 pre-build step for static only +- Quote --version-script argument in CMakeLists.txt +- Don't specify --version-script on Apple platforms in CMakeLists.txt +- Fix casting error in contrib/testzlib/testzlib.c +- Fix types in contrib/minizip to match result of get_crc_table() +- Simplify contrib/vstudio/vc10 with 'd' suffix +- Add TOP support to win32/Makefile.msc +- Suport i686 and amd64 assembler builds in CMakeLists.txt +- Fix typos in the use of _LARGEFILE64_SOURCE in zconf.h +- Add vc11 and vc12 build files to contrib/vstudio +- Add gzvprintf() as an undocumented function in zlib +- Fix configure for Sun shell +- Remove runtime check in configure for four-byte integer type +- Add casts and consts to ease user conversion to C++ +- Add man pages for minizip and miniunzip +- In Makefile uninstall, don't rm if preceding cd fails +- Do not return Z_BUF_ERROR if deflateParam() has nothing to write + +Changes in 1.2.7 (2 May 2012) +- Replace use of memmove() with a simple copy for portability +- Test for existence of strerror +- Restore gzgetc_ for backward compatibility with 1.2.6 +- Fix build with non-GNU make on Solaris +- Require gcc 4.0 or later on Mac OS X to use the hidden attribute +- Include unistd.h for Watcom C +- Use __WATCOMC__ instead of __WATCOM__ +- Do not use the visibility attribute if NO_VIZ defined +- Improve the detection of no hidden visibility attribute +- Avoid using __int64 for gcc or solo compilation +- Cast to char * in gzprintf to avoid warnings [Zinser] +- Fix make_vms.com for VAX [Zinser] +- Don't use library or built-in byte swaps +- Simplify test and use of gcc hidden attribute +- Fix bug in gzclose_w() when gzwrite() fails to allocate memory +- Add "x" (O_EXCL) and "e" (O_CLOEXEC) modes support to gzopen() +- Fix bug in test/minigzip.c for configure --solo +- Fix contrib/vstudio project link errors [Mohanathas] +- Add ability to choose the builder in make_vms.com [Schweda] +- Add DESTDIR support to mingw32 win32/Makefile.gcc +- Fix comments in win32/Makefile.gcc for proper usage +- Allow overriding the default install locations for cmake +- Generate and install the pkg-config file with cmake +- Build both a static and a shared version of zlib with cmake +- Include version symbols for cmake builds +- If using cmake with MSVC, add the source directory to the includes +- Remove unneeded EXTRA_CFLAGS from win32/Makefile.gcc [Truta] +- Move obsolete emx makefile to old [Truta] +- Allow the use of -Wundef when compiling or using zlib +- Avoid the use of the -u option with mktemp +- Improve inflate() documentation on the use of Z_FINISH +- Recognize clang as gcc +- Add gzopen_w() in Windows for wide character path names +- Rename zconf.h in CMakeLists.txt to move it out of the way +- Add source directory in CMakeLists.txt for building examples +- Look in build directory for zlib.pc in CMakeLists.txt +- Remove gzflags from zlibvc.def in vc9 and vc10 +- Fix contrib/minizip compilation in the MinGW environment +- Update ./configure for Solaris, support --64 [Mooney] +- Remove -R. from Solaris shared build (possible security issue) +- Avoid race condition for parallel make (-j) running example +- Fix type mismatch between get_crc_table() and crc_table +- Fix parsing of version with "-" in CMakeLists.txt [Snider, Ziegler] +- Fix the path to zlib.map in CMakeLists.txt +- Force the native libtool in Mac OS X to avoid GNU libtool [Beebe] +- Add instructions to win32/Makefile.gcc for shared install [Torri] + +Changes in 1.2.6.1 (12 Feb 2012) +- Avoid the use of the Objective-C reserved name "id" +- Include io.h in gzguts.h for Microsoft compilers +- Fix problem with ./configure --prefix and gzgetc macro +- Include gz_header definition when compiling zlib solo +- Put gzflags() functionality back in zutil.c +- Avoid library header include in crc32.c for Z_SOLO +- Use name in GCC_CLASSIC as C compiler for coverage testing, if set +- Minor cleanup in contrib/minizip/zip.c [Vollant] +- Update make_vms.com [Zinser] +- Remove unnecessary gzgetc_ function +- Use optimized byte swap operations for Microsoft and GNU [Snyder] +- Fix minor typo in zlib.h comments [Rzesniowiecki] + +Changes in 1.2.6 (29 Jan 2012) +- Update the Pascal interface in contrib/pascal +- Fix function numbers for gzgetc_ in zlibvc.def files +- Fix configure.ac for contrib/minizip [Schiffer] +- Fix large-entry detection in minizip on 64-bit systems [Schiffer] +- Have ./configure use the compiler return code for error indication +- Fix CMakeLists.txt for cross compilation [McClure] +- Fix contrib/minizip/zip.c for 64-bit architectures [Dalsnes] +- Fix compilation of contrib/minizip on FreeBSD [Marquez] +- Correct suggested usages in win32/Makefile.msc [Shachar, Horvath] +- Include io.h for Turbo C / Borland C on all platforms [Truta] +- Make version explicit in contrib/minizip/configure.ac [Bosmans] +- Avoid warning for no encryption in contrib/minizip/zip.c [Vollant] +- Minor cleanup up contrib/minizip/unzip.c [Vollant] +- Fix bug when compiling minizip with C++ [Vollant] +- Protect for long name and extra fields in contrib/minizip [Vollant] +- Avoid some warnings in contrib/minizip [Vollant] +- Add -I../.. -L../.. to CFLAGS for minizip and miniunzip +- Add missing libs to minizip linker command +- Add support for VPATH builds in contrib/minizip +- Add an --enable-demos option to contrib/minizip/configure +- Add the generation of configure.log by ./configure +- Exit when required parameters not provided to win32/Makefile.gcc +- Have gzputc return the character written instead of the argument +- Use the -m option on ldconfig for BSD systems [Tobias] +- Correct in zlib.map when deflateResetKeep was added + +Changes in 1.2.5.3 (15 Jan 2012) +- Restore gzgetc function for binary compatibility +- Do not use _lseeki64 under Borland C++ [Truta] +- Update win32/Makefile.msc to build test/*.c [Truta] +- Remove old/visualc6 given CMakefile and other alternatives +- Update AS400 build files and documentation [Monnerat] +- Update win32/Makefile.gcc to build test/*.c [Truta] +- Permit stronger flushes after Z_BLOCK flushes +- Avoid extraneous empty blocks when doing empty flushes +- Permit Z_NULL arguments to deflatePending +- Allow deflatePrime() to insert bits in the middle of a stream +- Remove second empty static block for Z_PARTIAL_FLUSH +- Write out all of the available bits when using Z_BLOCK +- Insert the first two strings in the hash table after a flush + +Changes in 1.2.5.2 (17 Dec 2011) +- fix ld error: unable to find version dependency 'ZLIB_1.2.5' +- use relative symlinks for shared libs +- Avoid searching past window for Z_RLE strategy +- Assure that high-water mark initialization is always applied in deflate +- Add assertions to fill_window() in deflate.c to match comments +- Update python link in README +- Correct spelling error in gzread.c +- Fix bug in gzgets() for a concatenated empty gzip stream +- Correct error in comment for gz_make() +- Change gzread() and related to ignore junk after gzip streams +- Allow gzread() and related to continue after gzclearerr() +- Allow gzrewind() and gzseek() after a premature end-of-file +- Simplify gzseek() now that raw after gzip is ignored +- Change gzgetc() to a macro for speed (~40% speedup in testing) +- Fix gzclose() to return the actual error last encountered +- Always add large file support for windows +- Include zconf.h for windows large file support +- Include zconf.h.cmakein for windows large file support +- Update zconf.h.cmakein on make distclean +- Merge vestigial vsnprintf determination from zutil.h to gzguts.h +- Clarify how gzopen() appends in zlib.h comments +- Correct documentation of gzdirect() since junk at end now ignored +- Add a transparent write mode to gzopen() when 'T' is in the mode +- Update python link in zlib man page +- Get inffixed.h and MAKEFIXED result to match +- Add a ./config --solo option to make zlib subset with no libary use +- Add undocumented inflateResetKeep() function for CAB file decoding +- Add --cover option to ./configure for gcc coverage testing +- Add #define ZLIB_CONST option to use const in the z_stream interface +- Add comment to gzdopen() in zlib.h to use dup() when using fileno() +- Note behavior of uncompress() to provide as much data as it can +- Add files in contrib/minizip to aid in building libminizip +- Split off AR options in Makefile.in and configure +- Change ON macro to Z_ARG to avoid application conflicts +- Facilitate compilation with Borland C++ for pragmas and vsnprintf +- Include io.h for Turbo C / Borland C++ +- Move example.c and minigzip.c to test/ +- Simplify incomplete code table filling in inflate_table() +- Remove code from inflate.c and infback.c that is impossible to execute +- Test the inflate code with full coverage +- Allow deflateSetDictionary, inflateSetDictionary at any time (in raw) +- Add deflateResetKeep and fix inflateResetKeep to retain dictionary +- Fix gzwrite.c to accommodate reduced memory zlib compilation +- Have inflate() with Z_FINISH avoid the allocation of a window +- Do not set strm->adler when doing raw inflate +- Fix gzeof() to behave just like feof() when read is not past end of file +- Fix bug in gzread.c when end-of-file is reached +- Avoid use of Z_BUF_ERROR in gz* functions except for premature EOF +- Document gzread() capability to read concurrently written files +- Remove hard-coding of resource compiler in CMakeLists.txt [Blammo] + +Changes in 1.2.5.1 (10 Sep 2011) +- Update FAQ entry on shared builds (#13) +- Avoid symbolic argument to chmod in Makefile.in +- Fix bug and add consts in contrib/puff [Oberhumer] +- Update contrib/puff/zeros.raw test file to have all block types +- Add full coverage test for puff in contrib/puff/Makefile +- Fix static-only-build install in Makefile.in +- Fix bug in unzGetCurrentFileInfo() in contrib/minizip [Kuno] +- Add libz.a dependency to shared in Makefile.in for parallel builds +- Spell out "number" (instead of "nb") in zlib.h for total_in, total_out +- Replace $(...) with `...` in configure for non-bash sh [Bowler] +- Add darwin* to Darwin* and solaris* to SunOS\ 5* in configure [Groffen] +- Add solaris* to Linux* in configure to allow gcc use [Groffen] +- Add *bsd* to Linux* case in configure [Bar-Lev] +- Add inffast.obj to dependencies in win32/Makefile.msc +- Correct spelling error in deflate.h [Kohler] +- Change libzdll.a again to libz.dll.a (!) in win32/Makefile.gcc +- Add test to configure for GNU C looking for gcc in output of $cc -v +- Add zlib.pc generation to win32/Makefile.gcc [Weigelt] +- Fix bug in zlib.h for _FILE_OFFSET_BITS set and _LARGEFILE64_SOURCE not +- Add comment in zlib.h that adler32_combine with len2 < 0 makes no sense +- Make NO_DIVIDE option in adler32.c much faster (thanks to John Reiser) +- Make stronger test in zconf.h to include unistd.h for LFS +- Apply Darwin patches for 64-bit file offsets to contrib/minizip [Slack] +- Fix zlib.h LFS support when Z_PREFIX used +- Add updated as400 support (removed from old) [Monnerat] +- Avoid deflate sensitivity to volatile input data +- Avoid division in adler32_combine for NO_DIVIDE +- Clarify the use of Z_FINISH with deflateBound() amount of space +- Set binary for output file in puff.c +- Use u4 type for crc_table to avoid conversion warnings +- Apply casts in zlib.h to avoid conversion warnings +- Add OF to prototypes for adler32_combine_ and crc32_combine_ [Miller] +- Improve inflateSync() documentation to note indeterminancy +- Add deflatePending() function to return the amount of pending output +- Correct the spelling of "specification" in FAQ [Randers-Pehrson] +- Add a check in configure for stdarg.h, use for gzprintf() +- Check that pointers fit in ints when gzprint() compiled old style +- Add dummy name before $(SHAREDLIBV) in Makefile [Bar-Lev, Bowler] +- Delete line in configure that adds -L. libz.a to LDFLAGS [Weigelt] +- Add debug records in assmebler code [Londer] +- Update RFC references to use http://tools.ietf.org/html/... [Li] +- Add --archs option, use of libtool to configure for Mac OS X [Borstel] + +Changes in 1.2.5 (19 Apr 2010) +- Disable visibility attribute in win32/Makefile.gcc [Bar-Lev] +- Default to libdir as sharedlibdir in configure [Nieder] +- Update copyright dates on modified source files +- Update trees.c to be able to generate modified trees.h +- Exit configure for MinGW, suggesting win32/Makefile.gcc +- Check for NULL path in gz_open [Homurlu] + +Changes in 1.2.4.5 (18 Apr 2010) +- Set sharedlibdir in configure [Torok] +- Set LDFLAGS in Makefile.in [Bar-Lev] +- Avoid mkdir objs race condition in Makefile.in [Bowler] +- Add ZLIB_INTERNAL in front of internal inter-module functions and arrays +- Define ZLIB_INTERNAL to hide internal functions and arrays for GNU C +- Don't use hidden attribute when it is a warning generator (e.g. Solaris) + +Changes in 1.2.4.4 (18 Apr 2010) +- Fix CROSS_PREFIX executable testing, CHOST extract, mingw* [Torok] +- Undefine _LARGEFILE64_SOURCE in zconf.h if it is zero, but not if empty +- Try to use bash or ksh regardless of functionality of /bin/sh +- Fix configure incompatibility with NetBSD sh +- Remove attempt to run under bash or ksh since have better NetBSD fix +- Fix win32/Makefile.gcc for MinGW [Bar-Lev] +- Add diagnostic messages when using CROSS_PREFIX in configure +- Added --sharedlibdir option to configure [Weigelt] +- Use hidden visibility attribute when available [Frysinger] + +Changes in 1.2.4.3 (10 Apr 2010) +- Only use CROSS_PREFIX in configure for ar and ranlib if they exist +- Use CROSS_PREFIX for nm [Bar-Lev] +- Assume _LARGEFILE64_SOURCE defined is equivalent to true +- Avoid use of undefined symbols in #if with && and || +- Make *64 prototypes in gzguts.h consistent with functions +- Add -shared load option for MinGW in configure [Bowler] +- Move z_off64_t to public interface, use instead of off64_t +- Remove ! from shell test in configure (not portable to Solaris) +- Change +0 macro tests to -0 for possibly increased portability + +Changes in 1.2.4.2 (9 Apr 2010) +- Add consistent carriage returns to readme.txt's in masmx86 and masmx64 +- Really provide prototypes for *64 functions when building without LFS +- Only define unlink() in minigzip.c if unistd.h not included +- Update README to point to contrib/vstudio project files +- Move projects/vc6 to old/ and remove projects/ +- Include stdlib.h in minigzip.c for setmode() definition under WinCE +- Clean up assembler builds in win32/Makefile.msc [Rowe] +- Include sys/types.h for Microsoft for off_t definition +- Fix memory leak on error in gz_open() +- Symbolize nm as $NM in configure [Weigelt] +- Use TEST_LDSHARED instead of LDSHARED to link test programs [Weigelt] +- Add +0 to _FILE_OFFSET_BITS and _LFS64_LARGEFILE in case not defined +- Fix bug in gzeof() to take into account unused input data +- Avoid initialization of structures with variables in puff.c +- Updated win32/README-WIN32.txt [Rowe] + +Changes in 1.2.4.1 (28 Mar 2010) +- Remove the use of [a-z] constructs for sed in configure [gentoo 310225] +- Remove $(SHAREDLIB) from LIBS in Makefile.in [Creech] +- Restore "for debugging" comment on sprintf() in gzlib.c +- Remove fdopen for MVS from gzguts.h +- Put new README-WIN32.txt in win32 [Rowe] +- Add check for shell to configure and invoke another shell if needed +- Fix big fat stinking bug in gzseek() on uncompressed files +- Remove vestigial F_OPEN64 define in zutil.h +- Set and check the value of _LARGEFILE_SOURCE and _LARGEFILE64_SOURCE +- Avoid errors on non-LFS systems when applications define LFS macros +- Set EXE to ".exe" in configure for MINGW [Kahle] +- Match crc32() in crc32.c exactly to the prototype in zlib.h [Sherrill] +- Add prefix for cross-compilation in win32/makefile.gcc [Bar-Lev] +- Add DLL install in win32/makefile.gcc [Bar-Lev] +- Allow Linux* or linux* from uname in configure [Bar-Lev] +- Allow ldconfig to be redefined in configure and Makefile.in [Bar-Lev] +- Add cross-compilation prefixes to configure [Bar-Lev] +- Match type exactly in gz_load() invocation in gzread.c +- Match type exactly of zcalloc() in zutil.c to zlib.h alloc_func +- Provide prototypes for *64 functions when building zlib without LFS +- Don't use -lc when linking shared library on MinGW +- Remove errno.h check in configure and vestigial errno code in zutil.h + +Changes in 1.2.4 (14 Mar 2010) +- Fix VER3 extraction in configure for no fourth subversion +- Update zlib.3, add docs to Makefile.in to make .pdf out of it +- Add zlib.3.pdf to distribution +- Don't set error code in gzerror() if passed pointer is NULL +- Apply destination directory fixes to CMakeLists.txt [Lowman] +- Move #cmakedefine's to a new zconf.in.cmakein +- Restore zconf.h for builds that don't use configure or cmake +- Add distclean to dummy Makefile for convenience +- Update and improve INDEX, README, and FAQ +- Update CMakeLists.txt for the return of zconf.h [Lowman] +- Update contrib/vstudio/vc9 and vc10 [Vollant] +- Change libz.dll.a back to libzdll.a in win32/Makefile.gcc +- Apply license and readme changes to contrib/asm686 [Raiter] +- Check file name lengths and add -c option in minigzip.c [Li] +- Update contrib/amd64 and contrib/masmx86/ [Vollant] +- Avoid use of "eof" parameter in trees.c to not shadow library variable +- Update make_vms.com for removal of zlibdefs.h [Zinser] +- Update assembler code and vstudio projects in contrib [Vollant] +- Remove outdated assembler code contrib/masm686 and contrib/asm586 +- Remove old vc7 and vc8 from contrib/vstudio +- Update win32/Makefile.msc, add ZLIB_VER_SUBREVISION [Rowe] +- Fix memory leaks in gzclose_r() and gzclose_w(), file leak in gz_open() +- Add contrib/gcc_gvmat64 for longest_match and inflate_fast [Vollant] +- Remove *64 functions from win32/zlib.def (they're not 64-bit yet) +- Fix bug in void-returning vsprintf() case in gzwrite.c +- Fix name change from inflate.h in contrib/inflate86/inffas86.c +- Check if temporary file exists before removing in make_vms.com [Zinser] +- Fix make install and uninstall for --static option +- Fix usage of _MSC_VER in gzguts.h and zutil.h [Truta] +- Update readme.txt in contrib/masmx64 and masmx86 to assemble + +Changes in 1.2.3.9 (21 Feb 2010) +- Expunge gzio.c +- Move as400 build information to old +- Fix updates in contrib/minizip and contrib/vstudio +- Add const to vsnprintf test in configure to avoid warnings [Weigelt] +- Delete zconf.h (made by configure) [Weigelt] +- Change zconf.in.h to zconf.h.in per convention [Weigelt] +- Check for NULL buf in gzgets() +- Return empty string for gzgets() with len == 1 (like fgets()) +- Fix description of gzgets() in zlib.h for end-of-file, NULL return +- Update minizip to 1.1 [Vollant] +- Avoid MSVC loss of data warnings in gzread.c, gzwrite.c +- Note in zlib.h that gzerror() should be used to distinguish from EOF +- Remove use of snprintf() from gzlib.c +- Fix bug in gzseek() +- Update contrib/vstudio, adding vc9 and vc10 [Kuno, Vollant] +- Fix zconf.h generation in CMakeLists.txt [Lowman] +- Improve comments in zconf.h where modified by configure + +Changes in 1.2.3.8 (13 Feb 2010) +- Clean up text files (tabs, trailing whitespace, etc.) [Oberhumer] +- Use z_off64_t in gz_zero() and gz_skip() to match state->skip +- Avoid comparison problem when sizeof(int) == sizeof(z_off64_t) +- Revert to Makefile.in from 1.2.3.6 (live with the clutter) +- Fix missing error return in gzflush(), add zlib.h note +- Add *64 functions to zlib.map [Levin] +- Fix signed/unsigned comparison in gz_comp() +- Use SFLAGS when testing shared linking in configure +- Add --64 option to ./configure to use -m64 with gcc +- Fix ./configure --help to correctly name options +- Have make fail if a test fails [Levin] +- Avoid buffer overrun in contrib/masmx64/gvmat64.asm [Simpson] +- Remove assembler object files from contrib + +Changes in 1.2.3.7 (24 Jan 2010) +- Always gzopen() with O_LARGEFILE if available +- Fix gzdirect() to work immediately after gzopen() or gzdopen() +- Make gzdirect() more precise when the state changes while reading +- Improve zlib.h documentation in many places +- Catch memory allocation failure in gz_open() +- Complete close operation if seek forward in gzclose_w() fails +- Return Z_ERRNO from gzclose_r() if close() fails +- Return Z_STREAM_ERROR instead of EOF for gzclose() being passed NULL +- Return zero for gzwrite() errors to match zlib.h description +- Return -1 on gzputs() error to match zlib.h description +- Add zconf.in.h to allow recovery from configure modification [Weigelt] +- Fix static library permissions in Makefile.in [Weigelt] +- Avoid warnings in configure tests that hide functionality [Weigelt] +- Add *BSD and DragonFly to Linux case in configure [gentoo 123571] +- Change libzdll.a to libz.dll.a in win32/Makefile.gcc [gentoo 288212] +- Avoid access of uninitialized data for first inflateReset2 call [Gomes] +- Keep object files in subdirectories to reduce the clutter somewhat +- Remove default Makefile and zlibdefs.h, add dummy Makefile +- Add new external functions to Z_PREFIX, remove duplicates, z_z_ -> z_ +- Remove zlibdefs.h completely -- modify zconf.h instead + +Changes in 1.2.3.6 (17 Jan 2010) +- Avoid void * arithmetic in gzread.c and gzwrite.c +- Make compilers happier with const char * for gz_error message +- Avoid unused parameter warning in inflate.c +- Avoid signed-unsigned comparison warning in inflate.c +- Indent #pragma's for traditional C +- Fix usage of strwinerror() in glib.c, change to gz_strwinerror() +- Correct email address in configure for system options +- Update make_vms.com and add make_vms.com to contrib/minizip [Zinser] +- Update zlib.map [Brown] +- Fix Makefile.in for Solaris 10 make of example64 and minizip64 [Torok] +- Apply various fixes to CMakeLists.txt [Lowman] +- Add checks on len in gzread() and gzwrite() +- Add error message for no more room for gzungetc() +- Remove zlib version check in gzwrite() +- Defer compression of gzprintf() result until need to +- Use snprintf() in gzdopen() if available +- Remove USE_MMAP configuration determination (only used by minigzip) +- Remove examples/pigz.c (available separately) +- Update examples/gun.c to 1.6 + +Changes in 1.2.3.5 (8 Jan 2010) +- Add space after #if in zutil.h for some compilers +- Fix relatively harmless bug in deflate_fast() [Exarevsky] +- Fix same problem in deflate_slow() +- Add $(SHAREDLIBV) to LIBS in Makefile.in [Brown] +- Add deflate_rle() for faster Z_RLE strategy run-length encoding +- Add deflate_huff() for faster Z_HUFFMAN_ONLY encoding +- Change name of "write" variable in inffast.c to avoid library collisions +- Fix premature EOF from gzread() in gzio.c [Brown] +- Use zlib header window size if windowBits is 0 in inflateInit2() +- Remove compressBound() call in deflate.c to avoid linking compress.o +- Replace use of errno in gz* with functions, support WinCE [Alves] +- Provide alternative to perror() in minigzip.c for WinCE [Alves] +- Don't use _vsnprintf on later versions of MSVC [Lowman] +- Add CMake build script and input file [Lowman] +- Update contrib/minizip to 1.1 [Svensson, Vollant] +- Moved nintendods directory from contrib to . +- Replace gzio.c with a new set of routines with the same functionality +- Add gzbuffer(), gzoffset(), gzclose_r(), gzclose_w() as part of above +- Update contrib/minizip to 1.1b +- Change gzeof() to return 0 on error instead of -1 to agree with zlib.h + +Changes in 1.2.3.4 (21 Dec 2009) +- Use old school .SUFFIXES in Makefile.in for FreeBSD compatibility +- Update comments in configure and Makefile.in for default --shared +- Fix test -z's in configure [Marquess] +- Build examplesh and minigzipsh when not testing +- Change NULL's to Z_NULL's in deflate.c and in comments in zlib.h +- Import LDFLAGS from the environment in configure +- Fix configure to populate SFLAGS with discovered CFLAGS options +- Adapt make_vms.com to the new Makefile.in [Zinser] +- Add zlib2ansi script for C++ compilation [Marquess] +- Add _FILE_OFFSET_BITS=64 test to make test (when applicable) +- Add AMD64 assembler code for longest match to contrib [Teterin] +- Include options from $SFLAGS when doing $LDSHARED +- Simplify 64-bit file support by introducing z_off64_t type +- Make shared object files in objs directory to work around old Sun cc +- Use only three-part version number for Darwin shared compiles +- Add rc option to ar in Makefile.in for when ./configure not run +- Add -WI,-rpath,. to LDFLAGS for OSF 1 V4* +- Set LD_LIBRARYN32_PATH for SGI IRIX shared compile +- Protect against _FILE_OFFSET_BITS being defined when compiling zlib +- Rename Makefile.in targets allstatic to static and allshared to shared +- Fix static and shared Makefile.in targets to be independent +- Correct error return bug in gz_open() by setting state [Brown] +- Put spaces before ;;'s in configure for better sh compatibility +- Add pigz.c (parallel implementation of gzip) to examples/ +- Correct constant in crc32.c to UL [Leventhal] +- Reject negative lengths in crc32_combine() +- Add inflateReset2() function to work like inflateEnd()/inflateInit2() +- Include sys/types.h for _LARGEFILE64_SOURCE [Brown] +- Correct typo in doc/algorithm.txt [Janik] +- Fix bug in adler32_combine() [Zhu] +- Catch missing-end-of-block-code error in all inflates and in puff + Assures that random input to inflate eventually results in an error +- Added enough.c (calculation of ENOUGH for inftrees.h) to examples/ +- Update ENOUGH and its usage to reflect discovered bounds +- Fix gzerror() error report on empty input file [Brown] +- Add ush casts in trees.c to avoid pedantic runtime errors +- Fix typo in zlib.h uncompress() description [Reiss] +- Correct inflate() comments with regard to automatic header detection +- Remove deprecation comment on Z_PARTIAL_FLUSH (it stays) +- Put new version of gzlog (2.0) in examples with interruption recovery +- Add puff compile option to permit invalid distance-too-far streams +- Add puff TEST command options, ability to read piped input +- Prototype the *64 functions in zlib.h when _FILE_OFFSET_BITS == 64, but + _LARGEFILE64_SOURCE not defined +- Fix Z_FULL_FLUSH to truly erase the past by resetting s->strstart +- Fix deflateSetDictionary() to use all 32K for output consistency +- Remove extraneous #define MIN_LOOKAHEAD in deflate.c (in deflate.h) +- Clear bytes after deflate lookahead to avoid use of uninitialized data +- Change a limit in inftrees.c to be more transparent to Coverity Prevent +- Update win32/zlib.def with exported symbols from zlib.h +- Correct spelling errors in zlib.h [Willem, Sobrado] +- Allow Z_BLOCK for deflate() to force a new block +- Allow negative bits in inflatePrime() to delete existing bit buffer +- Add Z_TREES flush option to inflate() to return at end of trees +- Add inflateMark() to return current state information for random access +- Add Makefile for NintendoDS to contrib [Costa] +- Add -w in configure compile tests to avoid spurious warnings [Beucler] +- Fix typos in zlib.h comments for deflateSetDictionary() +- Fix EOF detection in transparent gzread() [Maier] + +Changes in 1.2.3.3 (2 October 2006) +- Make --shared the default for configure, add a --static option +- Add compile option to permit invalid distance-too-far streams +- Add inflateUndermine() function which is required to enable above +- Remove use of "this" variable name for C++ compatibility [Marquess] +- Add testing of shared library in make test, if shared library built +- Use ftello() and fseeko() if available instead of ftell() and fseek() +- Provide two versions of all functions that use the z_off_t type for + binary compatibility -- a normal version and a 64-bit offset version, + per the Large File Support Extension when _LARGEFILE64_SOURCE is + defined; use the 64-bit versions by default when _FILE_OFFSET_BITS + is defined to be 64 +- Add a --uname= option to configure to perhaps help with cross-compiling + +Changes in 1.2.3.2 (3 September 2006) +- Turn off silly Borland warnings [Hay] +- Use off64_t and define _LARGEFILE64_SOURCE when present +- Fix missing dependency on inffixed.h in Makefile.in +- Rig configure --shared to build both shared and static [Teredesai, Truta] +- Remove zconf.in.h and instead create a new zlibdefs.h file +- Fix contrib/minizip/unzip.c non-encrypted after encrypted [Vollant] +- Add treebuild.xml (see http://treebuild.metux.de/) [Weigelt] + +Changes in 1.2.3.1 (16 August 2006) +- Add watcom directory with OpenWatcom make files [Daniel] +- Remove #undef of FAR in zconf.in.h for MVS [Fedtke] +- Update make_vms.com [Zinser] +- Use -fPIC for shared build in configure [Teredesai, Nicholson] +- Use only major version number for libz.so on IRIX and OSF1 [Reinholdtsen] +- Use fdopen() (not _fdopen()) for Interix in zutil.h [BŠck] +- Add some FAQ entries about the contrib directory +- Update the MVS question in the FAQ +- Avoid extraneous reads after EOF in gzio.c [Brown] +- Correct spelling of "successfully" in gzio.c [Randers-Pehrson] +- Add comments to zlib.h about gzerror() usage [Brown] +- Set extra flags in gzip header in gzopen() like deflate() does +- Make configure options more compatible with double-dash conventions + [Weigelt] +- Clean up compilation under Solaris SunStudio cc [Rowe, Reinholdtsen] +- Fix uninstall target in Makefile.in [Truta] +- Add pkgconfig support [Weigelt] +- Use $(DESTDIR) macro in Makefile.in [Reinholdtsen, Weigelt] +- Replace set_data_type() with a more accurate detect_data_type() in + trees.c, according to the txtvsbin.txt document [Truta] +- Swap the order of #include and #include "zlib.h" in + gzio.c, example.c and minigzip.c [Truta] +- Shut up annoying VS2005 warnings about standard C deprecation [Rowe, + Truta] (where?) +- Fix target "clean" from win32/Makefile.bor [Truta] +- Create .pdb and .manifest files in win32/makefile.msc [Ziegler, Rowe] +- Update zlib www home address in win32/DLL_FAQ.txt [Truta] +- Update contrib/masmx86/inffas32.asm for VS2005 [Vollant, Van Wassenhove] +- Enable browse info in the "Debug" and "ASM Debug" configurations in + the Visual C++ 6 project, and set (non-ASM) "Debug" as default [Truta] +- Add pkgconfig support [Weigelt] +- Add ZLIB_VER_MAJOR, ZLIB_VER_MINOR and ZLIB_VER_REVISION in zlib.h, + for use in win32/zlib1.rc [Polushin, Rowe, Truta] +- Add a document that explains the new text detection scheme to + doc/txtvsbin.txt [Truta] +- Add rfc1950.txt, rfc1951.txt and rfc1952.txt to doc/ [Truta] +- Move algorithm.txt into doc/ [Truta] +- Synchronize FAQ with website +- Fix compressBound(), was low for some pathological cases [Fearnley] +- Take into account wrapper variations in deflateBound() +- Set examples/zpipe.c input and output to binary mode for Windows +- Update examples/zlib_how.html with new zpipe.c (also web site) +- Fix some warnings in examples/gzlog.c and examples/zran.c (it seems + that gcc became pickier in 4.0) +- Add zlib.map for Linux: "All symbols from zlib-1.1.4 remain + un-versioned, the patch adds versioning only for symbols introduced in + zlib-1.2.0 or later. It also declares as local those symbols which are + not designed to be exported." [Levin] +- Update Z_PREFIX list in zconf.in.h, add --zprefix option to configure +- Do not initialize global static by default in trees.c, add a response + NO_INIT_GLOBAL_POINTERS to initialize them if needed [Marquess] +- Don't use strerror() in gzio.c under WinCE [Yakimov] +- Don't use errno.h in zutil.h under WinCE [Yakimov] +- Move arguments for AR to its usage to allow replacing ar [Marot] +- Add HAVE_VISIBILITY_PRAGMA in zconf.in.h for Mozilla [Randers-Pehrson] +- Improve inflateInit() and inflateInit2() documentation +- Fix structure size comment in inflate.h +- Change configure help option from --h* to --help [Santos] + +Changes in 1.2.3 (18 July 2005) +- Apply security vulnerability fixes to contrib/infback9 as well +- Clean up some text files (carriage returns, trailing space) +- Update testzlib, vstudio, masmx64, and masmx86 in contrib [Vollant] + +Changes in 1.2.2.4 (11 July 2005) +- Add inflatePrime() function for starting inflation at bit boundary +- Avoid some Visual C warnings in deflate.c +- Avoid more silly Visual C warnings in inflate.c and inftrees.c for 64-bit + compile +- Fix some spelling errors in comments [Betts] +- Correct inflateInit2() error return documentation in zlib.h +- Add zran.c example of compressed data random access to examples + directory, shows use of inflatePrime() +- Fix cast for assignments to strm->state in inflate.c and infback.c +- Fix zlibCompileFlags() in zutil.c to use 1L for long shifts [Oberhumer] +- Move declarations of gf2 functions to right place in crc32.c [Oberhumer] +- Add cast in trees.c t avoid a warning [Oberhumer] +- Avoid some warnings in fitblk.c, gun.c, gzjoin.c in examples [Oberhumer] +- Update make_vms.com [Zinser] +- Initialize state->write in inflateReset() since copied in inflate_fast() +- Be more strict on incomplete code sets in inflate_table() and increase + ENOUGH and MAXD -- this repairs a possible security vulnerability for + invalid inflate input. Thanks to Tavis Ormandy and Markus Oberhumer for + discovering the vulnerability and providing test cases. +- Add ia64 support to configure for HP-UX [Smith] +- Add error return to gzread() for format or i/o error [Levin] +- Use malloc.h for OS/2 [Necasek] + +Changes in 1.2.2.3 (27 May 2005) +- Replace 1U constants in inflate.c and inftrees.c for 64-bit compile +- Typecast fread() return values in gzio.c [Vollant] +- Remove trailing space in minigzip.c outmode (VC++ can't deal with it) +- Fix crc check bug in gzread() after gzungetc() [Heiner] +- Add the deflateTune() function to adjust internal compression parameters +- Add a fast gzip decompressor, gun.c, to examples (use of inflateBack) +- Remove an incorrect assertion in examples/zpipe.c +- Add C++ wrapper in infback9.h [Donais] +- Fix bug in inflateCopy() when decoding fixed codes +- Note in zlib.h how much deflateSetDictionary() actually uses +- Remove USE_DICT_HEAD in deflate.c (would mess up inflate if used) +- Add _WIN32_WCE to define WIN32 in zconf.in.h [Spencer] +- Don't include stderr.h or errno.h for _WIN32_WCE in zutil.h [Spencer] +- Add gzdirect() function to indicate transparent reads +- Update contrib/minizip [Vollant] +- Fix compilation of deflate.c when both ASMV and FASTEST [Oberhumer] +- Add casts in crc32.c to avoid warnings [Oberhumer] +- Add contrib/masmx64 [Vollant] +- Update contrib/asm586, asm686, masmx86, testzlib, vstudio [Vollant] + +Changes in 1.2.2.2 (30 December 2004) +- Replace structure assignments in deflate.c and inflate.c with zmemcpy to + avoid implicit memcpy calls (portability for no-library compilation) +- Increase sprintf() buffer size in gzdopen() to allow for large numbers +- Add INFLATE_STRICT to check distances against zlib header +- Improve WinCE errno handling and comments [Chang] +- Remove comment about no gzip header processing in FAQ +- Add Z_FIXED strategy option to deflateInit2() to force fixed trees +- Add updated make_vms.com [Coghlan], update README +- Create a new "examples" directory, move gzappend.c there, add zpipe.c, + fitblk.c, gzlog.[ch], gzjoin.c, and zlib_how.html. +- Add FAQ entry and comments in deflate.c on uninitialized memory access +- Add Solaris 9 make options in configure [Gilbert] +- Allow strerror() usage in gzio.c for STDC +- Fix DecompressBuf in contrib/delphi/ZLib.pas [ManChesTer] +- Update contrib/masmx86/inffas32.asm and gvmat32.asm [Vollant] +- Use z_off_t for adler32_combine() and crc32_combine() lengths +- Make adler32() much faster for small len +- Use OS_CODE in deflate() default gzip header + +Changes in 1.2.2.1 (31 October 2004) +- Allow inflateSetDictionary() call for raw inflate +- Fix inflate header crc check bug for file names and comments +- Add deflateSetHeader() and gz_header structure for custom gzip headers +- Add inflateGetheader() to retrieve gzip headers +- Add crc32_combine() and adler32_combine() functions +- Add alloc_func, free_func, in_func, out_func to Z_PREFIX list +- Use zstreamp consistently in zlib.h (inflate_back functions) +- Remove GUNZIP condition from definition of inflate_mode in inflate.h + and in contrib/inflate86/inffast.S [Truta, Anderson] +- Add support for AMD64 in contrib/inflate86/inffas86.c [Anderson] +- Update projects/README.projects and projects/visualc6 [Truta] +- Update win32/DLL_FAQ.txt [Truta] +- Avoid warning under NO_GZCOMPRESS in gzio.c; fix typo [Truta] +- Deprecate Z_ASCII; use Z_TEXT instead [Truta] +- Use a new algorithm for setting strm->data_type in trees.c [Truta] +- Do not define an exit() prototype in zutil.c unless DEBUG defined +- Remove prototype of exit() from zutil.c, example.c, minigzip.c [Truta] +- Add comment in zlib.h for Z_NO_FLUSH parameter to deflate() +- Fix Darwin build version identification [Peterson] + +Changes in 1.2.2 (3 October 2004) +- Update zlib.h comments on gzip in-memory processing +- Set adler to 1 in inflateReset() to support Java test suite [Walles] +- Add contrib/dotzlib [Ravn] +- Update win32/DLL_FAQ.txt [Truta] +- Update contrib/minizip [Vollant] +- Move contrib/visual-basic.txt to old/ [Truta] +- Fix assembler builds in projects/visualc6/ [Truta] + +Changes in 1.2.1.2 (9 September 2004) +- Update INDEX file +- Fix trees.c to update strm->data_type (no one ever noticed!) +- Fix bug in error case in inflate.c, infback.c, and infback9.c [Brown] +- Add "volatile" to crc table flag declaration (for DYNAMIC_CRC_TABLE) +- Add limited multitasking protection to DYNAMIC_CRC_TABLE +- Add NO_vsnprintf for VMS in zutil.h [Mozilla] +- Don't declare strerror() under VMS [Mozilla] +- Add comment to DYNAMIC_CRC_TABLE to use get_crc_table() to initialize +- Update contrib/ada [Anisimkov] +- Update contrib/minizip [Vollant] +- Fix configure to not hardcode directories for Darwin [Peterson] +- Fix gzio.c to not return error on empty files [Brown] +- Fix indentation; update version in contrib/delphi/ZLib.pas and + contrib/pascal/zlibpas.pas [Truta] +- Update mkasm.bat in contrib/masmx86 [Truta] +- Update contrib/untgz [Truta] +- Add projects/README.projects [Truta] +- Add project for MS Visual C++ 6.0 in projects/visualc6 [Cadieux, Truta] +- Update win32/DLL_FAQ.txt [Truta] +- Update list of Z_PREFIX symbols in zconf.h [Randers-Pehrson, Truta] +- Remove an unnecessary assignment to curr in inftrees.c [Truta] +- Add OS/2 to exe builds in configure [Poltorak] +- Remove err dummy parameter in zlib.h [Kientzle] + +Changes in 1.2.1.1 (9 January 2004) +- Update email address in README +- Several FAQ updates +- Fix a big fat bug in inftrees.c that prevented decoding valid + dynamic blocks with only literals and no distance codes -- + Thanks to "Hot Emu" for the bug report and sample file +- Add a note to puff.c on no distance codes case. + +Changes in 1.2.1 (17 November 2003) +- Remove a tab in contrib/gzappend/gzappend.c +- Update some interfaces in contrib for new zlib functions +- Update zlib version number in some contrib entries +- Add Windows CE definition for ptrdiff_t in zutil.h [Mai, Truta] +- Support shared libraries on Hurd and KFreeBSD [Brown] +- Fix error in NO_DIVIDE option of adler32.c + +Changes in 1.2.0.8 (4 November 2003) +- Update version in contrib/delphi/ZLib.pas and contrib/pascal/zlibpas.pas +- Add experimental NO_DIVIDE #define in adler32.c + - Possibly faster on some processors (let me know if it is) +- Correct Z_BLOCK to not return on first inflate call if no wrap +- Fix strm->data_type on inflate() return to correctly indicate EOB +- Add deflatePrime() function for appending in the middle of a byte +- Add contrib/gzappend for an example of appending to a stream +- Update win32/DLL_FAQ.txt [Truta] +- Delete Turbo C comment in README [Truta] +- Improve some indentation in zconf.h [Truta] +- Fix infinite loop on bad input in configure script [Church] +- Fix gzeof() for concatenated gzip files [Johnson] +- Add example to contrib/visual-basic.txt [Michael B.] +- Add -p to mkdir's in Makefile.in [vda] +- Fix configure to properly detect presence or lack of printf functions +- Add AS400 support [Monnerat] +- Add a little Cygwin support [Wilson] + +Changes in 1.2.0.7 (21 September 2003) +- Correct some debug formats in contrib/infback9 +- Cast a type in a debug statement in trees.c +- Change search and replace delimiter in configure from % to # [Beebe] +- Update contrib/untgz to 0.2 with various fixes [Truta] +- Add build support for Amiga [Nikl] +- Remove some directories in old that have been updated to 1.2 +- Add dylib building for Mac OS X in configure and Makefile.in +- Remove old distribution stuff from Makefile +- Update README to point to DLL_FAQ.txt, and add comment on Mac OS X +- Update links in README + +Changes in 1.2.0.6 (13 September 2003) +- Minor FAQ updates +- Update contrib/minizip to 1.00 [Vollant] +- Remove test of gz functions in example.c when GZ_COMPRESS defined [Truta] +- Update POSTINC comment for 68060 [Nikl] +- Add contrib/infback9 with deflate64 decoding (unsupported) +- For MVS define NO_vsnprintf and undefine FAR [van Burik] +- Add pragma for fdopen on MVS [van Burik] + +Changes in 1.2.0.5 (8 September 2003) +- Add OF to inflateBackEnd() declaration in zlib.h +- Remember start when using gzdopen in the middle of a file +- Use internal off_t counters in gz* functions to properly handle seeks +- Perform more rigorous check for distance-too-far in inffast.c +- Add Z_BLOCK flush option to return from inflate at block boundary +- Set strm->data_type on return from inflate + - Indicate bits unused, if at block boundary, and if in last block +- Replace size_t with ptrdiff_t in crc32.c, and check for correct size +- Add condition so old NO_DEFLATE define still works for compatibility +- FAQ update regarding the Windows DLL [Truta] +- INDEX update: add qnx entry, remove aix entry [Truta] +- Install zlib.3 into mandir [Wilson] +- Move contrib/zlib_dll_FAQ.txt to win32/DLL_FAQ.txt; update [Truta] +- Adapt the zlib interface to the new DLL convention guidelines [Truta] +- Introduce ZLIB_WINAPI macro to allow the export of functions using + the WINAPI calling convention, for Visual Basic [Vollant, Truta] +- Update msdos and win32 scripts and makefiles [Truta] +- Export symbols by name, not by ordinal, in win32/zlib.def [Truta] +- Add contrib/ada [Anisimkov] +- Move asm files from contrib/vstudio/vc70_32 to contrib/asm386 [Truta] +- Rename contrib/asm386 to contrib/masmx86 [Truta, Vollant] +- Add contrib/masm686 [Truta] +- Fix offsets in contrib/inflate86 and contrib/masmx86/inffas32.asm + [Truta, Vollant] +- Update contrib/delphi; rename to contrib/pascal; add example [Truta] +- Remove contrib/delphi2; add a new contrib/delphi [Truta] +- Avoid inclusion of the nonstandard in contrib/iostream, + and fix some method prototypes [Truta] +- Fix the ZCR_SEED2 constant to avoid warnings in contrib/minizip + [Truta] +- Avoid the use of backslash (\) in contrib/minizip [Vollant] +- Fix file time handling in contrib/untgz; update makefiles [Truta] +- Update contrib/vstudio/vc70_32 to comply with the new DLL guidelines + [Vollant] +- Remove contrib/vstudio/vc15_16 [Vollant] +- Rename contrib/vstudio/vc70_32 to contrib/vstudio/vc7 [Truta] +- Update README.contrib [Truta] +- Invert the assignment order of match_head and s->prev[...] in + INSERT_STRING [Truta] +- Compare TOO_FAR with 32767 instead of 32768, to avoid 16-bit warnings + [Truta] +- Compare function pointers with 0, not with NULL or Z_NULL [Truta] +- Fix prototype of syncsearch in inflate.c [Truta] +- Introduce ASMINF macro to be enabled when using an ASM implementation + of inflate_fast [Truta] +- Change NO_DEFLATE to NO_GZCOMPRESS [Truta] +- Modify test_gzio in example.c to take a single file name as a + parameter [Truta] +- Exit the example.c program if gzopen fails [Truta] +- Add type casts around strlen in example.c [Truta] +- Remove casting to sizeof in minigzip.c; give a proper type + to the variable compared with SUFFIX_LEN [Truta] +- Update definitions of STDC and STDC99 in zconf.h [Truta] +- Synchronize zconf.h with the new Windows DLL interface [Truta] +- Use SYS16BIT instead of __32BIT__ to distinguish between + 16- and 32-bit platforms [Truta] +- Use far memory allocators in small 16-bit memory models for + Turbo C [Truta] +- Add info about the use of ASMV, ASMINF and ZLIB_WINAPI in + zlibCompileFlags [Truta] +- Cygwin has vsnprintf [Wilson] +- In Windows16, OS_CODE is 0, as in MSDOS [Truta] +- In Cygwin, OS_CODE is 3 (Unix), not 11 (Windows32) [Wilson] + +Changes in 1.2.0.4 (10 August 2003) +- Minor FAQ updates +- Be more strict when checking inflateInit2's windowBits parameter +- Change NO_GUNZIP compile option to NO_GZIP to cover deflate as well +- Add gzip wrapper option to deflateInit2 using windowBits +- Add updated QNX rule in configure and qnx directory [Bonnefoy] +- Make inflate distance-too-far checks more rigorous +- Clean up FAR usage in inflate +- Add casting to sizeof() in gzio.c and minigzip.c + +Changes in 1.2.0.3 (19 July 2003) +- Fix silly error in gzungetc() implementation [Vollant] +- Update contrib/minizip and contrib/vstudio [Vollant] +- Fix printf format in example.c +- Correct cdecl support in zconf.in.h [Anisimkov] +- Minor FAQ updates + +Changes in 1.2.0.2 (13 July 2003) +- Add ZLIB_VERNUM in zlib.h for numerical preprocessor comparisons +- Attempt to avoid warnings in crc32.c for pointer-int conversion +- Add AIX to configure, remove aix directory [Bakker] +- Add some casts to minigzip.c +- Improve checking after insecure sprintf() or vsprintf() calls +- Remove #elif's from crc32.c +- Change leave label to inf_leave in inflate.c and infback.c to avoid + library conflicts +- Remove inflate gzip decoding by default--only enable gzip decoding by + special request for stricter backward compatibility +- Add zlibCompileFlags() function to return compilation information +- More typecasting in deflate.c to avoid warnings +- Remove leading underscore from _Capital #defines [Truta] +- Fix configure to link shared library when testing +- Add some Windows CE target adjustments [Mai] +- Remove #define ZLIB_DLL in zconf.h [Vollant] +- Add zlib.3 [Rodgers] +- Update RFC URL in deflate.c and algorithm.txt [Mai] +- Add zlib_dll_FAQ.txt to contrib [Truta] +- Add UL to some constants [Truta] +- Update minizip and vstudio [Vollant] +- Remove vestigial NEED_DUMMY_RETURN from zconf.in.h +- Expand use of NO_DUMMY_DECL to avoid all dummy structures +- Added iostream3 to contrib [Schwardt] +- Replace rewind() with fseek() for WinCE [Truta] +- Improve setting of zlib format compression level flags + - Report 0 for huffman and rle strategies and for level == 0 or 1 + - Report 2 only for level == 6 +- Only deal with 64K limit when necessary at compile time [Truta] +- Allow TOO_FAR check to be turned off at compile time [Truta] +- Add gzclearerr() function [Souza] +- Add gzungetc() function + +Changes in 1.2.0.1 (17 March 2003) +- Add Z_RLE strategy for run-length encoding [Truta] + - When Z_RLE requested, restrict matches to distance one + - Update zlib.h, minigzip.c, gzopen(), gzdopen() for Z_RLE +- Correct FASTEST compilation to allow level == 0 +- Clean up what gets compiled for FASTEST +- Incorporate changes to zconf.in.h [Vollant] + - Refine detection of Turbo C need for dummy returns + - Refine ZLIB_DLL compilation + - Include additional header file on VMS for off_t typedef +- Try to use _vsnprintf where it supplants vsprintf [Vollant] +- Add some casts in inffast.c +- Enchance comments in zlib.h on what happens if gzprintf() tries to + write more than 4095 bytes before compression +- Remove unused state from inflateBackEnd() +- Remove exit(0) from minigzip.c, example.c +- Get rid of all those darn tabs +- Add "check" target to Makefile.in that does the same thing as "test" +- Add "mostlyclean" and "maintainer-clean" targets to Makefile.in +- Update contrib/inflate86 [Anderson] +- Update contrib/testzlib, contrib/vstudio, contrib/minizip [Vollant] +- Add msdos and win32 directories with makefiles [Truta] +- More additions and improvements to the FAQ + +Changes in 1.2.0 (9 March 2003) +- New and improved inflate code + - About 20% faster + - Does not allocate 32K window unless and until needed + - Automatically detects and decompresses gzip streams + - Raw inflate no longer needs an extra dummy byte at end + - Added inflateBack functions using a callback interface--even faster + than inflate, useful for file utilities (gzip, zip) + - Added inflateCopy() function to record state for random access on + externally generated deflate streams (e.g. in gzip files) + - More readable code (I hope) +- New and improved crc32() + - About 50% faster, thanks to suggestions from Rodney Brown +- Add deflateBound() and compressBound() functions +- Fix memory leak in deflateInit2() +- Permit setting dictionary for raw deflate (for parallel deflate) +- Fix const declaration for gzwrite() +- Check for some malloc() failures in gzio.c +- Fix bug in gzopen() on single-byte file 0x1f +- Fix bug in gzread() on concatenated file with 0x1f at end of buffer + and next buffer doesn't start with 0x8b +- Fix uncompress() to return Z_DATA_ERROR on truncated input +- Free memory at end of example.c +- Remove MAX #define in trees.c (conflicted with some libraries) +- Fix static const's in deflate.c, gzio.c, and zutil.[ch] +- Declare malloc() and free() in gzio.c if STDC not defined +- Use malloc() instead of calloc() in zutil.c if int big enough +- Define STDC for AIX +- Add aix/ with approach for compiling shared library on AIX +- Add HP-UX support for shared libraries in configure +- Add OpenUNIX support for shared libraries in configure +- Use $cc instead of gcc to build shared library +- Make prefix directory if needed when installing +- Correct Macintosh avoidance of typedef Byte in zconf.h +- Correct Turbo C memory allocation when under Linux +- Use libz.a instead of -lz in Makefile (assure use of compiled library) +- Update configure to check for snprintf or vsnprintf functions and their + return value, warn during make if using an insecure function +- Fix configure problem with compile-time knowledge of HAVE_UNISTD_H that + is lost when library is used--resolution is to build new zconf.h +- Documentation improvements (in zlib.h): + - Document raw deflate and inflate + - Update RFCs URL + - Point out that zlib and gzip formats are different + - Note that Z_BUF_ERROR is not fatal + - Document string limit for gzprintf() and possible buffer overflow + - Note requirement on avail_out when flushing + - Note permitted values of flush parameter of inflate() +- Add some FAQs (and even answers) to the FAQ +- Add contrib/inflate86/ for x86 faster inflate +- Add contrib/blast/ for PKWare Data Compression Library decompression +- Add contrib/puff/ simple inflate for deflate format description + +Changes in 1.1.4 (11 March 2002) +- ZFREE was repeated on same allocation on some error conditions. + This creates a security problem described in + http://www.zlib.org/advisory-2002-03-11.txt +- Returned incorrect error (Z_MEM_ERROR) on some invalid data +- Avoid accesses before window for invalid distances with inflate window + less than 32K. +- force windowBits > 8 to avoid a bug in the encoder for a window size + of 256 bytes. (A complete fix will be available in 1.1.5). + +Changes in 1.1.3 (9 July 1998) +- fix "an inflate input buffer bug that shows up on rare but persistent + occasions" (Mark) +- fix gzread and gztell for concatenated .gz files (Didier Le Botlan) +- fix gzseek(..., SEEK_SET) in write mode +- fix crc check after a gzeek (Frank Faubert) +- fix miniunzip when the last entry in a zip file is itself a zip file + (J Lillge) +- add contrib/asm586 and contrib/asm686 (Brian Raiter) + See http://www.muppetlabs.com/~breadbox/software/assembly.html +- add support for Delphi 3 in contrib/delphi (Bob Dellaca) +- add support for C++Builder 3 and Delphi 3 in contrib/delphi2 (Davide Moretti) +- do not exit prematurely in untgz if 0 at start of block (Magnus Holmgren) +- use macro EXTERN instead of extern to support DLL for BeOS (Sander Stoks) +- added a FAQ file + +- Support gzdopen on Mac with Metrowerks (Jason Linhart) +- Do not redefine Byte on Mac (Brad Pettit & Jason Linhart) +- define SEEK_END too if SEEK_SET is not defined (Albert Chin-A-Young) +- avoid some warnings with Borland C (Tom Tanner) +- fix a problem in contrib/minizip/zip.c for 16-bit MSDOS (Gilles Vollant) +- emulate utime() for WIN32 in contrib/untgz (Gilles Vollant) +- allow several arguments to configure (Tim Mooney, Frodo Looijaard) +- use libdir and includedir in Makefile.in (Tim Mooney) +- support shared libraries on OSF1 V4 (Tim Mooney) +- remove so_locations in "make clean" (Tim Mooney) +- fix maketree.c compilation error (Glenn, Mark) +- Python interface to zlib now in Python 1.5 (Jeremy Hylton) +- new Makefile.riscos (Rich Walker) +- initialize static descriptors in trees.c for embedded targets (Nick Smith) +- use "foo-gz" in example.c for RISCOS and VMS (Nick Smith) +- add the OS/2 files in Makefile.in too (Andrew Zabolotny) +- fix fdopen and halloc macros for Microsoft C 6.0 (Tom Lane) +- fix maketree.c to allow clean compilation of inffixed.h (Mark) +- fix parameter check in deflateCopy (Gunther Nikl) +- cleanup trees.c, use compressed_len only in debug mode (Christian Spieler) +- Many portability patches by Christian Spieler: + . zutil.c, zutil.h: added "const" for zmem* + . Make_vms.com: fixed some typos + . Make_vms.com: msdos/Makefile.*: removed zutil.h from some dependency lists + . msdos/Makefile.msc: remove "default rtl link library" info from obj files + . msdos/Makefile.*: use model-dependent name for the built zlib library + . msdos/Makefile.emx, nt/Makefile.emx, nt/Makefile.gcc: + new makefiles, for emx (DOS/OS2), emx&rsxnt and mingw32 (Windows 9x / NT) +- use define instead of typedef for Bytef also for MSC small/medium (Tom Lane) +- replace __far with _far for better portability (Christian Spieler, Tom Lane) +- fix test for errno.h in configure (Tim Newsham) + +Changes in 1.1.2 (19 March 98) +- added contrib/minzip, mini zip and unzip based on zlib (Gilles Vollant) + See http://www.winimage.com/zLibDll/unzip.html +- preinitialize the inflate tables for fixed codes, to make the code + completely thread safe (Mark) +- some simplifications and slight speed-up to the inflate code (Mark) +- fix gzeof on non-compressed files (Allan Schrum) +- add -std1 option in configure for OSF1 to fix gzprintf (Martin Mokrejs) +- use default value of 4K for Z_BUFSIZE for 16-bit MSDOS (Tim Wegner + Glenn) +- added os2/Makefile.def and os2/zlib.def (Andrew Zabolotny) +- add shared lib support for UNIX_SV4.2MP (MATSUURA Takanori) +- do not wrap extern "C" around system includes (Tom Lane) +- mention zlib binding for TCL in README (Andreas Kupries) +- added amiga/Makefile.pup for Amiga powerUP SAS/C PPC (Andreas Kleinert) +- allow "make install prefix=..." even after configure (Glenn Randers-Pehrson) +- allow "configure --prefix $HOME" (Tim Mooney) +- remove warnings in example.c and gzio.c (Glenn Randers-Pehrson) +- move Makefile.sas to amiga/Makefile.sas + +Changes in 1.1.1 (27 Feb 98) +- fix macros _tr_tally_* in deflate.h for debug mode (Glenn Randers-Pehrson) +- remove block truncation heuristic which had very marginal effect for zlib + (smaller lit_bufsize than in gzip 1.2.4) and degraded a little the + compression ratio on some files. This also allows inlining _tr_tally for + matches in deflate_slow. +- added msdos/Makefile.w32 for WIN32 Microsoft Visual C++ (Bob Frazier) + +Changes in 1.1.0 (24 Feb 98) +- do not return STREAM_END prematurely in inflate (John Bowler) +- revert to the zlib 1.0.8 inflate to avoid the gcc 2.8.0 bug (Jeremy Buhler) +- compile with -DFASTEST to get compression code optimized for speed only +- in minigzip, try mmap'ing the input file first (Miguel Albrecht) +- increase size of I/O buffers in minigzip.c and gzio.c (not a big gain + on Sun but significant on HP) + +- add a pointer to experimental unzip library in README (Gilles Vollant) +- initialize variable gcc in configure (Chris Herborth) + +Changes in 1.0.9 (17 Feb 1998) +- added gzputs and gzgets functions +- do not clear eof flag in gzseek (Mark Diekhans) +- fix gzseek for files in transparent mode (Mark Diekhans) +- do not assume that vsprintf returns the number of bytes written (Jens Krinke) +- replace EXPORT with ZEXPORT to avoid conflict with other programs +- added compress2 in zconf.h, zlib.def, zlib.dnt +- new asm code from Gilles Vollant in contrib/asm386 +- simplify the inflate code (Mark): + . Replace ZALLOC's in huft_build() with single ZALLOC in inflate_blocks_new() + . ZALLOC the length list in inflate_trees_fixed() instead of using stack + . ZALLOC the value area for huft_build() instead of using stack + . Simplify Z_FINISH check in inflate() + +- Avoid gcc 2.8.0 comparison bug a little differently than zlib 1.0.8 +- in inftrees.c, avoid cc -O bug on HP (Farshid Elahi) +- in zconf.h move the ZLIB_DLL stuff earlier to avoid problems with + the declaration of FAR (Gilles VOllant) +- install libz.so* with mode 755 (executable) instead of 644 (Marc Lehmann) +- read_buf buf parameter of type Bytef* instead of charf* +- zmemcpy parameters are of type Bytef*, not charf* (Joseph Strout) +- do not redeclare unlink in minigzip.c for WIN32 (John Bowler) +- fix check for presence of directories in "make install" (Ian Willis) + +Changes in 1.0.8 (27 Jan 1998) +- fixed offsets in contrib/asm386/gvmat32.asm (Gilles Vollant) +- fix gzgetc and gzputc for big endian systems (Markus Oberhumer) +- added compress2() to allow setting the compression level +- include sys/types.h to get off_t on some systems (Marc Lehmann & QingLong) +- use constant arrays for the static trees in trees.c instead of computing + them at run time (thanks to Ken Raeburn for this suggestion). To create + trees.h, compile with GEN_TREES_H and run "make test". +- check return code of example in "make test" and display result +- pass minigzip command line options to file_compress +- simplifying code of inflateSync to avoid gcc 2.8 bug + +- support CC="gcc -Wall" in configure -s (QingLong) +- avoid a flush caused by ftell in gzopen for write mode (Ken Raeburn) +- fix test for shared library support to avoid compiler warnings +- zlib.lib -> zlib.dll in msdos/zlib.rc (Gilles Vollant) +- check for TARGET_OS_MAC in addition to MACOS (Brad Pettit) +- do not use fdopen for Metrowerks on Mac (Brad Pettit)) +- add checks for gzputc and gzputc in example.c +- avoid warnings in gzio.c and deflate.c (Andreas Kleinert) +- use const for the CRC table (Ken Raeburn) +- fixed "make uninstall" for shared libraries +- use Tracev instead of Trace in infblock.c +- in example.c use correct compressed length for test_sync +- suppress +vnocompatwarnings in configure for HPUX (not always supported) + +Changes in 1.0.7 (20 Jan 1998) +- fix gzseek which was broken in write mode +- return error for gzseek to negative absolute position +- fix configure for Linux (Chun-Chung Chen) +- increase stack space for MSC (Tim Wegner) +- get_crc_table and inflateSyncPoint are EXPORTed (Gilles Vollant) +- define EXPORTVA for gzprintf (Gilles Vollant) +- added man page zlib.3 (Rick Rodgers) +- for contrib/untgz, fix makedir() and improve Makefile + +- check gzseek in write mode in example.c +- allocate extra buffer for seeks only if gzseek is actually called +- avoid signed/unsigned comparisons (Tim Wegner, Gilles Vollant) +- add inflateSyncPoint in zconf.h +- fix list of exported functions in nt/zlib.dnt and mdsos/zlib.def + +Changes in 1.0.6 (19 Jan 1998) +- add functions gzprintf, gzputc, gzgetc, gztell, gzeof, gzseek, gzrewind and + gzsetparams (thanks to Roland Giersig and Kevin Ruland for some of this code) +- Fix a deflate bug occurring only with compression level 0 (thanks to + Andy Buckler for finding this one). +- In minigzip, pass transparently also the first byte for .Z files. +- return Z_BUF_ERROR instead of Z_OK if output buffer full in uncompress() +- check Z_FINISH in inflate (thanks to Marc Schluper) +- Implement deflateCopy (thanks to Adam Costello) +- make static libraries by default in configure, add --shared option. +- move MSDOS or Windows specific files to directory msdos +- suppress the notion of partial flush to simplify the interface + (but the symbol Z_PARTIAL_FLUSH is kept for compatibility with 1.0.4) +- suppress history buffer provided by application to simplify the interface + (this feature was not implemented anyway in 1.0.4) +- next_in and avail_in must be initialized before calling inflateInit or + inflateInit2 +- add EXPORT in all exported functions (for Windows DLL) +- added Makefile.nt (thanks to Stephen Williams) +- added the unsupported "contrib" directory: + contrib/asm386/ by Gilles Vollant + 386 asm code replacing longest_match(). + contrib/iostream/ by Kevin Ruland + A C++ I/O streams interface to the zlib gz* functions + contrib/iostream2/ by Tyge Løvset + Another C++ I/O streams interface + contrib/untgz/ by "Pedro A. Aranda Guti\irrez" + A very simple tar.gz file extractor using zlib + contrib/visual-basic.txt by Carlos Rios + How to use compress(), uncompress() and the gz* functions from VB. +- pass params -f (filtered data), -h (huffman only), -1 to -9 (compression + level) in minigzip (thanks to Tom Lane) + +- use const for rommable constants in deflate +- added test for gzseek and gztell in example.c +- add undocumented function inflateSyncPoint() (hack for Paul Mackerras) +- add undocumented function zError to convert error code to string + (for Tim Smithers) +- Allow compilation of gzio with -DNO_DEFLATE to avoid the compression code. +- Use default memcpy for Symantec MSDOS compiler. +- Add EXPORT keyword for check_func (needed for Windows DLL) +- add current directory to LD_LIBRARY_PATH for "make test" +- create also a link for libz.so.1 +- added support for FUJITSU UXP/DS (thanks to Toshiaki Nomura) +- use $(SHAREDLIB) instead of libz.so in Makefile.in (for HPUX) +- added -soname for Linux in configure (Chun-Chung Chen, +- assign numbers to the exported functions in zlib.def (for Windows DLL) +- add advice in zlib.h for best usage of deflateSetDictionary +- work around compiler bug on Atari (cast Z_NULL in call of s->checkfn) +- allow compilation with ANSI keywords only enabled for TurboC in large model +- avoid "versionString"[0] (Borland bug) +- add NEED_DUMMY_RETURN for Borland +- use variable z_verbose for tracing in debug mode (L. Peter Deutsch). +- allow compilation with CC +- defined STDC for OS/2 (David Charlap) +- limit external names to 8 chars for MVS (Thomas Lund) +- in minigzip.c, use static buffers only for 16-bit systems +- fix suffix check for "minigzip -d foo.gz" +- do not return an error for the 2nd of two consecutive gzflush() (Felix Lee) +- use _fdopen instead of fdopen for MSC >= 6.0 (Thomas Fanslau) +- added makelcc.bat for lcc-win32 (Tom St Denis) +- in Makefile.dj2, use copy and del instead of install and rm (Frank Donahoe) +- Avoid expanded $Id$. Use "rcs -kb" or "cvs admin -kb" to avoid Id expansion. +- check for unistd.h in configure (for off_t) +- remove useless check parameter in inflate_blocks_free +- avoid useless assignment of s->check to itself in inflate_blocks_new +- do not flush twice in gzclose (thanks to Ken Raeburn) +- rename FOPEN as F_OPEN to avoid clash with /usr/include/sys/file.h +- use NO_ERRNO_H instead of enumeration of operating systems with errno.h +- work around buggy fclose on pipes for HP/UX +- support zlib DLL with BORLAND C++ 5.0 (thanks to Glenn Randers-Pehrson) +- fix configure if CC is already equal to gcc + +Changes in 1.0.5 (3 Jan 98) +- Fix inflate to terminate gracefully when fed corrupted or invalid data +- Use const for rommable constants in inflate +- Eliminate memory leaks on error conditions in inflate +- Removed some vestigial code in inflate +- Update web address in README + +Changes in 1.0.4 (24 Jul 96) +- In very rare conditions, deflate(s, Z_FINISH) could fail to produce an EOF + bit, so the decompressor could decompress all the correct data but went + on to attempt decompressing extra garbage data. This affected minigzip too. +- zlibVersion and gzerror return const char* (needed for DLL) +- port to RISCOS (no fdopen, no multiple dots, no unlink, no fileno) +- use z_error only for DEBUG (avoid problem with DLLs) + +Changes in 1.0.3 (2 Jul 96) +- use z_streamp instead of z_stream *, which is now a far pointer in MSDOS + small and medium models; this makes the library incompatible with previous + versions for these models. (No effect in large model or on other systems.) +- return OK instead of BUF_ERROR if previous deflate call returned with + avail_out as zero but there is nothing to do +- added memcmp for non STDC compilers +- define NO_DUMMY_DECL for more Mac compilers (.h files merged incorrectly) +- define __32BIT__ if __386__ or i386 is defined (pb. with Watcom and SCO) +- better check for 16-bit mode MSC (avoids problem with Symantec) + +Changes in 1.0.2 (23 May 96) +- added Windows DLL support +- added a function zlibVersion (for the DLL support) +- fixed declarations using Bytef in infutil.c (pb with MSDOS medium model) +- Bytef is define's instead of typedef'd only for Borland C +- avoid reading uninitialized memory in example.c +- mention in README that the zlib format is now RFC1950 +- updated Makefile.dj2 +- added algorithm.doc + +Changes in 1.0.1 (20 May 96) [1.0 skipped to avoid confusion] +- fix array overlay in deflate.c which sometimes caused bad compressed data +- fix inflate bug with empty stored block +- fix MSDOS medium model which was broken in 0.99 +- fix deflateParams() which could generated bad compressed data. +- Bytef is define'd instead of typedef'ed (work around Borland bug) +- added an INDEX file +- new makefiles for DJGPP (Makefile.dj2), 32-bit Borland (Makefile.b32), + Watcom (Makefile.wat), Amiga SAS/C (Makefile.sas) +- speed up adler32 for modern machines without auto-increment +- added -ansi for IRIX in configure +- static_init_done in trees.c is an int +- define unlink as delete for VMS +- fix configure for QNX +- add configure branch for SCO and HPUX +- avoid many warnings (unused variables, dead assignments, etc...) +- no fdopen for BeOS +- fix the Watcom fix for 32 bit mode (define FAR as empty) +- removed redefinition of Byte for MKWERKS +- work around an MWKERKS bug (incorrect merge of all .h files) + +Changes in 0.99 (27 Jan 96) +- allow preset dictionary shared between compressor and decompressor +- allow compression level 0 (no compression) +- add deflateParams in zlib.h: allow dynamic change of compression level + and compression strategy. +- test large buffers and deflateParams in example.c +- add optional "configure" to build zlib as a shared library +- suppress Makefile.qnx, use configure instead +- fixed deflate for 64-bit systems (detected on Cray) +- fixed inflate_blocks for 64-bit systems (detected on Alpha) +- declare Z_DEFLATED in zlib.h (possible parameter for deflateInit2) +- always return Z_BUF_ERROR when deflate() has nothing to do +- deflateInit and inflateInit are now macros to allow version checking +- prefix all global functions and types with z_ with -DZ_PREFIX +- make falloc completely reentrant (inftrees.c) +- fixed very unlikely race condition in ct_static_init +- free in reverse order of allocation to help memory manager +- use zlib-1.0/* instead of zlib/* inside the tar.gz +- make zlib warning-free with "gcc -O3 -Wall -Wwrite-strings -Wpointer-arith + -Wconversion -Wstrict-prototypes -Wmissing-prototypes" +- allow gzread on concatenated .gz files +- deflateEnd now returns Z_DATA_ERROR if it was premature +- deflate is finally (?) fully deterministic (no matches beyond end of input) +- Document Z_SYNC_FLUSH +- add uninstall in Makefile +- Check for __cpluplus in zlib.h +- Better test in ct_align for partial flush +- avoid harmless warnings for Borland C++ +- initialize hash_head in deflate.c +- avoid warning on fdopen (gzio.c) for HP cc -Aa +- include stdlib.h for STDC compilers +- include errno.h for Cray +- ignore error if ranlib doesn't exist +- call ranlib twice for NeXTSTEP +- use exec_prefix instead of prefix for libz.a +- renamed ct_* as _tr_* to avoid conflict with applications +- clear z->msg in inflateInit2 before any error return +- initialize opaque in example.c, gzio.c, deflate.c and inflate.c +- fixed typo in zconf.h (_GNUC__ => __GNUC__) +- check for WIN32 in zconf.h and zutil.c (avoid farmalloc in 32-bit mode) +- fix typo in Make_vms.com (f$trnlnm -> f$getsyi) +- in fcalloc, normalize pointer if size > 65520 bytes +- don't use special fcalloc for 32 bit Borland C++ +- use STDC instead of __GO32__ to avoid redeclaring exit, calloc, etc... +- use Z_BINARY instead of BINARY +- document that gzclose after gzdopen will close the file +- allow "a" as mode in gzopen. +- fix error checking in gzread +- allow skipping .gz extra-field on pipes +- added reference to Perl interface in README +- put the crc table in FAR data (I dislike more and more the medium model :) +- added get_crc_table +- added a dimension to all arrays (Borland C can't count). +- workaround Borland C bug in declaration of inflate_codes_new & inflate_fast +- guard against multiple inclusion of *.h (for precompiled header on Mac) +- Watcom C pretends to be Microsoft C small model even in 32 bit mode. +- don't use unsized arrays to avoid silly warnings by Visual C++: + warning C4746: 'inflate_mask' : unsized array treated as '__far' + (what's wrong with far data in far model?). +- define enum out of inflate_blocks_state to allow compilation with C++ + +Changes in 0.95 (16 Aug 95) +- fix MSDOS small and medium model (now easier to adapt to any compiler) +- inlined send_bits +- fix the final (:-) bug for deflate with flush (output was correct but + not completely flushed in rare occasions). +- default window size is same for compression and decompression + (it's now sufficient to set MAX_WBITS in zconf.h). +- voidp -> voidpf and voidnp -> voidp (for consistency with other + typedefs and because voidnp was not near in large model). + +Changes in 0.94 (13 Aug 95) +- support MSDOS medium model +- fix deflate with flush (could sometimes generate bad output) +- fix deflateReset (zlib header was incorrectly suppressed) +- added support for VMS +- allow a compression level in gzopen() +- gzflush now calls fflush +- For deflate with flush, flush even if no more input is provided. +- rename libgz.a as libz.a +- avoid complex expression in infcodes.c triggering Turbo C bug +- work around a problem with gcc on Alpha (in INSERT_STRING) +- don't use inline functions (problem with some gcc versions) +- allow renaming of Byte, uInt, etc... with #define. +- avoid warning about (unused) pointer before start of array in deflate.c +- avoid various warnings in gzio.c, example.c, infblock.c, adler32.c, zutil.c +- avoid reserved word 'new' in trees.c + +Changes in 0.93 (25 June 95) +- temporarily disable inline functions +- make deflate deterministic +- give enough lookahead for PARTIAL_FLUSH +- Set binary mode for stdin/stdout in minigzip.c for OS/2 +- don't even use signed char in inflate (not portable enough) +- fix inflate memory leak for segmented architectures + +Changes in 0.92 (3 May 95) +- don't assume that char is signed (problem on SGI) +- Clear bit buffer when starting a stored block +- no memcpy on Pyramid +- suppressed inftest.c +- optimized fill_window, put longest_match inline for gcc +- optimized inflate on stored blocks. +- untabify all sources to simplify patches + +Changes in 0.91 (2 May 95) +- Default MEM_LEVEL is 8 (not 9 for Unix) as documented in zlib.h +- Document the memory requirements in zconf.h +- added "make install" +- fix sync search logic in inflateSync +- deflate(Z_FULL_FLUSH) now works even if output buffer too short +- after inflateSync, don't scare people with just "lo world" +- added support for DJGPP + +Changes in 0.9 (1 May 95) +- don't assume that zalloc clears the allocated memory (the TurboC bug + was Mark's bug after all :) +- let again gzread copy uncompressed data unchanged (was working in 0.71) +- deflate(Z_FULL_FLUSH), inflateReset and inflateSync are now fully implemented +- added a test of inflateSync in example.c +- moved MAX_WBITS to zconf.h because users might want to change that. +- document explicitly that zalloc(64K) on MSDOS must return a normalized + pointer (zero offset) +- added Makefiles for Microsoft C, Turbo C, Borland C++ +- faster crc32() + +Changes in 0.8 (29 April 95) +- added fast inflate (inffast.c) +- deflate(Z_FINISH) now returns Z_STREAM_END when done. Warning: this + is incompatible with previous versions of zlib which returned Z_OK. +- work around a TurboC compiler bug (bad code for b << 0, see infutil.h) + (actually that was not a compiler bug, see 0.81 above) +- gzread no longer reads one extra byte in certain cases +- In gzio destroy(), don't reference a freed structure +- avoid many warnings for MSDOS +- avoid the ERROR symbol which is used by MS Windows + +Changes in 0.71 (14 April 95) +- Fixed more MSDOS compilation problems :( There is still a bug with + TurboC large model. + +Changes in 0.7 (14 April 95) +- Added full inflate support. +- Simplified the crc32() interface. The pre- and post-conditioning + (one's complement) is now done inside crc32(). WARNING: this is + incompatible with previous versions; see zlib.h for the new usage. + +Changes in 0.61 (12 April 95) +- workaround for a bug in TurboC. example and minigzip now work on MSDOS. + +Changes in 0.6 (11 April 95) +- added minigzip.c +- added gzdopen to reopen a file descriptor as gzFile +- added transparent reading of non-gziped files in gzread. +- fixed bug in gzread (don't read crc as data) +- fixed bug in destroy (gzio.c) (don't return Z_STREAM_END for gzclose). +- don't allocate big arrays in the stack (for MSDOS) +- fix some MSDOS compilation problems + +Changes in 0.5: +- do real compression in deflate.c. Z_PARTIAL_FLUSH is supported but + not yet Z_FULL_FLUSH. +- support decompression but only in a single step (forced Z_FINISH) +- added opaque object for zalloc and zfree. +- added deflateReset and inflateReset +- added a variable zlib_version for consistency checking. +- renamed the 'filter' parameter of deflateInit2 as 'strategy'. + Added Z_FILTERED and Z_HUFFMAN_ONLY constants. + +Changes in 0.4: +- avoid "zip" everywhere, use zlib instead of ziplib. +- suppress Z_BLOCK_FLUSH, interpret Z_PARTIAL_FLUSH as block flush + if compression method == 8. +- added adler32 and crc32 +- renamed deflateOptions as deflateInit2, call one or the other but not both +- added the method parameter for deflateInit2. +- added inflateInit2 +- simplied considerably deflateInit and inflateInit by not supporting + user-provided history buffer. This is supported only in deflateInit2 + and inflateInit2. + +Changes in 0.3: +- prefix all macro names with Z_ +- use Z_FINISH instead of deflateEnd to finish compression. +- added Z_HUFFMAN_ONLY +- added gzerror() diff --git a/src/3rdparty/zlib/FAQ b/src/3rdparty/zlib/FAQ new file mode 100644 index 0000000..99b7cf9 --- /dev/null +++ b/src/3rdparty/zlib/FAQ @@ -0,0 +1,368 @@ + + Frequently Asked Questions about zlib + + +If your question is not there, please check the zlib home page +http://zlib.net/ which may have more recent information. +The lastest zlib FAQ is at http://zlib.net/zlib_faq.html + + + 1. Is zlib Y2K-compliant? + + Yes. zlib doesn't handle dates. + + 2. Where can I get a Windows DLL version? + + The zlib sources can be compiled without change to produce a DLL. See the + file win32/DLL_FAQ.txt in the zlib distribution. Pointers to the + precompiled DLL are found in the zlib web site at http://zlib.net/ . + + 3. Where can I get a Visual Basic interface to zlib? + + See + * http://marknelson.us/1997/01/01/zlib-engine/ + * win32/DLL_FAQ.txt in the zlib distribution + + 4. compress() returns Z_BUF_ERROR. + + Make sure that before the call of compress(), the length of the compressed + buffer is equal to the available size of the compressed buffer and not + zero. For Visual Basic, check that this parameter is passed by reference + ("as any"), not by value ("as long"). + + 5. deflate() or inflate() returns Z_BUF_ERROR. + + Before making the call, make sure that avail_in and avail_out are not zero. + When setting the parameter flush equal to Z_FINISH, also make sure that + avail_out is big enough to allow processing all pending input. Note that a + Z_BUF_ERROR is not fatal--another call to deflate() or inflate() can be + made with more input or output space. A Z_BUF_ERROR may in fact be + unavoidable depending on how the functions are used, since it is not + possible to tell whether or not there is more output pending when + strm.avail_out returns with zero. See http://zlib.net/zlib_how.html for a + heavily annotated example. + + 6. Where's the zlib documentation (man pages, etc.)? + + It's in zlib.h . Examples of zlib usage are in the files test/example.c + and test/minigzip.c, with more in examples/ . + + 7. Why don't you use GNU autoconf or libtool or ...? + + Because we would like to keep zlib as a very small and simple package. + zlib is rather portable and doesn't need much configuration. + + 8. I found a bug in zlib. + + Most of the time, such problems are due to an incorrect usage of zlib. + Please try to reproduce the problem with a small program and send the + corresponding source to us at zlib@gzip.org . Do not send multi-megabyte + data files without prior agreement. + + 9. Why do I get "undefined reference to gzputc"? + + If "make test" produces something like + + example.o(.text+0x154): undefined reference to `gzputc' + + check that you don't have old files libz.* in /usr/lib, /usr/local/lib or + /usr/X11R6/lib. Remove any old versions, then do "make install". + +10. I need a Delphi interface to zlib. + + See the contrib/delphi directory in the zlib distribution. + +11. Can zlib handle .zip archives? + + Not by itself, no. See the directory contrib/minizip in the zlib + distribution. + +12. Can zlib handle .Z files? + + No, sorry. You have to spawn an uncompress or gunzip subprocess, or adapt + the code of uncompress on your own. + +13. How can I make a Unix shared library? + + By default a shared (and a static) library is built for Unix. So: + + make distclean + ./configure + make + +14. How do I install a shared zlib library on Unix? + + After the above, then: + + make install + + However, many flavors of Unix come with a shared zlib already installed. + Before going to the trouble of compiling a shared version of zlib and + trying to install it, you may want to check if it's already there! If you + can #include , it's there. The -lz option will probably link to + it. You can check the version at the top of zlib.h or with the + ZLIB_VERSION symbol defined in zlib.h . + +15. I have a question about OttoPDF. + + We are not the authors of OttoPDF. The real author is on the OttoPDF web + site: Joel Hainley, jhainley@myndkryme.com. + +16. Can zlib decode Flate data in an Adobe PDF file? + + Yes. See http://www.pdflib.com/ . To modify PDF forms, see + http://sourceforge.net/projects/acroformtool/ . + +17. Why am I getting this "register_frame_info not found" error on Solaris? + + After installing zlib 1.1.4 on Solaris 2.6, running applications using zlib + generates an error such as: + + ld.so.1: rpm: fatal: relocation error: file /usr/local/lib/libz.so: + symbol __register_frame_info: referenced symbol not found + + The symbol __register_frame_info is not part of zlib, it is generated by + the C compiler (cc or gcc). You must recompile applications using zlib + which have this problem. This problem is specific to Solaris. See + http://www.sunfreeware.com for Solaris versions of zlib and applications + using zlib. + +18. Why does gzip give an error on a file I make with compress/deflate? + + The compress and deflate functions produce data in the zlib format, which + is different and incompatible with the gzip format. The gz* functions in + zlib on the other hand use the gzip format. Both the zlib and gzip formats + use the same compressed data format internally, but have different headers + and trailers around the compressed data. + +19. Ok, so why are there two different formats? + + The gzip format was designed to retain the directory information about a + single file, such as the name and last modification date. The zlib format + on the other hand was designed for in-memory and communication channel + applications, and has a much more compact header and trailer and uses a + faster integrity check than gzip. + +20. Well that's nice, but how do I make a gzip file in memory? + + You can request that deflate write the gzip format instead of the zlib + format using deflateInit2(). You can also request that inflate decode the + gzip format using inflateInit2(). Read zlib.h for more details. + +21. Is zlib thread-safe? + + Yes. However any library routines that zlib uses and any application- + provided memory allocation routines must also be thread-safe. zlib's gz* + functions use stdio library routines, and most of zlib's functions use the + library memory allocation routines by default. zlib's *Init* functions + allow for the application to provide custom memory allocation routines. + + Of course, you should only operate on any given zlib or gzip stream from a + single thread at a time. + +22. Can I use zlib in my commercial application? + + Yes. Please read the license in zlib.h. + +23. Is zlib under the GNU license? + + No. Please read the license in zlib.h. + +24. The license says that altered source versions must be "plainly marked". So + what exactly do I need to do to meet that requirement? + + You need to change the ZLIB_VERSION and ZLIB_VERNUM #defines in zlib.h. In + particular, the final version number needs to be changed to "f", and an + identification string should be appended to ZLIB_VERSION. Version numbers + x.x.x.f are reserved for modifications to zlib by others than the zlib + maintainers. For example, if the version of the base zlib you are altering + is "1.2.3.4", then in zlib.h you should change ZLIB_VERNUM to 0x123f, and + ZLIB_VERSION to something like "1.2.3.f-zachary-mods-v3". You can also + update the version strings in deflate.c and inftrees.c. + + For altered source distributions, you should also note the origin and + nature of the changes in zlib.h, as well as in ChangeLog and README, along + with the dates of the alterations. The origin should include at least your + name (or your company's name), and an email address to contact for help or + issues with the library. + + Note that distributing a compiled zlib library along with zlib.h and + zconf.h is also a source distribution, and so you should change + ZLIB_VERSION and ZLIB_VERNUM and note the origin and nature of the changes + in zlib.h as you would for a full source distribution. + +25. Will zlib work on a big-endian or little-endian architecture, and can I + exchange compressed data between them? + + Yes and yes. + +26. Will zlib work on a 64-bit machine? + + Yes. It has been tested on 64-bit machines, and has no dependence on any + data types being limited to 32-bits in length. If you have any + difficulties, please provide a complete problem report to zlib@gzip.org + +27. Will zlib decompress data from the PKWare Data Compression Library? + + No. The PKWare DCL uses a completely different compressed data format than + does PKZIP and zlib. However, you can look in zlib's contrib/blast + directory for a possible solution to your problem. + +28. Can I access data randomly in a compressed stream? + + No, not without some preparation. If when compressing you periodically use + Z_FULL_FLUSH, carefully write all the pending data at those points, and + keep an index of those locations, then you can start decompression at those + points. You have to be careful to not use Z_FULL_FLUSH too often, since it + can significantly degrade compression. Alternatively, you can scan a + deflate stream once to generate an index, and then use that index for + random access. See examples/zran.c . + +29. Does zlib work on MVS, OS/390, CICS, etc.? + + It has in the past, but we have not heard of any recent evidence. There + were working ports of zlib 1.1.4 to MVS, but those links no longer work. + If you know of recent, successful applications of zlib on these operating + systems, please let us know. Thanks. + +30. Is there some simpler, easier to read version of inflate I can look at to + understand the deflate format? + + First off, you should read RFC 1951. Second, yes. Look in zlib's + contrib/puff directory. + +31. Does zlib infringe on any patents? + + As far as we know, no. In fact, that was originally the whole point behind + zlib. Look here for some more information: + + http://www.gzip.org/#faq11 + +32. Can zlib work with greater than 4 GB of data? + + Yes. inflate() and deflate() will process any amount of data correctly. + Each call of inflate() or deflate() is limited to input and output chunks + of the maximum value that can be stored in the compiler's "unsigned int" + type, but there is no limit to the number of chunks. Note however that the + strm.total_in and strm_total_out counters may be limited to 4 GB. These + counters are provided as a convenience and are not used internally by + inflate() or deflate(). The application can easily set up its own counters + updated after each call of inflate() or deflate() to count beyond 4 GB. + compress() and uncompress() may be limited to 4 GB, since they operate in a + single call. gzseek() and gztell() may be limited to 4 GB depending on how + zlib is compiled. See the zlibCompileFlags() function in zlib.h. + + The word "may" appears several times above since there is a 4 GB limit only + if the compiler's "long" type is 32 bits. If the compiler's "long" type is + 64 bits, then the limit is 16 exabytes. + +33. Does zlib have any security vulnerabilities? + + The only one that we are aware of is potentially in gzprintf(). If zlib is + compiled to use sprintf() or vsprintf(), then there is no protection + against a buffer overflow of an 8K string space (or other value as set by + gzbuffer()), other than the caller of gzprintf() assuring that the output + will not exceed 8K. On the other hand, if zlib is compiled to use + snprintf() or vsnprintf(), which should normally be the case, then there is + no vulnerability. The ./configure script will display warnings if an + insecure variation of sprintf() will be used by gzprintf(). Also the + zlibCompileFlags() function will return information on what variant of + sprintf() is used by gzprintf(). + + If you don't have snprintf() or vsnprintf() and would like one, you can + find a portable implementation here: + + http://www.ijs.si/software/snprintf/ + + Note that you should be using the most recent version of zlib. Versions + 1.1.3 and before were subject to a double-free vulnerability, and versions + 1.2.1 and 1.2.2 were subject to an access exception when decompressing + invalid compressed data. + +34. Is there a Java version of zlib? + + Probably what you want is to use zlib in Java. zlib is already included + as part of the Java SDK in the java.util.zip package. If you really want + a version of zlib written in the Java language, look on the zlib home + page for links: http://zlib.net/ . + +35. I get this or that compiler or source-code scanner warning when I crank it + up to maximally-pedantic. Can't you guys write proper code? + + Many years ago, we gave up attempting to avoid warnings on every compiler + in the universe. It just got to be a waste of time, and some compilers + were downright silly as well as contradicted each other. So now, we simply + make sure that the code always works. + +36. Valgrind (or some similar memory access checker) says that deflate is + performing a conditional jump that depends on an uninitialized value. + Isn't that a bug? + + No. That is intentional for performance reasons, and the output of deflate + is not affected. This only started showing up recently since zlib 1.2.x + uses malloc() by default for allocations, whereas earlier versions used + calloc(), which zeros out the allocated memory. Even though the code was + correct, versions 1.2.4 and later was changed to not stimulate these + checkers. + +37. Will zlib read the (insert any ancient or arcane format here) compressed + data format? + + Probably not. Look in the comp.compression FAQ for pointers to various + formats and associated software. + +38. How can I encrypt/decrypt zip files with zlib? + + zlib doesn't support encryption. The original PKZIP encryption is very + weak and can be broken with freely available programs. To get strong + encryption, use GnuPG, http://www.gnupg.org/ , which already includes zlib + compression. For PKZIP compatible "encryption", look at + http://www.info-zip.org/ + +39. What's the difference between the "gzip" and "deflate" HTTP 1.1 encodings? + + "gzip" is the gzip format, and "deflate" is the zlib format. They should + probably have called the second one "zlib" instead to avoid confusion with + the raw deflate compressed data format. While the HTTP 1.1 RFC 2616 + correctly points to the zlib specification in RFC 1950 for the "deflate" + transfer encoding, there have been reports of servers and browsers that + incorrectly produce or expect raw deflate data per the deflate + specification in RFC 1951, most notably Microsoft. So even though the + "deflate" transfer encoding using the zlib format would be the more + efficient approach (and in fact exactly what the zlib format was designed + for), using the "gzip" transfer encoding is probably more reliable due to + an unfortunate choice of name on the part of the HTTP 1.1 authors. + + Bottom line: use the gzip format for HTTP 1.1 encoding. + +40. Does zlib support the new "Deflate64" format introduced by PKWare? + + No. PKWare has apparently decided to keep that format proprietary, since + they have not documented it as they have previous compression formats. In + any case, the compression improvements are so modest compared to other more + modern approaches, that it's not worth the effort to implement. + +41. I'm having a problem with the zip functions in zlib, can you help? + + There are no zip functions in zlib. You are probably using minizip by + Giles Vollant, which is found in the contrib directory of zlib. It is not + part of zlib. In fact none of the stuff in contrib is part of zlib. The + files in there are not supported by the zlib authors. You need to contact + the authors of the respective contribution for help. + +42. The match.asm code in contrib is under the GNU General Public License. + Since it's part of zlib, doesn't that mean that all of zlib falls under the + GNU GPL? + + No. The files in contrib are not part of zlib. They were contributed by + other authors and are provided as a convenience to the user within the zlib + distribution. Each item in contrib has its own license. + +43. Is zlib subject to export controls? What is its ECCN? + + zlib is not subject to export controls, and so is classified as EAR99. + +44. Can you please sign these lengthy legal documents and fax them back to us + so that we can use your software in our product? + + No. Go away. Shoo. diff --git a/src/3rdparty/zlib/INDEX b/src/3rdparty/zlib/INDEX new file mode 100644 index 0000000..2ba0641 --- /dev/null +++ b/src/3rdparty/zlib/INDEX @@ -0,0 +1,68 @@ +CMakeLists.txt cmake build file +ChangeLog history of changes +FAQ Frequently Asked Questions about zlib +INDEX this file +Makefile dummy Makefile that tells you to ./configure +Makefile.in template for Unix Makefile +README guess what +configure configure script for Unix +make_vms.com makefile for VMS +test/example.c zlib usages examples for build testing +test/minigzip.c minimal gzip-like functionality for build testing +test/infcover.c inf*.c code coverage for build coverage testing +treebuild.xml XML description of source file dependencies +zconf.h.cmakein zconf.h template for cmake +zconf.h.in zconf.h template for configure +zlib.3 Man page for zlib +zlib.3.pdf Man page in PDF format +zlib.map Linux symbol information +zlib.pc.in Template for pkg-config descriptor +zlib.pc.cmakein zlib.pc template for cmake +zlib2ansi perl script to convert source files for C++ compilation + +amiga/ makefiles for Amiga SAS C +as400/ makefiles for AS/400 +doc/ documentation for formats and algorithms +msdos/ makefiles for MSDOS +nintendods/ makefile for Nintendo DS +old/ makefiles for various architectures and zlib documentation + files that have not yet been updated for zlib 1.2.x +qnx/ makefiles for QNX +watcom/ makefiles for OpenWatcom +win32/ makefiles for Windows + + zlib public header files (required for library use): +zconf.h +zlib.h + + private source files used to build the zlib library: +adler32.c +compress.c +crc32.c +crc32.h +deflate.c +deflate.h +gzclose.c +gzguts.h +gzlib.c +gzread.c +gzwrite.c +infback.c +inffast.c +inffast.h +inffixed.h +inflate.c +inflate.h +inftrees.c +inftrees.h +trees.c +trees.h +uncompr.c +zutil.c +zutil.h + + source files for sample programs +See examples/README.examples + + unsupported contributions by third parties +See contrib/README.contrib diff --git a/src/3rdparty/zlib/README b/src/3rdparty/zlib/README new file mode 100644 index 0000000..5ca9d12 --- /dev/null +++ b/src/3rdparty/zlib/README @@ -0,0 +1,115 @@ +ZLIB DATA COMPRESSION LIBRARY + +zlib 1.2.8 is a general purpose data compression library. All the code is +thread safe. The data format used by the zlib library is described by RFCs +(Request for Comments) 1950 to 1952 in the files +http://tools.ietf.org/html/rfc1950 (zlib format), rfc1951 (deflate format) and +rfc1952 (gzip format). + +All functions of the compression library are documented in the file zlib.h +(volunteer to write man pages welcome, contact zlib@gzip.org). A usage example +of the library is given in the file test/example.c which also tests that +the library is working correctly. Another example is given in the file +test/minigzip.c. The compression library itself is composed of all source +files in the root directory. + +To compile all files and run the test program, follow the instructions given at +the top of Makefile.in. In short "./configure; make test", and if that goes +well, "make install" should work for most flavors of Unix. For Windows, use +one of the special makefiles in win32/ or contrib/vstudio/ . For VMS, use +make_vms.com. + +Questions about zlib should be sent to , or to Gilles Vollant + for the Windows DLL version. The zlib home page is +http://zlib.net/ . Before reporting a problem, please check this site to +verify that you have the latest version of zlib; otherwise get the latest +version and check whether the problem still exists or not. + +PLEASE read the zlib FAQ http://zlib.net/zlib_faq.html before asking for help. + +Mark Nelson wrote an article about zlib for the Jan. 1997 +issue of Dr. Dobb's Journal; a copy of the article is available at +http://marknelson.us/1997/01/01/zlib-engine/ . + +The changes made in version 1.2.8 are documented in the file ChangeLog. + +Unsupported third party contributions are provided in directory contrib/ . + +zlib is available in Java using the java.util.zip package, documented at +http://java.sun.com/developer/technicalArticles/Programming/compression/ . + +A Perl interface to zlib written by Paul Marquess is available +at CPAN (Comprehensive Perl Archive Network) sites, including +http://search.cpan.org/~pmqs/IO-Compress-Zlib/ . + +A Python interface to zlib written by A.M. Kuchling is +available in Python 1.5 and later versions, see +http://docs.python.org/library/zlib.html . + +zlib is built into tcl: http://wiki.tcl.tk/4610 . + +An experimental package to read and write files in .zip format, written on top +of zlib by Gilles Vollant , is available in the +contrib/minizip directory of zlib. + + +Notes for some targets: + +- For Windows DLL versions, please see win32/DLL_FAQ.txt + +- For 64-bit Irix, deflate.c must be compiled without any optimization. With + -O, one libpng test fails. The test works in 32 bit mode (with the -n32 + compiler flag). The compiler bug has been reported to SGI. + +- zlib doesn't work with gcc 2.6.3 on a DEC 3000/300LX under OSF/1 2.1 it works + when compiled with cc. + +- On Digital Unix 4.0D (formely OSF/1) on AlphaServer, the cc option -std1 is + necessary to get gzprintf working correctly. This is done by configure. + +- zlib doesn't work on HP-UX 9.05 with some versions of /bin/cc. It works with + other compilers. Use "make test" to check your compiler. + +- gzdopen is not supported on RISCOS or BEOS. + +- For PalmOs, see http://palmzlib.sourceforge.net/ + + +Acknowledgments: + + The deflate format used by zlib was defined by Phil Katz. The deflate and + zlib specifications were written by L. Peter Deutsch. Thanks to all the + people who reported problems and suggested various improvements in zlib; they + are too numerous to cite here. + +Copyright notice: + + (C) 1995-2013 Jean-loup Gailly and Mark Adler + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + + Jean-loup Gailly Mark Adler + jloup@gzip.org madler@alumni.caltech.edu + +If you use the zlib library in a product, we would appreciate *not* receiving +lengthy legal documents to sign. The sources are provided for free but without +warranty of any kind. The library has been entirely written by Jean-loup +Gailly and Mark Adler; it does not include third-party code. + +If you redistribute modified sources, we would appreciate that you include in +the file ChangeLog history information documenting your changes. Please read +the FAQ for more information on the distribution of modified source versions. diff --git a/src/3rdparty/zlib/adler32.c b/src/3rdparty/zlib/adler32.c new file mode 100644 index 0000000..a868f07 --- /dev/null +++ b/src/3rdparty/zlib/adler32.c @@ -0,0 +1,179 @@ +/* adler32.c -- compute the Adler-32 checksum of a data stream + * Copyright (C) 1995-2011 Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +/* @(#) $Id$ */ + +#include "zutil.h" + +#define local static + +local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2)); + +#define BASE 65521 /* largest prime smaller than 65536 */ +#define NMAX 5552 +/* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */ + +#define DO1(buf,i) {adler += (buf)[i]; sum2 += adler;} +#define DO2(buf,i) DO1(buf,i); DO1(buf,i+1); +#define DO4(buf,i) DO2(buf,i); DO2(buf,i+2); +#define DO8(buf,i) DO4(buf,i); DO4(buf,i+4); +#define DO16(buf) DO8(buf,0); DO8(buf,8); + +/* use NO_DIVIDE if your processor does not do division in hardware -- + try it both ways to see which is faster */ +#ifdef NO_DIVIDE +/* note that this assumes BASE is 65521, where 65536 % 65521 == 15 + (thank you to John Reiser for pointing this out) */ +# define CHOP(a) \ + do { \ + unsigned long tmp = a >> 16; \ + a &= 0xffffUL; \ + a += (tmp << 4) - tmp; \ + } while (0) +# define MOD28(a) \ + do { \ + CHOP(a); \ + if (a >= BASE) a -= BASE; \ + } while (0) +# define MOD(a) \ + do { \ + CHOP(a); \ + MOD28(a); \ + } while (0) +# define MOD63(a) \ + do { /* this assumes a is not negative */ \ + z_off64_t tmp = a >> 32; \ + a &= 0xffffffffL; \ + a += (tmp << 8) - (tmp << 5) + tmp; \ + tmp = a >> 16; \ + a &= 0xffffL; \ + a += (tmp << 4) - tmp; \ + tmp = a >> 16; \ + a &= 0xffffL; \ + a += (tmp << 4) - tmp; \ + if (a >= BASE) a -= BASE; \ + } while (0) +#else +# define MOD(a) a %= BASE +# define MOD28(a) a %= BASE +# define MOD63(a) a %= BASE +#endif + +/* ========================================================================= */ +uLong ZEXPORT adler32(adler, buf, len) + uLong adler; + const Bytef *buf; + uInt len; +{ + unsigned long sum2; + unsigned n; + + /* split Adler-32 into component sums */ + sum2 = (adler >> 16) & 0xffff; + adler &= 0xffff; + + /* in case user likes doing a byte at a time, keep it fast */ + if (len == 1) { + adler += buf[0]; + if (adler >= BASE) + adler -= BASE; + sum2 += adler; + if (sum2 >= BASE) + sum2 -= BASE; + return adler | (sum2 << 16); + } + + /* initial Adler-32 value (deferred check for len == 1 speed) */ + if (buf == Z_NULL) + return 1L; + + /* in case short lengths are provided, keep it somewhat fast */ + if (len < 16) { + while (len--) { + adler += *buf++; + sum2 += adler; + } + if (adler >= BASE) + adler -= BASE; + MOD28(sum2); /* only added so many BASE's */ + return adler | (sum2 << 16); + } + + /* do length NMAX blocks -- requires just one modulo operation */ + while (len >= NMAX) { + len -= NMAX; + n = NMAX / 16; /* NMAX is divisible by 16 */ + do { + DO16(buf); /* 16 sums unrolled */ + buf += 16; + } while (--n); + MOD(adler); + MOD(sum2); + } + + /* do remaining bytes (less than NMAX, still just one modulo) */ + if (len) { /* avoid modulos if none remaining */ + while (len >= 16) { + len -= 16; + DO16(buf); + buf += 16; + } + while (len--) { + adler += *buf++; + sum2 += adler; + } + MOD(adler); + MOD(sum2); + } + + /* return recombined sums */ + return adler | (sum2 << 16); +} + +/* ========================================================================= */ +local uLong adler32_combine_(adler1, adler2, len2) + uLong adler1; + uLong adler2; + z_off64_t len2; +{ + unsigned long sum1; + unsigned long sum2; + unsigned rem; + + /* for negative len, return invalid adler32 as a clue for debugging */ + if (len2 < 0) + return 0xffffffffUL; + + /* the derivation of this formula is left as an exercise for the reader */ + MOD63(len2); /* assumes len2 >= 0 */ + rem = (unsigned)len2; + sum1 = adler1 & 0xffff; + sum2 = rem * sum1; + MOD(sum2); + sum1 += (adler2 & 0xffff) + BASE - 1; + sum2 += ((adler1 >> 16) & 0xffff) + ((adler2 >> 16) & 0xffff) + BASE - rem; + if (sum1 >= BASE) sum1 -= BASE; + if (sum1 >= BASE) sum1 -= BASE; + if (sum2 >= (BASE << 1)) sum2 -= (BASE << 1); + if (sum2 >= BASE) sum2 -= BASE; + return sum1 | (sum2 << 16); +} + +/* ========================================================================= */ +uLong ZEXPORT adler32_combine(adler1, adler2, len2) + uLong adler1; + uLong adler2; + z_off_t len2; +{ + return adler32_combine_(adler1, adler2, len2); +} + +uLong ZEXPORT adler32_combine64(adler1, adler2, len2) + uLong adler1; + uLong adler2; + z_off64_t len2; +{ + return adler32_combine_(adler1, adler2, len2); +} diff --git a/src/3rdparty/zlib/compress.c b/src/3rdparty/zlib/compress.c new file mode 100644 index 0000000..6e97626 --- /dev/null +++ b/src/3rdparty/zlib/compress.c @@ -0,0 +1,80 @@ +/* compress.c -- compress a memory buffer + * Copyright (C) 1995-2005 Jean-loup Gailly. + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +/* @(#) $Id$ */ + +#define ZLIB_INTERNAL +#include "zlib.h" + +/* =========================================================================== + Compresses the source buffer into the destination buffer. The level + parameter has the same meaning as in deflateInit. sourceLen is the byte + length of the source buffer. Upon entry, destLen is the total size of the + destination buffer, which must be at least 0.1% larger than sourceLen plus + 12 bytes. Upon exit, destLen is the actual size of the compressed buffer. + + compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough + memory, Z_BUF_ERROR if there was not enough room in the output buffer, + Z_STREAM_ERROR if the level parameter is invalid. +*/ +int ZEXPORT compress2 (dest, destLen, source, sourceLen, level) + Bytef *dest; + uLongf *destLen; + const Bytef *source; + uLong sourceLen; + int level; +{ + z_stream stream; + int err; + + stream.next_in = (z_const Bytef *)source; + stream.avail_in = (uInt)sourceLen; +#ifdef MAXSEG_64K + /* Check for source > 64K on 16-bit machine: */ + if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR; +#endif + stream.next_out = dest; + stream.avail_out = (uInt)*destLen; + if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR; + + stream.zalloc = (alloc_func)0; + stream.zfree = (free_func)0; + stream.opaque = (voidpf)0; + + err = deflateInit(&stream, level); + if (err != Z_OK) return err; + + err = deflate(&stream, Z_FINISH); + if (err != Z_STREAM_END) { + deflateEnd(&stream); + return err == Z_OK ? Z_BUF_ERROR : err; + } + *destLen = stream.total_out; + + err = deflateEnd(&stream); + return err; +} + +/* =========================================================================== + */ +int ZEXPORT compress (dest, destLen, source, sourceLen) + Bytef *dest; + uLongf *destLen; + const Bytef *source; + uLong sourceLen; +{ + return compress2(dest, destLen, source, sourceLen, Z_DEFAULT_COMPRESSION); +} + +/* =========================================================================== + If the default memLevel or windowBits for deflateInit() is changed, then + this function needs to be updated. + */ +uLong ZEXPORT compressBound (sourceLen) + uLong sourceLen; +{ + return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) + + (sourceLen >> 25) + 13; +} diff --git a/src/3rdparty/zlib/crc32.c b/src/3rdparty/zlib/crc32.c new file mode 100644 index 0000000..979a719 --- /dev/null +++ b/src/3rdparty/zlib/crc32.c @@ -0,0 +1,425 @@ +/* crc32.c -- compute the CRC-32 of a data stream + * Copyright (C) 1995-2006, 2010, 2011, 2012 Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + * + * Thanks to Rodney Brown for his contribution of faster + * CRC methods: exclusive-oring 32 bits of data at a time, and pre-computing + * tables for updating the shift register in one step with three exclusive-ors + * instead of four steps with four exclusive-ors. This results in about a + * factor of two increase in speed on a Power PC G4 (PPC7455) using gcc -O3. + */ + +/* @(#) $Id$ */ + +/* + Note on the use of DYNAMIC_CRC_TABLE: there is no mutex or semaphore + protection on the static variables used to control the first-use generation + of the crc tables. Therefore, if you #define DYNAMIC_CRC_TABLE, you should + first call get_crc_table() to initialize the tables before allowing more than + one thread to use crc32(). + + DYNAMIC_CRC_TABLE and MAKECRCH can be #defined to write out crc32.h. + */ + +#ifdef MAKECRCH +# include +# ifndef DYNAMIC_CRC_TABLE +# define DYNAMIC_CRC_TABLE +# endif /* !DYNAMIC_CRC_TABLE */ +#endif /* MAKECRCH */ + +#include "zutil.h" /* for STDC and FAR definitions */ + +#define local static + +/* Definitions for doing the crc four data bytes at a time. */ +#if !defined(NOBYFOUR) && defined(Z_U4) +# define BYFOUR +#endif +#ifdef BYFOUR + local unsigned long crc32_little OF((unsigned long, + const unsigned char FAR *, unsigned)); + local unsigned long crc32_big OF((unsigned long, + const unsigned char FAR *, unsigned)); +# define TBLS 8 +#else +# define TBLS 1 +#endif /* BYFOUR */ + +/* Local functions for crc concatenation */ +local unsigned long gf2_matrix_times OF((unsigned long *mat, + unsigned long vec)); +local void gf2_matrix_square OF((unsigned long *square, unsigned long *mat)); +local uLong crc32_combine_ OF((uLong crc1, uLong crc2, z_off64_t len2)); + + +#ifdef DYNAMIC_CRC_TABLE + +local volatile int crc_table_empty = 1; +local z_crc_t FAR crc_table[TBLS][256]; +local void make_crc_table OF((void)); +#ifdef MAKECRCH + local void write_table OF((FILE *, const z_crc_t FAR *)); +#endif /* MAKECRCH */ +/* + Generate tables for a byte-wise 32-bit CRC calculation on the polynomial: + x^32+x^26+x^23+x^22+x^16+x^12+x^11+x^10+x^8+x^7+x^5+x^4+x^2+x+1. + + Polynomials over GF(2) are represented in binary, one bit per coefficient, + with the lowest powers in the most significant bit. Then adding polynomials + is just exclusive-or, and multiplying a polynomial by x is a right shift by + one. If we call the above polynomial p, and represent a byte as the + polynomial q, also with the lowest power in the most significant bit (so the + byte 0xb1 is the polynomial x^7+x^3+x+1), then the CRC is (q*x^32) mod p, + where a mod b means the remainder after dividing a by b. + + This calculation is done using the shift-register method of multiplying and + taking the remainder. The register is initialized to zero, and for each + incoming bit, x^32 is added mod p to the register if the bit is a one (where + x^32 mod p is p+x^32 = x^26+...+1), and the register is multiplied mod p by + x (which is shifting right by one and adding x^32 mod p if the bit shifted + out is a one). We start with the highest power (least significant bit) of + q and repeat for all eight bits of q. + + The first table is simply the CRC of all possible eight bit values. This is + all the information needed to generate CRCs on data a byte at a time for all + combinations of CRC register values and incoming bytes. The remaining tables + allow for word-at-a-time CRC calculation for both big-endian and little- + endian machines, where a word is four bytes. +*/ +local void make_crc_table() +{ + z_crc_t c; + int n, k; + z_crc_t poly; /* polynomial exclusive-or pattern */ + /* terms of polynomial defining this crc (except x^32): */ + static volatile int first = 1; /* flag to limit concurrent making */ + static const unsigned char p[] = {0,1,2,4,5,7,8,10,11,12,16,22,23,26}; + + /* See if another task is already doing this (not thread-safe, but better + than nothing -- significantly reduces duration of vulnerability in + case the advice about DYNAMIC_CRC_TABLE is ignored) */ + if (first) { + first = 0; + + /* make exclusive-or pattern from polynomial (0xedb88320UL) */ + poly = 0; + for (n = 0; n < (int)(sizeof(p)/sizeof(unsigned char)); n++) + poly |= (z_crc_t)1 << (31 - p[n]); + + /* generate a crc for every 8-bit value */ + for (n = 0; n < 256; n++) { + c = (z_crc_t)n; + for (k = 0; k < 8; k++) + c = c & 1 ? poly ^ (c >> 1) : c >> 1; + crc_table[0][n] = c; + } + +#ifdef BYFOUR + /* generate crc for each value followed by one, two, and three zeros, + and then the byte reversal of those as well as the first table */ + for (n = 0; n < 256; n++) { + c = crc_table[0][n]; + crc_table[4][n] = ZSWAP32(c); + for (k = 1; k < 4; k++) { + c = crc_table[0][c & 0xff] ^ (c >> 8); + crc_table[k][n] = c; + crc_table[k + 4][n] = ZSWAP32(c); + } + } +#endif /* BYFOUR */ + + crc_table_empty = 0; + } + else { /* not first */ + /* wait for the other guy to finish (not efficient, but rare) */ + while (crc_table_empty) + ; + } + +#ifdef MAKECRCH + /* write out CRC tables to crc32.h */ + { + FILE *out; + + out = fopen("crc32.h", "w"); + if (out == NULL) return; + fprintf(out, "/* crc32.h -- tables for rapid CRC calculation\n"); + fprintf(out, " * Generated automatically by crc32.c\n */\n\n"); + fprintf(out, "local const z_crc_t FAR "); + fprintf(out, "crc_table[TBLS][256] =\n{\n {\n"); + write_table(out, crc_table[0]); +# ifdef BYFOUR + fprintf(out, "#ifdef BYFOUR\n"); + for (k = 1; k < 8; k++) { + fprintf(out, " },\n {\n"); + write_table(out, crc_table[k]); + } + fprintf(out, "#endif\n"); +# endif /* BYFOUR */ + fprintf(out, " }\n};\n"); + fclose(out); + } +#endif /* MAKECRCH */ +} + +#ifdef MAKECRCH +local void write_table(out, table) + FILE *out; + const z_crc_t FAR *table; +{ + int n; + + for (n = 0; n < 256; n++) + fprintf(out, "%s0x%08lxUL%s", n % 5 ? "" : " ", + (unsigned long)(table[n]), + n == 255 ? "\n" : (n % 5 == 4 ? ",\n" : ", ")); +} +#endif /* MAKECRCH */ + +#else /* !DYNAMIC_CRC_TABLE */ +/* ======================================================================== + * Tables of CRC-32s of all single-byte values, made by make_crc_table(). + */ +#include "crc32.h" +#endif /* DYNAMIC_CRC_TABLE */ + +/* ========================================================================= + * This function can be used by asm versions of crc32() + */ +const z_crc_t FAR * ZEXPORT get_crc_table() +{ +#ifdef DYNAMIC_CRC_TABLE + if (crc_table_empty) + make_crc_table(); +#endif /* DYNAMIC_CRC_TABLE */ + return (const z_crc_t FAR *)crc_table; +} + +/* ========================================================================= */ +#define DO1 crc = crc_table[0][((int)crc ^ (*buf++)) & 0xff] ^ (crc >> 8) +#define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1 + +/* ========================================================================= */ +unsigned long ZEXPORT crc32(crc, buf, len) + unsigned long crc; + const unsigned char FAR *buf; + uInt len; +{ + if (buf == Z_NULL) return 0UL; + +#ifdef DYNAMIC_CRC_TABLE + if (crc_table_empty) + make_crc_table(); +#endif /* DYNAMIC_CRC_TABLE */ + +#ifdef BYFOUR + if (sizeof(void *) == sizeof(ptrdiff_t)) { + z_crc_t endian; + + endian = 1; + if (*((unsigned char *)(&endian))) + return crc32_little(crc, buf, len); + else + return crc32_big(crc, buf, len); + } +#endif /* BYFOUR */ + crc = crc ^ 0xffffffffUL; + while (len >= 8) { + DO8; + len -= 8; + } + if (len) do { + DO1; + } while (--len); + return crc ^ 0xffffffffUL; +} + +#ifdef BYFOUR + +/* ========================================================================= */ +#define DOLIT4 c ^= *buf4++; \ + c = crc_table[3][c & 0xff] ^ crc_table[2][(c >> 8) & 0xff] ^ \ + crc_table[1][(c >> 16) & 0xff] ^ crc_table[0][c >> 24] +#define DOLIT32 DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4 + +/* ========================================================================= */ +local unsigned long crc32_little(crc, buf, len) + unsigned long crc; + const unsigned char FAR *buf; + unsigned len; +{ + register z_crc_t c; + register const z_crc_t FAR *buf4; + + c = (z_crc_t)crc; + c = ~c; + while (len && ((ptrdiff_t)buf & 3)) { + c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8); + len--; + } + + buf4 = (const z_crc_t FAR *)(const void FAR *)buf; + while (len >= 32) { + DOLIT32; + len -= 32; + } + while (len >= 4) { + DOLIT4; + len -= 4; + } + buf = (const unsigned char FAR *)buf4; + + if (len) do { + c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8); + } while (--len); + c = ~c; + return (unsigned long)c; +} + +/* ========================================================================= */ +#define DOBIG4 c ^= *++buf4; \ + c = crc_table[4][c & 0xff] ^ crc_table[5][(c >> 8) & 0xff] ^ \ + crc_table[6][(c >> 16) & 0xff] ^ crc_table[7][c >> 24] +#define DOBIG32 DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4 + +/* ========================================================================= */ +local unsigned long crc32_big(crc, buf, len) + unsigned long crc; + const unsigned char FAR *buf; + unsigned len; +{ + register z_crc_t c; + register const z_crc_t FAR *buf4; + + c = ZSWAP32((z_crc_t)crc); + c = ~c; + while (len && ((ptrdiff_t)buf & 3)) { + c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8); + len--; + } + + buf4 = (const z_crc_t FAR *)(const void FAR *)buf; + buf4--; + while (len >= 32) { + DOBIG32; + len -= 32; + } + while (len >= 4) { + DOBIG4; + len -= 4; + } + buf4++; + buf = (const unsigned char FAR *)buf4; + + if (len) do { + c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8); + } while (--len); + c = ~c; + return (unsigned long)(ZSWAP32(c)); +} + +#endif /* BYFOUR */ + +#define GF2_DIM 32 /* dimension of GF(2) vectors (length of CRC) */ + +/* ========================================================================= */ +local unsigned long gf2_matrix_times(mat, vec) + unsigned long *mat; + unsigned long vec; +{ + unsigned long sum; + + sum = 0; + while (vec) { + if (vec & 1) + sum ^= *mat; + vec >>= 1; + mat++; + } + return sum; +} + +/* ========================================================================= */ +local void gf2_matrix_square(square, mat) + unsigned long *square; + unsigned long *mat; +{ + int n; + + for (n = 0; n < GF2_DIM; n++) + square[n] = gf2_matrix_times(mat, mat[n]); +} + +/* ========================================================================= */ +local uLong crc32_combine_(crc1, crc2, len2) + uLong crc1; + uLong crc2; + z_off64_t len2; +{ + int n; + unsigned long row; + unsigned long even[GF2_DIM]; /* even-power-of-two zeros operator */ + unsigned long odd[GF2_DIM]; /* odd-power-of-two zeros operator */ + + /* degenerate case (also disallow negative lengths) */ + if (len2 <= 0) + return crc1; + + /* put operator for one zero bit in odd */ + odd[0] = 0xedb88320UL; /* CRC-32 polynomial */ + row = 1; + for (n = 1; n < GF2_DIM; n++) { + odd[n] = row; + row <<= 1; + } + + /* put operator for two zero bits in even */ + gf2_matrix_square(even, odd); + + /* put operator for four zero bits in odd */ + gf2_matrix_square(odd, even); + + /* apply len2 zeros to crc1 (first square will put the operator for one + zero byte, eight zero bits, in even) */ + do { + /* apply zeros operator for this bit of len2 */ + gf2_matrix_square(even, odd); + if (len2 & 1) + crc1 = gf2_matrix_times(even, crc1); + len2 >>= 1; + + /* if no more bits set, then done */ + if (len2 == 0) + break; + + /* another iteration of the loop with odd and even swapped */ + gf2_matrix_square(odd, even); + if (len2 & 1) + crc1 = gf2_matrix_times(odd, crc1); + len2 >>= 1; + + /* if no more bits set, then done */ + } while (len2 != 0); + + /* return combined crc */ + crc1 ^= crc2; + return crc1; +} + +/* ========================================================================= */ +uLong ZEXPORT crc32_combine(crc1, crc2, len2) + uLong crc1; + uLong crc2; + z_off_t len2; +{ + return crc32_combine_(crc1, crc2, len2); +} + +uLong ZEXPORT crc32_combine64(crc1, crc2, len2) + uLong crc1; + uLong crc2; + z_off64_t len2; +{ + return crc32_combine_(crc1, crc2, len2); +} diff --git a/src/3rdparty/zlib/crc32.h b/src/3rdparty/zlib/crc32.h new file mode 100644 index 0000000..9e0c778 --- /dev/null +++ b/src/3rdparty/zlib/crc32.h @@ -0,0 +1,441 @@ +/* crc32.h -- tables for rapid CRC calculation + * Generated automatically by crc32.c + */ + +local const z_crc_t FAR crc_table[TBLS][256] = +{ + { + 0x00000000UL, 0x77073096UL, 0xee0e612cUL, 0x990951baUL, 0x076dc419UL, + 0x706af48fUL, 0xe963a535UL, 0x9e6495a3UL, 0x0edb8832UL, 0x79dcb8a4UL, + 0xe0d5e91eUL, 0x97d2d988UL, 0x09b64c2bUL, 0x7eb17cbdUL, 0xe7b82d07UL, + 0x90bf1d91UL, 0x1db71064UL, 0x6ab020f2UL, 0xf3b97148UL, 0x84be41deUL, + 0x1adad47dUL, 0x6ddde4ebUL, 0xf4d4b551UL, 0x83d385c7UL, 0x136c9856UL, + 0x646ba8c0UL, 0xfd62f97aUL, 0x8a65c9ecUL, 0x14015c4fUL, 0x63066cd9UL, + 0xfa0f3d63UL, 0x8d080df5UL, 0x3b6e20c8UL, 0x4c69105eUL, 0xd56041e4UL, + 0xa2677172UL, 0x3c03e4d1UL, 0x4b04d447UL, 0xd20d85fdUL, 0xa50ab56bUL, + 0x35b5a8faUL, 0x42b2986cUL, 0xdbbbc9d6UL, 0xacbcf940UL, 0x32d86ce3UL, + 0x45df5c75UL, 0xdcd60dcfUL, 0xabd13d59UL, 0x26d930acUL, 0x51de003aUL, + 0xc8d75180UL, 0xbfd06116UL, 0x21b4f4b5UL, 0x56b3c423UL, 0xcfba9599UL, + 0xb8bda50fUL, 0x2802b89eUL, 0x5f058808UL, 0xc60cd9b2UL, 0xb10be924UL, + 0x2f6f7c87UL, 0x58684c11UL, 0xc1611dabUL, 0xb6662d3dUL, 0x76dc4190UL, + 0x01db7106UL, 0x98d220bcUL, 0xefd5102aUL, 0x71b18589UL, 0x06b6b51fUL, + 0x9fbfe4a5UL, 0xe8b8d433UL, 0x7807c9a2UL, 0x0f00f934UL, 0x9609a88eUL, + 0xe10e9818UL, 0x7f6a0dbbUL, 0x086d3d2dUL, 0x91646c97UL, 0xe6635c01UL, + 0x6b6b51f4UL, 0x1c6c6162UL, 0x856530d8UL, 0xf262004eUL, 0x6c0695edUL, + 0x1b01a57bUL, 0x8208f4c1UL, 0xf50fc457UL, 0x65b0d9c6UL, 0x12b7e950UL, + 0x8bbeb8eaUL, 0xfcb9887cUL, 0x62dd1ddfUL, 0x15da2d49UL, 0x8cd37cf3UL, + 0xfbd44c65UL, 0x4db26158UL, 0x3ab551ceUL, 0xa3bc0074UL, 0xd4bb30e2UL, + 0x4adfa541UL, 0x3dd895d7UL, 0xa4d1c46dUL, 0xd3d6f4fbUL, 0x4369e96aUL, + 0x346ed9fcUL, 0xad678846UL, 0xda60b8d0UL, 0x44042d73UL, 0x33031de5UL, + 0xaa0a4c5fUL, 0xdd0d7cc9UL, 0x5005713cUL, 0x270241aaUL, 0xbe0b1010UL, + 0xc90c2086UL, 0x5768b525UL, 0x206f85b3UL, 0xb966d409UL, 0xce61e49fUL, + 0x5edef90eUL, 0x29d9c998UL, 0xb0d09822UL, 0xc7d7a8b4UL, 0x59b33d17UL, + 0x2eb40d81UL, 0xb7bd5c3bUL, 0xc0ba6cadUL, 0xedb88320UL, 0x9abfb3b6UL, + 0x03b6e20cUL, 0x74b1d29aUL, 0xead54739UL, 0x9dd277afUL, 0x04db2615UL, + 0x73dc1683UL, 0xe3630b12UL, 0x94643b84UL, 0x0d6d6a3eUL, 0x7a6a5aa8UL, + 0xe40ecf0bUL, 0x9309ff9dUL, 0x0a00ae27UL, 0x7d079eb1UL, 0xf00f9344UL, + 0x8708a3d2UL, 0x1e01f268UL, 0x6906c2feUL, 0xf762575dUL, 0x806567cbUL, + 0x196c3671UL, 0x6e6b06e7UL, 0xfed41b76UL, 0x89d32be0UL, 0x10da7a5aUL, + 0x67dd4accUL, 0xf9b9df6fUL, 0x8ebeeff9UL, 0x17b7be43UL, 0x60b08ed5UL, + 0xd6d6a3e8UL, 0xa1d1937eUL, 0x38d8c2c4UL, 0x4fdff252UL, 0xd1bb67f1UL, + 0xa6bc5767UL, 0x3fb506ddUL, 0x48b2364bUL, 0xd80d2bdaUL, 0xaf0a1b4cUL, + 0x36034af6UL, 0x41047a60UL, 0xdf60efc3UL, 0xa867df55UL, 0x316e8eefUL, + 0x4669be79UL, 0xcb61b38cUL, 0xbc66831aUL, 0x256fd2a0UL, 0x5268e236UL, + 0xcc0c7795UL, 0xbb0b4703UL, 0x220216b9UL, 0x5505262fUL, 0xc5ba3bbeUL, + 0xb2bd0b28UL, 0x2bb45a92UL, 0x5cb36a04UL, 0xc2d7ffa7UL, 0xb5d0cf31UL, + 0x2cd99e8bUL, 0x5bdeae1dUL, 0x9b64c2b0UL, 0xec63f226UL, 0x756aa39cUL, + 0x026d930aUL, 0x9c0906a9UL, 0xeb0e363fUL, 0x72076785UL, 0x05005713UL, + 0x95bf4a82UL, 0xe2b87a14UL, 0x7bb12baeUL, 0x0cb61b38UL, 0x92d28e9bUL, + 0xe5d5be0dUL, 0x7cdcefb7UL, 0x0bdbdf21UL, 0x86d3d2d4UL, 0xf1d4e242UL, + 0x68ddb3f8UL, 0x1fda836eUL, 0x81be16cdUL, 0xf6b9265bUL, 0x6fb077e1UL, + 0x18b74777UL, 0x88085ae6UL, 0xff0f6a70UL, 0x66063bcaUL, 0x11010b5cUL, + 0x8f659effUL, 0xf862ae69UL, 0x616bffd3UL, 0x166ccf45UL, 0xa00ae278UL, + 0xd70dd2eeUL, 0x4e048354UL, 0x3903b3c2UL, 0xa7672661UL, 0xd06016f7UL, + 0x4969474dUL, 0x3e6e77dbUL, 0xaed16a4aUL, 0xd9d65adcUL, 0x40df0b66UL, + 0x37d83bf0UL, 0xa9bcae53UL, 0xdebb9ec5UL, 0x47b2cf7fUL, 0x30b5ffe9UL, + 0xbdbdf21cUL, 0xcabac28aUL, 0x53b39330UL, 0x24b4a3a6UL, 0xbad03605UL, + 0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL, + 0x5d681b02UL, 0x2a6f2b94UL, 0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL, + 0x2d02ef8dUL +#ifdef BYFOUR + }, + { + 0x00000000UL, 0x191b3141UL, 0x32366282UL, 0x2b2d53c3UL, 0x646cc504UL, + 0x7d77f445UL, 0x565aa786UL, 0x4f4196c7UL, 0xc8d98a08UL, 0xd1c2bb49UL, + 0xfaefe88aUL, 0xe3f4d9cbUL, 0xacb54f0cUL, 0xb5ae7e4dUL, 0x9e832d8eUL, + 0x87981ccfUL, 0x4ac21251UL, 0x53d92310UL, 0x78f470d3UL, 0x61ef4192UL, + 0x2eaed755UL, 0x37b5e614UL, 0x1c98b5d7UL, 0x05838496UL, 0x821b9859UL, + 0x9b00a918UL, 0xb02dfadbUL, 0xa936cb9aUL, 0xe6775d5dUL, 0xff6c6c1cUL, + 0xd4413fdfUL, 0xcd5a0e9eUL, 0x958424a2UL, 0x8c9f15e3UL, 0xa7b24620UL, + 0xbea97761UL, 0xf1e8e1a6UL, 0xe8f3d0e7UL, 0xc3de8324UL, 0xdac5b265UL, + 0x5d5daeaaUL, 0x44469febUL, 0x6f6bcc28UL, 0x7670fd69UL, 0x39316baeUL, + 0x202a5aefUL, 0x0b07092cUL, 0x121c386dUL, 0xdf4636f3UL, 0xc65d07b2UL, + 0xed705471UL, 0xf46b6530UL, 0xbb2af3f7UL, 0xa231c2b6UL, 0x891c9175UL, + 0x9007a034UL, 0x179fbcfbUL, 0x0e848dbaUL, 0x25a9de79UL, 0x3cb2ef38UL, + 0x73f379ffUL, 0x6ae848beUL, 0x41c51b7dUL, 0x58de2a3cUL, 0xf0794f05UL, + 0xe9627e44UL, 0xc24f2d87UL, 0xdb541cc6UL, 0x94158a01UL, 0x8d0ebb40UL, + 0xa623e883UL, 0xbf38d9c2UL, 0x38a0c50dUL, 0x21bbf44cUL, 0x0a96a78fUL, + 0x138d96ceUL, 0x5ccc0009UL, 0x45d73148UL, 0x6efa628bUL, 0x77e153caUL, + 0xbabb5d54UL, 0xa3a06c15UL, 0x888d3fd6UL, 0x91960e97UL, 0xded79850UL, + 0xc7cca911UL, 0xece1fad2UL, 0xf5facb93UL, 0x7262d75cUL, 0x6b79e61dUL, + 0x4054b5deUL, 0x594f849fUL, 0x160e1258UL, 0x0f152319UL, 0x243870daUL, + 0x3d23419bUL, 0x65fd6ba7UL, 0x7ce65ae6UL, 0x57cb0925UL, 0x4ed03864UL, + 0x0191aea3UL, 0x188a9fe2UL, 0x33a7cc21UL, 0x2abcfd60UL, 0xad24e1afUL, + 0xb43fd0eeUL, 0x9f12832dUL, 0x8609b26cUL, 0xc94824abUL, 0xd05315eaUL, + 0xfb7e4629UL, 0xe2657768UL, 0x2f3f79f6UL, 0x362448b7UL, 0x1d091b74UL, + 0x04122a35UL, 0x4b53bcf2UL, 0x52488db3UL, 0x7965de70UL, 0x607eef31UL, + 0xe7e6f3feUL, 0xfefdc2bfUL, 0xd5d0917cUL, 0xcccba03dUL, 0x838a36faUL, + 0x9a9107bbUL, 0xb1bc5478UL, 0xa8a76539UL, 0x3b83984bUL, 0x2298a90aUL, + 0x09b5fac9UL, 0x10aecb88UL, 0x5fef5d4fUL, 0x46f46c0eUL, 0x6dd93fcdUL, + 0x74c20e8cUL, 0xf35a1243UL, 0xea412302UL, 0xc16c70c1UL, 0xd8774180UL, + 0x9736d747UL, 0x8e2de606UL, 0xa500b5c5UL, 0xbc1b8484UL, 0x71418a1aUL, + 0x685abb5bUL, 0x4377e898UL, 0x5a6cd9d9UL, 0x152d4f1eUL, 0x0c367e5fUL, + 0x271b2d9cUL, 0x3e001cddUL, 0xb9980012UL, 0xa0833153UL, 0x8bae6290UL, + 0x92b553d1UL, 0xddf4c516UL, 0xc4eff457UL, 0xefc2a794UL, 0xf6d996d5UL, + 0xae07bce9UL, 0xb71c8da8UL, 0x9c31de6bUL, 0x852aef2aUL, 0xca6b79edUL, + 0xd37048acUL, 0xf85d1b6fUL, 0xe1462a2eUL, 0x66de36e1UL, 0x7fc507a0UL, + 0x54e85463UL, 0x4df36522UL, 0x02b2f3e5UL, 0x1ba9c2a4UL, 0x30849167UL, + 0x299fa026UL, 0xe4c5aeb8UL, 0xfdde9ff9UL, 0xd6f3cc3aUL, 0xcfe8fd7bUL, + 0x80a96bbcUL, 0x99b25afdUL, 0xb29f093eUL, 0xab84387fUL, 0x2c1c24b0UL, + 0x350715f1UL, 0x1e2a4632UL, 0x07317773UL, 0x4870e1b4UL, 0x516bd0f5UL, + 0x7a468336UL, 0x635db277UL, 0xcbfad74eUL, 0xd2e1e60fUL, 0xf9ccb5ccUL, + 0xe0d7848dUL, 0xaf96124aUL, 0xb68d230bUL, 0x9da070c8UL, 0x84bb4189UL, + 0x03235d46UL, 0x1a386c07UL, 0x31153fc4UL, 0x280e0e85UL, 0x674f9842UL, + 0x7e54a903UL, 0x5579fac0UL, 0x4c62cb81UL, 0x8138c51fUL, 0x9823f45eUL, + 0xb30ea79dUL, 0xaa1596dcUL, 0xe554001bUL, 0xfc4f315aUL, 0xd7626299UL, + 0xce7953d8UL, 0x49e14f17UL, 0x50fa7e56UL, 0x7bd72d95UL, 0x62cc1cd4UL, + 0x2d8d8a13UL, 0x3496bb52UL, 0x1fbbe891UL, 0x06a0d9d0UL, 0x5e7ef3ecUL, + 0x4765c2adUL, 0x6c48916eUL, 0x7553a02fUL, 0x3a1236e8UL, 0x230907a9UL, + 0x0824546aUL, 0x113f652bUL, 0x96a779e4UL, 0x8fbc48a5UL, 0xa4911b66UL, + 0xbd8a2a27UL, 0xf2cbbce0UL, 0xebd08da1UL, 0xc0fdde62UL, 0xd9e6ef23UL, + 0x14bce1bdUL, 0x0da7d0fcUL, 0x268a833fUL, 0x3f91b27eUL, 0x70d024b9UL, + 0x69cb15f8UL, 0x42e6463bUL, 0x5bfd777aUL, 0xdc656bb5UL, 0xc57e5af4UL, + 0xee530937UL, 0xf7483876UL, 0xb809aeb1UL, 0xa1129ff0UL, 0x8a3fcc33UL, + 0x9324fd72UL + }, + { + 0x00000000UL, 0x01c26a37UL, 0x0384d46eUL, 0x0246be59UL, 0x0709a8dcUL, + 0x06cbc2ebUL, 0x048d7cb2UL, 0x054f1685UL, 0x0e1351b8UL, 0x0fd13b8fUL, + 0x0d9785d6UL, 0x0c55efe1UL, 0x091af964UL, 0x08d89353UL, 0x0a9e2d0aUL, + 0x0b5c473dUL, 0x1c26a370UL, 0x1de4c947UL, 0x1fa2771eUL, 0x1e601d29UL, + 0x1b2f0bacUL, 0x1aed619bUL, 0x18abdfc2UL, 0x1969b5f5UL, 0x1235f2c8UL, + 0x13f798ffUL, 0x11b126a6UL, 0x10734c91UL, 0x153c5a14UL, 0x14fe3023UL, + 0x16b88e7aUL, 0x177ae44dUL, 0x384d46e0UL, 0x398f2cd7UL, 0x3bc9928eUL, + 0x3a0bf8b9UL, 0x3f44ee3cUL, 0x3e86840bUL, 0x3cc03a52UL, 0x3d025065UL, + 0x365e1758UL, 0x379c7d6fUL, 0x35dac336UL, 0x3418a901UL, 0x3157bf84UL, + 0x3095d5b3UL, 0x32d36beaUL, 0x331101ddUL, 0x246be590UL, 0x25a98fa7UL, + 0x27ef31feUL, 0x262d5bc9UL, 0x23624d4cUL, 0x22a0277bUL, 0x20e69922UL, + 0x2124f315UL, 0x2a78b428UL, 0x2bbade1fUL, 0x29fc6046UL, 0x283e0a71UL, + 0x2d711cf4UL, 0x2cb376c3UL, 0x2ef5c89aUL, 0x2f37a2adUL, 0x709a8dc0UL, + 0x7158e7f7UL, 0x731e59aeUL, 0x72dc3399UL, 0x7793251cUL, 0x76514f2bUL, + 0x7417f172UL, 0x75d59b45UL, 0x7e89dc78UL, 0x7f4bb64fUL, 0x7d0d0816UL, + 0x7ccf6221UL, 0x798074a4UL, 0x78421e93UL, 0x7a04a0caUL, 0x7bc6cafdUL, + 0x6cbc2eb0UL, 0x6d7e4487UL, 0x6f38fadeUL, 0x6efa90e9UL, 0x6bb5866cUL, + 0x6a77ec5bUL, 0x68315202UL, 0x69f33835UL, 0x62af7f08UL, 0x636d153fUL, + 0x612bab66UL, 0x60e9c151UL, 0x65a6d7d4UL, 0x6464bde3UL, 0x662203baUL, + 0x67e0698dUL, 0x48d7cb20UL, 0x4915a117UL, 0x4b531f4eUL, 0x4a917579UL, + 0x4fde63fcUL, 0x4e1c09cbUL, 0x4c5ab792UL, 0x4d98dda5UL, 0x46c49a98UL, + 0x4706f0afUL, 0x45404ef6UL, 0x448224c1UL, 0x41cd3244UL, 0x400f5873UL, + 0x4249e62aUL, 0x438b8c1dUL, 0x54f16850UL, 0x55330267UL, 0x5775bc3eUL, + 0x56b7d609UL, 0x53f8c08cUL, 0x523aaabbUL, 0x507c14e2UL, 0x51be7ed5UL, + 0x5ae239e8UL, 0x5b2053dfUL, 0x5966ed86UL, 0x58a487b1UL, 0x5deb9134UL, + 0x5c29fb03UL, 0x5e6f455aUL, 0x5fad2f6dUL, 0xe1351b80UL, 0xe0f771b7UL, + 0xe2b1cfeeUL, 0xe373a5d9UL, 0xe63cb35cUL, 0xe7fed96bUL, 0xe5b86732UL, + 0xe47a0d05UL, 0xef264a38UL, 0xeee4200fUL, 0xeca29e56UL, 0xed60f461UL, + 0xe82fe2e4UL, 0xe9ed88d3UL, 0xebab368aUL, 0xea695cbdUL, 0xfd13b8f0UL, + 0xfcd1d2c7UL, 0xfe976c9eUL, 0xff5506a9UL, 0xfa1a102cUL, 0xfbd87a1bUL, + 0xf99ec442UL, 0xf85cae75UL, 0xf300e948UL, 0xf2c2837fUL, 0xf0843d26UL, + 0xf1465711UL, 0xf4094194UL, 0xf5cb2ba3UL, 0xf78d95faUL, 0xf64fffcdUL, + 0xd9785d60UL, 0xd8ba3757UL, 0xdafc890eUL, 0xdb3ee339UL, 0xde71f5bcUL, + 0xdfb39f8bUL, 0xddf521d2UL, 0xdc374be5UL, 0xd76b0cd8UL, 0xd6a966efUL, + 0xd4efd8b6UL, 0xd52db281UL, 0xd062a404UL, 0xd1a0ce33UL, 0xd3e6706aUL, + 0xd2241a5dUL, 0xc55efe10UL, 0xc49c9427UL, 0xc6da2a7eUL, 0xc7184049UL, + 0xc25756ccUL, 0xc3953cfbUL, 0xc1d382a2UL, 0xc011e895UL, 0xcb4dafa8UL, + 0xca8fc59fUL, 0xc8c97bc6UL, 0xc90b11f1UL, 0xcc440774UL, 0xcd866d43UL, + 0xcfc0d31aUL, 0xce02b92dUL, 0x91af9640UL, 0x906dfc77UL, 0x922b422eUL, + 0x93e92819UL, 0x96a63e9cUL, 0x976454abUL, 0x9522eaf2UL, 0x94e080c5UL, + 0x9fbcc7f8UL, 0x9e7eadcfUL, 0x9c381396UL, 0x9dfa79a1UL, 0x98b56f24UL, + 0x99770513UL, 0x9b31bb4aUL, 0x9af3d17dUL, 0x8d893530UL, 0x8c4b5f07UL, + 0x8e0de15eUL, 0x8fcf8b69UL, 0x8a809decUL, 0x8b42f7dbUL, 0x89044982UL, + 0x88c623b5UL, 0x839a6488UL, 0x82580ebfUL, 0x801eb0e6UL, 0x81dcdad1UL, + 0x8493cc54UL, 0x8551a663UL, 0x8717183aUL, 0x86d5720dUL, 0xa9e2d0a0UL, + 0xa820ba97UL, 0xaa6604ceUL, 0xaba46ef9UL, 0xaeeb787cUL, 0xaf29124bUL, + 0xad6fac12UL, 0xacadc625UL, 0xa7f18118UL, 0xa633eb2fUL, 0xa4755576UL, + 0xa5b73f41UL, 0xa0f829c4UL, 0xa13a43f3UL, 0xa37cfdaaUL, 0xa2be979dUL, + 0xb5c473d0UL, 0xb40619e7UL, 0xb640a7beUL, 0xb782cd89UL, 0xb2cddb0cUL, + 0xb30fb13bUL, 0xb1490f62UL, 0xb08b6555UL, 0xbbd72268UL, 0xba15485fUL, + 0xb853f606UL, 0xb9919c31UL, 0xbcde8ab4UL, 0xbd1ce083UL, 0xbf5a5edaUL, + 0xbe9834edUL + }, + { + 0x00000000UL, 0xb8bc6765UL, 0xaa09c88bUL, 0x12b5afeeUL, 0x8f629757UL, + 0x37def032UL, 0x256b5fdcUL, 0x9dd738b9UL, 0xc5b428efUL, 0x7d084f8aUL, + 0x6fbde064UL, 0xd7018701UL, 0x4ad6bfb8UL, 0xf26ad8ddUL, 0xe0df7733UL, + 0x58631056UL, 0x5019579fUL, 0xe8a530faUL, 0xfa109f14UL, 0x42acf871UL, + 0xdf7bc0c8UL, 0x67c7a7adUL, 0x75720843UL, 0xcdce6f26UL, 0x95ad7f70UL, + 0x2d111815UL, 0x3fa4b7fbUL, 0x8718d09eUL, 0x1acfe827UL, 0xa2738f42UL, + 0xb0c620acUL, 0x087a47c9UL, 0xa032af3eUL, 0x188ec85bUL, 0x0a3b67b5UL, + 0xb28700d0UL, 0x2f503869UL, 0x97ec5f0cUL, 0x8559f0e2UL, 0x3de59787UL, + 0x658687d1UL, 0xdd3ae0b4UL, 0xcf8f4f5aUL, 0x7733283fUL, 0xeae41086UL, + 0x525877e3UL, 0x40edd80dUL, 0xf851bf68UL, 0xf02bf8a1UL, 0x48979fc4UL, + 0x5a22302aUL, 0xe29e574fUL, 0x7f496ff6UL, 0xc7f50893UL, 0xd540a77dUL, + 0x6dfcc018UL, 0x359fd04eUL, 0x8d23b72bUL, 0x9f9618c5UL, 0x272a7fa0UL, + 0xbafd4719UL, 0x0241207cUL, 0x10f48f92UL, 0xa848e8f7UL, 0x9b14583dUL, + 0x23a83f58UL, 0x311d90b6UL, 0x89a1f7d3UL, 0x1476cf6aUL, 0xaccaa80fUL, + 0xbe7f07e1UL, 0x06c36084UL, 0x5ea070d2UL, 0xe61c17b7UL, 0xf4a9b859UL, + 0x4c15df3cUL, 0xd1c2e785UL, 0x697e80e0UL, 0x7bcb2f0eUL, 0xc377486bUL, + 0xcb0d0fa2UL, 0x73b168c7UL, 0x6104c729UL, 0xd9b8a04cUL, 0x446f98f5UL, + 0xfcd3ff90UL, 0xee66507eUL, 0x56da371bUL, 0x0eb9274dUL, 0xb6054028UL, + 0xa4b0efc6UL, 0x1c0c88a3UL, 0x81dbb01aUL, 0x3967d77fUL, 0x2bd27891UL, + 0x936e1ff4UL, 0x3b26f703UL, 0x839a9066UL, 0x912f3f88UL, 0x299358edUL, + 0xb4446054UL, 0x0cf80731UL, 0x1e4da8dfUL, 0xa6f1cfbaUL, 0xfe92dfecUL, + 0x462eb889UL, 0x549b1767UL, 0xec277002UL, 0x71f048bbUL, 0xc94c2fdeUL, + 0xdbf98030UL, 0x6345e755UL, 0x6b3fa09cUL, 0xd383c7f9UL, 0xc1366817UL, + 0x798a0f72UL, 0xe45d37cbUL, 0x5ce150aeUL, 0x4e54ff40UL, 0xf6e89825UL, + 0xae8b8873UL, 0x1637ef16UL, 0x048240f8UL, 0xbc3e279dUL, 0x21e91f24UL, + 0x99557841UL, 0x8be0d7afUL, 0x335cb0caUL, 0xed59b63bUL, 0x55e5d15eUL, + 0x47507eb0UL, 0xffec19d5UL, 0x623b216cUL, 0xda874609UL, 0xc832e9e7UL, + 0x708e8e82UL, 0x28ed9ed4UL, 0x9051f9b1UL, 0x82e4565fUL, 0x3a58313aUL, + 0xa78f0983UL, 0x1f336ee6UL, 0x0d86c108UL, 0xb53aa66dUL, 0xbd40e1a4UL, + 0x05fc86c1UL, 0x1749292fUL, 0xaff54e4aUL, 0x322276f3UL, 0x8a9e1196UL, + 0x982bbe78UL, 0x2097d91dUL, 0x78f4c94bUL, 0xc048ae2eUL, 0xd2fd01c0UL, + 0x6a4166a5UL, 0xf7965e1cUL, 0x4f2a3979UL, 0x5d9f9697UL, 0xe523f1f2UL, + 0x4d6b1905UL, 0xf5d77e60UL, 0xe762d18eUL, 0x5fdeb6ebUL, 0xc2098e52UL, + 0x7ab5e937UL, 0x680046d9UL, 0xd0bc21bcUL, 0x88df31eaUL, 0x3063568fUL, + 0x22d6f961UL, 0x9a6a9e04UL, 0x07bda6bdUL, 0xbf01c1d8UL, 0xadb46e36UL, + 0x15080953UL, 0x1d724e9aUL, 0xa5ce29ffUL, 0xb77b8611UL, 0x0fc7e174UL, + 0x9210d9cdUL, 0x2aacbea8UL, 0x38191146UL, 0x80a57623UL, 0xd8c66675UL, + 0x607a0110UL, 0x72cfaefeUL, 0xca73c99bUL, 0x57a4f122UL, 0xef189647UL, + 0xfdad39a9UL, 0x45115eccUL, 0x764dee06UL, 0xcef18963UL, 0xdc44268dUL, + 0x64f841e8UL, 0xf92f7951UL, 0x41931e34UL, 0x5326b1daUL, 0xeb9ad6bfUL, + 0xb3f9c6e9UL, 0x0b45a18cUL, 0x19f00e62UL, 0xa14c6907UL, 0x3c9b51beUL, + 0x842736dbUL, 0x96929935UL, 0x2e2efe50UL, 0x2654b999UL, 0x9ee8defcUL, + 0x8c5d7112UL, 0x34e11677UL, 0xa9362eceUL, 0x118a49abUL, 0x033fe645UL, + 0xbb838120UL, 0xe3e09176UL, 0x5b5cf613UL, 0x49e959fdUL, 0xf1553e98UL, + 0x6c820621UL, 0xd43e6144UL, 0xc68bceaaUL, 0x7e37a9cfUL, 0xd67f4138UL, + 0x6ec3265dUL, 0x7c7689b3UL, 0xc4caeed6UL, 0x591dd66fUL, 0xe1a1b10aUL, + 0xf3141ee4UL, 0x4ba87981UL, 0x13cb69d7UL, 0xab770eb2UL, 0xb9c2a15cUL, + 0x017ec639UL, 0x9ca9fe80UL, 0x241599e5UL, 0x36a0360bUL, 0x8e1c516eUL, + 0x866616a7UL, 0x3eda71c2UL, 0x2c6fde2cUL, 0x94d3b949UL, 0x090481f0UL, + 0xb1b8e695UL, 0xa30d497bUL, 0x1bb12e1eUL, 0x43d23e48UL, 0xfb6e592dUL, + 0xe9dbf6c3UL, 0x516791a6UL, 0xccb0a91fUL, 0x740cce7aUL, 0x66b96194UL, + 0xde0506f1UL + }, + { + 0x00000000UL, 0x96300777UL, 0x2c610eeeUL, 0xba510999UL, 0x19c46d07UL, + 0x8ff46a70UL, 0x35a563e9UL, 0xa395649eUL, 0x3288db0eUL, 0xa4b8dc79UL, + 0x1ee9d5e0UL, 0x88d9d297UL, 0x2b4cb609UL, 0xbd7cb17eUL, 0x072db8e7UL, + 0x911dbf90UL, 0x6410b71dUL, 0xf220b06aUL, 0x4871b9f3UL, 0xde41be84UL, + 0x7dd4da1aUL, 0xebe4dd6dUL, 0x51b5d4f4UL, 0xc785d383UL, 0x56986c13UL, + 0xc0a86b64UL, 0x7af962fdUL, 0xecc9658aUL, 0x4f5c0114UL, 0xd96c0663UL, + 0x633d0ffaUL, 0xf50d088dUL, 0xc8206e3bUL, 0x5e10694cUL, 0xe44160d5UL, + 0x727167a2UL, 0xd1e4033cUL, 0x47d4044bUL, 0xfd850dd2UL, 0x6bb50aa5UL, + 0xfaa8b535UL, 0x6c98b242UL, 0xd6c9bbdbUL, 0x40f9bcacUL, 0xe36cd832UL, + 0x755cdf45UL, 0xcf0dd6dcUL, 0x593dd1abUL, 0xac30d926UL, 0x3a00de51UL, + 0x8051d7c8UL, 0x1661d0bfUL, 0xb5f4b421UL, 0x23c4b356UL, 0x9995bacfUL, + 0x0fa5bdb8UL, 0x9eb80228UL, 0x0888055fUL, 0xb2d90cc6UL, 0x24e90bb1UL, + 0x877c6f2fUL, 0x114c6858UL, 0xab1d61c1UL, 0x3d2d66b6UL, 0x9041dc76UL, + 0x0671db01UL, 0xbc20d298UL, 0x2a10d5efUL, 0x8985b171UL, 0x1fb5b606UL, + 0xa5e4bf9fUL, 0x33d4b8e8UL, 0xa2c90778UL, 0x34f9000fUL, 0x8ea80996UL, + 0x18980ee1UL, 0xbb0d6a7fUL, 0x2d3d6d08UL, 0x976c6491UL, 0x015c63e6UL, + 0xf4516b6bUL, 0x62616c1cUL, 0xd8306585UL, 0x4e0062f2UL, 0xed95066cUL, + 0x7ba5011bUL, 0xc1f40882UL, 0x57c40ff5UL, 0xc6d9b065UL, 0x50e9b712UL, + 0xeab8be8bUL, 0x7c88b9fcUL, 0xdf1ddd62UL, 0x492dda15UL, 0xf37cd38cUL, + 0x654cd4fbUL, 0x5861b24dUL, 0xce51b53aUL, 0x7400bca3UL, 0xe230bbd4UL, + 0x41a5df4aUL, 0xd795d83dUL, 0x6dc4d1a4UL, 0xfbf4d6d3UL, 0x6ae96943UL, + 0xfcd96e34UL, 0x468867adUL, 0xd0b860daUL, 0x732d0444UL, 0xe51d0333UL, + 0x5f4c0aaaUL, 0xc97c0dddUL, 0x3c710550UL, 0xaa410227UL, 0x10100bbeUL, + 0x86200cc9UL, 0x25b56857UL, 0xb3856f20UL, 0x09d466b9UL, 0x9fe461ceUL, + 0x0ef9de5eUL, 0x98c9d929UL, 0x2298d0b0UL, 0xb4a8d7c7UL, 0x173db359UL, + 0x810db42eUL, 0x3b5cbdb7UL, 0xad6cbac0UL, 0x2083b8edUL, 0xb6b3bf9aUL, + 0x0ce2b603UL, 0x9ad2b174UL, 0x3947d5eaUL, 0xaf77d29dUL, 0x1526db04UL, + 0x8316dc73UL, 0x120b63e3UL, 0x843b6494UL, 0x3e6a6d0dUL, 0xa85a6a7aUL, + 0x0bcf0ee4UL, 0x9dff0993UL, 0x27ae000aUL, 0xb19e077dUL, 0x44930ff0UL, + 0xd2a30887UL, 0x68f2011eUL, 0xfec20669UL, 0x5d5762f7UL, 0xcb676580UL, + 0x71366c19UL, 0xe7066b6eUL, 0x761bd4feUL, 0xe02bd389UL, 0x5a7ada10UL, + 0xcc4add67UL, 0x6fdfb9f9UL, 0xf9efbe8eUL, 0x43beb717UL, 0xd58eb060UL, + 0xe8a3d6d6UL, 0x7e93d1a1UL, 0xc4c2d838UL, 0x52f2df4fUL, 0xf167bbd1UL, + 0x6757bca6UL, 0xdd06b53fUL, 0x4b36b248UL, 0xda2b0dd8UL, 0x4c1b0aafUL, + 0xf64a0336UL, 0x607a0441UL, 0xc3ef60dfUL, 0x55df67a8UL, 0xef8e6e31UL, + 0x79be6946UL, 0x8cb361cbUL, 0x1a8366bcUL, 0xa0d26f25UL, 0x36e26852UL, + 0x95770cccUL, 0x03470bbbUL, 0xb9160222UL, 0x2f260555UL, 0xbe3bbac5UL, + 0x280bbdb2UL, 0x925ab42bUL, 0x046ab35cUL, 0xa7ffd7c2UL, 0x31cfd0b5UL, + 0x8b9ed92cUL, 0x1daede5bUL, 0xb0c2649bUL, 0x26f263ecUL, 0x9ca36a75UL, + 0x0a936d02UL, 0xa906099cUL, 0x3f360eebUL, 0x85670772UL, 0x13570005UL, + 0x824abf95UL, 0x147ab8e2UL, 0xae2bb17bUL, 0x381bb60cUL, 0x9b8ed292UL, + 0x0dbed5e5UL, 0xb7efdc7cUL, 0x21dfdb0bUL, 0xd4d2d386UL, 0x42e2d4f1UL, + 0xf8b3dd68UL, 0x6e83da1fUL, 0xcd16be81UL, 0x5b26b9f6UL, 0xe177b06fUL, + 0x7747b718UL, 0xe65a0888UL, 0x706a0fffUL, 0xca3b0666UL, 0x5c0b0111UL, + 0xff9e658fUL, 0x69ae62f8UL, 0xd3ff6b61UL, 0x45cf6c16UL, 0x78e20aa0UL, + 0xeed20dd7UL, 0x5483044eUL, 0xc2b30339UL, 0x612667a7UL, 0xf71660d0UL, + 0x4d476949UL, 0xdb776e3eUL, 0x4a6ad1aeUL, 0xdc5ad6d9UL, 0x660bdf40UL, + 0xf03bd837UL, 0x53aebca9UL, 0xc59ebbdeUL, 0x7fcfb247UL, 0xe9ffb530UL, + 0x1cf2bdbdUL, 0x8ac2bacaUL, 0x3093b353UL, 0xa6a3b424UL, 0x0536d0baUL, + 0x9306d7cdUL, 0x2957de54UL, 0xbf67d923UL, 0x2e7a66b3UL, 0xb84a61c4UL, + 0x021b685dUL, 0x942b6f2aUL, 0x37be0bb4UL, 0xa18e0cc3UL, 0x1bdf055aUL, + 0x8def022dUL + }, + { + 0x00000000UL, 0x41311b19UL, 0x82623632UL, 0xc3532d2bUL, 0x04c56c64UL, + 0x45f4777dUL, 0x86a75a56UL, 0xc796414fUL, 0x088ad9c8UL, 0x49bbc2d1UL, + 0x8ae8effaUL, 0xcbd9f4e3UL, 0x0c4fb5acUL, 0x4d7eaeb5UL, 0x8e2d839eUL, + 0xcf1c9887UL, 0x5112c24aUL, 0x1023d953UL, 0xd370f478UL, 0x9241ef61UL, + 0x55d7ae2eUL, 0x14e6b537UL, 0xd7b5981cUL, 0x96848305UL, 0x59981b82UL, + 0x18a9009bUL, 0xdbfa2db0UL, 0x9acb36a9UL, 0x5d5d77e6UL, 0x1c6c6cffUL, + 0xdf3f41d4UL, 0x9e0e5acdUL, 0xa2248495UL, 0xe3159f8cUL, 0x2046b2a7UL, + 0x6177a9beUL, 0xa6e1e8f1UL, 0xe7d0f3e8UL, 0x2483dec3UL, 0x65b2c5daUL, + 0xaaae5d5dUL, 0xeb9f4644UL, 0x28cc6b6fUL, 0x69fd7076UL, 0xae6b3139UL, + 0xef5a2a20UL, 0x2c09070bUL, 0x6d381c12UL, 0xf33646dfUL, 0xb2075dc6UL, + 0x715470edUL, 0x30656bf4UL, 0xf7f32abbUL, 0xb6c231a2UL, 0x75911c89UL, + 0x34a00790UL, 0xfbbc9f17UL, 0xba8d840eUL, 0x79dea925UL, 0x38efb23cUL, + 0xff79f373UL, 0xbe48e86aUL, 0x7d1bc541UL, 0x3c2ade58UL, 0x054f79f0UL, + 0x447e62e9UL, 0x872d4fc2UL, 0xc61c54dbUL, 0x018a1594UL, 0x40bb0e8dUL, + 0x83e823a6UL, 0xc2d938bfUL, 0x0dc5a038UL, 0x4cf4bb21UL, 0x8fa7960aUL, + 0xce968d13UL, 0x0900cc5cUL, 0x4831d745UL, 0x8b62fa6eUL, 0xca53e177UL, + 0x545dbbbaUL, 0x156ca0a3UL, 0xd63f8d88UL, 0x970e9691UL, 0x5098d7deUL, + 0x11a9ccc7UL, 0xd2fae1ecUL, 0x93cbfaf5UL, 0x5cd76272UL, 0x1de6796bUL, + 0xdeb55440UL, 0x9f844f59UL, 0x58120e16UL, 0x1923150fUL, 0xda703824UL, + 0x9b41233dUL, 0xa76bfd65UL, 0xe65ae67cUL, 0x2509cb57UL, 0x6438d04eUL, + 0xa3ae9101UL, 0xe29f8a18UL, 0x21cca733UL, 0x60fdbc2aUL, 0xafe124adUL, + 0xeed03fb4UL, 0x2d83129fUL, 0x6cb20986UL, 0xab2448c9UL, 0xea1553d0UL, + 0x29467efbUL, 0x687765e2UL, 0xf6793f2fUL, 0xb7482436UL, 0x741b091dUL, + 0x352a1204UL, 0xf2bc534bUL, 0xb38d4852UL, 0x70de6579UL, 0x31ef7e60UL, + 0xfef3e6e7UL, 0xbfc2fdfeUL, 0x7c91d0d5UL, 0x3da0cbccUL, 0xfa368a83UL, + 0xbb07919aUL, 0x7854bcb1UL, 0x3965a7a8UL, 0x4b98833bUL, 0x0aa99822UL, + 0xc9fab509UL, 0x88cbae10UL, 0x4f5def5fUL, 0x0e6cf446UL, 0xcd3fd96dUL, + 0x8c0ec274UL, 0x43125af3UL, 0x022341eaUL, 0xc1706cc1UL, 0x804177d8UL, + 0x47d73697UL, 0x06e62d8eUL, 0xc5b500a5UL, 0x84841bbcUL, 0x1a8a4171UL, + 0x5bbb5a68UL, 0x98e87743UL, 0xd9d96c5aUL, 0x1e4f2d15UL, 0x5f7e360cUL, + 0x9c2d1b27UL, 0xdd1c003eUL, 0x120098b9UL, 0x533183a0UL, 0x9062ae8bUL, + 0xd153b592UL, 0x16c5f4ddUL, 0x57f4efc4UL, 0x94a7c2efUL, 0xd596d9f6UL, + 0xe9bc07aeUL, 0xa88d1cb7UL, 0x6bde319cUL, 0x2aef2a85UL, 0xed796bcaUL, + 0xac4870d3UL, 0x6f1b5df8UL, 0x2e2a46e1UL, 0xe136de66UL, 0xa007c57fUL, + 0x6354e854UL, 0x2265f34dUL, 0xe5f3b202UL, 0xa4c2a91bUL, 0x67918430UL, + 0x26a09f29UL, 0xb8aec5e4UL, 0xf99fdefdUL, 0x3accf3d6UL, 0x7bfde8cfUL, + 0xbc6ba980UL, 0xfd5ab299UL, 0x3e099fb2UL, 0x7f3884abUL, 0xb0241c2cUL, + 0xf1150735UL, 0x32462a1eUL, 0x73773107UL, 0xb4e17048UL, 0xf5d06b51UL, + 0x3683467aUL, 0x77b25d63UL, 0x4ed7facbUL, 0x0fe6e1d2UL, 0xccb5ccf9UL, + 0x8d84d7e0UL, 0x4a1296afUL, 0x0b238db6UL, 0xc870a09dUL, 0x8941bb84UL, + 0x465d2303UL, 0x076c381aUL, 0xc43f1531UL, 0x850e0e28UL, 0x42984f67UL, + 0x03a9547eUL, 0xc0fa7955UL, 0x81cb624cUL, 0x1fc53881UL, 0x5ef42398UL, + 0x9da70eb3UL, 0xdc9615aaUL, 0x1b0054e5UL, 0x5a314ffcUL, 0x996262d7UL, + 0xd85379ceUL, 0x174fe149UL, 0x567efa50UL, 0x952dd77bUL, 0xd41ccc62UL, + 0x138a8d2dUL, 0x52bb9634UL, 0x91e8bb1fUL, 0xd0d9a006UL, 0xecf37e5eUL, + 0xadc26547UL, 0x6e91486cUL, 0x2fa05375UL, 0xe836123aUL, 0xa9070923UL, + 0x6a542408UL, 0x2b653f11UL, 0xe479a796UL, 0xa548bc8fUL, 0x661b91a4UL, + 0x272a8abdUL, 0xe0bccbf2UL, 0xa18dd0ebUL, 0x62defdc0UL, 0x23efe6d9UL, + 0xbde1bc14UL, 0xfcd0a70dUL, 0x3f838a26UL, 0x7eb2913fUL, 0xb924d070UL, + 0xf815cb69UL, 0x3b46e642UL, 0x7a77fd5bUL, 0xb56b65dcUL, 0xf45a7ec5UL, + 0x370953eeUL, 0x763848f7UL, 0xb1ae09b8UL, 0xf09f12a1UL, 0x33cc3f8aUL, + 0x72fd2493UL + }, + { + 0x00000000UL, 0x376ac201UL, 0x6ed48403UL, 0x59be4602UL, 0xdca80907UL, + 0xebc2cb06UL, 0xb27c8d04UL, 0x85164f05UL, 0xb851130eUL, 0x8f3bd10fUL, + 0xd685970dUL, 0xe1ef550cUL, 0x64f91a09UL, 0x5393d808UL, 0x0a2d9e0aUL, + 0x3d475c0bUL, 0x70a3261cUL, 0x47c9e41dUL, 0x1e77a21fUL, 0x291d601eUL, + 0xac0b2f1bUL, 0x9b61ed1aUL, 0xc2dfab18UL, 0xf5b56919UL, 0xc8f23512UL, + 0xff98f713UL, 0xa626b111UL, 0x914c7310UL, 0x145a3c15UL, 0x2330fe14UL, + 0x7a8eb816UL, 0x4de47a17UL, 0xe0464d38UL, 0xd72c8f39UL, 0x8e92c93bUL, + 0xb9f80b3aUL, 0x3cee443fUL, 0x0b84863eUL, 0x523ac03cUL, 0x6550023dUL, + 0x58175e36UL, 0x6f7d9c37UL, 0x36c3da35UL, 0x01a91834UL, 0x84bf5731UL, + 0xb3d59530UL, 0xea6bd332UL, 0xdd011133UL, 0x90e56b24UL, 0xa78fa925UL, + 0xfe31ef27UL, 0xc95b2d26UL, 0x4c4d6223UL, 0x7b27a022UL, 0x2299e620UL, + 0x15f32421UL, 0x28b4782aUL, 0x1fdeba2bUL, 0x4660fc29UL, 0x710a3e28UL, + 0xf41c712dUL, 0xc376b32cUL, 0x9ac8f52eUL, 0xada2372fUL, 0xc08d9a70UL, + 0xf7e75871UL, 0xae591e73UL, 0x9933dc72UL, 0x1c259377UL, 0x2b4f5176UL, + 0x72f11774UL, 0x459bd575UL, 0x78dc897eUL, 0x4fb64b7fUL, 0x16080d7dUL, + 0x2162cf7cUL, 0xa4748079UL, 0x931e4278UL, 0xcaa0047aUL, 0xfdcac67bUL, + 0xb02ebc6cUL, 0x87447e6dUL, 0xdefa386fUL, 0xe990fa6eUL, 0x6c86b56bUL, + 0x5bec776aUL, 0x02523168UL, 0x3538f369UL, 0x087faf62UL, 0x3f156d63UL, + 0x66ab2b61UL, 0x51c1e960UL, 0xd4d7a665UL, 0xe3bd6464UL, 0xba032266UL, + 0x8d69e067UL, 0x20cbd748UL, 0x17a11549UL, 0x4e1f534bUL, 0x7975914aUL, + 0xfc63de4fUL, 0xcb091c4eUL, 0x92b75a4cUL, 0xa5dd984dUL, 0x989ac446UL, + 0xaff00647UL, 0xf64e4045UL, 0xc1248244UL, 0x4432cd41UL, 0x73580f40UL, + 0x2ae64942UL, 0x1d8c8b43UL, 0x5068f154UL, 0x67023355UL, 0x3ebc7557UL, + 0x09d6b756UL, 0x8cc0f853UL, 0xbbaa3a52UL, 0xe2147c50UL, 0xd57ebe51UL, + 0xe839e25aUL, 0xdf53205bUL, 0x86ed6659UL, 0xb187a458UL, 0x3491eb5dUL, + 0x03fb295cUL, 0x5a456f5eUL, 0x6d2fad5fUL, 0x801b35e1UL, 0xb771f7e0UL, + 0xeecfb1e2UL, 0xd9a573e3UL, 0x5cb33ce6UL, 0x6bd9fee7UL, 0x3267b8e5UL, + 0x050d7ae4UL, 0x384a26efUL, 0x0f20e4eeUL, 0x569ea2ecUL, 0x61f460edUL, + 0xe4e22fe8UL, 0xd388ede9UL, 0x8a36abebUL, 0xbd5c69eaUL, 0xf0b813fdUL, + 0xc7d2d1fcUL, 0x9e6c97feUL, 0xa90655ffUL, 0x2c101afaUL, 0x1b7ad8fbUL, + 0x42c49ef9UL, 0x75ae5cf8UL, 0x48e900f3UL, 0x7f83c2f2UL, 0x263d84f0UL, + 0x115746f1UL, 0x944109f4UL, 0xa32bcbf5UL, 0xfa958df7UL, 0xcdff4ff6UL, + 0x605d78d9UL, 0x5737bad8UL, 0x0e89fcdaUL, 0x39e33edbUL, 0xbcf571deUL, + 0x8b9fb3dfUL, 0xd221f5ddUL, 0xe54b37dcUL, 0xd80c6bd7UL, 0xef66a9d6UL, + 0xb6d8efd4UL, 0x81b22dd5UL, 0x04a462d0UL, 0x33cea0d1UL, 0x6a70e6d3UL, + 0x5d1a24d2UL, 0x10fe5ec5UL, 0x27949cc4UL, 0x7e2adac6UL, 0x494018c7UL, + 0xcc5657c2UL, 0xfb3c95c3UL, 0xa282d3c1UL, 0x95e811c0UL, 0xa8af4dcbUL, + 0x9fc58fcaUL, 0xc67bc9c8UL, 0xf1110bc9UL, 0x740744ccUL, 0x436d86cdUL, + 0x1ad3c0cfUL, 0x2db902ceUL, 0x4096af91UL, 0x77fc6d90UL, 0x2e422b92UL, + 0x1928e993UL, 0x9c3ea696UL, 0xab546497UL, 0xf2ea2295UL, 0xc580e094UL, + 0xf8c7bc9fUL, 0xcfad7e9eUL, 0x9613389cUL, 0xa179fa9dUL, 0x246fb598UL, + 0x13057799UL, 0x4abb319bUL, 0x7dd1f39aUL, 0x3035898dUL, 0x075f4b8cUL, + 0x5ee10d8eUL, 0x698bcf8fUL, 0xec9d808aUL, 0xdbf7428bUL, 0x82490489UL, + 0xb523c688UL, 0x88649a83UL, 0xbf0e5882UL, 0xe6b01e80UL, 0xd1dadc81UL, + 0x54cc9384UL, 0x63a65185UL, 0x3a181787UL, 0x0d72d586UL, 0xa0d0e2a9UL, + 0x97ba20a8UL, 0xce0466aaUL, 0xf96ea4abUL, 0x7c78ebaeUL, 0x4b1229afUL, + 0x12ac6fadUL, 0x25c6adacUL, 0x1881f1a7UL, 0x2feb33a6UL, 0x765575a4UL, + 0x413fb7a5UL, 0xc429f8a0UL, 0xf3433aa1UL, 0xaafd7ca3UL, 0x9d97bea2UL, + 0xd073c4b5UL, 0xe71906b4UL, 0xbea740b6UL, 0x89cd82b7UL, 0x0cdbcdb2UL, + 0x3bb10fb3UL, 0x620f49b1UL, 0x55658bb0UL, 0x6822d7bbUL, 0x5f4815baUL, + 0x06f653b8UL, 0x319c91b9UL, 0xb48adebcUL, 0x83e01cbdUL, 0xda5e5abfUL, + 0xed3498beUL + }, + { + 0x00000000UL, 0x6567bcb8UL, 0x8bc809aaUL, 0xeeafb512UL, 0x5797628fUL, + 0x32f0de37UL, 0xdc5f6b25UL, 0xb938d79dUL, 0xef28b4c5UL, 0x8a4f087dUL, + 0x64e0bd6fUL, 0x018701d7UL, 0xb8bfd64aUL, 0xddd86af2UL, 0x3377dfe0UL, + 0x56106358UL, 0x9f571950UL, 0xfa30a5e8UL, 0x149f10faUL, 0x71f8ac42UL, + 0xc8c07bdfUL, 0xada7c767UL, 0x43087275UL, 0x266fcecdUL, 0x707fad95UL, + 0x1518112dUL, 0xfbb7a43fUL, 0x9ed01887UL, 0x27e8cf1aUL, 0x428f73a2UL, + 0xac20c6b0UL, 0xc9477a08UL, 0x3eaf32a0UL, 0x5bc88e18UL, 0xb5673b0aUL, + 0xd00087b2UL, 0x6938502fUL, 0x0c5fec97UL, 0xe2f05985UL, 0x8797e53dUL, + 0xd1878665UL, 0xb4e03addUL, 0x5a4f8fcfUL, 0x3f283377UL, 0x8610e4eaUL, + 0xe3775852UL, 0x0dd8ed40UL, 0x68bf51f8UL, 0xa1f82bf0UL, 0xc49f9748UL, + 0x2a30225aUL, 0x4f579ee2UL, 0xf66f497fUL, 0x9308f5c7UL, 0x7da740d5UL, + 0x18c0fc6dUL, 0x4ed09f35UL, 0x2bb7238dUL, 0xc518969fUL, 0xa07f2a27UL, + 0x1947fdbaUL, 0x7c204102UL, 0x928ff410UL, 0xf7e848a8UL, 0x3d58149bUL, + 0x583fa823UL, 0xb6901d31UL, 0xd3f7a189UL, 0x6acf7614UL, 0x0fa8caacUL, + 0xe1077fbeUL, 0x8460c306UL, 0xd270a05eUL, 0xb7171ce6UL, 0x59b8a9f4UL, + 0x3cdf154cUL, 0x85e7c2d1UL, 0xe0807e69UL, 0x0e2fcb7bUL, 0x6b4877c3UL, + 0xa20f0dcbUL, 0xc768b173UL, 0x29c70461UL, 0x4ca0b8d9UL, 0xf5986f44UL, + 0x90ffd3fcUL, 0x7e5066eeUL, 0x1b37da56UL, 0x4d27b90eUL, 0x284005b6UL, + 0xc6efb0a4UL, 0xa3880c1cUL, 0x1ab0db81UL, 0x7fd76739UL, 0x9178d22bUL, + 0xf41f6e93UL, 0x03f7263bUL, 0x66909a83UL, 0x883f2f91UL, 0xed589329UL, + 0x546044b4UL, 0x3107f80cUL, 0xdfa84d1eUL, 0xbacff1a6UL, 0xecdf92feUL, + 0x89b82e46UL, 0x67179b54UL, 0x027027ecUL, 0xbb48f071UL, 0xde2f4cc9UL, + 0x3080f9dbUL, 0x55e74563UL, 0x9ca03f6bUL, 0xf9c783d3UL, 0x176836c1UL, + 0x720f8a79UL, 0xcb375de4UL, 0xae50e15cUL, 0x40ff544eUL, 0x2598e8f6UL, + 0x73888baeUL, 0x16ef3716UL, 0xf8408204UL, 0x9d273ebcUL, 0x241fe921UL, + 0x41785599UL, 0xafd7e08bUL, 0xcab05c33UL, 0x3bb659edUL, 0x5ed1e555UL, + 0xb07e5047UL, 0xd519ecffUL, 0x6c213b62UL, 0x094687daUL, 0xe7e932c8UL, + 0x828e8e70UL, 0xd49eed28UL, 0xb1f95190UL, 0x5f56e482UL, 0x3a31583aUL, + 0x83098fa7UL, 0xe66e331fUL, 0x08c1860dUL, 0x6da63ab5UL, 0xa4e140bdUL, + 0xc186fc05UL, 0x2f294917UL, 0x4a4ef5afUL, 0xf3762232UL, 0x96119e8aUL, + 0x78be2b98UL, 0x1dd99720UL, 0x4bc9f478UL, 0x2eae48c0UL, 0xc001fdd2UL, + 0xa566416aUL, 0x1c5e96f7UL, 0x79392a4fUL, 0x97969f5dUL, 0xf2f123e5UL, + 0x05196b4dUL, 0x607ed7f5UL, 0x8ed162e7UL, 0xebb6de5fUL, 0x528e09c2UL, + 0x37e9b57aUL, 0xd9460068UL, 0xbc21bcd0UL, 0xea31df88UL, 0x8f566330UL, + 0x61f9d622UL, 0x049e6a9aUL, 0xbda6bd07UL, 0xd8c101bfUL, 0x366eb4adUL, + 0x53090815UL, 0x9a4e721dUL, 0xff29cea5UL, 0x11867bb7UL, 0x74e1c70fUL, + 0xcdd91092UL, 0xa8beac2aUL, 0x46111938UL, 0x2376a580UL, 0x7566c6d8UL, + 0x10017a60UL, 0xfeaecf72UL, 0x9bc973caUL, 0x22f1a457UL, 0x479618efUL, + 0xa939adfdUL, 0xcc5e1145UL, 0x06ee4d76UL, 0x6389f1ceUL, 0x8d2644dcUL, + 0xe841f864UL, 0x51792ff9UL, 0x341e9341UL, 0xdab12653UL, 0xbfd69aebUL, + 0xe9c6f9b3UL, 0x8ca1450bUL, 0x620ef019UL, 0x07694ca1UL, 0xbe519b3cUL, + 0xdb362784UL, 0x35999296UL, 0x50fe2e2eUL, 0x99b95426UL, 0xfcdee89eUL, + 0x12715d8cUL, 0x7716e134UL, 0xce2e36a9UL, 0xab498a11UL, 0x45e63f03UL, + 0x208183bbUL, 0x7691e0e3UL, 0x13f65c5bUL, 0xfd59e949UL, 0x983e55f1UL, + 0x2106826cUL, 0x44613ed4UL, 0xaace8bc6UL, 0xcfa9377eUL, 0x38417fd6UL, + 0x5d26c36eUL, 0xb389767cUL, 0xd6eecac4UL, 0x6fd61d59UL, 0x0ab1a1e1UL, + 0xe41e14f3UL, 0x8179a84bUL, 0xd769cb13UL, 0xb20e77abUL, 0x5ca1c2b9UL, + 0x39c67e01UL, 0x80fea99cUL, 0xe5991524UL, 0x0b36a036UL, 0x6e511c8eUL, + 0xa7166686UL, 0xc271da3eUL, 0x2cde6f2cUL, 0x49b9d394UL, 0xf0810409UL, + 0x95e6b8b1UL, 0x7b490da3UL, 0x1e2eb11bUL, 0x483ed243UL, 0x2d596efbUL, + 0xc3f6dbe9UL, 0xa6916751UL, 0x1fa9b0ccUL, 0x7ace0c74UL, 0x9461b966UL, + 0xf10605deUL +#endif + } +}; diff --git a/src/3rdparty/zlib/deflate.c b/src/3rdparty/zlib/deflate.c new file mode 100644 index 0000000..6969577 --- /dev/null +++ b/src/3rdparty/zlib/deflate.c @@ -0,0 +1,1967 @@ +/* deflate.c -- compress data using the deflation algorithm + * Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +/* + * ALGORITHM + * + * The "deflation" process depends on being able to identify portions + * of the input text which are identical to earlier input (within a + * sliding window trailing behind the input currently being processed). + * + * The most straightforward technique turns out to be the fastest for + * most input files: try all possible matches and select the longest. + * The key feature of this algorithm is that insertions into the string + * dictionary are very simple and thus fast, and deletions are avoided + * completely. Insertions are performed at each input character, whereas + * string matches are performed only when the previous match ends. So it + * is preferable to spend more time in matches to allow very fast string + * insertions and avoid deletions. The matching algorithm for small + * strings is inspired from that of Rabin & Karp. A brute force approach + * is used to find longer strings when a small match has been found. + * A similar algorithm is used in comic (by Jan-Mark Wams) and freeze + * (by Leonid Broukhis). + * A previous version of this file used a more sophisticated algorithm + * (by Fiala and Greene) which is guaranteed to run in linear amortized + * time, but has a larger average cost, uses more memory and is patented. + * However the F&G algorithm may be faster for some highly redundant + * files if the parameter max_chain_length (described below) is too large. + * + * ACKNOWLEDGEMENTS + * + * The idea of lazy evaluation of matches is due to Jan-Mark Wams, and + * I found it in 'freeze' written by Leonid Broukhis. + * Thanks to many people for bug reports and testing. + * + * REFERENCES + * + * Deutsch, L.P.,"DEFLATE Compressed Data Format Specification". + * Available in http://tools.ietf.org/html/rfc1951 + * + * A description of the Rabin and Karp algorithm is given in the book + * "Algorithms" by R. Sedgewick, Addison-Wesley, p252. + * + * Fiala,E.R., and Greene,D.H. + * Data Compression with Finite Windows, Comm.ACM, 32,4 (1989) 490-595 + * + */ + +/* @(#) $Id$ */ + +#include "deflate.h" + +const char deflate_copyright[] = + " deflate 1.2.8 Copyright 1995-2013 Jean-loup Gailly and Mark Adler "; +/* + If you use the zlib library in a product, an acknowledgment is welcome + in the documentation of your product. If for some reason you cannot + include such an acknowledgment, I would appreciate that you keep this + copyright string in the executable of your product. + */ + +/* =========================================================================== + * Function prototypes. + */ +typedef enum { + need_more, /* block not completed, need more input or more output */ + block_done, /* block flush performed */ + finish_started, /* finish started, need only more output at next deflate */ + finish_done /* finish done, accept no more input or output */ +} block_state; + +typedef block_state (*compress_func) OF((deflate_state *s, int flush)); +/* Compression function. Returns the block state after the call. */ + +local void fill_window OF((deflate_state *s)); +local block_state deflate_stored OF((deflate_state *s, int flush)); +local block_state deflate_fast OF((deflate_state *s, int flush)); +#ifndef FASTEST +local block_state deflate_slow OF((deflate_state *s, int flush)); +#endif +local block_state deflate_rle OF((deflate_state *s, int flush)); +local block_state deflate_huff OF((deflate_state *s, int flush)); +local void lm_init OF((deflate_state *s)); +local void putShortMSB OF((deflate_state *s, uInt b)); +local void flush_pending OF((z_streamp strm)); +local int read_buf OF((z_streamp strm, Bytef *buf, unsigned size)); +#ifdef ASMV + void match_init OF((void)); /* asm code initialization */ + uInt longest_match OF((deflate_state *s, IPos cur_match)); +#else +local uInt longest_match OF((deflate_state *s, IPos cur_match)); +#endif + +#ifdef DEBUG +local void check_match OF((deflate_state *s, IPos start, IPos match, + int length)); +#endif + +/* =========================================================================== + * Local data + */ + +#define NIL 0 +/* Tail of hash chains */ + +#ifndef TOO_FAR +# define TOO_FAR 4096 +#endif +/* Matches of length 3 are discarded if their distance exceeds TOO_FAR */ + +/* Values for max_lazy_match, good_match and max_chain_length, depending on + * the desired pack level (0..9). The values given below have been tuned to + * exclude worst case performance for pathological files. Better values may be + * found for specific files. + */ +typedef struct config_s { + ush good_length; /* reduce lazy search above this match length */ + ush max_lazy; /* do not perform lazy search above this match length */ + ush nice_length; /* quit search above this match length */ + ush max_chain; + compress_func func; +} config; + +#ifdef FASTEST +local const config configuration_table[2] = { +/* good lazy nice chain */ +/* 0 */ {0, 0, 0, 0, deflate_stored}, /* store only */ +/* 1 */ {4, 4, 8, 4, deflate_fast}}; /* max speed, no lazy matches */ +#else +local const config configuration_table[10] = { +/* good lazy nice chain */ +/* 0 */ {0, 0, 0, 0, deflate_stored}, /* store only */ +/* 1 */ {4, 4, 8, 4, deflate_fast}, /* max speed, no lazy matches */ +/* 2 */ {4, 5, 16, 8, deflate_fast}, +/* 3 */ {4, 6, 32, 32, deflate_fast}, + +/* 4 */ {4, 4, 16, 16, deflate_slow}, /* lazy matches */ +/* 5 */ {8, 16, 32, 32, deflate_slow}, +/* 6 */ {8, 16, 128, 128, deflate_slow}, +/* 7 */ {8, 32, 128, 256, deflate_slow}, +/* 8 */ {32, 128, 258, 1024, deflate_slow}, +/* 9 */ {32, 258, 258, 4096, deflate_slow}}; /* max compression */ +#endif + +/* Note: the deflate() code requires max_lazy >= MIN_MATCH and max_chain >= 4 + * For deflate_fast() (levels <= 3) good is ignored and lazy has a different + * meaning. + */ + +#define EQUAL 0 +/* result of memcmp for equal strings */ + +#ifndef NO_DUMMY_DECL +struct static_tree_desc_s {int dummy;}; /* for buggy compilers */ +#endif + +/* rank Z_BLOCK between Z_NO_FLUSH and Z_PARTIAL_FLUSH */ +#define RANK(f) (((f) << 1) - ((f) > 4 ? 9 : 0)) + +/* =========================================================================== + * Update a hash value with the given input byte + * IN assertion: all calls to to UPDATE_HASH are made with consecutive + * input characters, so that a running hash key can be computed from the + * previous key instead of complete recalculation each time. + */ +#define UPDATE_HASH(s,h,c) (h = (((h)<hash_shift) ^ (c)) & s->hash_mask) + + +/* =========================================================================== + * Insert string str in the dictionary and set match_head to the previous head + * of the hash chain (the most recent string with same hash key). Return + * the previous length of the hash chain. + * If this file is compiled with -DFASTEST, the compression level is forced + * to 1, and no hash chains are maintained. + * IN assertion: all calls to to INSERT_STRING are made with consecutive + * input characters and the first MIN_MATCH bytes of str are valid + * (except for the last MIN_MATCH-1 bytes of the input file). + */ +#ifdef FASTEST +#define INSERT_STRING(s, str, match_head) \ + (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \ + match_head = s->head[s->ins_h], \ + s->head[s->ins_h] = (Pos)(str)) +#else +#define INSERT_STRING(s, str, match_head) \ + (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \ + match_head = s->prev[(str) & s->w_mask] = s->head[s->ins_h], \ + s->head[s->ins_h] = (Pos)(str)) +#endif + +/* =========================================================================== + * Initialize the hash table (avoiding 64K overflow for 16 bit systems). + * prev[] will be initialized on the fly. + */ +#define CLEAR_HASH(s) \ + s->head[s->hash_size-1] = NIL; \ + zmemzero((Bytef *)s->head, (unsigned)(s->hash_size-1)*sizeof(*s->head)); + +/* ========================================================================= */ +int ZEXPORT deflateInit_(strm, level, version, stream_size) + z_streamp strm; + int level; + const char *version; + int stream_size; +{ + return deflateInit2_(strm, level, Z_DEFLATED, MAX_WBITS, DEF_MEM_LEVEL, + Z_DEFAULT_STRATEGY, version, stream_size); + /* To do: ignore strm->next_in if we use it as window */ +} + +/* ========================================================================= */ +int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy, + version, stream_size) + z_streamp strm; + int level; + int method; + int windowBits; + int memLevel; + int strategy; + const char *version; + int stream_size; +{ + deflate_state *s; + int wrap = 1; + static const char my_version[] = ZLIB_VERSION; + + ushf *overlay; + /* We overlay pending_buf and d_buf+l_buf. This works since the average + * output size for (length,distance) codes is <= 24 bits. + */ + + if (version == Z_NULL || version[0] != my_version[0] || + stream_size != sizeof(z_stream)) { + return Z_VERSION_ERROR; + } + if (strm == Z_NULL) return Z_STREAM_ERROR; + + strm->msg = Z_NULL; + if (strm->zalloc == (alloc_func)0) { +#ifdef Z_SOLO + return Z_STREAM_ERROR; +#else + strm->zalloc = zcalloc; + strm->opaque = (voidpf)0; +#endif + } + if (strm->zfree == (free_func)0) +#ifdef Z_SOLO + return Z_STREAM_ERROR; +#else + strm->zfree = zcfree; +#endif + +#ifdef FASTEST + if (level != 0) level = 1; +#else + if (level == Z_DEFAULT_COMPRESSION) level = 6; +#endif + + if (windowBits < 0) { /* suppress zlib wrapper */ + wrap = 0; + windowBits = -windowBits; + } +#ifdef GZIP + else if (windowBits > 15) { + wrap = 2; /* write gzip wrapper instead */ + windowBits -= 16; + } +#endif + if (memLevel < 1 || memLevel > MAX_MEM_LEVEL || method != Z_DEFLATED || + windowBits < 8 || windowBits > 15 || level < 0 || level > 9 || + strategy < 0 || strategy > Z_FIXED) { + return Z_STREAM_ERROR; + } + if (windowBits == 8) windowBits = 9; /* until 256-byte window bug fixed */ + s = (deflate_state *) ZALLOC(strm, 1, sizeof(deflate_state)); + if (s == Z_NULL) return Z_MEM_ERROR; + strm->state = (struct internal_state FAR *)s; + s->strm = strm; + + s->wrap = wrap; + s->gzhead = Z_NULL; + s->w_bits = windowBits; + s->w_size = 1 << s->w_bits; + s->w_mask = s->w_size - 1; + + s->hash_bits = memLevel + 7; + s->hash_size = 1 << s->hash_bits; + s->hash_mask = s->hash_size - 1; + s->hash_shift = ((s->hash_bits+MIN_MATCH-1)/MIN_MATCH); + + s->window = (Bytef *) ZALLOC(strm, s->w_size, 2*sizeof(Byte)); + s->prev = (Posf *) ZALLOC(strm, s->w_size, sizeof(Pos)); + s->head = (Posf *) ZALLOC(strm, s->hash_size, sizeof(Pos)); + + s->high_water = 0; /* nothing written to s->window yet */ + + s->lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */ + + overlay = (ushf *) ZALLOC(strm, s->lit_bufsize, sizeof(ush)+2); + s->pending_buf = (uchf *) overlay; + s->pending_buf_size = (ulg)s->lit_bufsize * (sizeof(ush)+2L); + + if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL || + s->pending_buf == Z_NULL) { + s->status = FINISH_STATE; + strm->msg = ERR_MSG(Z_MEM_ERROR); + deflateEnd (strm); + return Z_MEM_ERROR; + } + s->d_buf = overlay + s->lit_bufsize/sizeof(ush); + s->l_buf = s->pending_buf + (1+sizeof(ush))*s->lit_bufsize; + + s->level = level; + s->strategy = strategy; + s->method = (Byte)method; + + return deflateReset(strm); +} + +/* ========================================================================= */ +int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength) + z_streamp strm; + const Bytef *dictionary; + uInt dictLength; +{ + deflate_state *s; + uInt str, n; + int wrap; + unsigned avail; + z_const unsigned char *next; + + if (strm == Z_NULL || strm->state == Z_NULL || dictionary == Z_NULL) + return Z_STREAM_ERROR; + s = strm->state; + wrap = s->wrap; + if (wrap == 2 || (wrap == 1 && s->status != INIT_STATE) || s->lookahead) + return Z_STREAM_ERROR; + + /* when using zlib wrappers, compute Adler-32 for provided dictionary */ + if (wrap == 1) + strm->adler = adler32(strm->adler, dictionary, dictLength); + s->wrap = 0; /* avoid computing Adler-32 in read_buf */ + + /* if dictionary would fill window, just replace the history */ + if (dictLength >= s->w_size) { + if (wrap == 0) { /* already empty otherwise */ + CLEAR_HASH(s); + s->strstart = 0; + s->block_start = 0L; + s->insert = 0; + } + dictionary += dictLength - s->w_size; /* use the tail */ + dictLength = s->w_size; + } + + /* insert dictionary into window and hash */ + avail = strm->avail_in; + next = strm->next_in; + strm->avail_in = dictLength; + strm->next_in = (z_const Bytef *)dictionary; + fill_window(s); + while (s->lookahead >= MIN_MATCH) { + str = s->strstart; + n = s->lookahead - (MIN_MATCH-1); + do { + UPDATE_HASH(s, s->ins_h, s->window[str + MIN_MATCH-1]); +#ifndef FASTEST + s->prev[str & s->w_mask] = s->head[s->ins_h]; +#endif + s->head[s->ins_h] = (Pos)str; + str++; + } while (--n); + s->strstart = str; + s->lookahead = MIN_MATCH-1; + fill_window(s); + } + s->strstart += s->lookahead; + s->block_start = (long)s->strstart; + s->insert = s->lookahead; + s->lookahead = 0; + s->match_length = s->prev_length = MIN_MATCH-1; + s->match_available = 0; + strm->next_in = next; + strm->avail_in = avail; + s->wrap = wrap; + return Z_OK; +} + +/* ========================================================================= */ +int ZEXPORT deflateResetKeep (strm) + z_streamp strm; +{ + deflate_state *s; + + if (strm == Z_NULL || strm->state == Z_NULL || + strm->zalloc == (alloc_func)0 || strm->zfree == (free_func)0) { + return Z_STREAM_ERROR; + } + + strm->total_in = strm->total_out = 0; + strm->msg = Z_NULL; /* use zfree if we ever allocate msg dynamically */ + strm->data_type = Z_UNKNOWN; + + s = (deflate_state *)strm->state; + s->pending = 0; + s->pending_out = s->pending_buf; + + if (s->wrap < 0) { + s->wrap = -s->wrap; /* was made negative by deflate(..., Z_FINISH); */ + } + s->status = s->wrap ? INIT_STATE : BUSY_STATE; + strm->adler = +#ifdef GZIP + s->wrap == 2 ? crc32(0L, Z_NULL, 0) : +#endif + adler32(0L, Z_NULL, 0); + s->last_flush = Z_NO_FLUSH; + + _tr_init(s); + + return Z_OK; +} + +/* ========================================================================= */ +int ZEXPORT deflateReset (strm) + z_streamp strm; +{ + int ret; + + ret = deflateResetKeep(strm); + if (ret == Z_OK) + lm_init(strm->state); + return ret; +} + +/* ========================================================================= */ +int ZEXPORT deflateSetHeader (strm, head) + z_streamp strm; + gz_headerp head; +{ + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + if (strm->state->wrap != 2) return Z_STREAM_ERROR; + strm->state->gzhead = head; + return Z_OK; +} + +/* ========================================================================= */ +int ZEXPORT deflatePending (strm, pending, bits) + unsigned *pending; + int *bits; + z_streamp strm; +{ + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + if (pending != Z_NULL) + *pending = strm->state->pending; + if (bits != Z_NULL) + *bits = strm->state->bi_valid; + return Z_OK; +} + +/* ========================================================================= */ +int ZEXPORT deflatePrime (strm, bits, value) + z_streamp strm; + int bits; + int value; +{ + deflate_state *s; + int put; + + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + s = strm->state; + if ((Bytef *)(s->d_buf) < s->pending_out + ((Buf_size + 7) >> 3)) + return Z_BUF_ERROR; + do { + put = Buf_size - s->bi_valid; + if (put > bits) + put = bits; + s->bi_buf |= (ush)((value & ((1 << put) - 1)) << s->bi_valid); + s->bi_valid += put; + _tr_flush_bits(s); + value >>= put; + bits -= put; + } while (bits); + return Z_OK; +} + +/* ========================================================================= */ +int ZEXPORT deflateParams(strm, level, strategy) + z_streamp strm; + int level; + int strategy; +{ + deflate_state *s; + compress_func func; + int err = Z_OK; + + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + s = strm->state; + +#ifdef FASTEST + if (level != 0) level = 1; +#else + if (level == Z_DEFAULT_COMPRESSION) level = 6; +#endif + if (level < 0 || level > 9 || strategy < 0 || strategy > Z_FIXED) { + return Z_STREAM_ERROR; + } + func = configuration_table[s->level].func; + + if ((strategy != s->strategy || func != configuration_table[level].func) && + strm->total_in != 0) { + /* Flush the last buffer: */ + err = deflate(strm, Z_BLOCK); + if (err == Z_BUF_ERROR && s->pending == 0) + err = Z_OK; + } + if (s->level != level) { + s->level = level; + s->max_lazy_match = configuration_table[level].max_lazy; + s->good_match = configuration_table[level].good_length; + s->nice_match = configuration_table[level].nice_length; + s->max_chain_length = configuration_table[level].max_chain; + } + s->strategy = strategy; + return err; +} + +/* ========================================================================= */ +int ZEXPORT deflateTune(strm, good_length, max_lazy, nice_length, max_chain) + z_streamp strm; + int good_length; + int max_lazy; + int nice_length; + int max_chain; +{ + deflate_state *s; + + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + s = strm->state; + s->good_match = good_length; + s->max_lazy_match = max_lazy; + s->nice_match = nice_length; + s->max_chain_length = max_chain; + return Z_OK; +} + +/* ========================================================================= + * For the default windowBits of 15 and memLevel of 8, this function returns + * a close to exact, as well as small, upper bound on the compressed size. + * They are coded as constants here for a reason--if the #define's are + * changed, then this function needs to be changed as well. The return + * value for 15 and 8 only works for those exact settings. + * + * For any setting other than those defaults for windowBits and memLevel, + * the value returned is a conservative worst case for the maximum expansion + * resulting from using fixed blocks instead of stored blocks, which deflate + * can emit on compressed data for some combinations of the parameters. + * + * This function could be more sophisticated to provide closer upper bounds for + * every combination of windowBits and memLevel. But even the conservative + * upper bound of about 14% expansion does not seem onerous for output buffer + * allocation. + */ +uLong ZEXPORT deflateBound(strm, sourceLen) + z_streamp strm; + uLong sourceLen; +{ + deflate_state *s; + uLong complen, wraplen; + Bytef *str; + + /* conservative upper bound for compressed data */ + complen = sourceLen + + ((sourceLen + 7) >> 3) + ((sourceLen + 63) >> 6) + 5; + + /* if can't get parameters, return conservative bound plus zlib wrapper */ + if (strm == Z_NULL || strm->state == Z_NULL) + return complen + 6; + + /* compute wrapper length */ + s = strm->state; + switch (s->wrap) { + case 0: /* raw deflate */ + wraplen = 0; + break; + case 1: /* zlib wrapper */ + wraplen = 6 + (s->strstart ? 4 : 0); + break; + case 2: /* gzip wrapper */ + wraplen = 18; + if (s->gzhead != Z_NULL) { /* user-supplied gzip header */ + if (s->gzhead->extra != Z_NULL) + wraplen += 2 + s->gzhead->extra_len; + str = s->gzhead->name; + if (str != Z_NULL) + do { + wraplen++; + } while (*str++); + str = s->gzhead->comment; + if (str != Z_NULL) + do { + wraplen++; + } while (*str++); + if (s->gzhead->hcrc) + wraplen += 2; + } + break; + default: /* for compiler happiness */ + wraplen = 6; + } + + /* if not default parameters, return conservative bound */ + if (s->w_bits != 15 || s->hash_bits != 8 + 7) + return complen + wraplen; + + /* default settings: return tight bound for that case */ + return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) + + (sourceLen >> 25) + 13 - 6 + wraplen; +} + +/* ========================================================================= + * Put a short in the pending buffer. The 16-bit value is put in MSB order. + * IN assertion: the stream state is correct and there is enough room in + * pending_buf. + */ +local void putShortMSB (s, b) + deflate_state *s; + uInt b; +{ + put_byte(s, (Byte)(b >> 8)); + put_byte(s, (Byte)(b & 0xff)); +} + +/* ========================================================================= + * Flush as much pending output as possible. All deflate() output goes + * through this function so some applications may wish to modify it + * to avoid allocating a large strm->next_out buffer and copying into it. + * (See also read_buf()). + */ +local void flush_pending(strm) + z_streamp strm; +{ + unsigned len; + deflate_state *s = strm->state; + + _tr_flush_bits(s); + len = s->pending; + if (len > strm->avail_out) len = strm->avail_out; + if (len == 0) return; + + zmemcpy(strm->next_out, s->pending_out, len); + strm->next_out += len; + s->pending_out += len; + strm->total_out += len; + strm->avail_out -= len; + s->pending -= len; + if (s->pending == 0) { + s->pending_out = s->pending_buf; + } +} + +/* ========================================================================= */ +int ZEXPORT deflate (strm, flush) + z_streamp strm; + int flush; +{ + int old_flush; /* value of flush param for previous deflate call */ + deflate_state *s; + + if (strm == Z_NULL || strm->state == Z_NULL || + flush > Z_BLOCK || flush < 0) { + return Z_STREAM_ERROR; + } + s = strm->state; + + if (strm->next_out == Z_NULL || + (strm->next_in == Z_NULL && strm->avail_in != 0) || + (s->status == FINISH_STATE && flush != Z_FINISH)) { + ERR_RETURN(strm, Z_STREAM_ERROR); + } + if (strm->avail_out == 0) ERR_RETURN(strm, Z_BUF_ERROR); + + s->strm = strm; /* just in case */ + old_flush = s->last_flush; + s->last_flush = flush; + + /* Write the header */ + if (s->status == INIT_STATE) { +#ifdef GZIP + if (s->wrap == 2) { + strm->adler = crc32(0L, Z_NULL, 0); + put_byte(s, 31); + put_byte(s, 139); + put_byte(s, 8); + if (s->gzhead == Z_NULL) { + put_byte(s, 0); + put_byte(s, 0); + put_byte(s, 0); + put_byte(s, 0); + put_byte(s, 0); + put_byte(s, s->level == 9 ? 2 : + (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ? + 4 : 0)); + put_byte(s, OS_CODE); + s->status = BUSY_STATE; + } + else { + put_byte(s, (s->gzhead->text ? 1 : 0) + + (s->gzhead->hcrc ? 2 : 0) + + (s->gzhead->extra == Z_NULL ? 0 : 4) + + (s->gzhead->name == Z_NULL ? 0 : 8) + + (s->gzhead->comment == Z_NULL ? 0 : 16) + ); + put_byte(s, (Byte)(s->gzhead->time & 0xff)); + put_byte(s, (Byte)((s->gzhead->time >> 8) & 0xff)); + put_byte(s, (Byte)((s->gzhead->time >> 16) & 0xff)); + put_byte(s, (Byte)((s->gzhead->time >> 24) & 0xff)); + put_byte(s, s->level == 9 ? 2 : + (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ? + 4 : 0)); + put_byte(s, s->gzhead->os & 0xff); + if (s->gzhead->extra != Z_NULL) { + put_byte(s, s->gzhead->extra_len & 0xff); + put_byte(s, (s->gzhead->extra_len >> 8) & 0xff); + } + if (s->gzhead->hcrc) + strm->adler = crc32(strm->adler, s->pending_buf, + s->pending); + s->gzindex = 0; + s->status = EXTRA_STATE; + } + } + else +#endif + { + uInt header = (Z_DEFLATED + ((s->w_bits-8)<<4)) << 8; + uInt level_flags; + + if (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2) + level_flags = 0; + else if (s->level < 6) + level_flags = 1; + else if (s->level == 6) + level_flags = 2; + else + level_flags = 3; + header |= (level_flags << 6); + if (s->strstart != 0) header |= PRESET_DICT; + header += 31 - (header % 31); + + s->status = BUSY_STATE; + putShortMSB(s, header); + + /* Save the adler32 of the preset dictionary: */ + if (s->strstart != 0) { + putShortMSB(s, (uInt)(strm->adler >> 16)); + putShortMSB(s, (uInt)(strm->adler & 0xffff)); + } + strm->adler = adler32(0L, Z_NULL, 0); + } + } +#ifdef GZIP + if (s->status == EXTRA_STATE) { + if (s->gzhead->extra != Z_NULL) { + uInt beg = s->pending; /* start of bytes to update crc */ + + while (s->gzindex < (s->gzhead->extra_len & 0xffff)) { + if (s->pending == s->pending_buf_size) { + if (s->gzhead->hcrc && s->pending > beg) + strm->adler = crc32(strm->adler, s->pending_buf + beg, + s->pending - beg); + flush_pending(strm); + beg = s->pending; + if (s->pending == s->pending_buf_size) + break; + } + put_byte(s, s->gzhead->extra[s->gzindex]); + s->gzindex++; + } + if (s->gzhead->hcrc && s->pending > beg) + strm->adler = crc32(strm->adler, s->pending_buf + beg, + s->pending - beg); + if (s->gzindex == s->gzhead->extra_len) { + s->gzindex = 0; + s->status = NAME_STATE; + } + } + else + s->status = NAME_STATE; + } + if (s->status == NAME_STATE) { + if (s->gzhead->name != Z_NULL) { + uInt beg = s->pending; /* start of bytes to update crc */ + int val; + + do { + if (s->pending == s->pending_buf_size) { + if (s->gzhead->hcrc && s->pending > beg) + strm->adler = crc32(strm->adler, s->pending_buf + beg, + s->pending - beg); + flush_pending(strm); + beg = s->pending; + if (s->pending == s->pending_buf_size) { + val = 1; + break; + } + } + val = s->gzhead->name[s->gzindex++]; + put_byte(s, val); + } while (val != 0); + if (s->gzhead->hcrc && s->pending > beg) + strm->adler = crc32(strm->adler, s->pending_buf + beg, + s->pending - beg); + if (val == 0) { + s->gzindex = 0; + s->status = COMMENT_STATE; + } + } + else + s->status = COMMENT_STATE; + } + if (s->status == COMMENT_STATE) { + if (s->gzhead->comment != Z_NULL) { + uInt beg = s->pending; /* start of bytes to update crc */ + int val; + + do { + if (s->pending == s->pending_buf_size) { + if (s->gzhead->hcrc && s->pending > beg) + strm->adler = crc32(strm->adler, s->pending_buf + beg, + s->pending - beg); + flush_pending(strm); + beg = s->pending; + if (s->pending == s->pending_buf_size) { + val = 1; + break; + } + } + val = s->gzhead->comment[s->gzindex++]; + put_byte(s, val); + } while (val != 0); + if (s->gzhead->hcrc && s->pending > beg) + strm->adler = crc32(strm->adler, s->pending_buf + beg, + s->pending - beg); + if (val == 0) + s->status = HCRC_STATE; + } + else + s->status = HCRC_STATE; + } + if (s->status == HCRC_STATE) { + if (s->gzhead->hcrc) { + if (s->pending + 2 > s->pending_buf_size) + flush_pending(strm); + if (s->pending + 2 <= s->pending_buf_size) { + put_byte(s, (Byte)(strm->adler & 0xff)); + put_byte(s, (Byte)((strm->adler >> 8) & 0xff)); + strm->adler = crc32(0L, Z_NULL, 0); + s->status = BUSY_STATE; + } + } + else + s->status = BUSY_STATE; + } +#endif + + /* Flush as much pending output as possible */ + if (s->pending != 0) { + flush_pending(strm); + if (strm->avail_out == 0) { + /* Since avail_out is 0, deflate will be called again with + * more output space, but possibly with both pending and + * avail_in equal to zero. There won't be anything to do, + * but this is not an error situation so make sure we + * return OK instead of BUF_ERROR at next call of deflate: + */ + s->last_flush = -1; + return Z_OK; + } + + /* Make sure there is something to do and avoid duplicate consecutive + * flushes. For repeated and useless calls with Z_FINISH, we keep + * returning Z_STREAM_END instead of Z_BUF_ERROR. + */ + } else if (strm->avail_in == 0 && RANK(flush) <= RANK(old_flush) && + flush != Z_FINISH) { + ERR_RETURN(strm, Z_BUF_ERROR); + } + + /* User must not provide more input after the first FINISH: */ + if (s->status == FINISH_STATE && strm->avail_in != 0) { + ERR_RETURN(strm, Z_BUF_ERROR); + } + + /* Start a new block or continue the current one. + */ + if (strm->avail_in != 0 || s->lookahead != 0 || + (flush != Z_NO_FLUSH && s->status != FINISH_STATE)) { + block_state bstate; + + bstate = s->strategy == Z_HUFFMAN_ONLY ? deflate_huff(s, flush) : + (s->strategy == Z_RLE ? deflate_rle(s, flush) : + (*(configuration_table[s->level].func))(s, flush)); + + if (bstate == finish_started || bstate == finish_done) { + s->status = FINISH_STATE; + } + if (bstate == need_more || bstate == finish_started) { + if (strm->avail_out == 0) { + s->last_flush = -1; /* avoid BUF_ERROR next call, see above */ + } + return Z_OK; + /* If flush != Z_NO_FLUSH && avail_out == 0, the next call + * of deflate should use the same flush parameter to make sure + * that the flush is complete. So we don't have to output an + * empty block here, this will be done at next call. This also + * ensures that for a very small output buffer, we emit at most + * one empty block. + */ + } + if (bstate == block_done) { + if (flush == Z_PARTIAL_FLUSH) { + _tr_align(s); + } else if (flush != Z_BLOCK) { /* FULL_FLUSH or SYNC_FLUSH */ + _tr_stored_block(s, (char*)0, 0L, 0); + /* For a full flush, this empty block will be recognized + * as a special marker by inflate_sync(). + */ + if (flush == Z_FULL_FLUSH) { + CLEAR_HASH(s); /* forget history */ + if (s->lookahead == 0) { + s->strstart = 0; + s->block_start = 0L; + s->insert = 0; + } + } + } + flush_pending(strm); + if (strm->avail_out == 0) { + s->last_flush = -1; /* avoid BUF_ERROR at next call, see above */ + return Z_OK; + } + } + } + Assert(strm->avail_out > 0, "bug2"); + + if (flush != Z_FINISH) return Z_OK; + if (s->wrap <= 0) return Z_STREAM_END; + + /* Write the trailer */ +#ifdef GZIP + if (s->wrap == 2) { + put_byte(s, (Byte)(strm->adler & 0xff)); + put_byte(s, (Byte)((strm->adler >> 8) & 0xff)); + put_byte(s, (Byte)((strm->adler >> 16) & 0xff)); + put_byte(s, (Byte)((strm->adler >> 24) & 0xff)); + put_byte(s, (Byte)(strm->total_in & 0xff)); + put_byte(s, (Byte)((strm->total_in >> 8) & 0xff)); + put_byte(s, (Byte)((strm->total_in >> 16) & 0xff)); + put_byte(s, (Byte)((strm->total_in >> 24) & 0xff)); + } + else +#endif + { + putShortMSB(s, (uInt)(strm->adler >> 16)); + putShortMSB(s, (uInt)(strm->adler & 0xffff)); + } + flush_pending(strm); + /* If avail_out is zero, the application will call deflate again + * to flush the rest. + */ + if (s->wrap > 0) s->wrap = -s->wrap; /* write the trailer only once! */ + return s->pending != 0 ? Z_OK : Z_STREAM_END; +} + +/* ========================================================================= */ +int ZEXPORT deflateEnd (strm) + z_streamp strm; +{ + int status; + + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + + status = strm->state->status; + if (status != INIT_STATE && + status != EXTRA_STATE && + status != NAME_STATE && + status != COMMENT_STATE && + status != HCRC_STATE && + status != BUSY_STATE && + status != FINISH_STATE) { + return Z_STREAM_ERROR; + } + + /* Deallocate in reverse order of allocations: */ + TRY_FREE(strm, strm->state->pending_buf); + TRY_FREE(strm, strm->state->head); + TRY_FREE(strm, strm->state->prev); + TRY_FREE(strm, strm->state->window); + + ZFREE(strm, strm->state); + strm->state = Z_NULL; + + return status == BUSY_STATE ? Z_DATA_ERROR : Z_OK; +} + +/* ========================================================================= + * Copy the source state to the destination state. + * To simplify the source, this is not supported for 16-bit MSDOS (which + * doesn't have enough memory anyway to duplicate compression states). + */ +int ZEXPORT deflateCopy (dest, source) + z_streamp dest; + z_streamp source; +{ +#ifdef MAXSEG_64K + return Z_STREAM_ERROR; +#else + deflate_state *ds; + deflate_state *ss; + ushf *overlay; + + + if (source == Z_NULL || dest == Z_NULL || source->state == Z_NULL) { + return Z_STREAM_ERROR; + } + + ss = source->state; + + zmemcpy((voidpf)dest, (voidpf)source, sizeof(z_stream)); + + ds = (deflate_state *) ZALLOC(dest, 1, sizeof(deflate_state)); + if (ds == Z_NULL) return Z_MEM_ERROR; + dest->state = (struct internal_state FAR *) ds; + zmemcpy((voidpf)ds, (voidpf)ss, sizeof(deflate_state)); + ds->strm = dest; + + ds->window = (Bytef *) ZALLOC(dest, ds->w_size, 2*sizeof(Byte)); + ds->prev = (Posf *) ZALLOC(dest, ds->w_size, sizeof(Pos)); + ds->head = (Posf *) ZALLOC(dest, ds->hash_size, sizeof(Pos)); + overlay = (ushf *) ZALLOC(dest, ds->lit_bufsize, sizeof(ush)+2); + ds->pending_buf = (uchf *) overlay; + + if (ds->window == Z_NULL || ds->prev == Z_NULL || ds->head == Z_NULL || + ds->pending_buf == Z_NULL) { + deflateEnd (dest); + return Z_MEM_ERROR; + } + /* following zmemcpy do not work for 16-bit MSDOS */ + zmemcpy(ds->window, ss->window, ds->w_size * 2 * sizeof(Byte)); + zmemcpy((voidpf)ds->prev, (voidpf)ss->prev, ds->w_size * sizeof(Pos)); + zmemcpy((voidpf)ds->head, (voidpf)ss->head, ds->hash_size * sizeof(Pos)); + zmemcpy(ds->pending_buf, ss->pending_buf, (uInt)ds->pending_buf_size); + + ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf); + ds->d_buf = overlay + ds->lit_bufsize/sizeof(ush); + ds->l_buf = ds->pending_buf + (1+sizeof(ush))*ds->lit_bufsize; + + ds->l_desc.dyn_tree = ds->dyn_ltree; + ds->d_desc.dyn_tree = ds->dyn_dtree; + ds->bl_desc.dyn_tree = ds->bl_tree; + + return Z_OK; +#endif /* MAXSEG_64K */ +} + +/* =========================================================================== + * Read a new buffer from the current input stream, update the adler32 + * and total number of bytes read. All deflate() input goes through + * this function so some applications may wish to modify it to avoid + * allocating a large strm->next_in buffer and copying from it. + * (See also flush_pending()). + */ +local int read_buf(strm, buf, size) + z_streamp strm; + Bytef *buf; + unsigned size; +{ + unsigned len = strm->avail_in; + + if (len > size) len = size; + if (len == 0) return 0; + + strm->avail_in -= len; + + zmemcpy(buf, strm->next_in, len); + if (strm->state->wrap == 1) { + strm->adler = adler32(strm->adler, buf, len); + } +#ifdef GZIP + else if (strm->state->wrap == 2) { + strm->adler = crc32(strm->adler, buf, len); + } +#endif + strm->next_in += len; + strm->total_in += len; + + return (int)len; +} + +/* =========================================================================== + * Initialize the "longest match" routines for a new zlib stream + */ +local void lm_init (s) + deflate_state *s; +{ + s->window_size = (ulg)2L*s->w_size; + + CLEAR_HASH(s); + + /* Set the default configuration parameters: + */ + s->max_lazy_match = configuration_table[s->level].max_lazy; + s->good_match = configuration_table[s->level].good_length; + s->nice_match = configuration_table[s->level].nice_length; + s->max_chain_length = configuration_table[s->level].max_chain; + + s->strstart = 0; + s->block_start = 0L; + s->lookahead = 0; + s->insert = 0; + s->match_length = s->prev_length = MIN_MATCH-1; + s->match_available = 0; + s->ins_h = 0; +#ifndef FASTEST +#ifdef ASMV + match_init(); /* initialize the asm code */ +#endif +#endif +} + +#ifndef FASTEST +/* =========================================================================== + * Set match_start to the longest match starting at the given string and + * return its length. Matches shorter or equal to prev_length are discarded, + * in which case the result is equal to prev_length and match_start is + * garbage. + * IN assertions: cur_match is the head of the hash chain for the current + * string (strstart) and its distance is <= MAX_DIST, and prev_length >= 1 + * OUT assertion: the match length is not greater than s->lookahead. + */ +#ifndef ASMV +/* For 80x86 and 680x0, an optimized version will be provided in match.asm or + * match.S. The code will be functionally equivalent. + */ +local uInt longest_match(s, cur_match) + deflate_state *s; + IPos cur_match; /* current match */ +{ + unsigned chain_length = s->max_chain_length;/* max hash chain length */ + register Bytef *scan = s->window + s->strstart; /* current string */ + register Bytef *match; /* matched string */ + register int len; /* length of current match */ + int best_len = s->prev_length; /* best match length so far */ + int nice_match = s->nice_match; /* stop if match long enough */ + IPos limit = s->strstart > (IPos)MAX_DIST(s) ? + s->strstart - (IPos)MAX_DIST(s) : NIL; + /* Stop when cur_match becomes <= limit. To simplify the code, + * we prevent matches with the string of window index 0. + */ + Posf *prev = s->prev; + uInt wmask = s->w_mask; + +#ifdef UNALIGNED_OK + /* Compare two bytes at a time. Note: this is not always beneficial. + * Try with and without -DUNALIGNED_OK to check. + */ + register Bytef *strend = s->window + s->strstart + MAX_MATCH - 1; + register ush scan_start = *(ushf*)scan; + register ush scan_end = *(ushf*)(scan+best_len-1); +#else + register Bytef *strend = s->window + s->strstart + MAX_MATCH; + register Byte scan_end1 = scan[best_len-1]; + register Byte scan_end = scan[best_len]; +#endif + + /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16. + * It is easy to get rid of this optimization if necessary. + */ + Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever"); + + /* Do not waste too much time if we already have a good match: */ + if (s->prev_length >= s->good_match) { + chain_length >>= 2; + } + /* Do not look for matches beyond the end of the input. This is necessary + * to make deflate deterministic. + */ + if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead; + + Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead"); + + do { + Assert(cur_match < s->strstart, "no future"); + match = s->window + cur_match; + + /* Skip to next match if the match length cannot increase + * or if the match length is less than 2. Note that the checks below + * for insufficient lookahead only occur occasionally for performance + * reasons. Therefore uninitialized memory will be accessed, and + * conditional jumps will be made that depend on those values. + * However the length of the match is limited to the lookahead, so + * the output of deflate is not affected by the uninitialized values. + */ +#if (defined(UNALIGNED_OK) && MAX_MATCH == 258) + /* This code assumes sizeof(unsigned short) == 2. Do not use + * UNALIGNED_OK if your compiler uses a different size. + */ + if (*(ushf*)(match+best_len-1) != scan_end || + *(ushf*)match != scan_start) continue; + + /* It is not necessary to compare scan[2] and match[2] since they are + * always equal when the other bytes match, given that the hash keys + * are equal and that HASH_BITS >= 8. Compare 2 bytes at a time at + * strstart+3, +5, ... up to strstart+257. We check for insufficient + * lookahead only every 4th comparison; the 128th check will be made + * at strstart+257. If MAX_MATCH-2 is not a multiple of 8, it is + * necessary to put more guard bytes at the end of the window, or + * to check more often for insufficient lookahead. + */ + Assert(scan[2] == match[2], "scan[2]?"); + scan++, match++; + do { + } while (*(ushf*)(scan+=2) == *(ushf*)(match+=2) && + *(ushf*)(scan+=2) == *(ushf*)(match+=2) && + *(ushf*)(scan+=2) == *(ushf*)(match+=2) && + *(ushf*)(scan+=2) == *(ushf*)(match+=2) && + scan < strend); + /* The funny "do {}" generates better code on most compilers */ + + /* Here, scan <= window+strstart+257 */ + Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan"); + if (*scan == *match) scan++; + + len = (MAX_MATCH - 1) - (int)(strend-scan); + scan = strend - (MAX_MATCH-1); + +#else /* UNALIGNED_OK */ + + if (match[best_len] != scan_end || + match[best_len-1] != scan_end1 || + *match != *scan || + *++match != scan[1]) continue; + + /* The check at best_len-1 can be removed because it will be made + * again later. (This heuristic is not always a win.) + * It is not necessary to compare scan[2] and match[2] since they + * are always equal when the other bytes match, given that + * the hash keys are equal and that HASH_BITS >= 8. + */ + scan += 2, match++; + Assert(*scan == *match, "match[2]?"); + + /* We check for insufficient lookahead only every 8th comparison; + * the 256th check will be made at strstart+258. + */ + do { + } while (*++scan == *++match && *++scan == *++match && + *++scan == *++match && *++scan == *++match && + *++scan == *++match && *++scan == *++match && + *++scan == *++match && *++scan == *++match && + scan < strend); + + Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan"); + + len = MAX_MATCH - (int)(strend - scan); + scan = strend - MAX_MATCH; + +#endif /* UNALIGNED_OK */ + + if (len > best_len) { + s->match_start = cur_match; + best_len = len; + if (len >= nice_match) break; +#ifdef UNALIGNED_OK + scan_end = *(ushf*)(scan+best_len-1); +#else + scan_end1 = scan[best_len-1]; + scan_end = scan[best_len]; +#endif + } + } while ((cur_match = prev[cur_match & wmask]) > limit + && --chain_length != 0); + + if ((uInt)best_len <= s->lookahead) return (uInt)best_len; + return s->lookahead; +} +#endif /* ASMV */ + +#else /* FASTEST */ + +/* --------------------------------------------------------------------------- + * Optimized version for FASTEST only + */ +local uInt longest_match(s, cur_match) + deflate_state *s; + IPos cur_match; /* current match */ +{ + register Bytef *scan = s->window + s->strstart; /* current string */ + register Bytef *match; /* matched string */ + register int len; /* length of current match */ + register Bytef *strend = s->window + s->strstart + MAX_MATCH; + + /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16. + * It is easy to get rid of this optimization if necessary. + */ + Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever"); + + Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead"); + + Assert(cur_match < s->strstart, "no future"); + + match = s->window + cur_match; + + /* Return failure if the match length is less than 2: + */ + if (match[0] != scan[0] || match[1] != scan[1]) return MIN_MATCH-1; + + /* The check at best_len-1 can be removed because it will be made + * again later. (This heuristic is not always a win.) + * It is not necessary to compare scan[2] and match[2] since they + * are always equal when the other bytes match, given that + * the hash keys are equal and that HASH_BITS >= 8. + */ + scan += 2, match += 2; + Assert(*scan == *match, "match[2]?"); + + /* We check for insufficient lookahead only every 8th comparison; + * the 256th check will be made at strstart+258. + */ + do { + } while (*++scan == *++match && *++scan == *++match && + *++scan == *++match && *++scan == *++match && + *++scan == *++match && *++scan == *++match && + *++scan == *++match && *++scan == *++match && + scan < strend); + + Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan"); + + len = MAX_MATCH - (int)(strend - scan); + + if (len < MIN_MATCH) return MIN_MATCH - 1; + + s->match_start = cur_match; + return (uInt)len <= s->lookahead ? (uInt)len : s->lookahead; +} + +#endif /* FASTEST */ + +#ifdef DEBUG +/* =========================================================================== + * Check that the match at match_start is indeed a match. + */ +local void check_match(s, start, match, length) + deflate_state *s; + IPos start, match; + int length; +{ + /* check that the match is indeed a match */ + if (zmemcmp(s->window + match, + s->window + start, length) != EQUAL) { + fprintf(stderr, " start %u, match %u, length %d\n", + start, match, length); + do { + fprintf(stderr, "%c%c", s->window[match++], s->window[start++]); + } while (--length != 0); + z_error("invalid match"); + } + if (z_verbose > 1) { + fprintf(stderr,"\\[%d,%d]", start-match, length); + do { putc(s->window[start++], stderr); } while (--length != 0); + } +} +#else +# define check_match(s, start, match, length) +#endif /* DEBUG */ + +/* =========================================================================== + * Fill the window when the lookahead becomes insufficient. + * Updates strstart and lookahead. + * + * IN assertion: lookahead < MIN_LOOKAHEAD + * OUT assertions: strstart <= window_size-MIN_LOOKAHEAD + * At least one byte has been read, or avail_in == 0; reads are + * performed for at least two bytes (required for the zip translate_eol + * option -- not supported here). + */ +local void fill_window(s) + deflate_state *s; +{ + register unsigned n, m; + register Posf *p; + unsigned more; /* Amount of free space at the end of the window. */ + uInt wsize = s->w_size; + + Assert(s->lookahead < MIN_LOOKAHEAD, "already enough lookahead"); + + do { + more = (unsigned)(s->window_size -(ulg)s->lookahead -(ulg)s->strstart); + + /* Deal with !@#$% 64K limit: */ + if (sizeof(int) <= 2) { + if (more == 0 && s->strstart == 0 && s->lookahead == 0) { + more = wsize; + + } else if (more == (unsigned)(-1)) { + /* Very unlikely, but possible on 16 bit machine if + * strstart == 0 && lookahead == 1 (input done a byte at time) + */ + more--; + } + } + + /* If the window is almost full and there is insufficient lookahead, + * move the upper half to the lower one to make room in the upper half. + */ + if (s->strstart >= wsize+MAX_DIST(s)) { + + zmemcpy(s->window, s->window+wsize, (unsigned)wsize); + s->match_start -= wsize; + s->strstart -= wsize; /* we now have strstart >= MAX_DIST */ + s->block_start -= (long) wsize; + + /* Slide the hash table (could be avoided with 32 bit values + at the expense of memory usage). We slide even when level == 0 + to keep the hash table consistent if we switch back to level > 0 + later. (Using level 0 permanently is not an optimal usage of + zlib, so we don't care about this pathological case.) + */ + n = s->hash_size; + p = &s->head[n]; + do { + m = *--p; + *p = (Pos)(m >= wsize ? m-wsize : NIL); + } while (--n); + + n = wsize; +#ifndef FASTEST + p = &s->prev[n]; + do { + m = *--p; + *p = (Pos)(m >= wsize ? m-wsize : NIL); + /* If n is not on any hash chain, prev[n] is garbage but + * its value will never be used. + */ + } while (--n); +#endif + more += wsize; + } + if (s->strm->avail_in == 0) break; + + /* If there was no sliding: + * strstart <= WSIZE+MAX_DIST-1 && lookahead <= MIN_LOOKAHEAD - 1 && + * more == window_size - lookahead - strstart + * => more >= window_size - (MIN_LOOKAHEAD-1 + WSIZE + MAX_DIST-1) + * => more >= window_size - 2*WSIZE + 2 + * In the BIG_MEM or MMAP case (not yet supported), + * window_size == input_size + MIN_LOOKAHEAD && + * strstart + s->lookahead <= input_size => more >= MIN_LOOKAHEAD. + * Otherwise, window_size == 2*WSIZE so more >= 2. + * If there was sliding, more >= WSIZE. So in all cases, more >= 2. + */ + Assert(more >= 2, "more < 2"); + + n = read_buf(s->strm, s->window + s->strstart + s->lookahead, more); + s->lookahead += n; + + /* Initialize the hash value now that we have some input: */ + if (s->lookahead + s->insert >= MIN_MATCH) { + uInt str = s->strstart - s->insert; + s->ins_h = s->window[str]; + UPDATE_HASH(s, s->ins_h, s->window[str + 1]); +#if MIN_MATCH != 3 + Call UPDATE_HASH() MIN_MATCH-3 more times +#endif + while (s->insert) { + UPDATE_HASH(s, s->ins_h, s->window[str + MIN_MATCH-1]); +#ifndef FASTEST + s->prev[str & s->w_mask] = s->head[s->ins_h]; +#endif + s->head[s->ins_h] = (Pos)str; + str++; + s->insert--; + if (s->lookahead + s->insert < MIN_MATCH) + break; + } + } + /* If the whole input has less than MIN_MATCH bytes, ins_h is garbage, + * but this is not important since only literal bytes will be emitted. + */ + + } while (s->lookahead < MIN_LOOKAHEAD && s->strm->avail_in != 0); + + /* If the WIN_INIT bytes after the end of the current data have never been + * written, then zero those bytes in order to avoid memory check reports of + * the use of uninitialized (or uninitialised as Julian writes) bytes by + * the longest match routines. Update the high water mark for the next + * time through here. WIN_INIT is set to MAX_MATCH since the longest match + * routines allow scanning to strstart + MAX_MATCH, ignoring lookahead. + */ + if (s->high_water < s->window_size) { + ulg curr = s->strstart + (ulg)(s->lookahead); + ulg init; + + if (s->high_water < curr) { + /* Previous high water mark below current data -- zero WIN_INIT + * bytes or up to end of window, whichever is less. + */ + init = s->window_size - curr; + if (init > WIN_INIT) + init = WIN_INIT; + zmemzero(s->window + curr, (unsigned)init); + s->high_water = curr + init; + } + else if (s->high_water < (ulg)curr + WIN_INIT) { + /* High water mark at or above current data, but below current data + * plus WIN_INIT -- zero out to current data plus WIN_INIT, or up + * to end of window, whichever is less. + */ + init = (ulg)curr + WIN_INIT - s->high_water; + if (init > s->window_size - s->high_water) + init = s->window_size - s->high_water; + zmemzero(s->window + s->high_water, (unsigned)init); + s->high_water += init; + } + } + + Assert((ulg)s->strstart <= s->window_size - MIN_LOOKAHEAD, + "not enough room for search"); +} + +/* =========================================================================== + * Flush the current block, with given end-of-file flag. + * IN assertion: strstart is set to the end of the current match. + */ +#define FLUSH_BLOCK_ONLY(s, last) { \ + _tr_flush_block(s, (s->block_start >= 0L ? \ + (charf *)&s->window[(unsigned)s->block_start] : \ + (charf *)Z_NULL), \ + (ulg)((long)s->strstart - s->block_start), \ + (last)); \ + s->block_start = s->strstart; \ + flush_pending(s->strm); \ + Tracev((stderr,"[FLUSH]")); \ +} + +/* Same but force premature exit if necessary. */ +#define FLUSH_BLOCK(s, last) { \ + FLUSH_BLOCK_ONLY(s, last); \ + if (s->strm->avail_out == 0) return (last) ? finish_started : need_more; \ +} + +/* =========================================================================== + * Copy without compression as much as possible from the input stream, return + * the current block state. + * This function does not insert new strings in the dictionary since + * uncompressible data is probably not useful. This function is used + * only for the level=0 compression option. + * NOTE: this function should be optimized to avoid extra copying from + * window to pending_buf. + */ +local block_state deflate_stored(s, flush) + deflate_state *s; + int flush; +{ + /* Stored blocks are limited to 0xffff bytes, pending_buf is limited + * to pending_buf_size, and each stored block has a 5 byte header: + */ + ulg max_block_size = 0xffff; + ulg max_start; + + if (max_block_size > s->pending_buf_size - 5) { + max_block_size = s->pending_buf_size - 5; + } + + /* Copy as much as possible from input to output: */ + for (;;) { + /* Fill the window as much as possible: */ + if (s->lookahead <= 1) { + + Assert(s->strstart < s->w_size+MAX_DIST(s) || + s->block_start >= (long)s->w_size, "slide too late"); + + fill_window(s); + if (s->lookahead == 0 && flush == Z_NO_FLUSH) return need_more; + + if (s->lookahead == 0) break; /* flush the current block */ + } + Assert(s->block_start >= 0L, "block gone"); + + s->strstart += s->lookahead; + s->lookahead = 0; + + /* Emit a stored block if pending_buf will be full: */ + max_start = s->block_start + max_block_size; + if (s->strstart == 0 || (ulg)s->strstart >= max_start) { + /* strstart == 0 is possible when wraparound on 16-bit machine */ + s->lookahead = (uInt)(s->strstart - max_start); + s->strstart = (uInt)max_start; + FLUSH_BLOCK(s, 0); + } + /* Flush if we may have to slide, otherwise block_start may become + * negative and the data will be gone: + */ + if (s->strstart - (uInt)s->block_start >= MAX_DIST(s)) { + FLUSH_BLOCK(s, 0); + } + } + s->insert = 0; + if (flush == Z_FINISH) { + FLUSH_BLOCK(s, 1); + return finish_done; + } + if ((long)s->strstart > s->block_start) + FLUSH_BLOCK(s, 0); + return block_done; +} + +/* =========================================================================== + * Compress as much as possible from the input stream, return the current + * block state. + * This function does not perform lazy evaluation of matches and inserts + * new strings in the dictionary only for unmatched strings or for short + * matches. It is used only for the fast compression options. + */ +local block_state deflate_fast(s, flush) + deflate_state *s; + int flush; +{ + IPos hash_head; /* head of the hash chain */ + int bflush; /* set if current block must be flushed */ + + for (;;) { + /* Make sure that we always have enough lookahead, except + * at the end of the input file. We need MAX_MATCH bytes + * for the next match, plus MIN_MATCH bytes to insert the + * string following the next match. + */ + if (s->lookahead < MIN_LOOKAHEAD) { + fill_window(s); + if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) { + return need_more; + } + if (s->lookahead == 0) break; /* flush the current block */ + } + + /* Insert the string window[strstart .. strstart+2] in the + * dictionary, and set hash_head to the head of the hash chain: + */ + hash_head = NIL; + if (s->lookahead >= MIN_MATCH) { + INSERT_STRING(s, s->strstart, hash_head); + } + + /* Find the longest match, discarding those <= prev_length. + * At this point we have always match_length < MIN_MATCH + */ + if (hash_head != NIL && s->strstart - hash_head <= MAX_DIST(s)) { + /* To simplify the code, we prevent matches with the string + * of window index 0 (in particular we have to avoid a match + * of the string with itself at the start of the input file). + */ + s->match_length = longest_match (s, hash_head); + /* longest_match() sets match_start */ + } + if (s->match_length >= MIN_MATCH) { + check_match(s, s->strstart, s->match_start, s->match_length); + + _tr_tally_dist(s, s->strstart - s->match_start, + s->match_length - MIN_MATCH, bflush); + + s->lookahead -= s->match_length; + + /* Insert new strings in the hash table only if the match length + * is not too large. This saves time but degrades compression. + */ +#ifndef FASTEST + if (s->match_length <= s->max_insert_length && + s->lookahead >= MIN_MATCH) { + s->match_length--; /* string at strstart already in table */ + do { + s->strstart++; + INSERT_STRING(s, s->strstart, hash_head); + /* strstart never exceeds WSIZE-MAX_MATCH, so there are + * always MIN_MATCH bytes ahead. + */ + } while (--s->match_length != 0); + s->strstart++; + } else +#endif + { + s->strstart += s->match_length; + s->match_length = 0; + s->ins_h = s->window[s->strstart]; + UPDATE_HASH(s, s->ins_h, s->window[s->strstart+1]); +#if MIN_MATCH != 3 + Call UPDATE_HASH() MIN_MATCH-3 more times +#endif + /* If lookahead < MIN_MATCH, ins_h is garbage, but it does not + * matter since it will be recomputed at next deflate call. + */ + } + } else { + /* No match, output a literal byte */ + Tracevv((stderr,"%c", s->window[s->strstart])); + _tr_tally_lit (s, s->window[s->strstart], bflush); + s->lookahead--; + s->strstart++; + } + if (bflush) FLUSH_BLOCK(s, 0); + } + s->insert = s->strstart < MIN_MATCH-1 ? s->strstart : MIN_MATCH-1; + if (flush == Z_FINISH) { + FLUSH_BLOCK(s, 1); + return finish_done; + } + if (s->last_lit) + FLUSH_BLOCK(s, 0); + return block_done; +} + +#ifndef FASTEST +/* =========================================================================== + * Same as above, but achieves better compression. We use a lazy + * evaluation for matches: a match is finally adopted only if there is + * no better match at the next window position. + */ +local block_state deflate_slow(s, flush) + deflate_state *s; + int flush; +{ + IPos hash_head; /* head of hash chain */ + int bflush; /* set if current block must be flushed */ + + /* Process the input block. */ + for (;;) { + /* Make sure that we always have enough lookahead, except + * at the end of the input file. We need MAX_MATCH bytes + * for the next match, plus MIN_MATCH bytes to insert the + * string following the next match. + */ + if (s->lookahead < MIN_LOOKAHEAD) { + fill_window(s); + if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) { + return need_more; + } + if (s->lookahead == 0) break; /* flush the current block */ + } + + /* Insert the string window[strstart .. strstart+2] in the + * dictionary, and set hash_head to the head of the hash chain: + */ + hash_head = NIL; + if (s->lookahead >= MIN_MATCH) { + INSERT_STRING(s, s->strstart, hash_head); + } + + /* Find the longest match, discarding those <= prev_length. + */ + s->prev_length = s->match_length, s->prev_match = s->match_start; + s->match_length = MIN_MATCH-1; + + if (hash_head != NIL && s->prev_length < s->max_lazy_match && + s->strstart - hash_head <= MAX_DIST(s)) { + /* To simplify the code, we prevent matches with the string + * of window index 0 (in particular we have to avoid a match + * of the string with itself at the start of the input file). + */ + s->match_length = longest_match (s, hash_head); + /* longest_match() sets match_start */ + + if (s->match_length <= 5 && (s->strategy == Z_FILTERED +#if TOO_FAR <= 32767 + || (s->match_length == MIN_MATCH && + s->strstart - s->match_start > TOO_FAR) +#endif + )) { + + /* If prev_match is also MIN_MATCH, match_start is garbage + * but we will ignore the current match anyway. + */ + s->match_length = MIN_MATCH-1; + } + } + /* If there was a match at the previous step and the current + * match is not better, output the previous match: + */ + if (s->prev_length >= MIN_MATCH && s->match_length <= s->prev_length) { + uInt max_insert = s->strstart + s->lookahead - MIN_MATCH; + /* Do not insert strings in hash table beyond this. */ + + check_match(s, s->strstart-1, s->prev_match, s->prev_length); + + _tr_tally_dist(s, s->strstart -1 - s->prev_match, + s->prev_length - MIN_MATCH, bflush); + + /* Insert in hash table all strings up to the end of the match. + * strstart-1 and strstart are already inserted. If there is not + * enough lookahead, the last two strings are not inserted in + * the hash table. + */ + s->lookahead -= s->prev_length-1; + s->prev_length -= 2; + do { + if (++s->strstart <= max_insert) { + INSERT_STRING(s, s->strstart, hash_head); + } + } while (--s->prev_length != 0); + s->match_available = 0; + s->match_length = MIN_MATCH-1; + s->strstart++; + + if (bflush) FLUSH_BLOCK(s, 0); + + } else if (s->match_available) { + /* If there was no match at the previous position, output a + * single literal. If there was a match but the current match + * is longer, truncate the previous match to a single literal. + */ + Tracevv((stderr,"%c", s->window[s->strstart-1])); + _tr_tally_lit(s, s->window[s->strstart-1], bflush); + if (bflush) { + FLUSH_BLOCK_ONLY(s, 0); + } + s->strstart++; + s->lookahead--; + if (s->strm->avail_out == 0) return need_more; + } else { + /* There is no previous match to compare with, wait for + * the next step to decide. + */ + s->match_available = 1; + s->strstart++; + s->lookahead--; + } + } + Assert (flush != Z_NO_FLUSH, "no flush?"); + if (s->match_available) { + Tracevv((stderr,"%c", s->window[s->strstart-1])); + _tr_tally_lit(s, s->window[s->strstart-1], bflush); + s->match_available = 0; + } + s->insert = s->strstart < MIN_MATCH-1 ? s->strstart : MIN_MATCH-1; + if (flush == Z_FINISH) { + FLUSH_BLOCK(s, 1); + return finish_done; + } + if (s->last_lit) + FLUSH_BLOCK(s, 0); + return block_done; +} +#endif /* FASTEST */ + +/* =========================================================================== + * For Z_RLE, simply look for runs of bytes, generate matches only of distance + * one. Do not maintain a hash table. (It will be regenerated if this run of + * deflate switches away from Z_RLE.) + */ +local block_state deflate_rle(s, flush) + deflate_state *s; + int flush; +{ + int bflush; /* set if current block must be flushed */ + uInt prev; /* byte at distance one to match */ + Bytef *scan, *strend; /* scan goes up to strend for length of run */ + + for (;;) { + /* Make sure that we always have enough lookahead, except + * at the end of the input file. We need MAX_MATCH bytes + * for the longest run, plus one for the unrolled loop. + */ + if (s->lookahead <= MAX_MATCH) { + fill_window(s); + if (s->lookahead <= MAX_MATCH && flush == Z_NO_FLUSH) { + return need_more; + } + if (s->lookahead == 0) break; /* flush the current block */ + } + + /* See how many times the previous byte repeats */ + s->match_length = 0; + if (s->lookahead >= MIN_MATCH && s->strstart > 0) { + scan = s->window + s->strstart - 1; + prev = *scan; + if (prev == *++scan && prev == *++scan && prev == *++scan) { + strend = s->window + s->strstart + MAX_MATCH; + do { + } while (prev == *++scan && prev == *++scan && + prev == *++scan && prev == *++scan && + prev == *++scan && prev == *++scan && + prev == *++scan && prev == *++scan && + scan < strend); + s->match_length = MAX_MATCH - (int)(strend - scan); + if (s->match_length > s->lookahead) + s->match_length = s->lookahead; + } + Assert(scan <= s->window+(uInt)(s->window_size-1), "wild scan"); + } + + /* Emit match if have run of MIN_MATCH or longer, else emit literal */ + if (s->match_length >= MIN_MATCH) { + check_match(s, s->strstart, s->strstart - 1, s->match_length); + + _tr_tally_dist(s, 1, s->match_length - MIN_MATCH, bflush); + + s->lookahead -= s->match_length; + s->strstart += s->match_length; + s->match_length = 0; + } else { + /* No match, output a literal byte */ + Tracevv((stderr,"%c", s->window[s->strstart])); + _tr_tally_lit (s, s->window[s->strstart], bflush); + s->lookahead--; + s->strstart++; + } + if (bflush) FLUSH_BLOCK(s, 0); + } + s->insert = 0; + if (flush == Z_FINISH) { + FLUSH_BLOCK(s, 1); + return finish_done; + } + if (s->last_lit) + FLUSH_BLOCK(s, 0); + return block_done; +} + +/* =========================================================================== + * For Z_HUFFMAN_ONLY, do not look for matches. Do not maintain a hash table. + * (It will be regenerated if this run of deflate switches away from Huffman.) + */ +local block_state deflate_huff(s, flush) + deflate_state *s; + int flush; +{ + int bflush; /* set if current block must be flushed */ + + for (;;) { + /* Make sure that we have a literal to write. */ + if (s->lookahead == 0) { + fill_window(s); + if (s->lookahead == 0) { + if (flush == Z_NO_FLUSH) + return need_more; + break; /* flush the current block */ + } + } + + /* Output a literal byte */ + s->match_length = 0; + Tracevv((stderr,"%c", s->window[s->strstart])); + _tr_tally_lit (s, s->window[s->strstart], bflush); + s->lookahead--; + s->strstart++; + if (bflush) FLUSH_BLOCK(s, 0); + } + s->insert = 0; + if (flush == Z_FINISH) { + FLUSH_BLOCK(s, 1); + return finish_done; + } + if (s->last_lit) + FLUSH_BLOCK(s, 0); + return block_done; +} diff --git a/src/3rdparty/zlib/deflate.h b/src/3rdparty/zlib/deflate.h new file mode 100644 index 0000000..ce0299e --- /dev/null +++ b/src/3rdparty/zlib/deflate.h @@ -0,0 +1,346 @@ +/* deflate.h -- internal compression state + * Copyright (C) 1995-2012 Jean-loup Gailly + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +/* WARNING: this file should *not* be used by applications. It is + part of the implementation of the compression library and is + subject to change. Applications should only use zlib.h. + */ + +/* @(#) $Id$ */ + +#ifndef DEFLATE_H +#define DEFLATE_H + +#include "zutil.h" + +/* define NO_GZIP when compiling if you want to disable gzip header and + trailer creation by deflate(). NO_GZIP would be used to avoid linking in + the crc code when it is not needed. For shared libraries, gzip encoding + should be left enabled. */ +#ifndef NO_GZIP +# define GZIP +#endif + +/* =========================================================================== + * Internal compression state. + */ + +#define LENGTH_CODES 29 +/* number of length codes, not counting the special END_BLOCK code */ + +#define LITERALS 256 +/* number of literal bytes 0..255 */ + +#define L_CODES (LITERALS+1+LENGTH_CODES) +/* number of Literal or Length codes, including the END_BLOCK code */ + +#define D_CODES 30 +/* number of distance codes */ + +#define BL_CODES 19 +/* number of codes used to transfer the bit lengths */ + +#define HEAP_SIZE (2*L_CODES+1) +/* maximum heap size */ + +#define MAX_BITS 15 +/* All codes must not exceed MAX_BITS bits */ + +#define Buf_size 16 +/* size of bit buffer in bi_buf */ + +#define INIT_STATE 42 +#define EXTRA_STATE 69 +#define NAME_STATE 73 +#define COMMENT_STATE 91 +#define HCRC_STATE 103 +#define BUSY_STATE 113 +#define FINISH_STATE 666 +/* Stream status */ + + +/* Data structure describing a single value and its code string. */ +typedef struct ct_data_s { + union { + ush freq; /* frequency count */ + ush code; /* bit string */ + } fc; + union { + ush dad; /* father node in Huffman tree */ + ush len; /* length of bit string */ + } dl; +} FAR ct_data; + +#define Freq fc.freq +#define Code fc.code +#define Dad dl.dad +#define Len dl.len + +typedef struct static_tree_desc_s static_tree_desc; + +typedef struct tree_desc_s { + ct_data *dyn_tree; /* the dynamic tree */ + int max_code; /* largest code with non zero frequency */ + static_tree_desc *stat_desc; /* the corresponding static tree */ +} FAR tree_desc; + +typedef ush Pos; +typedef Pos FAR Posf; +typedef unsigned IPos; + +/* A Pos is an index in the character window. We use short instead of int to + * save space in the various tables. IPos is used only for parameter passing. + */ + +typedef struct internal_state { + z_streamp strm; /* pointer back to this zlib stream */ + int status; /* as the name implies */ + Bytef *pending_buf; /* output still pending */ + ulg pending_buf_size; /* size of pending_buf */ + Bytef *pending_out; /* next pending byte to output to the stream */ + uInt pending; /* nb of bytes in the pending buffer */ + int wrap; /* bit 0 true for zlib, bit 1 true for gzip */ + gz_headerp gzhead; /* gzip header information to write */ + uInt gzindex; /* where in extra, name, or comment */ + Byte method; /* can only be DEFLATED */ + int last_flush; /* value of flush param for previous deflate call */ + + /* used by deflate.c: */ + + uInt w_size; /* LZ77 window size (32K by default) */ + uInt w_bits; /* log2(w_size) (8..16) */ + uInt w_mask; /* w_size - 1 */ + + Bytef *window; + /* Sliding window. Input bytes are read into the second half of the window, + * and move to the first half later to keep a dictionary of at least wSize + * bytes. With this organization, matches are limited to a distance of + * wSize-MAX_MATCH bytes, but this ensures that IO is always + * performed with a length multiple of the block size. Also, it limits + * the window size to 64K, which is quite useful on MSDOS. + * To do: use the user input buffer as sliding window. + */ + + ulg window_size; + /* Actual size of window: 2*wSize, except when the user input buffer + * is directly used as sliding window. + */ + + Posf *prev; + /* Link to older string with same hash index. To limit the size of this + * array to 64K, this link is maintained only for the last 32K strings. + * An index in this array is thus a window index modulo 32K. + */ + + Posf *head; /* Heads of the hash chains or NIL. */ + + uInt ins_h; /* hash index of string to be inserted */ + uInt hash_size; /* number of elements in hash table */ + uInt hash_bits; /* log2(hash_size) */ + uInt hash_mask; /* hash_size-1 */ + + uInt hash_shift; + /* Number of bits by which ins_h must be shifted at each input + * step. It must be such that after MIN_MATCH steps, the oldest + * byte no longer takes part in the hash key, that is: + * hash_shift * MIN_MATCH >= hash_bits + */ + + long block_start; + /* Window position at the beginning of the current output block. Gets + * negative when the window is moved backwards. + */ + + uInt match_length; /* length of best match */ + IPos prev_match; /* previous match */ + int match_available; /* set if previous match exists */ + uInt strstart; /* start of string to insert */ + uInt match_start; /* start of matching string */ + uInt lookahead; /* number of valid bytes ahead in window */ + + uInt prev_length; + /* Length of the best match at previous step. Matches not greater than this + * are discarded. This is used in the lazy match evaluation. + */ + + uInt max_chain_length; + /* To speed up deflation, hash chains are never searched beyond this + * length. A higher limit improves compression ratio but degrades the + * speed. + */ + + uInt max_lazy_match; + /* Attempt to find a better match only when the current match is strictly + * smaller than this value. This mechanism is used only for compression + * levels >= 4. + */ +# define max_insert_length max_lazy_match + /* Insert new strings in the hash table only if the match length is not + * greater than this length. This saves time but degrades compression. + * max_insert_length is used only for compression levels <= 3. + */ + + int level; /* compression level (1..9) */ + int strategy; /* favor or force Huffman coding*/ + + uInt good_match; + /* Use a faster search when the previous match is longer than this */ + + int nice_match; /* Stop searching when current match exceeds this */ + + /* used by trees.c: */ + /* Didn't use ct_data typedef below to suppress compiler warning */ + struct ct_data_s dyn_ltree[HEAP_SIZE]; /* literal and length tree */ + struct ct_data_s dyn_dtree[2*D_CODES+1]; /* distance tree */ + struct ct_data_s bl_tree[2*BL_CODES+1]; /* Huffman tree for bit lengths */ + + struct tree_desc_s l_desc; /* desc. for literal tree */ + struct tree_desc_s d_desc; /* desc. for distance tree */ + struct tree_desc_s bl_desc; /* desc. for bit length tree */ + + ush bl_count[MAX_BITS+1]; + /* number of codes at each bit length for an optimal tree */ + + int heap[2*L_CODES+1]; /* heap used to build the Huffman trees */ + int heap_len; /* number of elements in the heap */ + int heap_max; /* element of largest frequency */ + /* The sons of heap[n] are heap[2*n] and heap[2*n+1]. heap[0] is not used. + * The same heap array is used to build all trees. + */ + + uch depth[2*L_CODES+1]; + /* Depth of each subtree used as tie breaker for trees of equal frequency + */ + + uchf *l_buf; /* buffer for literals or lengths */ + + uInt lit_bufsize; + /* Size of match buffer for literals/lengths. There are 4 reasons for + * limiting lit_bufsize to 64K: + * - frequencies can be kept in 16 bit counters + * - if compression is not successful for the first block, all input + * data is still in the window so we can still emit a stored block even + * when input comes from standard input. (This can also be done for + * all blocks if lit_bufsize is not greater than 32K.) + * - if compression is not successful for a file smaller than 64K, we can + * even emit a stored file instead of a stored block (saving 5 bytes). + * This is applicable only for zip (not gzip or zlib). + * - creating new Huffman trees less frequently may not provide fast + * adaptation to changes in the input data statistics. (Take for + * example a binary file with poorly compressible code followed by + * a highly compressible string table.) Smaller buffer sizes give + * fast adaptation but have of course the overhead of transmitting + * trees more frequently. + * - I can't count above 4 + */ + + 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. + */ + + ulg opt_len; /* bit length of current block with optimal trees */ + ulg static_len; /* bit length of current block with static trees */ + uInt matches; /* number of string matches in current block */ + uInt insert; /* bytes at end of window left to insert */ + +#ifdef DEBUG + ulg compressed_len; /* total bit length of compressed file mod 2^32 */ + ulg bits_sent; /* bit length of compressed data sent mod 2^32 */ +#endif + + ush bi_buf; + /* Output buffer. bits are inserted starting at the bottom (least + * significant bits). + */ + int bi_valid; + /* Number of valid bits in bi_buf. All bits above the last valid bit + * are always zero. + */ + + ulg high_water; + /* High water mark offset in window for initialized bytes -- bytes above + * this are set to zero in order to avoid memory check warnings when + * longest match routines access bytes past the input. This is then + * updated to the new high water mark. + */ + +} FAR deflate_state; + +/* Output a byte on the stream. + * IN assertion: there is enough room in pending_buf. + */ +#define put_byte(s, c) {s->pending_buf[s->pending++] = (c);} + + +#define MIN_LOOKAHEAD (MAX_MATCH+MIN_MATCH+1) +/* Minimum amount of lookahead, except at the end of the input file. + * See deflate.c for comments about the MIN_MATCH+1. + */ + +#define MAX_DIST(s) ((s)->w_size-MIN_LOOKAHEAD) +/* In order to simplify the code, particularly on 16 bit machines, match + * distances are limited to MAX_DIST instead of WSIZE. + */ + +#define WIN_INIT MAX_MATCH +/* Number of bytes after end of data in window to initialize in order to avoid + memory checker errors from longest match routines */ + + /* in trees.c */ +void ZLIB_INTERNAL _tr_init OF((deflate_state *s)); +int ZLIB_INTERNAL _tr_tally OF((deflate_state *s, unsigned dist, unsigned lc)); +void ZLIB_INTERNAL _tr_flush_block OF((deflate_state *s, charf *buf, + ulg stored_len, int last)); +void ZLIB_INTERNAL _tr_flush_bits OF((deflate_state *s)); +void ZLIB_INTERNAL _tr_align OF((deflate_state *s)); +void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf, + ulg stored_len, int last)); + +#define d_code(dist) \ + ((dist) < 256 ? _dist_code[dist] : _dist_code[256+((dist)>>7)]) +/* Mapping from a distance to a distance code. dist is the distance - 1 and + * must not have side effects. _dist_code[256] and _dist_code[257] are never + * used. + */ + +#ifndef DEBUG +/* Inline versions of _tr_tally for speed: */ + +#if defined(GEN_TREES_H) || !defined(STDC) + extern uch ZLIB_INTERNAL _length_code[]; + extern uch ZLIB_INTERNAL _dist_code[]; +#else + extern const uch ZLIB_INTERNAL _length_code[]; + extern const uch ZLIB_INTERNAL _dist_code[]; +#endif + +# 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->dyn_ltree[cc].Freq++; \ + flush = (s->last_lit == s->lit_bufsize-1); \ + } +# define _tr_tally_dist(s, distance, length, flush) \ + { uch len = (length); \ + ush dist = (distance); \ + s->d_buf[s->last_lit] = dist; \ + s->l_buf[s->last_lit++] = 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); \ + } +#else +# define _tr_tally_lit(s, c, flush) flush = _tr_tally(s, 0, c) +# define _tr_tally_dist(s, distance, length, flush) \ + flush = _tr_tally(s, distance, length) +#endif + +#endif /* DEFLATE_H */ diff --git a/src/3rdparty/zlib/doc/algorithm.txt b/src/3rdparty/zlib/doc/algorithm.txt new file mode 100644 index 0000000..c97f495 --- /dev/null +++ b/src/3rdparty/zlib/doc/algorithm.txt @@ -0,0 +1,209 @@ +1. Compression algorithm (deflate) + +The deflation algorithm used by gzip (also zip and zlib) is a variation of +LZ77 (Lempel-Ziv 1977, see reference below). It finds duplicated strings in +the input data. The second occurrence of a string is replaced by a +pointer to the previous string, in the form of a pair (distance, +length). Distances are limited to 32K bytes, and lengths are limited +to 258 bytes. When a string does not occur anywhere in the previous +32K bytes, it is emitted as a sequence of literal bytes. (In this +description, `string' must be taken as an arbitrary sequence of bytes, +and is not restricted to printable characters.) + +Literals or match lengths are compressed with one Huffman tree, and +match distances are compressed with another tree. The trees are stored +in a compact form at the start of each block. The blocks can have any +size (except that the compressed data for one block must fit in +available memory). A block is terminated when deflate() determines that +it would be useful to start another block with fresh trees. (This is +somewhat similar to the behavior of LZW-based _compress_.) + +Duplicated strings are found using a hash table. All input strings of +length 3 are inserted in the hash table. A hash index is computed for +the next 3 bytes. If the hash chain for this index is not empty, all +strings in the chain are compared with the current input string, and +the longest match is selected. + +The hash chains are searched starting with the most recent strings, to +favor small distances and thus take advantage of the Huffman encoding. +The hash chains are singly linked. There are no deletions from the +hash chains, the algorithm simply discards matches that are too old. + +To avoid a worst-case situation, very long hash chains are arbitrarily +truncated at a certain length, determined by a runtime option (level +parameter of deflateInit). So deflate() does not always find the longest +possible match but generally finds a match which is long enough. + +deflate() also defers the selection of matches with a lazy evaluation +mechanism. After a match of length N has been found, deflate() searches for +a longer match at the next input byte. If a longer match is found, the +previous match is truncated to a length of one (thus producing a single +literal byte) and the process of lazy evaluation begins again. Otherwise, +the original match is kept, and the next match search is attempted only N +steps later. + +The lazy match evaluation is also subject to a runtime parameter. If +the current match is long enough, deflate() reduces the search for a longer +match, thus speeding up the whole process. If compression ratio is more +important than speed, deflate() attempts a complete second search even if +the first match is already long enough. + +The lazy match evaluation is not performed for the fastest compression +modes (level parameter 1 to 3). For these fast modes, new strings +are inserted in the hash table only when no match was found, or +when the match is not too long. This degrades the compression ratio +but saves time since there are both fewer insertions and fewer searches. + + +2. Decompression algorithm (inflate) + +2.1 Introduction + +The key question is how to represent a Huffman code (or any prefix code) so +that you can decode fast. The most important characteristic is that shorter +codes are much more common than longer codes, so pay attention to decoding the +short codes fast, and let the long codes take longer to decode. + +inflate() sets up a first level table that covers some number of bits of +input less than the length of longest code. It gets that many bits from the +stream, and looks it up in the table. The table will tell if the next +code is that many bits or less and how many, and if it is, it will tell +the value, else it will point to the next level table for which inflate() +grabs more bits and tries to decode a longer code. + +How many bits to make the first lookup is a tradeoff between the time it +takes to decode and the time it takes to build the table. If building the +table took no time (and if you had infinite memory), then there would only +be a first level table to cover all the way to the longest code. However, +building the table ends up taking a lot longer for more bits since short +codes are replicated many times in such a table. What inflate() does is +simply to make the number of bits in the first table a variable, and then +to set that variable for the maximum speed. + +For inflate, which has 286 possible codes for the literal/length tree, the size +of the first table is nine bits. Also the distance trees have 30 possible +values, and the size of the first table is six bits. Note that for each of +those cases, the table ended up one bit longer than the ``average'' code +length, i.e. the code length of an approximately flat code which would be a +little more than eight bits for 286 symbols and a little less than five bits +for 30 symbols. + + +2.2 More details on the inflate table lookup + +Ok, you want to know what this cleverly obfuscated inflate tree actually +looks like. You are correct that it's not a Huffman tree. It is simply a +lookup table for the first, let's say, nine bits of a Huffman symbol. The +symbol could be as short as one bit or as long as 15 bits. If a particular +symbol is shorter than nine bits, then that symbol's translation is duplicated +in all those entries that start with that symbol's bits. For example, if the +symbol is four bits, then it's duplicated 32 times in a nine-bit table. If a +symbol is nine bits long, it appears in the table once. + +If the symbol is longer than nine bits, then that entry in the table points +to another similar table for the remaining bits. Again, there are duplicated +entries as needed. The idea is that most of the time the symbol will be short +and there will only be one table look up. (That's whole idea behind data +compression in the first place.) For the less frequent long symbols, there +will be two lookups. If you had a compression method with really long +symbols, you could have as many levels of lookups as is efficient. For +inflate, two is enough. + +So a table entry either points to another table (in which case nine bits in +the above example are gobbled), or it contains the translation for the symbol +and the number of bits to gobble. Then you start again with the next +ungobbled bit. + +You may wonder: why not just have one lookup table for how ever many bits the +longest symbol is? The reason is that if you do that, you end up spending +more time filling in duplicate symbol entries than you do actually decoding. +At least for deflate's output that generates new trees every several 10's of +kbytes. You can imagine that filling in a 2^15 entry table for a 15-bit code +would take too long if you're only decoding several thousand symbols. At the +other extreme, you could make a new table for every bit in the code. In fact, +that's essentially a Huffman tree. But then you spend too much time +traversing the tree while decoding, even for short symbols. + +So the number of bits for the first lookup table is a trade of the time to +fill out the table vs. the time spent looking at the second level and above of +the table. + +Here is an example, scaled down: + +The code being decoded, with 10 symbols, from 1 to 6 bits long: + +A: 0 +B: 10 +C: 1100 +D: 11010 +E: 11011 +F: 11100 +G: 11101 +H: 11110 +I: 111110 +J: 111111 + +Let's make the first table three bits long (eight entries): + +000: A,1 +001: A,1 +010: A,1 +011: A,1 +100: B,2 +101: B,2 +110: -> table X (gobble 3 bits) +111: -> table Y (gobble 3 bits) + +Each entry is what the bits decode as and how many bits that is, i.e. how +many bits to gobble. Or the entry points to another table, with the number of +bits to gobble implicit in the size of the table. + +Table X is two bits long since the longest code starting with 110 is five bits +long: + +00: C,1 +01: C,1 +10: D,2 +11: E,2 + +Table Y is three bits long since the longest code starting with 111 is six +bits long: + +000: F,2 +001: F,2 +010: G,2 +011: G,2 +100: H,2 +101: H,2 +110: I,3 +111: J,3 + +So what we have here are three tables with a total of 20 entries that had to +be constructed. That's compared to 64 entries for a single table. Or +compared to 16 entries for a Huffman tree (six two entry tables and one four +entry table). Assuming that the code ideally represents the probability of +the symbols, it takes on the average 1.25 lookups per symbol. That's compared +to one lookup for the single table, or 1.66 lookups per symbol for the +Huffman tree. + +There, I think that gives you a picture of what's going on. For inflate, the +meaning of a particular symbol is often more than just a letter. It can be a +byte (a "literal"), or it can be either a length or a distance which +indicates a base value and a number of bits to fetch after the code that is +added to the base value. Or it might be the special end-of-block code. The +data structures created in inftrees.c try to encode all that information +compactly in the tables. + + +Jean-loup Gailly Mark Adler +jloup@gzip.org madler@alumni.caltech.edu + + +References: + +[LZ77] Ziv J., Lempel A., ``A Universal Algorithm for Sequential Data +Compression,'' IEEE Transactions on Information Theory, Vol. 23, No. 3, +pp. 337-343. + +``DEFLATE Compressed Data Format Specification'' available in +http://tools.ietf.org/html/rfc1951 diff --git a/src/3rdparty/zlib/doc/rfc1950.txt b/src/3rdparty/zlib/doc/rfc1950.txt new file mode 100644 index 0000000..ce6428a --- /dev/null +++ b/src/3rdparty/zlib/doc/rfc1950.txt @@ -0,0 +1,619 @@ + + + + + + +Network Working Group P. Deutsch +Request for Comments: 1950 Aladdin Enterprises +Category: Informational J-L. Gailly + Info-ZIP + May 1996 + + + ZLIB Compressed Data Format Specification version 3.3 + +Status of This Memo + + This memo provides information for the Internet community. This memo + does not specify an Internet standard of any kind. Distribution of + this memo is unlimited. + +IESG Note: + + The IESG takes no position on the validity of any Intellectual + Property Rights statements contained in this document. + +Notices + + Copyright (c) 1996 L. Peter Deutsch and Jean-Loup Gailly + + Permission is granted to copy and distribute this document for any + purpose and without charge, including translations into other + languages and incorporation into compilations, provided that the + copyright notice and this notice are preserved, and that any + substantive changes or deletions from the original are clearly + marked. + + A pointer to the latest version of this and related documentation in + HTML format can be found at the URL + . + +Abstract + + This specification defines a lossless compressed data format. The + data can be produced or consumed, even for an arbitrarily long + sequentially presented input data stream, using only an a priori + bounded amount of intermediate storage. The format presently uses + the DEFLATE compression method but can be easily extended to use + other compression methods. It can be implemented readily in a manner + not covered by patents. This specification also defines the ADLER-32 + checksum (an extension and improvement of the Fletcher checksum), + used for detection of data corruption, and provides an algorithm for + computing it. + + + + +Deutsch & Gailly Informational [Page 1] + +RFC 1950 ZLIB Compressed Data Format Specification May 1996 + + +Table of Contents + + 1. Introduction ................................................... 2 + 1.1. Purpose ................................................... 2 + 1.2. Intended audience ......................................... 3 + 1.3. Scope ..................................................... 3 + 1.4. Compliance ................................................ 3 + 1.5. Definitions of terms and conventions used ................ 3 + 1.6. Changes from previous versions ............................ 3 + 2. Detailed specification ......................................... 3 + 2.1. Overall conventions ....................................... 3 + 2.2. Data format ............................................... 4 + 2.3. Compliance ................................................ 7 + 3. References ..................................................... 7 + 4. Source code .................................................... 8 + 5. Security Considerations ........................................ 8 + 6. Acknowledgements ............................................... 8 + 7. Authors' Addresses ............................................. 8 + 8. Appendix: Rationale ............................................ 9 + 9. Appendix: Sample code ..........................................10 + +1. Introduction + + 1.1. Purpose + + The purpose of this specification is to define a lossless + compressed data format that: + + * Is independent of CPU type, operating system, file system, + and character set, and hence can be used for interchange; + + * Can be produced or consumed, even for an arbitrarily long + sequentially presented input data stream, using only an a + priori bounded amount of intermediate storage, and hence can + be used in data communications or similar structures such as + Unix filters; + + * Can use a number of different compression methods; + + * Can be implemented readily in a manner not covered by + patents, and hence can be practiced freely. + + The data format defined by this specification does not attempt to + allow random access to compressed data. + + + + + + + +Deutsch & Gailly Informational [Page 2] + +RFC 1950 ZLIB Compressed Data Format Specification May 1996 + + + 1.2. Intended audience + + This specification is intended for use by implementors of software + to compress data into zlib format and/or decompress data from zlib + format. + + The text of the specification assumes a basic background in + programming at the level of bits and other primitive data + representations. + + 1.3. Scope + + The specification specifies a compressed data format that can be + used for in-memory compression of a sequence of arbitrary bytes. + + 1.4. Compliance + + Unless otherwise indicated below, a compliant decompressor must be + able to accept and decompress any data set that conforms to all + the specifications presented here; a compliant compressor must + produce data sets that conform to all the specifications presented + here. + + 1.5. Definitions of terms and conventions used + + byte: 8 bits stored or transmitted as a unit (same as an octet). + (For this specification, a byte is exactly 8 bits, even on + machines which store a character on a number of bits different + from 8.) See below, for the numbering of bits within a byte. + + 1.6. Changes from previous versions + + Version 3.1 was the first public release of this specification. + In version 3.2, some terminology was changed and the Adler-32 + sample code was rewritten for clarity. In version 3.3, the + support for a preset dictionary was introduced, and the + specification was converted to RFC style. + +2. Detailed specification + + 2.1. Overall conventions + + In the diagrams below, a box like this: + + +---+ + | | <-- the vertical bars might be missing + +---+ + + + + +Deutsch & Gailly Informational [Page 3] + +RFC 1950 ZLIB Compressed Data Format Specification May 1996 + + + represents one byte; a box like this: + + +==============+ + | | + +==============+ + + represents a variable number of bytes. + + Bytes stored within a computer do not have a "bit order", since + they are always treated as a unit. However, a byte considered as + an integer between 0 and 255 does have a most- and least- + significant bit, and since we write numbers with the most- + significant digit on the left, we also write bytes with the most- + significant bit on the left. In the diagrams below, we number the + bits of a byte so that bit 0 is the least-significant bit, i.e., + the bits are numbered: + + +--------+ + |76543210| + +--------+ + + Within a computer, a number may occupy multiple bytes. All + multi-byte numbers in the format described here are stored with + the MOST-significant byte first (at the lower memory address). + For example, the decimal number 520 is stored as: + + 0 1 + +--------+--------+ + |00000010|00001000| + +--------+--------+ + ^ ^ + | | + | + less significant byte = 8 + + more significant byte = 2 x 256 + + 2.2. Data format + + A zlib stream has the following structure: + + 0 1 + +---+---+ + |CMF|FLG| (more-->) + +---+---+ + + + + + + + + +Deutsch & Gailly Informational [Page 4] + +RFC 1950 ZLIB Compressed Data Format Specification May 1996 + + + (if FLG.FDICT set) + + 0 1 2 3 + +---+---+---+---+ + | DICTID | (more-->) + +---+---+---+---+ + + +=====================+---+---+---+---+ + |...compressed data...| ADLER32 | + +=====================+---+---+---+---+ + + Any data which may appear after ADLER32 are not part of the zlib + stream. + + CMF (Compression Method and flags) + This byte is divided into a 4-bit compression method and a 4- + bit information field depending on the compression method. + + bits 0 to 3 CM Compression method + bits 4 to 7 CINFO Compression info + + CM (Compression method) + This identifies the compression method used in the file. CM = 8 + denotes the "deflate" compression method with a window size up + to 32K. This is the method used by gzip and PNG (see + references [1] and [2] in Chapter 3, below, for the reference + documents). CM = 15 is reserved. It might be used in a future + version of this specification to indicate the presence of an + extra field before the compressed data. + + CINFO (Compression info) + For CM = 8, CINFO is the base-2 logarithm of the LZ77 window + size, minus eight (CINFO=7 indicates a 32K window size). Values + of CINFO above 7 are not allowed in this version of the + specification. CINFO is not defined in this specification for + CM not equal to 8. + + FLG (FLaGs) + This flag byte is divided as follows: + + bits 0 to 4 FCHECK (check bits for CMF and FLG) + bit 5 FDICT (preset dictionary) + bits 6 to 7 FLEVEL (compression level) + + The FCHECK value must be such that CMF and FLG, when viewed as + a 16-bit unsigned integer stored in MSB order (CMF*256 + FLG), + is a multiple of 31. + + + + +Deutsch & Gailly Informational [Page 5] + +RFC 1950 ZLIB Compressed Data Format Specification May 1996 + + + FDICT (Preset dictionary) + If FDICT is set, a DICT dictionary identifier is present + immediately after the FLG byte. The dictionary is a sequence of + bytes which are initially fed to the compressor without + producing any compressed output. DICT is the Adler-32 checksum + of this sequence of bytes (see the definition of ADLER32 + below). The decompressor can use this identifier to determine + which dictionary has been used by the compressor. + + FLEVEL (Compression level) + These flags are available for use by specific compression + methods. The "deflate" method (CM = 8) sets these flags as + follows: + + 0 - compressor used fastest algorithm + 1 - compressor used fast algorithm + 2 - compressor used default algorithm + 3 - compressor used maximum compression, slowest algorithm + + The information in FLEVEL is not needed for decompression; it + is there to indicate if recompression might be worthwhile. + + compressed data + For compression method 8, the compressed data is stored in the + deflate compressed data format as described in the document + "DEFLATE Compressed Data Format Specification" by L. Peter + Deutsch. (See reference [3] in Chapter 3, below) + + Other compressed data formats are not specified in this version + of the zlib specification. + + ADLER32 (Adler-32 checksum) + This contains a checksum value of the uncompressed data + (excluding any dictionary data) computed according to Adler-32 + algorithm. This algorithm is a 32-bit extension and improvement + of the Fletcher algorithm, used in the ITU-T X.224 / ISO 8073 + standard. See references [4] and [5] in Chapter 3, below) + + Adler-32 is composed of two sums accumulated per byte: s1 is + the sum of all bytes, s2 is the sum of all s1 values. Both sums + are done modulo 65521. s1 is initialized to 1, s2 to zero. The + Adler-32 checksum is stored as s2*65536 + s1 in most- + significant-byte first (network) order. + + + + + + + + +Deutsch & Gailly Informational [Page 6] + +RFC 1950 ZLIB Compressed Data Format Specification May 1996 + + + 2.3. Compliance + + A compliant compressor must produce streams with correct CMF, FLG + and ADLER32, but need not support preset dictionaries. When the + zlib data format is used as part of another standard data format, + the compressor may use only preset dictionaries that are specified + by this other data format. If this other format does not use the + preset dictionary feature, the compressor must not set the FDICT + flag. + + A compliant decompressor must check CMF, FLG, and ADLER32, and + provide an error indication if any of these have incorrect values. + A compliant decompressor must give an error indication if CM is + not one of the values defined in this specification (only the + value 8 is permitted in this version), since another value could + indicate the presence of new features that would cause subsequent + data to be interpreted incorrectly. A compliant decompressor must + give an error indication if FDICT is set and DICTID is not the + identifier of a known preset dictionary. A decompressor may + ignore FLEVEL and still be compliant. When the zlib data format + is being used as a part of another standard format, a compliant + decompressor must support all the preset dictionaries specified by + the other format. When the other format does not use the preset + dictionary feature, a compliant decompressor must reject any + stream in which the FDICT flag is set. + +3. References + + [1] Deutsch, L.P.,"GZIP Compressed Data Format Specification", + available in ftp://ftp.uu.net/pub/archiving/zip/doc/ + + [2] Thomas Boutell, "PNG (Portable Network Graphics) specification", + available in ftp://ftp.uu.net/graphics/png/documents/ + + [3] Deutsch, L.P.,"DEFLATE Compressed Data Format Specification", + available in ftp://ftp.uu.net/pub/archiving/zip/doc/ + + [4] Fletcher, J. G., "An Arithmetic Checksum for Serial + Transmissions," IEEE Transactions on Communications, Vol. COM-30, + No. 1, January 1982, pp. 247-252. + + [5] ITU-T Recommendation X.224, Annex D, "Checksum Algorithms," + November, 1993, pp. 144, 145. (Available from + gopher://info.itu.ch). ITU-T X.244 is also the same as ISO 8073. + + + + + + + +Deutsch & Gailly Informational [Page 7] + +RFC 1950 ZLIB Compressed Data Format Specification May 1996 + + +4. Source code + + Source code for a C language implementation of a "zlib" compliant + library is available at ftp://ftp.uu.net/pub/archiving/zip/zlib/. + +5. Security Considerations + + A decoder that fails to check the ADLER32 checksum value may be + subject to undetected data corruption. + +6. Acknowledgements + + Trademarks cited in this document are the property of their + respective owners. + + Jean-Loup Gailly and Mark Adler designed the zlib format and wrote + the related software described in this specification. Glenn + Randers-Pehrson converted this document to RFC and HTML format. + +7. Authors' Addresses + + L. Peter Deutsch + Aladdin Enterprises + 203 Santa Margarita Ave. + Menlo Park, CA 94025 + + Phone: (415) 322-0103 (AM only) + FAX: (415) 322-1734 + EMail: + + + Jean-Loup Gailly + + EMail: + + Questions about the technical content of this specification can be + sent by email to + + Jean-Loup Gailly and + Mark Adler + + Editorial comments on this specification can be sent by email to + + L. Peter Deutsch and + Glenn Randers-Pehrson + + + + + + +Deutsch & Gailly Informational [Page 8] + +RFC 1950 ZLIB Compressed Data Format Specification May 1996 + + +8. Appendix: Rationale + + 8.1. Preset dictionaries + + A preset dictionary is specially useful to compress short input + sequences. The compressor can take advantage of the dictionary + context to encode the input in a more compact manner. The + decompressor can be initialized with the appropriate context by + virtually decompressing a compressed version of the dictionary + without producing any output. However for certain compression + algorithms such as the deflate algorithm this operation can be + achieved without actually performing any decompression. + + The compressor and the decompressor must use exactly the same + dictionary. The dictionary may be fixed or may be chosen among a + certain number of predefined dictionaries, according to the kind + of input data. The decompressor can determine which dictionary has + been chosen by the compressor by checking the dictionary + identifier. This document does not specify the contents of + predefined dictionaries, since the optimal dictionaries are + application specific. Standard data formats using this feature of + the zlib specification must precisely define the allowed + dictionaries. + + 8.2. The Adler-32 algorithm + + The Adler-32 algorithm is much faster than the CRC32 algorithm yet + still provides an extremely low probability of undetected errors. + + The modulo on unsigned long accumulators can be delayed for 5552 + bytes, so the modulo operation time is negligible. If the bytes + are a, b, c, the second sum is 3a + 2b + c + 3, and so is position + and order sensitive, unlike the first sum, which is just a + checksum. That 65521 is prime is important to avoid a possible + large class of two-byte errors that leave the check unchanged. + (The Fletcher checksum uses 255, which is not prime and which also + makes the Fletcher check insensitive to single byte changes 0 <-> + 255.) + + The sum s1 is initialized to 1 instead of zero to make the length + of the sequence part of s2, so that the length does not have to be + checked separately. (Any sequence of zeroes has a Fletcher + checksum of zero.) + + + + + + + + +Deutsch & Gailly Informational [Page 9] + +RFC 1950 ZLIB Compressed Data Format Specification May 1996 + + +9. Appendix: Sample code + + The following C code computes the Adler-32 checksum of a data buffer. + It is written for clarity, not for speed. The sample code is in the + ANSI C programming language. Non C users may find it easier to read + with these hints: + + & Bitwise AND operator. + >> Bitwise right shift operator. When applied to an + unsigned quantity, as here, right shift inserts zero bit(s) + at the left. + << Bitwise left shift operator. Left shift inserts zero + bit(s) at the right. + ++ "n++" increments the variable n. + % modulo operator: a % b is the remainder of a divided by b. + + #define BASE 65521 /* largest prime smaller than 65536 */ + + /* + Update a running Adler-32 checksum with the bytes buf[0..len-1] + and return the updated checksum. The Adler-32 checksum should be + initialized to 1. + + Usage example: + + unsigned long adler = 1L; + + while (read_buffer(buffer, length) != EOF) { + adler = update_adler32(adler, buffer, length); + } + if (adler != original_adler) error(); + */ + unsigned long update_adler32(unsigned long adler, + unsigned char *buf, int len) + { + unsigned long s1 = adler & 0xffff; + unsigned long s2 = (adler >> 16) & 0xffff; + int n; + + for (n = 0; n < len; n++) { + s1 = (s1 + buf[n]) % BASE; + s2 = (s2 + s1) % BASE; + } + return (s2 << 16) + s1; + } + + /* Return the adler32 of the bytes buf[0..len-1] */ + + + + +Deutsch & Gailly Informational [Page 10] + +RFC 1950 ZLIB Compressed Data Format Specification May 1996 + + + unsigned long adler32(unsigned char *buf, int len) + { + return update_adler32(1L, buf, len); + } + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +Deutsch & Gailly Informational [Page 11] + diff --git a/src/3rdparty/zlib/doc/rfc1951.txt b/src/3rdparty/zlib/doc/rfc1951.txt new file mode 100644 index 0000000..403c8c7 --- /dev/null +++ b/src/3rdparty/zlib/doc/rfc1951.txt @@ -0,0 +1,955 @@ + + + + + + +Network Working Group P. Deutsch +Request for Comments: 1951 Aladdin Enterprises +Category: Informational May 1996 + + + DEFLATE Compressed Data Format Specification version 1.3 + +Status of This Memo + + This memo provides information for the Internet community. This memo + does not specify an Internet standard of any kind. Distribution of + this memo is unlimited. + +IESG Note: + + The IESG takes no position on the validity of any Intellectual + Property Rights statements contained in this document. + +Notices + + Copyright (c) 1996 L. Peter Deutsch + + Permission is granted to copy and distribute this document for any + purpose and without charge, including translations into other + languages and incorporation into compilations, provided that the + copyright notice and this notice are preserved, and that any + substantive changes or deletions from the original are clearly + marked. + + A pointer to the latest version of this and related documentation in + HTML format can be found at the URL + . + +Abstract + + This specification defines a lossless compressed data format that + compresses data using a combination of the LZ77 algorithm and Huffman + coding, with efficiency comparable to the best currently available + general-purpose compression methods. The data can be produced or + consumed, even for an arbitrarily long sequentially presented input + data stream, using only an a priori bounded amount of intermediate + storage. The format can be implemented readily in a manner not + covered by patents. + + + + + + + + +Deutsch Informational [Page 1] + +RFC 1951 DEFLATE Compressed Data Format Specification May 1996 + + +Table of Contents + + 1. Introduction ................................................... 2 + 1.1. Purpose ................................................... 2 + 1.2. Intended audience ......................................... 3 + 1.3. Scope ..................................................... 3 + 1.4. Compliance ................................................ 3 + 1.5. Definitions of terms and conventions used ................ 3 + 1.6. Changes from previous versions ............................ 4 + 2. Compressed representation overview ............................. 4 + 3. Detailed specification ......................................... 5 + 3.1. Overall conventions ....................................... 5 + 3.1.1. Packing into bytes .................................. 5 + 3.2. Compressed block format ................................... 6 + 3.2.1. Synopsis of prefix and Huffman coding ............... 6 + 3.2.2. Use of Huffman coding in the "deflate" format ....... 7 + 3.2.3. Details of block format ............................. 9 + 3.2.4. Non-compressed blocks (BTYPE=00) ................... 11 + 3.2.5. Compressed blocks (length and distance codes) ...... 11 + 3.2.6. Compression with fixed Huffman codes (BTYPE=01) .... 12 + 3.2.7. Compression with dynamic Huffman codes (BTYPE=10) .. 13 + 3.3. Compliance ............................................... 14 + 4. Compression algorithm details ................................. 14 + 5. References .................................................... 16 + 6. Security Considerations ....................................... 16 + 7. Source code ................................................... 16 + 8. Acknowledgements .............................................. 16 + 9. Author's Address .............................................. 17 + +1. Introduction + + 1.1. Purpose + + The purpose of this specification is to define a lossless + compressed data format that: + * Is independent of CPU type, operating system, file system, + and character set, and hence can be used for interchange; + * Can be produced or consumed, even for an arbitrarily long + sequentially presented input data stream, using only an a + priori bounded amount of intermediate storage, and hence + can be used in data communications or similar structures + such as Unix filters; + * Compresses data with efficiency comparable to the best + currently available general-purpose compression methods, + and in particular considerably better than the "compress" + program; + * Can be implemented readily in a manner not covered by + patents, and hence can be practiced freely; + + + +Deutsch Informational [Page 2] + +RFC 1951 DEFLATE Compressed Data Format Specification May 1996 + + + * Is compatible with the file format produced by the current + widely used gzip utility, in that conforming decompressors + will be able to read data produced by the existing gzip + compressor. + + The data format defined by this specification does not attempt to: + + * Allow random access to compressed data; + * Compress specialized data (e.g., raster graphics) as well + as the best currently available specialized algorithms. + + A simple counting argument shows that no lossless compression + algorithm can compress every possible input data set. For the + format defined here, the worst case expansion is 5 bytes per 32K- + byte block, i.e., a size increase of 0.015% for large data sets. + English text usually compresses by a factor of 2.5 to 3; + executable files usually compress somewhat less; graphical data + such as raster images may compress much more. + + 1.2. Intended audience + + This specification is intended for use by implementors of software + to compress data into "deflate" format and/or decompress data from + "deflate" format. + + The text of the specification assumes a basic background in + programming at the level of bits and other primitive data + representations. Familiarity with the technique of Huffman coding + is helpful but not required. + + 1.3. Scope + + The specification specifies a method for representing a sequence + of bytes as a (usually shorter) sequence of bits, and a method for + packing the latter bit sequence into bytes. + + 1.4. Compliance + + Unless otherwise indicated below, a compliant decompressor must be + able to accept and decompress any data set that conforms to all + the specifications presented here; a compliant compressor must + produce data sets that conform to all the specifications presented + here. + + 1.5. Definitions of terms and conventions used + + Byte: 8 bits stored or transmitted as a unit (same as an octet). + For this specification, a byte is exactly 8 bits, even on machines + + + +Deutsch Informational [Page 3] + +RFC 1951 DEFLATE Compressed Data Format Specification May 1996 + + + which store a character on a number of bits different from eight. + See below, for the numbering of bits within a byte. + + String: a sequence of arbitrary bytes. + + 1.6. Changes from previous versions + + There have been no technical changes to the deflate format since + version 1.1 of this specification. In version 1.2, some + terminology was changed. Version 1.3 is a conversion of the + specification to RFC style. + +2. Compressed representation overview + + A compressed data set consists of a series of blocks, corresponding + to successive blocks of input data. The block sizes are arbitrary, + except that non-compressible blocks are limited to 65,535 bytes. + + Each block is compressed using a combination of the LZ77 algorithm + and Huffman coding. The Huffman trees for each block are independent + of those for previous or subsequent blocks; the LZ77 algorithm may + use a reference to a duplicated string occurring in a previous block, + up to 32K input bytes before. + + Each block consists of two parts: a pair of Huffman code trees that + describe the representation of the compressed data part, and a + compressed data part. (The Huffman trees themselves are compressed + using Huffman encoding.) The compressed data consists of a series of + elements of two types: literal bytes (of strings that have not been + detected as duplicated within the previous 32K input bytes), and + pointers to duplicated strings, where a pointer is represented as a + pair . The representation used in the + "deflate" format limits distances to 32K bytes and lengths to 258 + bytes, but does not limit the size of a block, except for + uncompressible blocks, which are limited as noted above. + + Each type of value (literals, distances, and lengths) in the + compressed data is represented using a Huffman code, using one code + tree for literals and lengths and a separate code tree for distances. + The code trees for each block appear in a compact form just before + the compressed data for that block. + + + + + + + + + + +Deutsch Informational [Page 4] + +RFC 1951 DEFLATE Compressed Data Format Specification May 1996 + + +3. Detailed specification + + 3.1. Overall conventions In the diagrams below, a box like this: + + +---+ + | | <-- the vertical bars might be missing + +---+ + + represents one byte; a box like this: + + +==============+ + | | + +==============+ + + represents a variable number of bytes. + + Bytes stored within a computer do not have a "bit order", since + they are always treated as a unit. However, a byte considered as + an integer between 0 and 255 does have a most- and least- + significant bit, and since we write numbers with the most- + significant digit on the left, we also write bytes with the most- + significant bit on the left. In the diagrams below, we number the + bits of a byte so that bit 0 is the least-significant bit, i.e., + the bits are numbered: + + +--------+ + |76543210| + +--------+ + + Within a computer, a number may occupy multiple bytes. All + multi-byte numbers in the format described here are stored with + the least-significant byte first (at the lower memory address). + For example, the decimal number 520 is stored as: + + 0 1 + +--------+--------+ + |00001000|00000010| + +--------+--------+ + ^ ^ + | | + | + more significant byte = 2 x 256 + + less significant byte = 8 + + 3.1.1. Packing into bytes + + This document does not address the issue of the order in which + bits of a byte are transmitted on a bit-sequential medium, + since the final data format described here is byte- rather than + + + +Deutsch Informational [Page 5] + +RFC 1951 DEFLATE Compressed Data Format Specification May 1996 + + + bit-oriented. However, we describe the compressed block format + in below, as a sequence of data elements of various bit + lengths, not a sequence of bytes. We must therefore specify + how to pack these data elements into bytes to form the final + compressed byte sequence: + + * Data elements are packed into bytes in order of + increasing bit number within the byte, i.e., starting + with the least-significant bit of the byte. + * Data elements other than Huffman codes are packed + starting with the least-significant bit of the data + element. + * Huffman codes are packed starting with the most- + significant bit of the code. + + In other words, if one were to print out the compressed data as + a sequence of bytes, starting with the first byte at the + *right* margin and proceeding to the *left*, with the most- + significant bit of each byte on the left as usual, one would be + able to parse the result from right to left, with fixed-width + elements in the correct MSB-to-LSB order and Huffman codes in + bit-reversed order (i.e., with the first bit of the code in the + relative LSB position). + + 3.2. Compressed block format + + 3.2.1. Synopsis of prefix and Huffman coding + + Prefix coding represents symbols from an a priori known + alphabet by bit sequences (codes), one code for each symbol, in + a manner such that different symbols may be represented by bit + sequences of different lengths, but a parser can always parse + an encoded string unambiguously symbol-by-symbol. + + We define a prefix code in terms of a binary tree in which the + two edges descending from each non-leaf node are labeled 0 and + 1 and in which the leaf nodes correspond one-for-one with (are + labeled with) the symbols of the alphabet; then the code for a + symbol is the sequence of 0's and 1's on the edges leading from + the root to the leaf labeled with that symbol. For example: + + + + + + + + + + + +Deutsch Informational [Page 6] + +RFC 1951 DEFLATE Compressed Data Format Specification May 1996 + + + /\ Symbol Code + 0 1 ------ ---- + / \ A 00 + /\ B B 1 + 0 1 C 011 + / \ D 010 + A /\ + 0 1 + / \ + D C + + A parser can decode the next symbol from an encoded input + stream by walking down the tree from the root, at each step + choosing the edge corresponding to the next input bit. + + Given an alphabet with known symbol frequencies, the Huffman + algorithm allows the construction of an optimal prefix code + (one which represents strings with those symbol frequencies + using the fewest bits of any possible prefix codes for that + alphabet). Such a code is called a Huffman code. (See + reference [1] in Chapter 5, references for additional + information on Huffman codes.) + + Note that in the "deflate" format, the Huffman codes for the + various alphabets must not exceed certain maximum code lengths. + This constraint complicates the algorithm for computing code + lengths from symbol frequencies. Again, see Chapter 5, + references for details. + + 3.2.2. Use of Huffman coding in the "deflate" format + + The Huffman codes used for each alphabet in the "deflate" + format have two additional rules: + + * All codes of a given bit length have lexicographically + consecutive values, in the same order as the symbols + they represent; + + * Shorter codes lexicographically precede longer codes. + + + + + + + + + + + + +Deutsch Informational [Page 7] + +RFC 1951 DEFLATE Compressed Data Format Specification May 1996 + + + We could recode the example above to follow this rule as + follows, assuming that the order of the alphabet is ABCD: + + Symbol Code + ------ ---- + A 10 + B 0 + C 110 + D 111 + + I.e., 0 precedes 10 which precedes 11x, and 110 and 111 are + lexicographically consecutive. + + Given this rule, we can define the Huffman code for an alphabet + just by giving the bit lengths of the codes for each symbol of + the alphabet in order; this is sufficient to determine the + actual codes. In our example, the code is completely defined + by the sequence of bit lengths (2, 1, 3, 3). The following + algorithm generates the codes as integers, intended to be read + from most- to least-significant bit. The code lengths are + initially in tree[I].Len; the codes are produced in + tree[I].Code. + + 1) Count the number of codes for each code length. Let + bl_count[N] be the number of codes of length N, N >= 1. + + 2) Find the numerical value of the smallest code for each + code length: + + code = 0; + bl_count[0] = 0; + for (bits = 1; bits <= MAX_BITS; bits++) { + code = (code + bl_count[bits-1]) << 1; + next_code[bits] = code; + } + + 3) Assign numerical values to all codes, using consecutive + values for all codes of the same length with the base + values determined at step 2. Codes that are never used + (which have a bit length of zero) must not be assigned a + value. + + for (n = 0; n <= max_code; n++) { + len = tree[n].Len; + if (len != 0) { + tree[n].Code = next_code[len]; + next_code[len]++; + } + + + +Deutsch Informational [Page 8] + +RFC 1951 DEFLATE Compressed Data Format Specification May 1996 + + + } + + Example: + + Consider the alphabet ABCDEFGH, with bit lengths (3, 3, 3, 3, + 3, 2, 4, 4). After step 1, we have: + + N bl_count[N] + - ----------- + 2 1 + 3 5 + 4 2 + + Step 2 computes the following next_code values: + + N next_code[N] + - ------------ + 1 0 + 2 0 + 3 2 + 4 14 + + Step 3 produces the following code values: + + Symbol Length Code + ------ ------ ---- + A 3 010 + B 3 011 + C 3 100 + D 3 101 + E 3 110 + F 2 00 + G 4 1110 + H 4 1111 + + 3.2.3. Details of block format + + Each block of compressed data begins with 3 header bits + containing the following data: + + first bit BFINAL + next 2 bits BTYPE + + Note that the header bits do not necessarily begin on a byte + boundary, since a block does not necessarily occupy an integral + number of bytes. + + + + + +Deutsch Informational [Page 9] + +RFC 1951 DEFLATE Compressed Data Format Specification May 1996 + + + BFINAL is set if and only if this is the last block of the data + set. + + BTYPE specifies how the data are compressed, as follows: + + 00 - no compression + 01 - compressed with fixed Huffman codes + 10 - compressed with dynamic Huffman codes + 11 - reserved (error) + + The only difference between the two compressed cases is how the + Huffman codes for the literal/length and distance alphabets are + defined. + + In all cases, the decoding algorithm for the actual data is as + follows: + + do + read block header from input stream. + if stored with no compression + skip any remaining bits in current partially + processed byte + read LEN and NLEN (see next section) + copy LEN bytes of data to output + otherwise + if compressed with dynamic Huffman codes + read representation of code trees (see + subsection below) + loop (until end of block code recognized) + decode literal/length value from input stream + if value < 256 + copy value (literal byte) to output stream + otherwise + if value = end of block (256) + break from loop + otherwise (value = 257..285) + decode distance from input stream + + move backwards distance bytes in the output + stream, and copy length bytes from this + position to the output stream. + end loop + while not last block + + Note that a duplicated string reference may refer to a string + in a previous block; i.e., the backward distance may cross one + or more block boundaries. However a distance cannot refer past + the beginning of the output stream. (An application using a + + + +Deutsch Informational [Page 10] + +RFC 1951 DEFLATE Compressed Data Format Specification May 1996 + + + preset dictionary might discard part of the output stream; a + distance can refer to that part of the output stream anyway) + Note also that the referenced string may overlap the current + position; for example, if the last 2 bytes decoded have values + X and Y, a string reference with + adds X,Y,X,Y,X to the output stream. + + We now specify each compression method in turn. + + 3.2.4. Non-compressed blocks (BTYPE=00) + + Any bits of input up to the next byte boundary are ignored. + The rest of the block consists of the following information: + + 0 1 2 3 4... + +---+---+---+---+================================+ + | LEN | NLEN |... LEN bytes of literal data...| + +---+---+---+---+================================+ + + LEN is the number of data bytes in the block. NLEN is the + one's complement of LEN. + + 3.2.5. Compressed blocks (length and distance codes) + + As noted above, encoded data blocks in the "deflate" format + consist of sequences of symbols drawn from three conceptually + distinct alphabets: either literal bytes, from the alphabet of + byte values (0..255), or pairs, + where the length is drawn from (3..258) and the distance is + drawn from (1..32,768). In fact, the literal and length + alphabets are merged into a single alphabet (0..285), where + values 0..255 represent literal bytes, the value 256 indicates + end-of-block, and values 257..285 represent length codes + (possibly in conjunction with extra bits following the symbol + code) as follows: + + + + + + + + + + + + + + + + +Deutsch Informational [Page 11] + +RFC 1951 DEFLATE Compressed Data Format Specification May 1996 + + + Extra Extra Extra + Code Bits Length(s) Code Bits Lengths Code Bits Length(s) + ---- ---- ------ ---- ---- ------- ---- ---- ------- + 257 0 3 267 1 15,16 277 4 67-82 + 258 0 4 268 1 17,18 278 4 83-98 + 259 0 5 269 2 19-22 279 4 99-114 + 260 0 6 270 2 23-26 280 4 115-130 + 261 0 7 271 2 27-30 281 5 131-162 + 262 0 8 272 2 31-34 282 5 163-194 + 263 0 9 273 3 35-42 283 5 195-226 + 264 0 10 274 3 43-50 284 5 227-257 + 265 1 11,12 275 3 51-58 285 0 258 + 266 1 13,14 276 3 59-66 + + The extra bits should be interpreted as a machine integer + stored with the most-significant bit first, e.g., bits 1110 + represent the value 14. + + Extra Extra Extra + Code Bits Dist Code Bits Dist Code Bits Distance + ---- ---- ---- ---- ---- ------ ---- ---- -------- + 0 0 1 10 4 33-48 20 9 1025-1536 + 1 0 2 11 4 49-64 21 9 1537-2048 + 2 0 3 12 5 65-96 22 10 2049-3072 + 3 0 4 13 5 97-128 23 10 3073-4096 + 4 1 5,6 14 6 129-192 24 11 4097-6144 + 5 1 7,8 15 6 193-256 25 11 6145-8192 + 6 2 9-12 16 7 257-384 26 12 8193-12288 + 7 2 13-16 17 7 385-512 27 12 12289-16384 + 8 3 17-24 18 8 513-768 28 13 16385-24576 + 9 3 25-32 19 8 769-1024 29 13 24577-32768 + + 3.2.6. Compression with fixed Huffman codes (BTYPE=01) + + The Huffman codes for the two alphabets are fixed, and are not + represented explicitly in the data. The Huffman code lengths + for the literal/length alphabet are: + + Lit Value Bits Codes + --------- ---- ----- + 0 - 143 8 00110000 through + 10111111 + 144 - 255 9 110010000 through + 111111111 + 256 - 279 7 0000000 through + 0010111 + 280 - 287 8 11000000 through + 11000111 + + + +Deutsch Informational [Page 12] + +RFC 1951 DEFLATE Compressed Data Format Specification May 1996 + + + The code lengths are sufficient to generate the actual codes, + as described above; we show the codes in the table for added + clarity. Literal/length values 286-287 will never actually + occur in the compressed data, but participate in the code + construction. + + Distance codes 0-31 are represented by (fixed-length) 5-bit + codes, with possible additional bits as shown in the table + shown in Paragraph 3.2.5, above. Note that distance codes 30- + 31 will never actually occur in the compressed data. + + 3.2.7. Compression with dynamic Huffman codes (BTYPE=10) + + The Huffman codes for the two alphabets appear in the block + immediately after the header bits and before the actual + compressed data, first the literal/length code and then the + distance code. Each code is defined by a sequence of code + lengths, as discussed in Paragraph 3.2.2, above. For even + greater compactness, the code length sequences themselves are + compressed using a Huffman code. The alphabet for code lengths + is as follows: + + 0 - 15: Represent code lengths of 0 - 15 + 16: Copy the previous code length 3 - 6 times. + The next 2 bits indicate repeat length + (0 = 3, ... , 3 = 6) + Example: Codes 8, 16 (+2 bits 11), + 16 (+2 bits 10) will expand to + 12 code lengths of 8 (1 + 6 + 5) + 17: Repeat a code length of 0 for 3 - 10 times. + (3 bits of length) + 18: Repeat a code length of 0 for 11 - 138 times + (7 bits of length) + + A code length of 0 indicates that the corresponding symbol in + the literal/length or distance alphabet will not occur in the + block, and should not participate in the Huffman code + construction algorithm given earlier. If only one distance + code is used, it is encoded using one bit, not zero bits; in + this case there is a single code length of one, with one unused + code. One distance code of zero bits means that there are no + distance codes used at all (the data is all literals). + + We can now define the format of the block: + + 5 Bits: HLIT, # of Literal/Length codes - 257 (257 - 286) + 5 Bits: HDIST, # of Distance codes - 1 (1 - 32) + 4 Bits: HCLEN, # of Code Length codes - 4 (4 - 19) + + + +Deutsch Informational [Page 13] + +RFC 1951 DEFLATE Compressed Data Format Specification May 1996 + + + (HCLEN + 4) x 3 bits: code lengths for the code length + alphabet given just above, in the order: 16, 17, 18, + 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15 + + These code lengths are interpreted as 3-bit integers + (0-7); as above, a code length of 0 means the + corresponding symbol (literal/length or distance code + length) is not used. + + HLIT + 257 code lengths for the literal/length alphabet, + encoded using the code length Huffman code + + HDIST + 1 code lengths for the distance alphabet, + encoded using the code length Huffman code + + The actual compressed data of the block, + encoded using the literal/length and distance Huffman + codes + + The literal/length symbol 256 (end of data), + encoded using the literal/length Huffman code + + The code length repeat codes can cross from HLIT + 257 to the + HDIST + 1 code lengths. In other words, all code lengths form + a single sequence of HLIT + HDIST + 258 values. + + 3.3. Compliance + + A compressor may limit further the ranges of values specified in + the previous section and still be compliant; for example, it may + limit the range of backward pointers to some value smaller than + 32K. Similarly, a compressor may limit the size of blocks so that + a compressible block fits in memory. + + A compliant decompressor must accept the full range of possible + values defined in the previous section, and must accept blocks of + arbitrary size. + +4. Compression algorithm details + + While it is the intent of this document to define the "deflate" + compressed data format without reference to any particular + compression algorithm, the format is related to the compressed + formats produced by LZ77 (Lempel-Ziv 1977, see reference [2] below); + since many variations of LZ77 are patented, it is strongly + recommended that the implementor of a compressor follow the general + algorithm presented here, which is known not to be patented per se. + The material in this section is not part of the definition of the + + + +Deutsch Informational [Page 14] + +RFC 1951 DEFLATE Compressed Data Format Specification May 1996 + + + specification per se, and a compressor need not follow it in order to + be compliant. + + The compressor terminates a block when it determines that starting a + new block with fresh trees would be useful, or when the block size + fills up the compressor's block buffer. + + The compressor uses a chained hash table to find duplicated strings, + using a hash function that operates on 3-byte sequences. At any + given point during compression, let XYZ be the next 3 input bytes to + be examined (not necessarily all different, of course). First, the + compressor examines the hash chain for XYZ. If the chain is empty, + the compressor simply writes out X as a literal byte and advances one + byte in the input. If the hash chain is not empty, indicating that + the sequence XYZ (or, if we are unlucky, some other 3 bytes with the + same hash function value) has occurred recently, the compressor + compares all strings on the XYZ hash chain with the actual input data + sequence starting at the current point, and selects the longest + match. + + The compressor searches the hash chains starting with the most recent + strings, to favor small distances and thus take advantage of the + Huffman encoding. The hash chains are singly linked. There are no + deletions from the hash chains; the algorithm simply discards matches + that are too old. To avoid a worst-case situation, very long hash + chains are arbitrarily truncated at a certain length, determined by a + run-time parameter. + + To improve overall compression, the compressor optionally defers the + selection of matches ("lazy matching"): after a match of length N has + been found, the compressor searches for a longer match starting at + the next input byte. If it finds a longer match, it truncates the + previous match to a length of one (thus producing a single literal + byte) and then emits the longer match. Otherwise, it emits the + original match, and, as described above, advances N bytes before + continuing. + + Run-time parameters also control this "lazy match" procedure. If + compression ratio is most important, the compressor attempts a + complete second search regardless of the length of the first match. + In the normal case, if the current match is "long enough", the + compressor reduces the search for a longer match, thus speeding up + the process. If speed is most important, the compressor inserts new + strings in the hash table only when no match was found, or when the + match is not "too long". This degrades the compression ratio but + saves time since there are both fewer insertions and fewer searches. + + + + + +Deutsch Informational [Page 15] + +RFC 1951 DEFLATE Compressed Data Format Specification May 1996 + + +5. References + + [1] Huffman, D. A., "A Method for the Construction of Minimum + Redundancy Codes", Proceedings of the Institute of Radio + Engineers, September 1952, Volume 40, Number 9, pp. 1098-1101. + + [2] Ziv J., Lempel A., "A Universal Algorithm for Sequential Data + Compression", IEEE Transactions on Information Theory, Vol. 23, + No. 3, pp. 337-343. + + [3] Gailly, J.-L., and Adler, M., ZLIB documentation and sources, + available in ftp://ftp.uu.net/pub/archiving/zip/doc/ + + [4] Gailly, J.-L., and Adler, M., GZIP documentation and sources, + available as gzip-*.tar in ftp://prep.ai.mit.edu/pub/gnu/ + + [5] Schwartz, E. S., and Kallick, B. "Generating a canonical prefix + encoding." Comm. ACM, 7,3 (Mar. 1964), pp. 166-169. + + [6] Hirschberg and Lelewer, "Efficient decoding of prefix codes," + Comm. ACM, 33,4, April 1990, pp. 449-459. + +6. Security Considerations + + Any data compression method involves the reduction of redundancy in + the data. Consequently, any corruption of the data is likely to have + severe effects and be difficult to correct. Uncompressed text, on + the other hand, will probably still be readable despite the presence + of some corrupted bytes. + + It is recommended that systems using this data format provide some + means of validating the integrity of the compressed data. See + reference [3], for example. + +7. Source code + + Source code for a C language implementation of a "deflate" compliant + compressor and decompressor is available within the zlib package at + ftp://ftp.uu.net/pub/archiving/zip/zlib/. + +8. Acknowledgements + + Trademarks cited in this document are the property of their + respective owners. + + Phil Katz designed the deflate format. Jean-Loup Gailly and Mark + Adler wrote the related software described in this specification. + Glenn Randers-Pehrson converted this document to RFC and HTML format. + + + +Deutsch Informational [Page 16] + +RFC 1951 DEFLATE Compressed Data Format Specification May 1996 + + +9. Author's Address + + L. Peter Deutsch + Aladdin Enterprises + 203 Santa Margarita Ave. + Menlo Park, CA 94025 + + Phone: (415) 322-0103 (AM only) + FAX: (415) 322-1734 + EMail: + + Questions about the technical content of this specification can be + sent by email to: + + Jean-Loup Gailly and + Mark Adler + + Editorial comments on this specification can be sent by email to: + + L. Peter Deutsch and + Glenn Randers-Pehrson + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +Deutsch Informational [Page 17] + diff --git a/src/3rdparty/zlib/doc/rfc1952.txt b/src/3rdparty/zlib/doc/rfc1952.txt new file mode 100644 index 0000000..a8e51b4 --- /dev/null +++ b/src/3rdparty/zlib/doc/rfc1952.txt @@ -0,0 +1,675 @@ + + + + + + +Network Working Group P. Deutsch +Request for Comments: 1952 Aladdin Enterprises +Category: Informational May 1996 + + + GZIP file format specification version 4.3 + +Status of This Memo + + This memo provides information for the Internet community. This memo + does not specify an Internet standard of any kind. Distribution of + this memo is unlimited. + +IESG Note: + + The IESG takes no position on the validity of any Intellectual + Property Rights statements contained in this document. + +Notices + + Copyright (c) 1996 L. Peter Deutsch + + Permission is granted to copy and distribute this document for any + purpose and without charge, including translations into other + languages and incorporation into compilations, provided that the + copyright notice and this notice are preserved, and that any + substantive changes or deletions from the original are clearly + marked. + + A pointer to the latest version of this and related documentation in + HTML format can be found at the URL + . + +Abstract + + This specification defines a lossless compressed data format that is + compatible with the widely used GZIP utility. The format includes a + cyclic redundancy check value for detecting data corruption. The + format presently uses the DEFLATE method of compression but can be + easily extended to use other compression methods. The format can be + implemented readily in a manner not covered by patents. + + + + + + + + + + +Deutsch Informational [Page 1] + +RFC 1952 GZIP File Format Specification May 1996 + + +Table of Contents + + 1. Introduction ................................................... 2 + 1.1. Purpose ................................................... 2 + 1.2. Intended audience ......................................... 3 + 1.3. Scope ..................................................... 3 + 1.4. Compliance ................................................ 3 + 1.5. Definitions of terms and conventions used ................. 3 + 1.6. Changes from previous versions ............................ 3 + 2. Detailed specification ......................................... 4 + 2.1. Overall conventions ....................................... 4 + 2.2. File format ............................................... 5 + 2.3. Member format ............................................. 5 + 2.3.1. Member header and trailer ........................... 6 + 2.3.1.1. Extra field ................................... 8 + 2.3.1.2. Compliance .................................... 9 + 3. References .................................................. 9 + 4. Security Considerations .................................... 10 + 5. Acknowledgements ........................................... 10 + 6. Author's Address ........................................... 10 + 7. Appendix: Jean-Loup Gailly's gzip utility .................. 11 + 8. Appendix: Sample CRC Code .................................. 11 + +1. Introduction + + 1.1. Purpose + + The purpose of this specification is to define a lossless + compressed data format that: + + * Is independent of CPU type, operating system, file system, + and character set, and hence can be used for interchange; + * Can compress or decompress a data stream (as opposed to a + randomly accessible file) to produce another data stream, + using only an a priori bounded amount of intermediate + storage, and hence can be used in data communications or + similar structures such as Unix filters; + * Compresses data with efficiency comparable to the best + currently available general-purpose compression methods, + and in particular considerably better than the "compress" + program; + * Can be implemented readily in a manner not covered by + patents, and hence can be practiced freely; + * Is compatible with the file format produced by the current + widely used gzip utility, in that conforming decompressors + will be able to read data produced by the existing gzip + compressor. + + + + +Deutsch Informational [Page 2] + +RFC 1952 GZIP File Format Specification May 1996 + + + The data format defined by this specification does not attempt to: + + * Provide random access to compressed data; + * Compress specialized data (e.g., raster graphics) as well as + the best currently available specialized algorithms. + + 1.2. Intended audience + + This specification is intended for use by implementors of software + to compress data into gzip format and/or decompress data from gzip + format. + + The text of the specification assumes a basic background in + programming at the level of bits and other primitive data + representations. + + 1.3. Scope + + The specification specifies a compression method and a file format + (the latter assuming only that a file can store a sequence of + arbitrary bytes). It does not specify any particular interface to + a file system or anything about character sets or encodings + (except for file names and comments, which are optional). + + 1.4. Compliance + + Unless otherwise indicated below, a compliant decompressor must be + able to accept and decompress any file that conforms to all the + specifications presented here; a compliant compressor must produce + files that conform to all the specifications presented here. The + material in the appendices is not part of the specification per se + and is not relevant to compliance. + + 1.5. Definitions of terms and conventions used + + byte: 8 bits stored or transmitted as a unit (same as an octet). + (For this specification, a byte is exactly 8 bits, even on + machines which store a character on a number of bits different + from 8.) See below for the numbering of bits within a byte. + + 1.6. Changes from previous versions + + There have been no technical changes to the gzip format since + version 4.1 of this specification. In version 4.2, some + terminology was changed, and the sample CRC code was rewritten for + clarity and to eliminate the requirement for the caller to do pre- + and post-conditioning. Version 4.3 is a conversion of the + specification to RFC style. + + + +Deutsch Informational [Page 3] + +RFC 1952 GZIP File Format Specification May 1996 + + +2. Detailed specification + + 2.1. Overall conventions + + In the diagrams below, a box like this: + + +---+ + | | <-- the vertical bars might be missing + +---+ + + represents one byte; a box like this: + + +==============+ + | | + +==============+ + + represents a variable number of bytes. + + Bytes stored within a computer do not have a "bit order", since + they are always treated as a unit. However, a byte considered as + an integer between 0 and 255 does have a most- and least- + significant bit, and since we write numbers with the most- + significant digit on the left, we also write bytes with the most- + significant bit on the left. In the diagrams below, we number the + bits of a byte so that bit 0 is the least-significant bit, i.e., + the bits are numbered: + + +--------+ + |76543210| + +--------+ + + This document does not address the issue of the order in which + bits of a byte are transmitted on a bit-sequential medium, since + the data format described here is byte- rather than bit-oriented. + + Within a computer, a number may occupy multiple bytes. All + multi-byte numbers in the format described here are stored with + the least-significant byte first (at the lower memory address). + For example, the decimal number 520 is stored as: + + 0 1 + +--------+--------+ + |00001000|00000010| + +--------+--------+ + ^ ^ + | | + | + more significant byte = 2 x 256 + + less significant byte = 8 + + + +Deutsch Informational [Page 4] + +RFC 1952 GZIP File Format Specification May 1996 + + + 2.2. File format + + A gzip file consists of a series of "members" (compressed data + sets). The format of each member is specified in the following + section. The members simply appear one after another in the file, + with no additional information before, between, or after them. + + 2.3. Member format + + Each member has the following structure: + + +---+---+---+---+---+---+---+---+---+---+ + |ID1|ID2|CM |FLG| MTIME |XFL|OS | (more-->) + +---+---+---+---+---+---+---+---+---+---+ + + (if FLG.FEXTRA set) + + +---+---+=================================+ + | XLEN |...XLEN bytes of "extra field"...| (more-->) + +---+---+=================================+ + + (if FLG.FNAME set) + + +=========================================+ + |...original file name, zero-terminated...| (more-->) + +=========================================+ + + (if FLG.FCOMMENT set) + + +===================================+ + |...file comment, zero-terminated...| (more-->) + +===================================+ + + (if FLG.FHCRC set) + + +---+---+ + | CRC16 | + +---+---+ + + +=======================+ + |...compressed blocks...| (more-->) + +=======================+ + + 0 1 2 3 4 5 6 7 + +---+---+---+---+---+---+---+---+ + | CRC32 | ISIZE | + +---+---+---+---+---+---+---+---+ + + + + +Deutsch Informational [Page 5] + +RFC 1952 GZIP File Format Specification May 1996 + + + 2.3.1. Member header and trailer + + ID1 (IDentification 1) + ID2 (IDentification 2) + These have the fixed values ID1 = 31 (0x1f, \037), ID2 = 139 + (0x8b, \213), to identify the file as being in gzip format. + + CM (Compression Method) + This identifies the compression method used in the file. CM + = 0-7 are reserved. CM = 8 denotes the "deflate" + compression method, which is the one customarily used by + gzip and which is documented elsewhere. + + FLG (FLaGs) + This flag byte is divided into individual bits as follows: + + bit 0 FTEXT + bit 1 FHCRC + bit 2 FEXTRA + bit 3 FNAME + bit 4 FCOMMENT + bit 5 reserved + bit 6 reserved + bit 7 reserved + + If FTEXT is set, the file is probably ASCII text. This is + an optional indication, which the compressor may set by + checking a small amount of the input data to see whether any + non-ASCII characters are present. In case of doubt, FTEXT + is cleared, indicating binary data. For systems which have + different file formats for ascii text and binary data, the + decompressor can use FTEXT to choose the appropriate format. + We deliberately do not specify the algorithm used to set + this bit, since a compressor always has the option of + leaving it cleared and a decompressor always has the option + of ignoring it and letting some other program handle issues + of data conversion. + + If FHCRC is set, a CRC16 for the gzip header is present, + immediately before the compressed data. The CRC16 consists + of the two least significant bytes of the CRC32 for all + bytes of the gzip header up to and not including the CRC16. + [The FHCRC bit was never set by versions of gzip up to + 1.2.4, even though it was documented with a different + meaning in gzip 1.2.4.] + + If FEXTRA is set, optional extra fields are present, as + described in a following section. + + + +Deutsch Informational [Page 6] + +RFC 1952 GZIP File Format Specification May 1996 + + + If FNAME is set, an original file name is present, + terminated by a zero byte. The name must consist of ISO + 8859-1 (LATIN-1) characters; on operating systems using + EBCDIC or any other character set for file names, the name + must be translated to the ISO LATIN-1 character set. This + is the original name of the file being compressed, with any + directory components removed, and, if the file being + compressed is on a file system with case insensitive names, + forced to lower case. There is no original file name if the + data was compressed from a source other than a named file; + for example, if the source was stdin on a Unix system, there + is no file name. + + If FCOMMENT is set, a zero-terminated file comment is + present. This comment is not interpreted; it is only + intended for human consumption. The comment must consist of + ISO 8859-1 (LATIN-1) characters. Line breaks should be + denoted by a single line feed character (10 decimal). + + Reserved FLG bits must be zero. + + MTIME (Modification TIME) + This gives the most recent modification time of the original + file being compressed. The time is in Unix format, i.e., + seconds since 00:00:00 GMT, Jan. 1, 1970. (Note that this + may cause problems for MS-DOS and other systems that use + local rather than Universal time.) If the compressed data + did not come from a file, MTIME is set to the time at which + compression started. MTIME = 0 means no time stamp is + available. + + XFL (eXtra FLags) + These flags are available for use by specific compression + methods. The "deflate" method (CM = 8) sets these flags as + follows: + + XFL = 2 - compressor used maximum compression, + slowest algorithm + XFL = 4 - compressor used fastest algorithm + + OS (Operating System) + This identifies the type of file system on which compression + took place. This may be useful in determining end-of-line + convention for text files. The currently defined values are + as follows: + + + + + + +Deutsch Informational [Page 7] + +RFC 1952 GZIP File Format Specification May 1996 + + + 0 - FAT filesystem (MS-DOS, OS/2, NT/Win32) + 1 - Amiga + 2 - VMS (or OpenVMS) + 3 - Unix + 4 - VM/CMS + 5 - Atari TOS + 6 - HPFS filesystem (OS/2, NT) + 7 - Macintosh + 8 - Z-System + 9 - CP/M + 10 - TOPS-20 + 11 - NTFS filesystem (NT) + 12 - QDOS + 13 - Acorn RISCOS + 255 - unknown + + XLEN (eXtra LENgth) + If FLG.FEXTRA is set, this gives the length of the optional + extra field. See below for details. + + CRC32 (CRC-32) + This contains a Cyclic Redundancy Check value of the + uncompressed data computed according to CRC-32 algorithm + used in the ISO 3309 standard and in section 8.1.1.6.2 of + ITU-T recommendation V.42. (See http://www.iso.ch for + ordering ISO documents. See gopher://info.itu.ch for an + online version of ITU-T V.42.) + + ISIZE (Input SIZE) + This contains the size of the original (uncompressed) input + data modulo 2^32. + + 2.3.1.1. Extra field + + If the FLG.FEXTRA bit is set, an "extra field" is present in + the header, with total length XLEN bytes. It consists of a + series of subfields, each of the form: + + +---+---+---+---+==================================+ + |SI1|SI2| LEN |... LEN bytes of subfield data ...| + +---+---+---+---+==================================+ + + SI1 and SI2 provide a subfield ID, typically two ASCII letters + with some mnemonic value. Jean-Loup Gailly + is maintaining a registry of subfield + IDs; please send him any subfield ID you wish to use. Subfield + IDs with SI2 = 0 are reserved for future use. The following + IDs are currently defined: + + + +Deutsch Informational [Page 8] + +RFC 1952 GZIP File Format Specification May 1996 + + + SI1 SI2 Data + ---------- ---------- ---- + 0x41 ('A') 0x70 ('P') Apollo file type information + + LEN gives the length of the subfield data, excluding the 4 + initial bytes. + + 2.3.1.2. Compliance + + A compliant compressor must produce files with correct ID1, + ID2, CM, CRC32, and ISIZE, but may set all the other fields in + the fixed-length part of the header to default values (255 for + OS, 0 for all others). The compressor must set all reserved + bits to zero. + + A compliant decompressor must check ID1, ID2, and CM, and + provide an error indication if any of these have incorrect + values. It must examine FEXTRA/XLEN, FNAME, FCOMMENT and FHCRC + at least so it can skip over the optional fields if they are + present. It need not examine any other part of the header or + trailer; in particular, a decompressor may ignore FTEXT and OS + and always produce binary output, and still be compliant. A + compliant decompressor must give an error indication if any + reserved bit is non-zero, since such a bit could indicate the + presence of a new field that would cause subsequent data to be + interpreted incorrectly. + +3. References + + [1] "Information Processing - 8-bit single-byte coded graphic + character sets - Part 1: Latin alphabet No.1" (ISO 8859-1:1987). + The ISO 8859-1 (Latin-1) character set is a superset of 7-bit + ASCII. Files defining this character set are available as + iso_8859-1.* in ftp://ftp.uu.net/graphics/png/documents/ + + [2] ISO 3309 + + [3] ITU-T recommendation V.42 + + [4] Deutsch, L.P.,"DEFLATE Compressed Data Format Specification", + available in ftp://ftp.uu.net/pub/archiving/zip/doc/ + + [5] Gailly, J.-L., GZIP documentation, available as gzip-*.tar in + ftp://prep.ai.mit.edu/pub/gnu/ + + [6] Sarwate, D.V., "Computation of Cyclic Redundancy Checks via Table + Look-Up", Communications of the ACM, 31(8), pp.1008-1013. + + + + +Deutsch Informational [Page 9] + +RFC 1952 GZIP File Format Specification May 1996 + + + [7] Schwaderer, W.D., "CRC Calculation", April 85 PC Tech Journal, + pp.118-133. + + [8] ftp://ftp.adelaide.edu.au/pub/rocksoft/papers/crc_v3.txt, + describing the CRC concept. + +4. Security Considerations + + Any data compression method involves the reduction of redundancy in + the data. Consequently, any corruption of the data is likely to have + severe effects and be difficult to correct. Uncompressed text, on + the other hand, will probably still be readable despite the presence + of some corrupted bytes. + + It is recommended that systems using this data format provide some + means of validating the integrity of the compressed data, such as by + setting and checking the CRC-32 check value. + +5. Acknowledgements + + Trademarks cited in this document are the property of their + respective owners. + + Jean-Loup Gailly designed the gzip format and wrote, with Mark Adler, + the related software described in this specification. Glenn + Randers-Pehrson converted this document to RFC and HTML format. + +6. Author's Address + + L. Peter Deutsch + Aladdin Enterprises + 203 Santa Margarita Ave. + Menlo Park, CA 94025 + + Phone: (415) 322-0103 (AM only) + FAX: (415) 322-1734 + EMail: + + Questions about the technical content of this specification can be + sent by email to: + + Jean-Loup Gailly and + Mark Adler + + Editorial comments on this specification can be sent by email to: + + L. Peter Deutsch and + Glenn Randers-Pehrson + + + +Deutsch Informational [Page 10] + +RFC 1952 GZIP File Format Specification May 1996 + + +7. Appendix: Jean-Loup Gailly's gzip utility + + The most widely used implementation of gzip compression, and the + original documentation on which this specification is based, were + created by Jean-Loup Gailly . Since this + implementation is a de facto standard, we mention some more of its + features here. Again, the material in this section is not part of + the specification per se, and implementations need not follow it to + be compliant. + + When compressing or decompressing a file, gzip preserves the + protection, ownership, and modification time attributes on the local + file system, since there is no provision for representing protection + attributes in the gzip file format itself. Since the file format + includes a modification time, the gzip decompressor provides a + command line switch that assigns the modification time from the file, + rather than the local modification time of the compressed input, to + the decompressed output. + +8. Appendix: Sample CRC Code + + The following sample code represents a practical implementation of + the CRC (Cyclic Redundancy Check). (See also ISO 3309 and ITU-T V.42 + for a formal specification.) + + The sample code is in the ANSI C programming language. Non C users + may find it easier to read with these hints: + + & Bitwise AND operator. + ^ Bitwise exclusive-OR operator. + >> Bitwise right shift operator. When applied to an + unsigned quantity, as here, right shift inserts zero + bit(s) at the left. + ! Logical NOT operator. + ++ "n++" increments the variable n. + 0xNNN 0x introduces a hexadecimal (base 16) constant. + Suffix L indicates a long value (at least 32 bits). + + /* Table of CRCs of all 8-bit messages. */ + unsigned long crc_table[256]; + + /* Flag: has the table been computed? Initially false. */ + int crc_table_computed = 0; + + /* Make the table for a fast CRC. */ + void make_crc_table(void) + { + unsigned long c; + + + +Deutsch Informational [Page 11] + +RFC 1952 GZIP File Format Specification May 1996 + + + int n, k; + for (n = 0; n < 256; n++) { + c = (unsigned long) n; + for (k = 0; k < 8; k++) { + if (c & 1) { + c = 0xedb88320L ^ (c >> 1); + } else { + c = c >> 1; + } + } + crc_table[n] = c; + } + crc_table_computed = 1; + } + + /* + Update a running crc with the bytes buf[0..len-1] and return + the updated crc. The crc should be initialized to zero. Pre- and + post-conditioning (one's complement) is performed within this + function so it shouldn't be done by the caller. Usage example: + + unsigned long crc = 0L; + + while (read_buffer(buffer, length) != EOF) { + crc = update_crc(crc, buffer, length); + } + if (crc != original_crc) error(); + */ + unsigned long update_crc(unsigned long crc, + unsigned char *buf, int len) + { + unsigned long c = crc ^ 0xffffffffL; + int n; + + if (!crc_table_computed) + make_crc_table(); + for (n = 0; n < len; n++) { + c = crc_table[(c ^ buf[n]) & 0xff] ^ (c >> 8); + } + return c ^ 0xffffffffL; + } + + /* Return the CRC of the bytes buf[0..len-1]. */ + unsigned long crc(unsigned char *buf, int len) + { + return update_crc(0L, buf, len); + } + + + + +Deutsch Informational [Page 12] + diff --git a/src/3rdparty/zlib/doc/txtvsbin.txt b/src/3rdparty/zlib/doc/txtvsbin.txt new file mode 100644 index 0000000..3d0f063 --- /dev/null +++ b/src/3rdparty/zlib/doc/txtvsbin.txt @@ -0,0 +1,107 @@ +A Fast Method for Identifying Plain Text Files +============================================== + + +Introduction +------------ + +Given a file coming from an unknown source, it is sometimes desirable +to find out whether the format of that file is plain text. Although +this may appear like a simple task, a fully accurate detection of the +file type requires heavy-duty semantic analysis on the file contents. +It is, however, possible to obtain satisfactory results by employing +various heuristics. + +Previous versions of PKZip and other zip-compatible compression tools +were using a crude detection scheme: if more than 80% (4/5) of the bytes +found in a certain buffer are within the range [7..127], the file is +labeled as plain text, otherwise it is labeled as binary. A prominent +limitation of this scheme is the restriction to Latin-based alphabets. +Other alphabets, like Greek, Cyrillic or Asian, make extensive use of +the bytes within the range [128..255], and texts using these alphabets +are most often misidentified by this scheme; in other words, the rate +of false negatives is sometimes too high, which means that the recall +is low. Another weakness of this scheme is a reduced precision, due to +the false positives that may occur when binary files containing large +amounts of textual characters are misidentified as plain text. + +In this article we propose a new, simple detection scheme that features +a much increased precision and a near-100% recall. This scheme is +designed to work on ASCII, Unicode and other ASCII-derived alphabets, +and it handles single-byte encodings (ISO-8859, MacRoman, KOI8, etc.) +and variable-sized encodings (ISO-2022, UTF-8, etc.). Wider encodings +(UCS-2/UTF-16 and UCS-4/UTF-32) are not handled, however. + + +The Algorithm +------------- + +The algorithm works by dividing the set of bytecodes [0..255] into three +categories: +- The white list of textual bytecodes: + 9 (TAB), 10 (LF), 13 (CR), 32 (SPACE) to 255. +- The gray list of tolerated bytecodes: + 7 (BEL), 8 (BS), 11 (VT), 12 (FF), 26 (SUB), 27 (ESC). +- The black list of undesired, non-textual bytecodes: + 0 (NUL) to 6, 14 to 31. + +If a file contains at least one byte that belongs to the white list and +no byte that belongs to the black list, then the file is categorized as +plain text; otherwise, it is categorized as binary. (The boundary case, +when the file is empty, automatically falls into the latter category.) + + +Rationale +--------- + +The idea behind this algorithm relies on two observations. + +The first observation is that, although the full range of 7-bit codes +[0..127] is properly specified by the ASCII standard, most control +characters in the range [0..31] are not used in practice. The only +widely-used, almost universally-portable control codes are 9 (TAB), +10 (LF) and 13 (CR). There are a few more control codes that are +recognized on a reduced range of platforms and text viewers/editors: +7 (BEL), 8 (BS), 11 (VT), 12 (FF), 26 (SUB) and 27 (ESC); but these +codes are rarely (if ever) used alone, without being accompanied by +some printable text. Even the newer, portable text formats such as +XML avoid using control characters outside the list mentioned here. + +The second observation is that most of the binary files tend to contain +control characters, especially 0 (NUL). Even though the older text +detection schemes observe the presence of non-ASCII codes from the range +[128..255], the precision rarely has to suffer if this upper range is +labeled as textual, because the files that are genuinely binary tend to +contain both control characters and codes from the upper range. On the +other hand, the upper range needs to be labeled as textual, because it +is used by virtually all ASCII extensions. In particular, this range is +used for encoding non-Latin scripts. + +Since there is no counting involved, other than simply observing the +presence or the absence of some byte values, the algorithm produces +consistent results, regardless what alphabet encoding is being used. +(If counting were involved, it could be possible to obtain different +results on a text encoded, say, using ISO-8859-16 versus UTF-8.) + +There is an extra category of plain text files that are "polluted" with +one or more black-listed codes, either by mistake or by peculiar design +considerations. In such cases, a scheme that tolerates a small fraction +of black-listed codes would provide an increased recall (i.e. more true +positives). This, however, incurs a reduced precision overall, since +false positives are more likely to appear in binary files that contain +large chunks of textual data. Furthermore, "polluted" plain text should +be regarded as binary by general-purpose text detection schemes, because +general-purpose text processing algorithms might not be applicable. +Under this premise, it is safe to say that our detection method provides +a near-100% recall. + +Experiments have been run on many files coming from various platforms +and applications. We tried plain text files, system logs, source code, +formatted office documents, compiled object code, etc. The results +confirm the optimistic assumptions about the capabilities of this +algorithm. + + +-- +Cosmin Truta +Last updated: 2006-May-28 diff --git a/src/3rdparty/zlib/gzclose.c b/src/3rdparty/zlib/gzclose.c new file mode 100644 index 0000000..caeb99a --- /dev/null +++ b/src/3rdparty/zlib/gzclose.c @@ -0,0 +1,25 @@ +/* gzclose.c -- zlib gzclose() function + * Copyright (C) 2004, 2010 Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +#include "gzguts.h" + +/* gzclose() is in a separate file so that it is linked in only if it is used. + That way the other gzclose functions can be used instead to avoid linking in + unneeded compression or decompression routines. */ +int ZEXPORT gzclose(file) + gzFile file; +{ +#ifndef NO_GZCOMPRESS + gz_statep state; + + if (file == NULL) + return Z_STREAM_ERROR; + state = (gz_statep)file; + + return state->mode == GZ_READ ? gzclose_r(file) : gzclose_w(file); +#else + return gzclose_r(file); +#endif +} diff --git a/src/3rdparty/zlib/gzguts.h b/src/3rdparty/zlib/gzguts.h new file mode 100644 index 0000000..d87659d --- /dev/null +++ b/src/3rdparty/zlib/gzguts.h @@ -0,0 +1,209 @@ +/* gzguts.h -- zlib internal header definitions for gz* operations + * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013 Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +#ifdef _LARGEFILE64_SOURCE +# ifndef _LARGEFILE_SOURCE +# define _LARGEFILE_SOURCE 1 +# endif +# ifdef _FILE_OFFSET_BITS +# undef _FILE_OFFSET_BITS +# endif +#endif + +#ifdef HAVE_HIDDEN +# define ZLIB_INTERNAL __attribute__((visibility ("hidden"))) +#else +# define ZLIB_INTERNAL +#endif + +#include +#include "zlib.h" +#ifdef STDC +# include +# include +# include +#endif +#include + +#ifdef _WIN32 +# include +#endif + +#if defined(__TURBOC__) || defined(_MSC_VER) || defined(_WIN32) +# include +#endif + +#ifdef WINAPI_FAMILY +# define open _open +# define read _read +# define write _write +# define close _close +#endif + +#ifdef NO_DEFLATE /* for compatibility with old definition */ +# define NO_GZCOMPRESS +#endif + +#if defined(STDC99) || (defined(__TURBOC__) && __TURBOC__ >= 0x550) +# ifndef HAVE_VSNPRINTF +# define HAVE_VSNPRINTF +# endif +#endif + +#if defined(__CYGWIN__) +# ifndef HAVE_VSNPRINTF +# define HAVE_VSNPRINTF +# endif +#endif + +#if defined(MSDOS) && defined(__BORLANDC__) && (BORLANDC > 0x410) +# ifndef HAVE_VSNPRINTF +# define HAVE_VSNPRINTF +# endif +#endif + +#ifndef HAVE_VSNPRINTF +# ifdef MSDOS +/* vsnprintf may exist on some MS-DOS compilers (DJGPP?), + but for now we just assume it doesn't. */ +# define NO_vsnprintf +# endif +# ifdef __TURBOC__ +# define NO_vsnprintf +# endif +# ifdef WIN32 +/* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */ +# if !defined(vsnprintf) && !defined(NO_vsnprintf) +# if !defined(_MSC_VER) || ( defined(_MSC_VER) && _MSC_VER < 1500 ) +# define vsnprintf _vsnprintf +# endif +# endif +# endif +# ifdef __SASC +# define NO_vsnprintf +# endif +# ifdef VMS +# define NO_vsnprintf +# endif +# ifdef __OS400__ +# define NO_vsnprintf +# endif +# ifdef __MVS__ +# define NO_vsnprintf +# endif +#endif + +/* unlike snprintf (which is required in C99, yet still not supported by + Microsoft more than a decade later!), _snprintf does not guarantee null + termination of the result -- however this is only used in gzlib.c where + the result is assured to fit in the space provided */ +#ifdef _MSC_VER +# define snprintf _snprintf +#endif + +#ifndef local +# define local static +#endif +/* compile with -Dlocal if your debugger can't find static symbols */ + +/* gz* functions always use library allocation functions */ +#ifndef STDC + extern voidp malloc OF((uInt size)); + extern void free OF((voidpf ptr)); +#endif + +/* get errno and strerror definition */ +#if defined UNDER_CE +# include +# define zstrerror() gz_strwinerror((DWORD)GetLastError()) +#else +# ifndef NO_STRERROR +# include +# define zstrerror() strerror(errno) +# else +# define zstrerror() "stdio error (consult errno)" +# endif +#endif + +/* provide prototypes for these when building zlib without LFS */ +#if !defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0 + ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *)); + ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int)); + ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile)); + ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile)); +#endif + +/* default memLevel */ +#if MAX_MEM_LEVEL >= 8 +# define DEF_MEM_LEVEL 8 +#else +# define DEF_MEM_LEVEL MAX_MEM_LEVEL +#endif + +/* default i/o buffer size -- double this for output when reading (this and + twice this must be able to fit in an unsigned type) */ +#define GZBUFSIZE 8192 + +/* gzip modes, also provide a little integrity check on the passed structure */ +#define GZ_NONE 0 +#define GZ_READ 7247 +#define GZ_WRITE 31153 +#define GZ_APPEND 1 /* mode set to GZ_WRITE after the file is opened */ + +/* values for gz_state how */ +#define LOOK 0 /* look for a gzip header */ +#define COPY 1 /* copy input directly */ +#define GZIP 2 /* decompress a gzip stream */ + +/* internal gzip file state data structure */ +typedef struct { + /* exposed contents for gzgetc() macro */ + struct gzFile_s x; /* "x" for exposed */ + /* x.have: number of bytes available at x.next */ + /* x.next: next output data to deliver or write */ + /* x.pos: current position in uncompressed data */ + /* used for both reading and writing */ + int mode; /* see gzip modes above */ + int fd; /* file descriptor */ + char *path; /* path or fd for error messages */ + unsigned size; /* buffer size, zero if not allocated yet */ + unsigned want; /* requested buffer size, default is GZBUFSIZE */ + unsigned char *in; /* input buffer */ + unsigned char *out; /* output buffer (double-sized when reading) */ + int direct; /* 0 if processing gzip, 1 if transparent */ + /* just for reading */ + int how; /* 0: get header, 1: copy, 2: decompress */ + z_off64_t start; /* where the gzip data started, for rewinding */ + int eof; /* true if end of input file reached */ + int past; /* true if read requested past end */ + /* just for writing */ + int level; /* compression level */ + int strategy; /* compression strategy */ + /* seek request */ + z_off64_t skip; /* amount to skip (already rewound if backwards) */ + int seek; /* true if seek request pending */ + /* error information */ + int err; /* error code */ + char *msg; /* error message */ + /* zlib inflate or deflate stream */ + z_stream strm; /* stream structure in-place (not a pointer) */ +} gz_state; +typedef gz_state FAR *gz_statep; + +/* shared functions */ +void ZLIB_INTERNAL gz_error OF((gz_statep, int, const char *)); +#if defined UNDER_CE +char ZLIB_INTERNAL *gz_strwinerror OF((DWORD error)); +#endif + +/* GT_OFF(x), where x is an unsigned value, is true if x > maximum z_off64_t + value -- needed when comparing unsigned to z_off64_t, which is signed + (possible z_off64_t types off_t, off64_t, and long are all signed) */ +#ifdef INT_MAX +# define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > INT_MAX) +#else +unsigned ZLIB_INTERNAL gz_intmax OF((void)); +# define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > gz_intmax()) +#endif diff --git a/src/3rdparty/zlib/gzlib.c b/src/3rdparty/zlib/gzlib.c new file mode 100644 index 0000000..fae202e --- /dev/null +++ b/src/3rdparty/zlib/gzlib.c @@ -0,0 +1,634 @@ +/* gzlib.c -- zlib functions common to reading and writing gzip files + * Copyright (C) 2004, 2010, 2011, 2012, 2013 Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +#include "gzguts.h" + +#if defined(_WIN32) && !defined(__BORLANDC__) +# define LSEEK _lseeki64 +#else +#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0 +# define LSEEK lseek64 +#else +# define LSEEK lseek +#endif +#endif + +/* Local functions */ +local void gz_reset OF((gz_statep)); +local gzFile gz_open OF((const void *, int, const char *)); + +#if defined UNDER_CE + +/* Map the Windows error number in ERROR to a locale-dependent error message + string and return a pointer to it. Typically, the values for ERROR come + from GetLastError. + + The string pointed to shall not be modified by the application, but may be + overwritten by a subsequent call to gz_strwinerror + + The gz_strwinerror function does not change the current setting of + GetLastError. */ +char ZLIB_INTERNAL *gz_strwinerror (error) + DWORD error; +{ + static char buf[1024]; + + wchar_t *msgbuf; + DWORD lasterr = GetLastError(); + DWORD chars = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM + | FORMAT_MESSAGE_ALLOCATE_BUFFER, + NULL, + error, + 0, /* Default language */ + (LPVOID)&msgbuf, + 0, + NULL); + if (chars != 0) { + /* If there is an \r\n appended, zap it. */ + if (chars >= 2 + && msgbuf[chars - 2] == '\r' && msgbuf[chars - 1] == '\n') { + chars -= 2; + msgbuf[chars] = 0; + } + + if (chars > sizeof (buf) - 1) { + chars = sizeof (buf) - 1; + msgbuf[chars] = 0; + } + + wcstombs(buf, msgbuf, chars + 1); + LocalFree(msgbuf); + } + else { + sprintf(buf, "unknown win32 error (%ld)", error); + } + + SetLastError(lasterr); + return buf; +} + +#endif /* UNDER_CE */ + +/* Reset gzip file state */ +local void gz_reset(state) + gz_statep state; +{ + state->x.have = 0; /* no output data available */ + if (state->mode == GZ_READ) { /* for reading ... */ + state->eof = 0; /* not at end of file */ + state->past = 0; /* have not read past end yet */ + state->how = LOOK; /* look for gzip header */ + } + state->seek = 0; /* no seek request pending */ + gz_error(state, Z_OK, NULL); /* clear error */ + state->x.pos = 0; /* no uncompressed data yet */ + state->strm.avail_in = 0; /* no input data yet */ +} + +/* Open a gzip file either by name or file descriptor. */ +local gzFile gz_open(path, fd, mode) + const void *path; + int fd; + const char *mode; +{ + gz_statep state; + size_t len; + int oflag; +#ifdef O_CLOEXEC + int cloexec = 0; +#endif +#ifdef O_EXCL + int exclusive = 0; +#endif + + /* check input */ + if (path == NULL) + return NULL; + + /* allocate gzFile structure to return */ + state = (gz_statep)malloc(sizeof(gz_state)); + if (state == NULL) + return NULL; + state->size = 0; /* no buffers allocated yet */ + state->want = GZBUFSIZE; /* requested buffer size */ + state->msg = NULL; /* no error message yet */ + + /* interpret mode */ + state->mode = GZ_NONE; + state->level = Z_DEFAULT_COMPRESSION; + state->strategy = Z_DEFAULT_STRATEGY; + state->direct = 0; + while (*mode) { + if (*mode >= '0' && *mode <= '9') + state->level = *mode - '0'; + else + switch (*mode) { + case 'r': + state->mode = GZ_READ; + break; +#ifndef NO_GZCOMPRESS + case 'w': + state->mode = GZ_WRITE; + break; + case 'a': + state->mode = GZ_APPEND; + break; +#endif + case '+': /* can't read and write at the same time */ + free(state); + return NULL; + case 'b': /* ignore -- will request binary anyway */ + break; +#ifdef O_CLOEXEC + case 'e': + cloexec = 1; + break; +#endif +#ifdef O_EXCL + case 'x': + exclusive = 1; + break; +#endif + case 'f': + state->strategy = Z_FILTERED; + break; + case 'h': + state->strategy = Z_HUFFMAN_ONLY; + break; + case 'R': + state->strategy = Z_RLE; + break; + case 'F': + state->strategy = Z_FIXED; + break; + case 'T': + state->direct = 1; + break; + default: /* could consider as an error, but just ignore */ + ; + } + mode++; + } + + /* must provide an "r", "w", or "a" */ + if (state->mode == GZ_NONE) { + free(state); + return NULL; + } + + /* can't force transparent read */ + if (state->mode == GZ_READ) { + if (state->direct) { + free(state); + return NULL; + } + state->direct = 1; /* for empty file */ + } + + /* save the path name for error messages */ +#ifdef _WIN32 + if (fd == -2) { + len = wcstombs(NULL, path, 0); + if (len == (size_t)-1) + len = 0; + } + else +#endif + len = strlen((const char *)path); + state->path = (char *)malloc(len + 1); + if (state->path == NULL) { + free(state); + return NULL; + } +#ifdef _WIN32 + if (fd == -2) + if (len) + wcstombs(state->path, path, len + 1); + else + *(state->path) = 0; + else +#endif +#if !defined(NO_snprintf) && !defined(NO_vsnprintf) + snprintf(state->path, len + 1, "%s", (const char *)path); +#else + strcpy(state->path, path); +#endif + + /* compute the flags for open() */ + oflag = +#ifdef O_LARGEFILE + O_LARGEFILE | +#endif +#ifdef O_BINARY + O_BINARY | +#endif +#ifdef O_CLOEXEC + (cloexec ? O_CLOEXEC : 0) | +#endif + (state->mode == GZ_READ ? + O_RDONLY : + (O_WRONLY | O_CREAT | +#ifdef O_EXCL + (exclusive ? O_EXCL : 0) | +#endif + (state->mode == GZ_WRITE ? + O_TRUNC : + O_APPEND))); + + /* open the file with the appropriate flags (or just use fd) */ + state->fd = fd > -1 ? fd : ( +#ifdef _WIN32 + fd == -2 ? _wopen(path, oflag, 0666) : +#endif + open((const char *)path, oflag, 0666)); + if (state->fd == -1) { + free(state->path); + free(state); + return NULL; + } + if (state->mode == GZ_APPEND) + state->mode = GZ_WRITE; /* simplify later checks */ + + /* save the current position for rewinding (only if reading) */ + if (state->mode == GZ_READ) { + state->start = LSEEK(state->fd, 0, SEEK_CUR); + if (state->start == -1) state->start = 0; + } + + /* initialize stream */ + gz_reset(state); + + /* return stream */ + return (gzFile)state; +} + +/* -- see zlib.h -- */ +gzFile ZEXPORT gzopen(path, mode) + const char *path; + const char *mode; +{ + return gz_open(path, -1, mode); +} + +/* -- see zlib.h -- */ +gzFile ZEXPORT gzopen64(path, mode) + const char *path; + const char *mode; +{ + return gz_open(path, -1, mode); +} + +/* -- see zlib.h -- */ +gzFile ZEXPORT gzdopen(fd, mode) + int fd; + const char *mode; +{ + char *path; /* identifier for error messages */ + gzFile gz; + + if (fd == -1 || (path = (char *)malloc(7 + 3 * sizeof(int))) == NULL) + return NULL; +#if !defined(NO_snprintf) && !defined(NO_vsnprintf) + snprintf(path, 7 + 3 * sizeof(int), "", fd); /* for debugging */ +#else + sprintf(path, "", fd); /* for debugging */ +#endif + gz = gz_open(path, fd, mode); + free(path); + return gz; +} + +/* -- see zlib.h -- */ +#ifdef _WIN32 +gzFile ZEXPORT gzopen_w(path, mode) + const wchar_t *path; + const char *mode; +{ + return gz_open(path, -2, mode); +} +#endif + +/* -- see zlib.h -- */ +int ZEXPORT gzbuffer(file, size) + gzFile file; + unsigned size; +{ + gz_statep state; + + /* get internal structure and check integrity */ + if (file == NULL) + return -1; + state = (gz_statep)file; + if (state->mode != GZ_READ && state->mode != GZ_WRITE) + return -1; + + /* make sure we haven't already allocated memory */ + if (state->size != 0) + return -1; + + /* check and set requested size */ + if (size < 2) + size = 2; /* need two bytes to check magic header */ + state->want = size; + return 0; +} + +/* -- see zlib.h -- */ +int ZEXPORT gzrewind(file) + gzFile file; +{ + gz_statep state; + + /* get internal structure */ + if (file == NULL) + return -1; + state = (gz_statep)file; + + /* check that we're reading and that there's no error */ + if (state->mode != GZ_READ || + (state->err != Z_OK && state->err != Z_BUF_ERROR)) + return -1; + + /* back up and start over */ + if (LSEEK(state->fd, state->start, SEEK_SET) == -1) + return -1; + gz_reset(state); + return 0; +} + +/* -- see zlib.h -- */ +z_off64_t ZEXPORT gzseek64(file, offset, whence) + gzFile file; + z_off64_t offset; + int whence; +{ + unsigned n; + z_off64_t ret; + gz_statep state; + + /* get internal structure and check integrity */ + if (file == NULL) + return -1; + state = (gz_statep)file; + if (state->mode != GZ_READ && state->mode != GZ_WRITE) + return -1; + + /* check that there's no error */ + if (state->err != Z_OK && state->err != Z_BUF_ERROR) + return -1; + + /* can only seek from start or relative to current position */ + if (whence != SEEK_SET && whence != SEEK_CUR) + return -1; + + /* normalize offset to a SEEK_CUR specification */ + if (whence == SEEK_SET) + offset -= state->x.pos; + else if (state->seek) + offset += state->skip; + state->seek = 0; + + /* if within raw area while reading, just go there */ + if (state->mode == GZ_READ && state->how == COPY && + state->x.pos + offset >= 0) { + ret = LSEEK(state->fd, offset - state->x.have, SEEK_CUR); + if (ret == -1) + return -1; + state->x.have = 0; + state->eof = 0; + state->past = 0; + state->seek = 0; + gz_error(state, Z_OK, NULL); + state->strm.avail_in = 0; + state->x.pos += offset; + return state->x.pos; + } + + /* calculate skip amount, rewinding if needed for back seek when reading */ + if (offset < 0) { + if (state->mode != GZ_READ) /* writing -- can't go backwards */ + return -1; + offset += state->x.pos; + if (offset < 0) /* before start of file! */ + return -1; + if (gzrewind(file) == -1) /* rewind, then skip to offset */ + return -1; + } + + /* if reading, skip what's in output buffer (one less gzgetc() check) */ + if (state->mode == GZ_READ) { + n = GT_OFF(state->x.have) || (z_off64_t)state->x.have > offset ? + (unsigned)offset : state->x.have; + state->x.have -= n; + state->x.next += n; + state->x.pos += n; + offset -= n; + } + + /* request skip (if not zero) */ + if (offset) { + state->seek = 1; + state->skip = offset; + } + return state->x.pos + offset; +} + +/* -- see zlib.h -- */ +z_off_t ZEXPORT gzseek(file, offset, whence) + gzFile file; + z_off_t offset; + int whence; +{ + z_off64_t ret; + + ret = gzseek64(file, (z_off64_t)offset, whence); + return ret == (z_off_t)ret ? (z_off_t)ret : -1; +} + +/* -- see zlib.h -- */ +z_off64_t ZEXPORT gztell64(file) + gzFile file; +{ + gz_statep state; + + /* get internal structure and check integrity */ + if (file == NULL) + return -1; + state = (gz_statep)file; + if (state->mode != GZ_READ && state->mode != GZ_WRITE) + return -1; + + /* return position */ + return state->x.pos + (state->seek ? state->skip : 0); +} + +/* -- see zlib.h -- */ +z_off_t ZEXPORT gztell(file) + gzFile file; +{ + z_off64_t ret; + + ret = gztell64(file); + return ret == (z_off_t)ret ? (z_off_t)ret : -1; +} + +/* -- see zlib.h -- */ +z_off64_t ZEXPORT gzoffset64(file) + gzFile file; +{ + z_off64_t offset; + gz_statep state; + + /* get internal structure and check integrity */ + if (file == NULL) + return -1; + state = (gz_statep)file; + if (state->mode != GZ_READ && state->mode != GZ_WRITE) + return -1; + + /* compute and return effective offset in file */ + offset = LSEEK(state->fd, 0, SEEK_CUR); + if (offset == -1) + return -1; + if (state->mode == GZ_READ) /* reading */ + offset -= state->strm.avail_in; /* don't count buffered input */ + return offset; +} + +/* -- see zlib.h -- */ +z_off_t ZEXPORT gzoffset(file) + gzFile file; +{ + z_off64_t ret; + + ret = gzoffset64(file); + return ret == (z_off_t)ret ? (z_off_t)ret : -1; +} + +/* -- see zlib.h -- */ +int ZEXPORT gzeof(file) + gzFile file; +{ + gz_statep state; + + /* get internal structure and check integrity */ + if (file == NULL) + return 0; + state = (gz_statep)file; + if (state->mode != GZ_READ && state->mode != GZ_WRITE) + return 0; + + /* return end-of-file state */ + return state->mode == GZ_READ ? state->past : 0; +} + +/* -- see zlib.h -- */ +const char * ZEXPORT gzerror(file, errnum) + gzFile file; + int *errnum; +{ + gz_statep state; + + /* get internal structure and check integrity */ + if (file == NULL) + return NULL; + state = (gz_statep)file; + if (state->mode != GZ_READ && state->mode != GZ_WRITE) + return NULL; + + /* return error information */ + if (errnum != NULL) + *errnum = state->err; + return state->err == Z_MEM_ERROR ? "out of memory" : + (state->msg == NULL ? "" : state->msg); +} + +/* -- see zlib.h -- */ +void ZEXPORT gzclearerr(file) + gzFile file; +{ + gz_statep state; + + /* get internal structure and check integrity */ + if (file == NULL) + return; + state = (gz_statep)file; + if (state->mode != GZ_READ && state->mode != GZ_WRITE) + return; + + /* clear error and end-of-file */ + if (state->mode == GZ_READ) { + state->eof = 0; + state->past = 0; + } + gz_error(state, Z_OK, NULL); +} + +/* Create an error message in allocated memory and set state->err and + state->msg accordingly. Free any previous error message already there. Do + not try to free or allocate space if the error is Z_MEM_ERROR (out of + memory). Simply save the error message as a static string. If there is an + allocation failure constructing the error message, then convert the error to + out of memory. */ +void ZLIB_INTERNAL gz_error(state, err, msg) + gz_statep state; + int err; + const char *msg; +{ + /* free previously allocated message and clear */ + if (state->msg != NULL) { + if (state->err != Z_MEM_ERROR) + free(state->msg); + state->msg = NULL; + } + + /* if fatal, set state->x.have to 0 so that the gzgetc() macro fails */ + if (err != Z_OK && err != Z_BUF_ERROR) + state->x.have = 0; + + /* set error code, and if no message, then done */ + state->err = err; + if (msg == NULL) + return; + + /* for an out of memory error, return literal string when requested */ + if (err == Z_MEM_ERROR) + return; + + /* construct error message with path */ + if ((state->msg = (char *)malloc(strlen(state->path) + strlen(msg) + 3)) == + NULL) { + state->err = Z_MEM_ERROR; + return; + } +#if !defined(NO_snprintf) && !defined(NO_vsnprintf) + snprintf(state->msg, strlen(state->path) + strlen(msg) + 3, + "%s%s%s", state->path, ": ", msg); +#else + strcpy(state->msg, state->path); + strcat(state->msg, ": "); + strcat(state->msg, msg); +#endif + return; +} + +#ifndef INT_MAX +/* portably return maximum value for an int (when limits.h presumed not + available) -- we need to do this to cover cases where 2's complement not + used, since C standard permits 1's complement and sign-bit representations, + otherwise we could just use ((unsigned)-1) >> 1 */ +unsigned ZLIB_INTERNAL gz_intmax() +{ + unsigned p, q; + + p = 1; + do { + q = p; + p <<= 1; + p++; + } while (p > q); + return q >> 1; +} +#endif diff --git a/src/3rdparty/zlib/gzread.c b/src/3rdparty/zlib/gzread.c new file mode 100644 index 0000000..bf4538e --- /dev/null +++ b/src/3rdparty/zlib/gzread.c @@ -0,0 +1,594 @@ +/* gzread.c -- zlib functions for reading gzip files + * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013 Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +#include "gzguts.h" + +/* Local functions */ +local int gz_load OF((gz_statep, unsigned char *, unsigned, unsigned *)); +local int gz_avail OF((gz_statep)); +local int gz_look OF((gz_statep)); +local int gz_decomp OF((gz_statep)); +local int gz_fetch OF((gz_statep)); +local int gz_skip OF((gz_statep, z_off64_t)); + +/* Use read() to load a buffer -- return -1 on error, otherwise 0. Read from + state->fd, and update state->eof, state->err, and state->msg as appropriate. + This function needs to loop on read(), since read() is not guaranteed to + read the number of bytes requested, depending on the type of descriptor. */ +local int gz_load(state, buf, len, have) + gz_statep state; + unsigned char *buf; + unsigned len; + unsigned *have; +{ + int ret; + + *have = 0; + do { + ret = read(state->fd, buf + *have, len - *have); + if (ret <= 0) + break; + *have += ret; + } while (*have < len); + if (ret < 0) { + gz_error(state, Z_ERRNO, zstrerror()); + return -1; + } + if (ret == 0) + state->eof = 1; + return 0; +} + +/* Load up input buffer and set eof flag if last data loaded -- return -1 on + error, 0 otherwise. Note that the eof flag is set when the end of the input + file is reached, even though there may be unused data in the buffer. Once + that data has been used, no more attempts will be made to read the file. + If strm->avail_in != 0, then the current data is moved to the beginning of + the input buffer, and then the remainder of the buffer is loaded with the + available data from the input file. */ +local int gz_avail(state) + gz_statep state; +{ + unsigned got; + z_streamp strm = &(state->strm); + + if (state->err != Z_OK && state->err != Z_BUF_ERROR) + return -1; + if (state->eof == 0) { + if (strm->avail_in) { /* copy what's there to the start */ + unsigned char *p = state->in; + unsigned const char *q = strm->next_in; + unsigned n = strm->avail_in; + do { + *p++ = *q++; + } while (--n); + } + if (gz_load(state, state->in + strm->avail_in, + state->size - strm->avail_in, &got) == -1) + return -1; + strm->avail_in += got; + strm->next_in = state->in; + } + return 0; +} + +/* Look for gzip header, set up for inflate or copy. state->x.have must be 0. + If this is the first time in, allocate required memory. state->how will be + left unchanged if there is no more input data available, will be set to COPY + if there is no gzip header and direct copying will be performed, or it will + be set to GZIP for decompression. If direct copying, then leftover input + data from the input buffer will be copied to the output buffer. In that + case, all further file reads will be directly to either the output buffer or + a user buffer. If decompressing, the inflate state will be initialized. + gz_look() will return 0 on success or -1 on failure. */ +local int gz_look(state) + gz_statep state; +{ + z_streamp strm = &(state->strm); + + /* allocate read buffers and inflate memory */ + if (state->size == 0) { + /* allocate buffers */ + state->in = (unsigned char *)malloc(state->want); + state->out = (unsigned char *)malloc(state->want << 1); + if (state->in == NULL || state->out == NULL) { + if (state->out != NULL) + free(state->out); + if (state->in != NULL) + free(state->in); + gz_error(state, Z_MEM_ERROR, "out of memory"); + return -1; + } + state->size = state->want; + + /* allocate inflate memory */ + state->strm.zalloc = Z_NULL; + state->strm.zfree = Z_NULL; + state->strm.opaque = Z_NULL; + state->strm.avail_in = 0; + state->strm.next_in = Z_NULL; + if (inflateInit2(&(state->strm), 15 + 16) != Z_OK) { /* gunzip */ + free(state->out); + free(state->in); + state->size = 0; + gz_error(state, Z_MEM_ERROR, "out of memory"); + return -1; + } + } + + /* get at least the magic bytes in the input buffer */ + if (strm->avail_in < 2) { + if (gz_avail(state) == -1) + return -1; + if (strm->avail_in == 0) + return 0; + } + + /* look for gzip magic bytes -- if there, do gzip decoding (note: there is + a logical dilemma here when considering the case of a partially written + gzip file, to wit, if a single 31 byte is written, then we cannot tell + whether this is a single-byte file, or just a partially written gzip + file -- for here we assume that if a gzip file is being written, then + the header will be written in a single operation, so that reading a + single byte is sufficient indication that it is not a gzip file) */ + if (strm->avail_in > 1 && + strm->next_in[0] == 31 && strm->next_in[1] == 139) { + inflateReset(strm); + state->how = GZIP; + state->direct = 0; + return 0; + } + + /* no gzip header -- if we were decoding gzip before, then this is trailing + garbage. Ignore the trailing garbage and finish. */ + if (state->direct == 0) { + strm->avail_in = 0; + state->eof = 1; + state->x.have = 0; + return 0; + } + + /* doing raw i/o, copy any leftover input to output -- this assumes that + the output buffer is larger than the input buffer, which also assures + space for gzungetc() */ + state->x.next = state->out; + if (strm->avail_in) { + memcpy(state->x.next, strm->next_in, strm->avail_in); + state->x.have = strm->avail_in; + strm->avail_in = 0; + } + state->how = COPY; + state->direct = 1; + return 0; +} + +/* Decompress from input to the provided next_out and avail_out in the state. + On return, state->x.have and state->x.next point to the just decompressed + data. If the gzip stream completes, state->how is reset to LOOK to look for + the next gzip stream or raw data, once state->x.have is depleted. Returns 0 + on success, -1 on failure. */ +local int gz_decomp(state) + gz_statep state; +{ + int ret = Z_OK; + unsigned had; + z_streamp strm = &(state->strm); + + /* fill output buffer up to end of deflate stream */ + had = strm->avail_out; + do { + /* get more input for inflate() */ + if (strm->avail_in == 0 && gz_avail(state) == -1) + return -1; + if (strm->avail_in == 0) { + gz_error(state, Z_BUF_ERROR, "unexpected end of file"); + break; + } + + /* decompress and handle errors */ + ret = inflate(strm, Z_NO_FLUSH); + if (ret == Z_STREAM_ERROR || ret == Z_NEED_DICT) { + gz_error(state, Z_STREAM_ERROR, + "internal error: inflate stream corrupt"); + return -1; + } + if (ret == Z_MEM_ERROR) { + gz_error(state, Z_MEM_ERROR, "out of memory"); + return -1; + } + if (ret == Z_DATA_ERROR) { /* deflate stream invalid */ + gz_error(state, Z_DATA_ERROR, + strm->msg == NULL ? "compressed data error" : strm->msg); + return -1; + } + } while (strm->avail_out && ret != Z_STREAM_END); + + /* update available output */ + state->x.have = had - strm->avail_out; + state->x.next = strm->next_out - state->x.have; + + /* if the gzip stream completed successfully, look for another */ + if (ret == Z_STREAM_END) + state->how = LOOK; + + /* good decompression */ + return 0; +} + +/* Fetch data and put it in the output buffer. Assumes state->x.have is 0. + Data is either copied from the input file or decompressed from the input + file depending on state->how. If state->how is LOOK, then a gzip header is + looked for to determine whether to copy or decompress. Returns -1 on error, + otherwise 0. gz_fetch() will leave state->how as COPY or GZIP unless the + end of the input file has been reached and all data has been processed. */ +local int gz_fetch(state) + gz_statep state; +{ + z_streamp strm = &(state->strm); + + do { + switch(state->how) { + case LOOK: /* -> LOOK, COPY (only if never GZIP), or GZIP */ + if (gz_look(state) == -1) + return -1; + if (state->how == LOOK) + return 0; + break; + case COPY: /* -> COPY */ + if (gz_load(state, state->out, state->size << 1, &(state->x.have)) + == -1) + return -1; + state->x.next = state->out; + return 0; + case GZIP: /* -> GZIP or LOOK (if end of gzip stream) */ + strm->avail_out = state->size << 1; + strm->next_out = state->out; + if (gz_decomp(state) == -1) + return -1; + } + } while (state->x.have == 0 && (!state->eof || strm->avail_in)); + return 0; +} + +/* Skip len uncompressed bytes of output. Return -1 on error, 0 on success. */ +local int gz_skip(state, len) + gz_statep state; + z_off64_t len; +{ + unsigned n; + + /* skip over len bytes or reach end-of-file, whichever comes first */ + while (len) + /* skip over whatever is in output buffer */ + if (state->x.have) { + n = GT_OFF(state->x.have) || (z_off64_t)state->x.have > len ? + (unsigned)len : state->x.have; + state->x.have -= n; + state->x.next += n; + state->x.pos += n; + len -= n; + } + + /* output buffer empty -- return if we're at the end of the input */ + else if (state->eof && state->strm.avail_in == 0) + break; + + /* need more data to skip -- load up output buffer */ + else { + /* get more output, looking for header if required */ + if (gz_fetch(state) == -1) + return -1; + } + return 0; +} + +/* -- see zlib.h -- */ +int ZEXPORT gzread(file, buf, len) + gzFile file; + voidp buf; + unsigned len; +{ + unsigned got, n; + gz_statep state; + z_streamp strm; + + /* get internal structure */ + if (file == NULL) + return -1; + state = (gz_statep)file; + strm = &(state->strm); + + /* check that we're reading and that there's no (serious) error */ + if (state->mode != GZ_READ || + (state->err != Z_OK && state->err != Z_BUF_ERROR)) + return -1; + + /* since an int is returned, make sure len fits in one, otherwise return + with an error (this avoids the flaw in the interface) */ + if ((int)len < 0) { + gz_error(state, Z_DATA_ERROR, "requested length does not fit in int"); + return -1; + } + + /* if len is zero, avoid unnecessary operations */ + if (len == 0) + return 0; + + /* process a skip request */ + if (state->seek) { + state->seek = 0; + if (gz_skip(state, state->skip) == -1) + return -1; + } + + /* get len bytes to buf, or less than len if at the end */ + got = 0; + do { + /* first just try copying data from the output buffer */ + if (state->x.have) { + n = state->x.have > len ? len : state->x.have; + memcpy(buf, state->x.next, n); + state->x.next += n; + state->x.have -= n; + } + + /* output buffer empty -- return if we're at the end of the input */ + else if (state->eof && strm->avail_in == 0) { + state->past = 1; /* tried to read past end */ + break; + } + + /* need output data -- for small len or new stream load up our output + buffer */ + else if (state->how == LOOK || len < (state->size << 1)) { + /* get more output, looking for header if required */ + if (gz_fetch(state) == -1) + return -1; + continue; /* no progress yet -- go back to copy above */ + /* the copy above assures that we will leave with space in the + output buffer, allowing at least one gzungetc() to succeed */ + } + + /* large len -- read directly into user buffer */ + else if (state->how == COPY) { /* read directly */ + if (gz_load(state, (unsigned char *)buf, len, &n) == -1) + return -1; + } + + /* large len -- decompress directly into user buffer */ + else { /* state->how == GZIP */ + strm->avail_out = len; + strm->next_out = (unsigned char *)buf; + if (gz_decomp(state) == -1) + return -1; + n = state->x.have; + state->x.have = 0; + } + + /* update progress */ + len -= n; + buf = (char *)buf + n; + got += n; + state->x.pos += n; + } while (len); + + /* return number of bytes read into user buffer (will fit in int) */ + return (int)got; +} + +/* -- see zlib.h -- */ +#ifdef Z_PREFIX_SET +# undef z_gzgetc +#else +# undef gzgetc +#endif +int ZEXPORT gzgetc(file) + gzFile file; +{ + int ret; + unsigned char buf[1]; + gz_statep state; + + /* get internal structure */ + if (file == NULL) + return -1; + state = (gz_statep)file; + + /* check that we're reading and that there's no (serious) error */ + if (state->mode != GZ_READ || + (state->err != Z_OK && state->err != Z_BUF_ERROR)) + return -1; + + /* try output buffer (no need to check for skip request) */ + if (state->x.have) { + state->x.have--; + state->x.pos++; + return *(state->x.next)++; + } + + /* nothing there -- try gzread() */ + ret = gzread(file, buf, 1); + return ret < 1 ? -1 : buf[0]; +} + +int ZEXPORT gzgetc_(file) +gzFile file; +{ + return gzgetc(file); +} + +/* -- see zlib.h -- */ +int ZEXPORT gzungetc(c, file) + int c; + gzFile file; +{ + gz_statep state; + + /* get internal structure */ + if (file == NULL) + return -1; + state = (gz_statep)file; + + /* check that we're reading and that there's no (serious) error */ + if (state->mode != GZ_READ || + (state->err != Z_OK && state->err != Z_BUF_ERROR)) + return -1; + + /* process a skip request */ + if (state->seek) { + state->seek = 0; + if (gz_skip(state, state->skip) == -1) + return -1; + } + + /* can't push EOF */ + if (c < 0) + return -1; + + /* if output buffer empty, put byte at end (allows more pushing) */ + if (state->x.have == 0) { + state->x.have = 1; + state->x.next = state->out + (state->size << 1) - 1; + state->x.next[0] = c; + state->x.pos--; + state->past = 0; + return c; + } + + /* if no room, give up (must have already done a gzungetc()) */ + if (state->x.have == (state->size << 1)) { + gz_error(state, Z_DATA_ERROR, "out of room to push characters"); + return -1; + } + + /* slide output data if needed and insert byte before existing data */ + if (state->x.next == state->out) { + unsigned char *src = state->out + state->x.have; + unsigned char *dest = state->out + (state->size << 1); + while (src > state->out) + *--dest = *--src; + state->x.next = dest; + } + state->x.have++; + state->x.next--; + state->x.next[0] = c; + state->x.pos--; + state->past = 0; + return c; +} + +/* -- see zlib.h -- */ +char * ZEXPORT gzgets(file, buf, len) + gzFile file; + char *buf; + int len; +{ + unsigned left, n; + char *str; + unsigned char *eol; + gz_statep state; + + /* check parameters and get internal structure */ + if (file == NULL || buf == NULL || len < 1) + return NULL; + state = (gz_statep)file; + + /* check that we're reading and that there's no (serious) error */ + if (state->mode != GZ_READ || + (state->err != Z_OK && state->err != Z_BUF_ERROR)) + return NULL; + + /* process a skip request */ + if (state->seek) { + state->seek = 0; + if (gz_skip(state, state->skip) == -1) + return NULL; + } + + /* copy output bytes up to new line or len - 1, whichever comes first -- + append a terminating zero to the string (we don't check for a zero in + the contents, let the user worry about that) */ + str = buf; + left = (unsigned)len - 1; + if (left) do { + /* assure that something is in the output buffer */ + if (state->x.have == 0 && gz_fetch(state) == -1) + return NULL; /* error */ + if (state->x.have == 0) { /* end of file */ + state->past = 1; /* read past end */ + break; /* return what we have */ + } + + /* look for end-of-line in current output buffer */ + n = state->x.have > left ? left : state->x.have; + eol = (unsigned char *)memchr(state->x.next, '\n', n); + if (eol != NULL) + n = (unsigned)(eol - state->x.next) + 1; + + /* copy through end-of-line, or remainder if not found */ + memcpy(buf, state->x.next, n); + state->x.have -= n; + state->x.next += n; + state->x.pos += n; + left -= n; + buf += n; + } while (left && eol == NULL); + + /* return terminated string, or if nothing, end of file */ + if (buf == str) + return NULL; + buf[0] = 0; + return str; +} + +/* -- see zlib.h -- */ +int ZEXPORT gzdirect(file) + gzFile file; +{ + gz_statep state; + + /* get internal structure */ + if (file == NULL) + return 0; + state = (gz_statep)file; + + /* if the state is not known, but we can find out, then do so (this is + mainly for right after a gzopen() or gzdopen()) */ + if (state->mode == GZ_READ && state->how == LOOK && state->x.have == 0) + (void)gz_look(state); + + /* return 1 if transparent, 0 if processing a gzip stream */ + return state->direct; +} + +/* -- see zlib.h -- */ +int ZEXPORT gzclose_r(file) + gzFile file; +{ + int ret, err; + gz_statep state; + + /* get internal structure */ + if (file == NULL) + return Z_STREAM_ERROR; + state = (gz_statep)file; + + /* check that we're reading */ + if (state->mode != GZ_READ) + return Z_STREAM_ERROR; + + /* free memory and close file */ + if (state->size) { + inflateEnd(&(state->strm)); + free(state->out); + free(state->in); + } + err = state->err == Z_BUF_ERROR ? Z_BUF_ERROR : Z_OK; + gz_error(state, Z_OK, NULL); + free(state->path); + ret = close(state->fd); + free(state); + return ret ? Z_ERRNO : err; +} diff --git a/src/3rdparty/zlib/gzwrite.c b/src/3rdparty/zlib/gzwrite.c new file mode 100644 index 0000000..aa767fb --- /dev/null +++ b/src/3rdparty/zlib/gzwrite.c @@ -0,0 +1,577 @@ +/* gzwrite.c -- zlib functions for writing gzip files + * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013 Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +#include "gzguts.h" + +/* Local functions */ +local int gz_init OF((gz_statep)); +local int gz_comp OF((gz_statep, int)); +local int gz_zero OF((gz_statep, z_off64_t)); + +/* Initialize state for writing a gzip file. Mark initialization by setting + state->size to non-zero. Return -1 on failure or 0 on success. */ +local int gz_init(state) + gz_statep state; +{ + int ret; + z_streamp strm = &(state->strm); + + /* allocate input buffer */ + state->in = (unsigned char *)malloc(state->want); + if (state->in == NULL) { + gz_error(state, Z_MEM_ERROR, "out of memory"); + return -1; + } + + /* only need output buffer and deflate state if compressing */ + if (!state->direct) { + /* allocate output buffer */ + state->out = (unsigned char *)malloc(state->want); + if (state->out == NULL) { + free(state->in); + gz_error(state, Z_MEM_ERROR, "out of memory"); + return -1; + } + + /* allocate deflate memory, set up for gzip compression */ + strm->zalloc = Z_NULL; + strm->zfree = Z_NULL; + strm->opaque = Z_NULL; + ret = deflateInit2(strm, state->level, Z_DEFLATED, + MAX_WBITS + 16, DEF_MEM_LEVEL, state->strategy); + if (ret != Z_OK) { + free(state->out); + free(state->in); + gz_error(state, Z_MEM_ERROR, "out of memory"); + return -1; + } + } + + /* mark state as initialized */ + state->size = state->want; + + /* initialize write buffer if compressing */ + if (!state->direct) { + strm->avail_out = state->size; + strm->next_out = state->out; + state->x.next = strm->next_out; + } + return 0; +} + +/* Compress whatever is at avail_in and next_in and write to the output file. + Return -1 if there is an error writing to the output file, otherwise 0. + flush is assumed to be a valid deflate() flush value. If flush is Z_FINISH, + then the deflate() state is reset to start a new gzip stream. If gz->direct + is true, then simply write to the output file without compressing, and + ignore flush. */ +local int gz_comp(state, flush) + gz_statep state; + int flush; +{ + int ret, got; + unsigned have; + z_streamp strm = &(state->strm); + + /* allocate memory if this is the first time through */ + if (state->size == 0 && gz_init(state) == -1) + return -1; + + /* write directly if requested */ + if (state->direct) { + got = write(state->fd, strm->next_in, strm->avail_in); + if (got < 0 || (unsigned)got != strm->avail_in) { + gz_error(state, Z_ERRNO, zstrerror()); + return -1; + } + strm->avail_in = 0; + return 0; + } + + /* run deflate() on provided input until it produces no more output */ + ret = Z_OK; + do { + /* write out current buffer contents if full, or if flushing, but if + doing Z_FINISH then don't write until we get to Z_STREAM_END */ + if (strm->avail_out == 0 || (flush != Z_NO_FLUSH && + (flush != Z_FINISH || ret == Z_STREAM_END))) { + have = (unsigned)(strm->next_out - state->x.next); + if (have && ((got = write(state->fd, state->x.next, have)) < 0 || + (unsigned)got != have)) { + gz_error(state, Z_ERRNO, zstrerror()); + return -1; + } + if (strm->avail_out == 0) { + strm->avail_out = state->size; + strm->next_out = state->out; + } + state->x.next = strm->next_out; + } + + /* compress */ + have = strm->avail_out; + ret = deflate(strm, flush); + if (ret == Z_STREAM_ERROR) { + gz_error(state, Z_STREAM_ERROR, + "internal error: deflate stream corrupt"); + return -1; + } + have -= strm->avail_out; + } while (have); + + /* if that completed a deflate stream, allow another to start */ + if (flush == Z_FINISH) + deflateReset(strm); + + /* all done, no errors */ + return 0; +} + +/* Compress len zeros to output. Return -1 on error, 0 on success. */ +local int gz_zero(state, len) + gz_statep state; + z_off64_t len; +{ + int first; + unsigned n; + z_streamp strm = &(state->strm); + + /* consume whatever's left in the input buffer */ + if (strm->avail_in && gz_comp(state, Z_NO_FLUSH) == -1) + return -1; + + /* compress len zeros (len guaranteed > 0) */ + first = 1; + while (len) { + n = GT_OFF(state->size) || (z_off64_t)state->size > len ? + (unsigned)len : state->size; + if (first) { + memset(state->in, 0, n); + first = 0; + } + strm->avail_in = n; + strm->next_in = state->in; + state->x.pos += n; + if (gz_comp(state, Z_NO_FLUSH) == -1) + return -1; + len -= n; + } + return 0; +} + +/* -- see zlib.h -- */ +int ZEXPORT gzwrite(file, buf, len) + gzFile file; + voidpc buf; + unsigned len; +{ + unsigned put = len; + gz_statep state; + z_streamp strm; + + /* get internal structure */ + if (file == NULL) + return 0; + state = (gz_statep)file; + strm = &(state->strm); + + /* check that we're writing and that there's no error */ + if (state->mode != GZ_WRITE || state->err != Z_OK) + return 0; + + /* since an int is returned, make sure len fits in one, otherwise return + with an error (this avoids the flaw in the interface) */ + if ((int)len < 0) { + gz_error(state, Z_DATA_ERROR, "requested length does not fit in int"); + return 0; + } + + /* if len is zero, avoid unnecessary operations */ + if (len == 0) + return 0; + + /* allocate memory if this is the first time through */ + if (state->size == 0 && gz_init(state) == -1) + return 0; + + /* check for seek request */ + if (state->seek) { + state->seek = 0; + if (gz_zero(state, state->skip) == -1) + return 0; + } + + /* for small len, copy to input buffer, otherwise compress directly */ + if (len < state->size) { + /* copy to input buffer, compress when full */ + do { + unsigned have, copy; + + if (strm->avail_in == 0) + strm->next_in = state->in; + have = (unsigned)((strm->next_in + strm->avail_in) - state->in); + copy = state->size - have; + if (copy > len) + copy = len; + memcpy(state->in + have, buf, copy); + strm->avail_in += copy; + state->x.pos += copy; + buf = (const char *)buf + copy; + len -= copy; + if (len && gz_comp(state, Z_NO_FLUSH) == -1) + return 0; + } while (len); + } + else { + /* consume whatever's left in the input buffer */ + if (strm->avail_in && gz_comp(state, Z_NO_FLUSH) == -1) + return 0; + + /* directly compress user buffer to file */ + strm->avail_in = len; + strm->next_in = (z_const Bytef *)buf; + state->x.pos += len; + if (gz_comp(state, Z_NO_FLUSH) == -1) + return 0; + } + + /* input was all buffered or compressed (put will fit in int) */ + return (int)put; +} + +/* -- see zlib.h -- */ +int ZEXPORT gzputc(file, c) + gzFile file; + int c; +{ + unsigned have; + unsigned char buf[1]; + gz_statep state; + z_streamp strm; + + /* get internal structure */ + if (file == NULL) + return -1; + state = (gz_statep)file; + strm = &(state->strm); + + /* check that we're writing and that there's no error */ + if (state->mode != GZ_WRITE || state->err != Z_OK) + return -1; + + /* check for seek request */ + if (state->seek) { + state->seek = 0; + if (gz_zero(state, state->skip) == -1) + return -1; + } + + /* try writing to input buffer for speed (state->size == 0 if buffer not + initialized) */ + if (state->size) { + if (strm->avail_in == 0) + strm->next_in = state->in; + have = (unsigned)((strm->next_in + strm->avail_in) - state->in); + if (have < state->size) { + state->in[have] = c; + strm->avail_in++; + state->x.pos++; + return c & 0xff; + } + } + + /* no room in buffer or not initialized, use gz_write() */ + buf[0] = c; + if (gzwrite(file, buf, 1) != 1) + return -1; + return c & 0xff; +} + +/* -- see zlib.h -- */ +int ZEXPORT gzputs(file, str) + gzFile file; + const char *str; +{ + int ret; + unsigned len; + + /* write string */ + len = (unsigned)strlen(str); + ret = gzwrite(file, str, len); + return ret == 0 && len != 0 ? -1 : ret; +} + +#if defined(STDC) || defined(Z_HAVE_STDARG_H) +#include + +/* -- see zlib.h -- */ +int ZEXPORTVA gzvprintf(gzFile file, const char *format, va_list va) +{ + int size, len; + gz_statep state; + z_streamp strm; + + /* get internal structure */ + if (file == NULL) + return -1; + state = (gz_statep)file; + strm = &(state->strm); + + /* check that we're writing and that there's no error */ + if (state->mode != GZ_WRITE || state->err != Z_OK) + return 0; + + /* make sure we have some buffer space */ + if (state->size == 0 && gz_init(state) == -1) + return 0; + + /* check for seek request */ + if (state->seek) { + state->seek = 0; + if (gz_zero(state, state->skip) == -1) + return 0; + } + + /* consume whatever's left in the input buffer */ + if (strm->avail_in && gz_comp(state, Z_NO_FLUSH) == -1) + return 0; + + /* do the printf() into the input buffer, put length in len */ + size = (int)(state->size); + state->in[size - 1] = 0; +#ifdef NO_vsnprintf +# ifdef HAS_vsprintf_void + (void)vsprintf((char *)(state->in), format, va); + for (len = 0; len < size; len++) + if (state->in[len] == 0) break; +# else + len = vsprintf((char *)(state->in), format, va); +# endif +#else +# ifdef HAS_vsnprintf_void + (void)vsnprintf((char *)(state->in), size, format, va); + len = strlen((char *)(state->in)); +# else + len = vsnprintf((char *)(state->in), size, format, va); +# endif +#endif + + /* check that printf() results fit in buffer */ + if (len <= 0 || len >= (int)size || state->in[size - 1] != 0) + return 0; + + /* update buffer and position, defer compression until needed */ + strm->avail_in = (unsigned)len; + strm->next_in = state->in; + state->x.pos += len; + return len; +} + +int ZEXPORTVA gzprintf(gzFile file, const char *format, ...) +{ + va_list va; + int ret; + + va_start(va, format); + ret = gzvprintf(file, format, va); + va_end(va); + return ret; +} + +#else /* !STDC && !Z_HAVE_STDARG_H */ + +/* -- see zlib.h -- */ +int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, + a11, a12, a13, a14, a15, a16, a17, a18, a19, a20) + gzFile file; + const char *format; + int a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, + a11, a12, a13, a14, a15, a16, a17, a18, a19, a20; +{ + int size, len; + gz_statep state; + z_streamp strm; + + /* get internal structure */ + if (file == NULL) + return -1; + state = (gz_statep)file; + strm = &(state->strm); + + /* check that can really pass pointer in ints */ + if (sizeof(int) != sizeof(void *)) + return 0; + + /* check that we're writing and that there's no error */ + if (state->mode != GZ_WRITE || state->err != Z_OK) + return 0; + + /* make sure we have some buffer space */ + if (state->size == 0 && gz_init(state) == -1) + return 0; + + /* check for seek request */ + if (state->seek) { + state->seek = 0; + if (gz_zero(state, state->skip) == -1) + return 0; + } + + /* consume whatever's left in the input buffer */ + if (strm->avail_in && gz_comp(state, Z_NO_FLUSH) == -1) + return 0; + + /* do the printf() into the input buffer, put length in len */ + size = (int)(state->size); + state->in[size - 1] = 0; +#ifdef NO_snprintf +# ifdef HAS_sprintf_void + sprintf((char *)(state->in), format, a1, a2, a3, a4, a5, a6, a7, a8, + a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20); + for (len = 0; len < size; len++) + if (state->in[len] == 0) break; +# else + len = sprintf((char *)(state->in), format, a1, a2, a3, a4, a5, a6, a7, a8, + a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20); +# endif +#else +# ifdef HAS_snprintf_void + snprintf((char *)(state->in), size, format, a1, a2, a3, a4, a5, a6, a7, a8, + a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20); + len = strlen((char *)(state->in)); +# else + len = snprintf((char *)(state->in), size, format, a1, a2, a3, a4, a5, a6, + a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, + a19, a20); +# endif +#endif + + /* check that printf() results fit in buffer */ + if (len <= 0 || len >= (int)size || state->in[size - 1] != 0) + return 0; + + /* update buffer and position, defer compression until needed */ + strm->avail_in = (unsigned)len; + strm->next_in = state->in; + state->x.pos += len; + return len; +} + +#endif + +/* -- see zlib.h -- */ +int ZEXPORT gzflush(file, flush) + gzFile file; + int flush; +{ + gz_statep state; + + /* get internal structure */ + if (file == NULL) + return -1; + state = (gz_statep)file; + + /* check that we're writing and that there's no error */ + if (state->mode != GZ_WRITE || state->err != Z_OK) + return Z_STREAM_ERROR; + + /* check flush parameter */ + if (flush < 0 || flush > Z_FINISH) + return Z_STREAM_ERROR; + + /* check for seek request */ + if (state->seek) { + state->seek = 0; + if (gz_zero(state, state->skip) == -1) + return -1; + } + + /* compress remaining data with requested flush */ + gz_comp(state, flush); + return state->err; +} + +/* -- see zlib.h -- */ +int ZEXPORT gzsetparams(file, level, strategy) + gzFile file; + int level; + int strategy; +{ + gz_statep state; + z_streamp strm; + + /* get internal structure */ + if (file == NULL) + return Z_STREAM_ERROR; + state = (gz_statep)file; + strm = &(state->strm); + + /* check that we're writing and that there's no error */ + if (state->mode != GZ_WRITE || state->err != Z_OK) + return Z_STREAM_ERROR; + + /* if no change is requested, then do nothing */ + if (level == state->level && strategy == state->strategy) + return Z_OK; + + /* check for seek request */ + if (state->seek) { + state->seek = 0; + if (gz_zero(state, state->skip) == -1) + return -1; + } + + /* change compression parameters for subsequent input */ + if (state->size) { + /* flush previous input with previous parameters before changing */ + if (strm->avail_in && gz_comp(state, Z_PARTIAL_FLUSH) == -1) + return state->err; + deflateParams(strm, level, strategy); + } + state->level = level; + state->strategy = strategy; + return Z_OK; +} + +/* -- see zlib.h -- */ +int ZEXPORT gzclose_w(file) + gzFile file; +{ + int ret = Z_OK; + gz_statep state; + + /* get internal structure */ + if (file == NULL) + return Z_STREAM_ERROR; + state = (gz_statep)file; + + /* check that we're writing */ + if (state->mode != GZ_WRITE) + return Z_STREAM_ERROR; + + /* check for seek request */ + if (state->seek) { + state->seek = 0; + if (gz_zero(state, state->skip) == -1) + ret = state->err; + } + + /* flush, free memory, and close file */ + if (gz_comp(state, Z_FINISH) == -1) + ret = state->err; + if (state->size) { + if (!state->direct) { + (void)deflateEnd(&(state->strm)); + free(state->out); + } + free(state->in); + } + gz_error(state, Z_OK, NULL); + free(state->path); + if (close(state->fd) == -1) + ret = Z_ERRNO; + free(state); + return ret; +} diff --git a/src/3rdparty/zlib/infback.c b/src/3rdparty/zlib/infback.c new file mode 100644 index 0000000..f3833c2 --- /dev/null +++ b/src/3rdparty/zlib/infback.c @@ -0,0 +1,640 @@ +/* infback.c -- inflate using a call-back interface + * Copyright (C) 1995-2011 Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +/* + This code is largely copied from inflate.c. Normally either infback.o or + inflate.o would be linked into an application--not both. The interface + with inffast.c is retained so that optimized assembler-coded versions of + inflate_fast() can be used with either inflate.c or infback.c. + */ + +#include "zutil.h" +#include "inftrees.h" +#include "inflate.h" +#include "inffast.h" + +/* function prototypes */ +local void fixedtables OF((struct inflate_state FAR *state)); + +/* + strm provides memory allocation functions in zalloc and zfree, or + Z_NULL to use the library memory allocation functions. + + windowBits is in the range 8..15, and window is a user-supplied + window and output buffer that is 2**windowBits bytes. + */ +int ZEXPORT inflateBackInit_(strm, windowBits, window, version, stream_size) +z_streamp strm; +int windowBits; +unsigned char FAR *window; +const char *version; +int stream_size; +{ + struct inflate_state FAR *state; + + if (version == Z_NULL || version[0] != ZLIB_VERSION[0] || + stream_size != (int)(sizeof(z_stream))) + return Z_VERSION_ERROR; + if (strm == Z_NULL || window == Z_NULL || + windowBits < 8 || windowBits > 15) + return Z_STREAM_ERROR; + strm->msg = Z_NULL; /* in case we return an error */ + if (strm->zalloc == (alloc_func)0) { +#ifdef Z_SOLO + return Z_STREAM_ERROR; +#else + strm->zalloc = zcalloc; + strm->opaque = (voidpf)0; +#endif + } + if (strm->zfree == (free_func)0) +#ifdef Z_SOLO + return Z_STREAM_ERROR; +#else + strm->zfree = zcfree; +#endif + state = (struct inflate_state FAR *)ZALLOC(strm, 1, + sizeof(struct inflate_state)); + if (state == Z_NULL) return Z_MEM_ERROR; + Tracev((stderr, "inflate: allocated\n")); + strm->state = (struct internal_state FAR *)state; + state->dmax = 32768U; + state->wbits = windowBits; + state->wsize = 1U << windowBits; + state->window = window; + state->wnext = 0; + state->whave = 0; + return Z_OK; +} + +/* + Return state with length and distance decoding tables and index sizes set to + fixed code decoding. Normally this returns fixed tables from inffixed.h. + If BUILDFIXED is defined, then instead this routine builds the tables the + first time it's called, and returns those tables the first time and + thereafter. This reduces the size of the code by about 2K bytes, in + exchange for a little execution time. However, BUILDFIXED should not be + used for threaded applications, since the rewriting of the tables and virgin + may not be thread-safe. + */ +local void fixedtables(state) +struct inflate_state FAR *state; +{ +#ifdef BUILDFIXED + static int virgin = 1; + static code *lenfix, *distfix; + static code fixed[544]; + + /* build fixed huffman tables if first call (may not be thread safe) */ + if (virgin) { + unsigned sym, bits; + static code *next; + + /* literal/length table */ + sym = 0; + while (sym < 144) state->lens[sym++] = 8; + while (sym < 256) state->lens[sym++] = 9; + while (sym < 280) state->lens[sym++] = 7; + while (sym < 288) state->lens[sym++] = 8; + next = fixed; + lenfix = next; + bits = 9; + inflate_table(LENS, state->lens, 288, &(next), &(bits), state->work); + + /* distance table */ + sym = 0; + while (sym < 32) state->lens[sym++] = 5; + distfix = next; + bits = 5; + inflate_table(DISTS, state->lens, 32, &(next), &(bits), state->work); + + /* do this just once */ + virgin = 0; + } +#else /* !BUILDFIXED */ +# include "inffixed.h" +#endif /* BUILDFIXED */ + state->lencode = lenfix; + state->lenbits = 9; + state->distcode = distfix; + state->distbits = 5; +} + +/* Macros for inflateBack(): */ + +/* Load returned state from inflate_fast() */ +#define LOAD() \ + do { \ + put = strm->next_out; \ + left = strm->avail_out; \ + next = strm->next_in; \ + have = strm->avail_in; \ + hold = state->hold; \ + bits = state->bits; \ + } while (0) + +/* Set state from registers for inflate_fast() */ +#define RESTORE() \ + do { \ + strm->next_out = put; \ + strm->avail_out = left; \ + strm->next_in = next; \ + strm->avail_in = have; \ + state->hold = hold; \ + state->bits = bits; \ + } while (0) + +/* Clear the input bit accumulator */ +#define INITBITS() \ + do { \ + hold = 0; \ + bits = 0; \ + } while (0) + +/* Assure that some input is available. If input is requested, but denied, + then return a Z_BUF_ERROR from inflateBack(). */ +#define PULL() \ + do { \ + if (have == 0) { \ + have = in(in_desc, &next); \ + if (have == 0) { \ + next = Z_NULL; \ + ret = Z_BUF_ERROR; \ + goto inf_leave; \ + } \ + } \ + } while (0) + +/* Get a byte of input into the bit accumulator, or return from inflateBack() + with an error if there is no input available. */ +#define PULLBYTE() \ + do { \ + PULL(); \ + have--; \ + hold += (unsigned long)(*next++) << bits; \ + bits += 8; \ + } while (0) + +/* Assure that there are at least n bits in the bit accumulator. If there is + not enough available input to do that, then return from inflateBack() with + an error. */ +#define NEEDBITS(n) \ + do { \ + while (bits < (unsigned)(n)) \ + PULLBYTE(); \ + } while (0) + +/* Return the low n bits of the bit accumulator (n < 16) */ +#define BITS(n) \ + ((unsigned)hold & ((1U << (n)) - 1)) + +/* Remove n bits from the bit accumulator */ +#define DROPBITS(n) \ + do { \ + hold >>= (n); \ + bits -= (unsigned)(n); \ + } while (0) + +/* Remove zero to seven bits as needed to go to a byte boundary */ +#define BYTEBITS() \ + do { \ + hold >>= bits & 7; \ + bits -= bits & 7; \ + } while (0) + +/* Assure that some output space is available, by writing out the window + if it's full. If the write fails, return from inflateBack() with a + Z_BUF_ERROR. */ +#define ROOM() \ + do { \ + if (left == 0) { \ + put = state->window; \ + left = state->wsize; \ + state->whave = left; \ + if (out(out_desc, put, left)) { \ + ret = Z_BUF_ERROR; \ + goto inf_leave; \ + } \ + } \ + } while (0) + +/* + strm provides the memory allocation functions and window buffer on input, + and provides information on the unused input on return. For Z_DATA_ERROR + returns, strm will also provide an error message. + + in() and out() are the call-back input and output functions. When + inflateBack() needs more input, it calls in(). When inflateBack() has + filled the window with output, or when it completes with data in the + window, it calls out() to write out the data. The application must not + change the provided input until in() is called again or inflateBack() + returns. The application must not change the window/output buffer until + inflateBack() returns. + + in() and out() are called with a descriptor parameter provided in the + inflateBack() call. This parameter can be a structure that provides the + information required to do the read or write, as well as accumulated + information on the input and output such as totals and check values. + + in() should return zero on failure. out() should return non-zero on + failure. If either in() or out() fails, than inflateBack() returns a + Z_BUF_ERROR. strm->next_in can be checked for Z_NULL to see whether it + was in() or out() that caused in the error. Otherwise, inflateBack() + returns Z_STREAM_END on success, Z_DATA_ERROR for an deflate format + error, or Z_MEM_ERROR if it could not allocate memory for the state. + inflateBack() can also return Z_STREAM_ERROR if the input parameters + are not correct, i.e. strm is Z_NULL or the state was not initialized. + */ +int ZEXPORT inflateBack(strm, in, in_desc, out, out_desc) +z_streamp strm; +in_func in; +void FAR *in_desc; +out_func out; +void FAR *out_desc; +{ + struct inflate_state FAR *state; + z_const unsigned char FAR *next; /* next input */ + unsigned char FAR *put; /* next output */ + unsigned have, left; /* available input and output */ + unsigned long hold; /* bit buffer */ + unsigned bits; /* bits in bit buffer */ + unsigned copy; /* number of stored or match bytes to copy */ + unsigned char FAR *from; /* where to copy match bytes from */ + code here; /* current decoding table entry */ + code last; /* parent table entry */ + unsigned len; /* length to copy for repeats, bits to drop */ + int ret; /* return code */ + static const unsigned short order[19] = /* permutation of code lengths */ + {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15}; + + /* Check that the strm exists and that the state was initialized */ + if (strm == Z_NULL || strm->state == Z_NULL) + return Z_STREAM_ERROR; + state = (struct inflate_state FAR *)strm->state; + + /* Reset the state */ + strm->msg = Z_NULL; + state->mode = TYPE; + state->last = 0; + state->whave = 0; + next = strm->next_in; + have = next != Z_NULL ? strm->avail_in : 0; + hold = 0; + bits = 0; + put = state->window; + left = state->wsize; + + /* Inflate until end of block marked as last */ + for (;;) + switch (state->mode) { + case TYPE: + /* determine and dispatch block type */ + if (state->last) { + BYTEBITS(); + state->mode = DONE; + break; + } + NEEDBITS(3); + state->last = BITS(1); + DROPBITS(1); + switch (BITS(2)) { + case 0: /* stored block */ + Tracev((stderr, "inflate: stored block%s\n", + state->last ? " (last)" : "")); + state->mode = STORED; + break; + case 1: /* fixed block */ + fixedtables(state); + Tracev((stderr, "inflate: fixed codes block%s\n", + state->last ? " (last)" : "")); + state->mode = LEN; /* decode codes */ + break; + case 2: /* dynamic block */ + Tracev((stderr, "inflate: dynamic codes block%s\n", + state->last ? " (last)" : "")); + state->mode = TABLE; + break; + case 3: + strm->msg = (char *)"invalid block type"; + state->mode = BAD; + } + DROPBITS(2); + break; + + case STORED: + /* get and verify stored block length */ + BYTEBITS(); /* go to byte boundary */ + NEEDBITS(32); + if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) { + strm->msg = (char *)"invalid stored block lengths"; + state->mode = BAD; + break; + } + state->length = (unsigned)hold & 0xffff; + Tracev((stderr, "inflate: stored length %u\n", + state->length)); + INITBITS(); + + /* copy stored block from input to output */ + while (state->length != 0) { + copy = state->length; + PULL(); + ROOM(); + if (copy > have) copy = have; + if (copy > left) copy = left; + zmemcpy(put, next, copy); + have -= copy; + next += copy; + left -= copy; + put += copy; + state->length -= copy; + } + Tracev((stderr, "inflate: stored end\n")); + state->mode = TYPE; + break; + + case TABLE: + /* get dynamic table entries descriptor */ + NEEDBITS(14); + state->nlen = BITS(5) + 257; + DROPBITS(5); + state->ndist = BITS(5) + 1; + DROPBITS(5); + state->ncode = BITS(4) + 4; + DROPBITS(4); +#ifndef PKZIP_BUG_WORKAROUND + if (state->nlen > 286 || state->ndist > 30) { + strm->msg = (char *)"too many length or distance symbols"; + state->mode = BAD; + break; + } +#endif + Tracev((stderr, "inflate: table sizes ok\n")); + + /* get code length code lengths (not a typo) */ + state->have = 0; + while (state->have < state->ncode) { + NEEDBITS(3); + state->lens[order[state->have++]] = (unsigned short)BITS(3); + DROPBITS(3); + } + while (state->have < 19) + state->lens[order[state->have++]] = 0; + state->next = state->codes; + state->lencode = (code const FAR *)(state->next); + state->lenbits = 7; + ret = inflate_table(CODES, state->lens, 19, &(state->next), + &(state->lenbits), state->work); + if (ret) { + strm->msg = (char *)"invalid code lengths set"; + state->mode = BAD; + break; + } + Tracev((stderr, "inflate: code lengths ok\n")); + + /* get length and distance code code lengths */ + state->have = 0; + while (state->have < state->nlen + state->ndist) { + for (;;) { + here = state->lencode[BITS(state->lenbits)]; + if ((unsigned)(here.bits) <= bits) break; + PULLBYTE(); + } + if (here.val < 16) { + DROPBITS(here.bits); + state->lens[state->have++] = here.val; + } + else { + if (here.val == 16) { + NEEDBITS(here.bits + 2); + DROPBITS(here.bits); + if (state->have == 0) { + strm->msg = (char *)"invalid bit length repeat"; + state->mode = BAD; + break; + } + len = (unsigned)(state->lens[state->have - 1]); + copy = 3 + BITS(2); + DROPBITS(2); + } + else if (here.val == 17) { + NEEDBITS(here.bits + 3); + DROPBITS(here.bits); + len = 0; + copy = 3 + BITS(3); + DROPBITS(3); + } + else { + NEEDBITS(here.bits + 7); + DROPBITS(here.bits); + len = 0; + copy = 11 + BITS(7); + DROPBITS(7); + } + if (state->have + copy > state->nlen + state->ndist) { + strm->msg = (char *)"invalid bit length repeat"; + state->mode = BAD; + break; + } + while (copy--) + state->lens[state->have++] = (unsigned short)len; + } + } + + /* handle error breaks in while */ + if (state->mode == BAD) break; + + /* check for end-of-block code (better have one) */ + if (state->lens[256] == 0) { + strm->msg = (char *)"invalid code -- missing end-of-block"; + state->mode = BAD; + break; + } + + /* build code tables -- note: do not change the lenbits or distbits + values here (9 and 6) without reading the comments in inftrees.h + concerning the ENOUGH constants, which depend on those values */ + state->next = state->codes; + state->lencode = (code const FAR *)(state->next); + state->lenbits = 9; + ret = inflate_table(LENS, state->lens, state->nlen, &(state->next), + &(state->lenbits), state->work); + if (ret) { + strm->msg = (char *)"invalid literal/lengths set"; + state->mode = BAD; + break; + } + state->distcode = (code const FAR *)(state->next); + state->distbits = 6; + ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist, + &(state->next), &(state->distbits), state->work); + if (ret) { + strm->msg = (char *)"invalid distances set"; + state->mode = BAD; + break; + } + Tracev((stderr, "inflate: codes ok\n")); + state->mode = LEN; + + case LEN: + /* use inflate_fast() if we have enough input and output */ + if (have >= 6 && left >= 258) { + RESTORE(); + if (state->whave < state->wsize) + state->whave = state->wsize - left; + inflate_fast(strm, state->wsize); + LOAD(); + break; + } + + /* get a literal, length, or end-of-block code */ + for (;;) { + here = state->lencode[BITS(state->lenbits)]; + if ((unsigned)(here.bits) <= bits) break; + PULLBYTE(); + } + if (here.op && (here.op & 0xf0) == 0) { + last = here; + for (;;) { + here = state->lencode[last.val + + (BITS(last.bits + last.op) >> last.bits)]; + if ((unsigned)(last.bits + here.bits) <= bits) break; + PULLBYTE(); + } + DROPBITS(last.bits); + } + DROPBITS(here.bits); + state->length = (unsigned)here.val; + + /* process literal */ + if (here.op == 0) { + Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ? + "inflate: literal '%c'\n" : + "inflate: literal 0x%02x\n", here.val)); + ROOM(); + *put++ = (unsigned char)(state->length); + left--; + state->mode = LEN; + break; + } + + /* process end of block */ + if (here.op & 32) { + Tracevv((stderr, "inflate: end of block\n")); + state->mode = TYPE; + break; + } + + /* invalid code */ + if (here.op & 64) { + strm->msg = (char *)"invalid literal/length code"; + state->mode = BAD; + break; + } + + /* length code -- get extra bits, if any */ + state->extra = (unsigned)(here.op) & 15; + if (state->extra != 0) { + NEEDBITS(state->extra); + state->length += BITS(state->extra); + DROPBITS(state->extra); + } + Tracevv((stderr, "inflate: length %u\n", state->length)); + + /* get distance code */ + for (;;) { + here = state->distcode[BITS(state->distbits)]; + if ((unsigned)(here.bits) <= bits) break; + PULLBYTE(); + } + if ((here.op & 0xf0) == 0) { + last = here; + for (;;) { + here = state->distcode[last.val + + (BITS(last.bits + last.op) >> last.bits)]; + if ((unsigned)(last.bits + here.bits) <= bits) break; + PULLBYTE(); + } + DROPBITS(last.bits); + } + DROPBITS(here.bits); + if (here.op & 64) { + strm->msg = (char *)"invalid distance code"; + state->mode = BAD; + break; + } + state->offset = (unsigned)here.val; + + /* get distance extra bits, if any */ + state->extra = (unsigned)(here.op) & 15; + if (state->extra != 0) { + NEEDBITS(state->extra); + state->offset += BITS(state->extra); + DROPBITS(state->extra); + } + if (state->offset > state->wsize - (state->whave < state->wsize ? + left : 0)) { + strm->msg = (char *)"invalid distance too far back"; + state->mode = BAD; + break; + } + Tracevv((stderr, "inflate: distance %u\n", state->offset)); + + /* copy match from window to output */ + do { + ROOM(); + copy = state->wsize - state->offset; + if (copy < left) { + from = put + copy; + copy = left - copy; + } + else { + from = put - state->offset; + copy = left; + } + if (copy > state->length) copy = state->length; + state->length -= copy; + left -= copy; + do { + *put++ = *from++; + } while (--copy); + } while (state->length != 0); + break; + + case DONE: + /* inflate stream terminated properly -- write leftover output */ + ret = Z_STREAM_END; + if (left < state->wsize) { + if (out(out_desc, state->window, state->wsize - left)) + ret = Z_BUF_ERROR; + } + goto inf_leave; + + case BAD: + ret = Z_DATA_ERROR; + goto inf_leave; + + default: /* can't happen, but makes compilers happy */ + ret = Z_STREAM_ERROR; + goto inf_leave; + } + + /* Return unused input */ + inf_leave: + strm->next_in = next; + strm->avail_in = have; + return ret; +} + +int ZEXPORT inflateBackEnd(strm) +z_streamp strm; +{ + if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0) + return Z_STREAM_ERROR; + ZFREE(strm, strm->state); + strm->state = Z_NULL; + Tracev((stderr, "inflate: end\n")); + return Z_OK; +} diff --git a/src/3rdparty/zlib/inffast.c b/src/3rdparty/zlib/inffast.c new file mode 100644 index 0000000..bda59ce --- /dev/null +++ b/src/3rdparty/zlib/inffast.c @@ -0,0 +1,340 @@ +/* inffast.c -- fast decoding + * Copyright (C) 1995-2008, 2010, 2013 Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +#include "zutil.h" +#include "inftrees.h" +#include "inflate.h" +#include "inffast.h" + +#ifndef ASMINF + +/* Allow machine dependent optimization for post-increment or pre-increment. + Based on testing to date, + Pre-increment preferred for: + - PowerPC G3 (Adler) + - MIPS R5000 (Randers-Pehrson) + Post-increment preferred for: + - none + No measurable difference: + - Pentium III (Anderson) + - M68060 (Nikl) + */ +#ifdef POSTINC +# define OFF 0 +# define PUP(a) *(a)++ +#else +# define OFF 1 +# define PUP(a) *++(a) +#endif + +/* + Decode literal, length, and distance codes and write out the resulting + literal and match bytes until either not enough input or output is + available, an end-of-block is encountered, or a data error is encountered. + When large enough input and output buffers are supplied to inflate(), for + example, a 16K input buffer and a 64K output buffer, more than 95% of the + inflate execution time is spent in this routine. + + Entry assumptions: + + state->mode == LEN + strm->avail_in >= 6 + strm->avail_out >= 258 + start >= strm->avail_out + state->bits < 8 + + On return, state->mode is one of: + + LEN -- ran out of enough output space or enough available input + TYPE -- reached end of block code, inflate() to interpret next block + BAD -- error in block data + + Notes: + + - The maximum input bits used by a length/distance pair is 15 bits for the + length code, 5 bits for the length extra, 15 bits for the distance code, + and 13 bits for the distance extra. This totals 48 bits, or six bytes. + Therefore if strm->avail_in >= 6, then there is enough input to avoid + checking for available input while decoding. + + - The maximum bytes that a single length/distance pair can output is 258 + bytes, which is the maximum length that can be coded. inflate_fast() + requires strm->avail_out >= 258 for each loop to avoid checking for + output space. + */ +void ZLIB_INTERNAL inflate_fast(strm, start) +z_streamp strm; +unsigned start; /* inflate()'s starting value for strm->avail_out */ +{ + struct inflate_state FAR *state; + z_const unsigned char FAR *in; /* local strm->next_in */ + z_const unsigned char FAR *last; /* have enough input while in < last */ + unsigned char FAR *out; /* local strm->next_out */ + unsigned char FAR *beg; /* inflate()'s initial strm->next_out */ + unsigned char FAR *end; /* while out < end, enough space available */ +#ifdef INFLATE_STRICT + unsigned dmax; /* maximum distance from zlib header */ +#endif + unsigned wsize; /* window size or zero if not using window */ + unsigned whave; /* valid bytes in the window */ + unsigned wnext; /* window write index */ + unsigned char FAR *window; /* allocated sliding window, if wsize != 0 */ + unsigned long hold; /* local strm->hold */ + unsigned bits; /* local strm->bits */ + code const FAR *lcode; /* local strm->lencode */ + code const FAR *dcode; /* local strm->distcode */ + unsigned lmask; /* mask for first level of length codes */ + unsigned dmask; /* mask for first level of distance codes */ + code here; /* retrieved table entry */ + unsigned op; /* code bits, operation, extra bits, or */ + /* window position, window bytes to copy */ + unsigned len; /* match length, unused bytes */ + unsigned dist; /* match distance */ + unsigned char FAR *from; /* where to copy match from */ + + /* copy state to local variables */ + state = (struct inflate_state FAR *)strm->state; + in = strm->next_in - OFF; + last = in + (strm->avail_in - 5); + out = strm->next_out - OFF; + beg = out - (start - strm->avail_out); + end = out + (strm->avail_out - 257); +#ifdef INFLATE_STRICT + dmax = state->dmax; +#endif + wsize = state->wsize; + whave = state->whave; + wnext = state->wnext; + window = state->window; + hold = state->hold; + bits = state->bits; + lcode = state->lencode; + dcode = state->distcode; + lmask = (1U << state->lenbits) - 1; + dmask = (1U << state->distbits) - 1; + + /* decode literals and length/distances until end-of-block or not enough + input data or output space */ + do { + if (bits < 15) { + hold += (unsigned long)(PUP(in)) << bits; + bits += 8; + hold += (unsigned long)(PUP(in)) << bits; + bits += 8; + } + here = lcode[hold & lmask]; + dolen: + op = (unsigned)(here.bits); + hold >>= op; + bits -= op; + op = (unsigned)(here.op); + if (op == 0) { /* literal */ + Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ? + "inflate: literal '%c'\n" : + "inflate: literal 0x%02x\n", here.val)); + PUP(out) = (unsigned char)(here.val); + } + else if (op & 16) { /* length base */ + len = (unsigned)(here.val); + op &= 15; /* number of extra bits */ + if (op) { + if (bits < op) { + hold += (unsigned long)(PUP(in)) << bits; + bits += 8; + } + len += (unsigned)hold & ((1U << op) - 1); + hold >>= op; + bits -= op; + } + Tracevv((stderr, "inflate: length %u\n", len)); + if (bits < 15) { + hold += (unsigned long)(PUP(in)) << bits; + bits += 8; + hold += (unsigned long)(PUP(in)) << bits; + bits += 8; + } + here = dcode[hold & dmask]; + dodist: + op = (unsigned)(here.bits); + hold >>= op; + bits -= op; + op = (unsigned)(here.op); + if (op & 16) { /* distance base */ + dist = (unsigned)(here.val); + op &= 15; /* number of extra bits */ + if (bits < op) { + hold += (unsigned long)(PUP(in)) << bits; + bits += 8; + if (bits < op) { + hold += (unsigned long)(PUP(in)) << bits; + bits += 8; + } + } + dist += (unsigned)hold & ((1U << op) - 1); +#ifdef INFLATE_STRICT + if (dist > dmax) { + strm->msg = (char *)"invalid distance too far back"; + state->mode = BAD; + break; + } +#endif + hold >>= op; + bits -= op; + Tracevv((stderr, "inflate: distance %u\n", dist)); + op = (unsigned)(out - beg); /* max distance in output */ + if (dist > op) { /* see if copy from window */ + op = dist - op; /* distance back in window */ + if (op > whave) { + if (state->sane) { + strm->msg = + (char *)"invalid distance too far back"; + state->mode = BAD; + break; + } +#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR + if (len <= op - whave) { + do { + PUP(out) = 0; + } while (--len); + continue; + } + len -= op - whave; + do { + PUP(out) = 0; + } while (--op > whave); + if (op == 0) { + from = out - dist; + do { + PUP(out) = PUP(from); + } while (--len); + continue; + } +#endif + } + from = window - OFF; + if (wnext == 0) { /* very common case */ + from += wsize - op; + if (op < len) { /* some from window */ + len -= op; + do { + PUP(out) = PUP(from); + } while (--op); + from = out - dist; /* rest from output */ + } + } + else if (wnext < op) { /* wrap around window */ + from += wsize + wnext - op; + op -= wnext; + if (op < len) { /* some from end of window */ + len -= op; + do { + PUP(out) = PUP(from); + } while (--op); + from = window - OFF; + if (wnext < len) { /* some from start of window */ + op = wnext; + len -= op; + do { + PUP(out) = PUP(from); + } while (--op); + from = out - dist; /* rest from output */ + } + } + } + else { /* contiguous in window */ + from += wnext - op; + if (op < len) { /* some from window */ + len -= op; + do { + PUP(out) = PUP(from); + } while (--op); + from = out - dist; /* rest from output */ + } + } + while (len > 2) { + PUP(out) = PUP(from); + PUP(out) = PUP(from); + PUP(out) = PUP(from); + len -= 3; + } + if (len) { + PUP(out) = PUP(from); + if (len > 1) + PUP(out) = PUP(from); + } + } + else { + from = out - dist; /* copy direct from output */ + do { /* minimum length is three */ + PUP(out) = PUP(from); + PUP(out) = PUP(from); + PUP(out) = PUP(from); + len -= 3; + } while (len > 2); + if (len) { + PUP(out) = PUP(from); + if (len > 1) + PUP(out) = PUP(from); + } + } + } + else if ((op & 64) == 0) { /* 2nd level distance code */ + here = dcode[here.val + (hold & ((1U << op) - 1))]; + goto dodist; + } + else { + strm->msg = (char *)"invalid distance code"; + state->mode = BAD; + break; + } + } + else if ((op & 64) == 0) { /* 2nd level length code */ + here = lcode[here.val + (hold & ((1U << op) - 1))]; + goto dolen; + } + else if (op & 32) { /* end-of-block */ + Tracevv((stderr, "inflate: end of block\n")); + state->mode = TYPE; + break; + } + else { + strm->msg = (char *)"invalid literal/length code"; + state->mode = BAD; + break; + } + } while (in < last && out < end); + + /* return unused bytes (on entry, bits < 8, so in won't go too far back) */ + len = bits >> 3; + in -= len; + bits -= len << 3; + hold &= (1U << bits) - 1; + + /* update state and return */ + strm->next_in = in + OFF; + strm->next_out = out + OFF; + strm->avail_in = (unsigned)(in < last ? 5 + (last - in) : 5 - (in - last)); + strm->avail_out = (unsigned)(out < end ? + 257 + (end - out) : 257 - (out - end)); + state->hold = hold; + state->bits = bits; + return; +} + +/* + inflate_fast() speedups that turned out slower (on a PowerPC G3 750CXe): + - Using bit fields for code structure + - Different op definition to avoid & for extra bits (do & for table bits) + - Three separate decoding do-loops for direct, window, and wnext == 0 + - Special case for distance > 1 copies to do overlapped load and store copy + - Explicit branch predictions (based on measured branch probabilities) + - Deferring match copy and interspersed it with decoding subsequent codes + - Swapping literal/length else + - Swapping window/direct else + - Larger unrolled copy loops (three is about right) + - Moving len -= 3 statement into middle of loop + */ + +#endif /* !ASMINF */ diff --git a/src/3rdparty/zlib/inffast.h b/src/3rdparty/zlib/inffast.h new file mode 100644 index 0000000..e5c1aa4 --- /dev/null +++ b/src/3rdparty/zlib/inffast.h @@ -0,0 +1,11 @@ +/* inffast.h -- header to use inffast.c + * Copyright (C) 1995-2003, 2010 Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +/* WARNING: this file should *not* be used by applications. It is + part of the implementation of the compression library and is + subject to change. Applications should only use zlib.h. + */ + +void ZLIB_INTERNAL inflate_fast OF((z_streamp strm, unsigned start)); diff --git a/src/3rdparty/zlib/inffixed.h b/src/3rdparty/zlib/inffixed.h new file mode 100644 index 0000000..d628327 --- /dev/null +++ b/src/3rdparty/zlib/inffixed.h @@ -0,0 +1,94 @@ + /* inffixed.h -- table for decoding fixed codes + * Generated automatically by makefixed(). + */ + + /* WARNING: this file should *not* be used by applications. + It is part of the implementation of this library and is + subject to change. Applications should only use zlib.h. + */ + + static const code lenfix[512] = { + {96,7,0},{0,8,80},{0,8,16},{20,8,115},{18,7,31},{0,8,112},{0,8,48}, + {0,9,192},{16,7,10},{0,8,96},{0,8,32},{0,9,160},{0,8,0},{0,8,128}, + {0,8,64},{0,9,224},{16,7,6},{0,8,88},{0,8,24},{0,9,144},{19,7,59}, + {0,8,120},{0,8,56},{0,9,208},{17,7,17},{0,8,104},{0,8,40},{0,9,176}, + {0,8,8},{0,8,136},{0,8,72},{0,9,240},{16,7,4},{0,8,84},{0,8,20}, + {21,8,227},{19,7,43},{0,8,116},{0,8,52},{0,9,200},{17,7,13},{0,8,100}, + {0,8,36},{0,9,168},{0,8,4},{0,8,132},{0,8,68},{0,9,232},{16,7,8}, + {0,8,92},{0,8,28},{0,9,152},{20,7,83},{0,8,124},{0,8,60},{0,9,216}, + {18,7,23},{0,8,108},{0,8,44},{0,9,184},{0,8,12},{0,8,140},{0,8,76}, + {0,9,248},{16,7,3},{0,8,82},{0,8,18},{21,8,163},{19,7,35},{0,8,114}, + {0,8,50},{0,9,196},{17,7,11},{0,8,98},{0,8,34},{0,9,164},{0,8,2}, + {0,8,130},{0,8,66},{0,9,228},{16,7,7},{0,8,90},{0,8,26},{0,9,148}, + {20,7,67},{0,8,122},{0,8,58},{0,9,212},{18,7,19},{0,8,106},{0,8,42}, + {0,9,180},{0,8,10},{0,8,138},{0,8,74},{0,9,244},{16,7,5},{0,8,86}, + {0,8,22},{64,8,0},{19,7,51},{0,8,118},{0,8,54},{0,9,204},{17,7,15}, + {0,8,102},{0,8,38},{0,9,172},{0,8,6},{0,8,134},{0,8,70},{0,9,236}, + {16,7,9},{0,8,94},{0,8,30},{0,9,156},{20,7,99},{0,8,126},{0,8,62}, + {0,9,220},{18,7,27},{0,8,110},{0,8,46},{0,9,188},{0,8,14},{0,8,142}, + {0,8,78},{0,9,252},{96,7,0},{0,8,81},{0,8,17},{21,8,131},{18,7,31}, + {0,8,113},{0,8,49},{0,9,194},{16,7,10},{0,8,97},{0,8,33},{0,9,162}, + {0,8,1},{0,8,129},{0,8,65},{0,9,226},{16,7,6},{0,8,89},{0,8,25}, + {0,9,146},{19,7,59},{0,8,121},{0,8,57},{0,9,210},{17,7,17},{0,8,105}, + {0,8,41},{0,9,178},{0,8,9},{0,8,137},{0,8,73},{0,9,242},{16,7,4}, + {0,8,85},{0,8,21},{16,8,258},{19,7,43},{0,8,117},{0,8,53},{0,9,202}, + {17,7,13},{0,8,101},{0,8,37},{0,9,170},{0,8,5},{0,8,133},{0,8,69}, + {0,9,234},{16,7,8},{0,8,93},{0,8,29},{0,9,154},{20,7,83},{0,8,125}, + {0,8,61},{0,9,218},{18,7,23},{0,8,109},{0,8,45},{0,9,186},{0,8,13}, + {0,8,141},{0,8,77},{0,9,250},{16,7,3},{0,8,83},{0,8,19},{21,8,195}, + {19,7,35},{0,8,115},{0,8,51},{0,9,198},{17,7,11},{0,8,99},{0,8,35}, + {0,9,166},{0,8,3},{0,8,131},{0,8,67},{0,9,230},{16,7,7},{0,8,91}, + {0,8,27},{0,9,150},{20,7,67},{0,8,123},{0,8,59},{0,9,214},{18,7,19}, + {0,8,107},{0,8,43},{0,9,182},{0,8,11},{0,8,139},{0,8,75},{0,9,246}, + {16,7,5},{0,8,87},{0,8,23},{64,8,0},{19,7,51},{0,8,119},{0,8,55}, + {0,9,206},{17,7,15},{0,8,103},{0,8,39},{0,9,174},{0,8,7},{0,8,135}, + {0,8,71},{0,9,238},{16,7,9},{0,8,95},{0,8,31},{0,9,158},{20,7,99}, + {0,8,127},{0,8,63},{0,9,222},{18,7,27},{0,8,111},{0,8,47},{0,9,190}, + {0,8,15},{0,8,143},{0,8,79},{0,9,254},{96,7,0},{0,8,80},{0,8,16}, + {20,8,115},{18,7,31},{0,8,112},{0,8,48},{0,9,193},{16,7,10},{0,8,96}, + {0,8,32},{0,9,161},{0,8,0},{0,8,128},{0,8,64},{0,9,225},{16,7,6}, + {0,8,88},{0,8,24},{0,9,145},{19,7,59},{0,8,120},{0,8,56},{0,9,209}, + {17,7,17},{0,8,104},{0,8,40},{0,9,177},{0,8,8},{0,8,136},{0,8,72}, + {0,9,241},{16,7,4},{0,8,84},{0,8,20},{21,8,227},{19,7,43},{0,8,116}, + {0,8,52},{0,9,201},{17,7,13},{0,8,100},{0,8,36},{0,9,169},{0,8,4}, + {0,8,132},{0,8,68},{0,9,233},{16,7,8},{0,8,92},{0,8,28},{0,9,153}, + {20,7,83},{0,8,124},{0,8,60},{0,9,217},{18,7,23},{0,8,108},{0,8,44}, + {0,9,185},{0,8,12},{0,8,140},{0,8,76},{0,9,249},{16,7,3},{0,8,82}, + {0,8,18},{21,8,163},{19,7,35},{0,8,114},{0,8,50},{0,9,197},{17,7,11}, + {0,8,98},{0,8,34},{0,9,165},{0,8,2},{0,8,130},{0,8,66},{0,9,229}, + {16,7,7},{0,8,90},{0,8,26},{0,9,149},{20,7,67},{0,8,122},{0,8,58}, + {0,9,213},{18,7,19},{0,8,106},{0,8,42},{0,9,181},{0,8,10},{0,8,138}, + {0,8,74},{0,9,245},{16,7,5},{0,8,86},{0,8,22},{64,8,0},{19,7,51}, + {0,8,118},{0,8,54},{0,9,205},{17,7,15},{0,8,102},{0,8,38},{0,9,173}, + {0,8,6},{0,8,134},{0,8,70},{0,9,237},{16,7,9},{0,8,94},{0,8,30}, + {0,9,157},{20,7,99},{0,8,126},{0,8,62},{0,9,221},{18,7,27},{0,8,110}, + {0,8,46},{0,9,189},{0,8,14},{0,8,142},{0,8,78},{0,9,253},{96,7,0}, + {0,8,81},{0,8,17},{21,8,131},{18,7,31},{0,8,113},{0,8,49},{0,9,195}, + {16,7,10},{0,8,97},{0,8,33},{0,9,163},{0,8,1},{0,8,129},{0,8,65}, + {0,9,227},{16,7,6},{0,8,89},{0,8,25},{0,9,147},{19,7,59},{0,8,121}, + {0,8,57},{0,9,211},{17,7,17},{0,8,105},{0,8,41},{0,9,179},{0,8,9}, + {0,8,137},{0,8,73},{0,9,243},{16,7,4},{0,8,85},{0,8,21},{16,8,258}, + {19,7,43},{0,8,117},{0,8,53},{0,9,203},{17,7,13},{0,8,101},{0,8,37}, + {0,9,171},{0,8,5},{0,8,133},{0,8,69},{0,9,235},{16,7,8},{0,8,93}, + {0,8,29},{0,9,155},{20,7,83},{0,8,125},{0,8,61},{0,9,219},{18,7,23}, + {0,8,109},{0,8,45},{0,9,187},{0,8,13},{0,8,141},{0,8,77},{0,9,251}, + {16,7,3},{0,8,83},{0,8,19},{21,8,195},{19,7,35},{0,8,115},{0,8,51}, + {0,9,199},{17,7,11},{0,8,99},{0,8,35},{0,9,167},{0,8,3},{0,8,131}, + {0,8,67},{0,9,231},{16,7,7},{0,8,91},{0,8,27},{0,9,151},{20,7,67}, + {0,8,123},{0,8,59},{0,9,215},{18,7,19},{0,8,107},{0,8,43},{0,9,183}, + {0,8,11},{0,8,139},{0,8,75},{0,9,247},{16,7,5},{0,8,87},{0,8,23}, + {64,8,0},{19,7,51},{0,8,119},{0,8,55},{0,9,207},{17,7,15},{0,8,103}, + {0,8,39},{0,9,175},{0,8,7},{0,8,135},{0,8,71},{0,9,239},{16,7,9}, + {0,8,95},{0,8,31},{0,9,159},{20,7,99},{0,8,127},{0,8,63},{0,9,223}, + {18,7,27},{0,8,111},{0,8,47},{0,9,191},{0,8,15},{0,8,143},{0,8,79}, + {0,9,255} + }; + + static const code distfix[32] = { + {16,5,1},{23,5,257},{19,5,17},{27,5,4097},{17,5,5},{25,5,1025}, + {21,5,65},{29,5,16385},{16,5,3},{24,5,513},{20,5,33},{28,5,8193}, + {18,5,9},{26,5,2049},{22,5,129},{64,5,0},{16,5,2},{23,5,385}, + {19,5,25},{27,5,6145},{17,5,7},{25,5,1537},{21,5,97},{29,5,24577}, + {16,5,4},{24,5,769},{20,5,49},{28,5,12289},{18,5,13},{26,5,3073}, + {22,5,193},{64,5,0} + }; diff --git a/src/3rdparty/zlib/inflate.c b/src/3rdparty/zlib/inflate.c new file mode 100644 index 0000000..870f89b --- /dev/null +++ b/src/3rdparty/zlib/inflate.c @@ -0,0 +1,1512 @@ +/* inflate.c -- zlib decompression + * Copyright (C) 1995-2012 Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +/* + * Change history: + * + * 1.2.beta0 24 Nov 2002 + * - First version -- complete rewrite of inflate to simplify code, avoid + * creation of window when not needed, minimize use of window when it is + * needed, make inffast.c even faster, implement gzip decoding, and to + * improve code readability and style over the previous zlib inflate code + * + * 1.2.beta1 25 Nov 2002 + * - Use pointers for available input and output checking in inffast.c + * - Remove input and output counters in inffast.c + * - Change inffast.c entry and loop from avail_in >= 7 to >= 6 + * - Remove unnecessary second byte pull from length extra in inffast.c + * - Unroll direct copy to three copies per loop in inffast.c + * + * 1.2.beta2 4 Dec 2002 + * - Change external routine names to reduce potential conflicts + * - Correct filename to inffixed.h for fixed tables in inflate.c + * - Make hbuf[] unsigned char to match parameter type in inflate.c + * - Change strm->next_out[-state->offset] to *(strm->next_out - state->offset) + * to avoid negation problem on Alphas (64 bit) in inflate.c + * + * 1.2.beta3 22 Dec 2002 + * - Add comments on state->bits assertion in inffast.c + * - Add comments on op field in inftrees.h + * - Fix bug in reuse of allocated window after inflateReset() + * - Remove bit fields--back to byte structure for speed + * - Remove distance extra == 0 check in inflate_fast()--only helps for lengths + * - Change post-increments to pre-increments in inflate_fast(), PPC biased? + * - Add compile time option, POSTINC, to use post-increments instead (Intel?) + * - Make MATCH copy in inflate() much faster for when inflate_fast() not used + * - Use local copies of stream next and avail values, as well as local bit + * buffer and bit count in inflate()--for speed when inflate_fast() not used + * + * 1.2.beta4 1 Jan 2003 + * - Split ptr - 257 statements in inflate_table() to avoid compiler warnings + * - Move a comment on output buffer sizes from inffast.c to inflate.c + * - Add comments in inffast.c to introduce the inflate_fast() routine + * - Rearrange window copies in inflate_fast() for speed and simplification + * - Unroll last copy for window match in inflate_fast() + * - Use local copies of window variables in inflate_fast() for speed + * - Pull out common wnext == 0 case for speed in inflate_fast() + * - Make op and len in inflate_fast() unsigned for consistency + * - Add FAR to lcode and dcode declarations in inflate_fast() + * - Simplified bad distance check in inflate_fast() + * - Added inflateBackInit(), inflateBack(), and inflateBackEnd() in new + * source file infback.c to provide a call-back interface to inflate for + * programs like gzip and unzip -- uses window as output buffer to avoid + * window copying + * + * 1.2.beta5 1 Jan 2003 + * - Improved inflateBack() interface to allow the caller to provide initial + * input in strm. + * - Fixed stored blocks bug in inflateBack() + * + * 1.2.beta6 4 Jan 2003 + * - Added comments in inffast.c on effectiveness of POSTINC + * - Typecasting all around to reduce compiler warnings + * - Changed loops from while (1) or do {} while (1) to for (;;), again to + * make compilers happy + * - Changed type of window in inflateBackInit() to unsigned char * + * + * 1.2.beta7 27 Jan 2003 + * - Changed many types to unsigned or unsigned short to avoid warnings + * - Added inflateCopy() function + * + * 1.2.0 9 Mar 2003 + * - Changed inflateBack() interface to provide separate opaque descriptors + * for the in() and out() functions + * - Changed inflateBack() argument and in_func typedef to swap the length + * and buffer address return values for the input function + * - Check next_in and next_out for Z_NULL on entry to inflate() + * + * The history for versions after 1.2.0 are in ChangeLog in zlib distribution. + */ + +#include "zutil.h" +#include "inftrees.h" +#include "inflate.h" +#include "inffast.h" + +#ifdef MAKEFIXED +# ifndef BUILDFIXED +# define BUILDFIXED +# endif +#endif + +/* function prototypes */ +local void fixedtables OF((struct inflate_state FAR *state)); +local int updatewindow OF((z_streamp strm, const unsigned char FAR *end, + unsigned copy)); +#ifdef BUILDFIXED + void makefixed OF((void)); +#endif +local unsigned syncsearch OF((unsigned FAR *have, const unsigned char FAR *buf, + unsigned len)); + +int ZEXPORT inflateResetKeep(strm) +z_streamp strm; +{ + struct inflate_state FAR *state; + + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + state = (struct inflate_state FAR *)strm->state; + strm->total_in = strm->total_out = state->total = 0; + strm->msg = Z_NULL; + if (state->wrap) /* to support ill-conceived Java test suite */ + strm->adler = state->wrap & 1; + state->mode = HEAD; + state->last = 0; + state->havedict = 0; + state->dmax = 32768U; + state->head = Z_NULL; + state->hold = 0; + state->bits = 0; + state->lencode = state->distcode = state->next = state->codes; + state->sane = 1; + state->back = -1; + Tracev((stderr, "inflate: reset\n")); + return Z_OK; +} + +int ZEXPORT inflateReset(strm) +z_streamp strm; +{ + struct inflate_state FAR *state; + + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + state = (struct inflate_state FAR *)strm->state; + state->wsize = 0; + state->whave = 0; + state->wnext = 0; + return inflateResetKeep(strm); +} + +int ZEXPORT inflateReset2(strm, windowBits) +z_streamp strm; +int windowBits; +{ + int wrap; + struct inflate_state FAR *state; + + /* get the state */ + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + state = (struct inflate_state FAR *)strm->state; + + /* extract wrap request from windowBits parameter */ + if (windowBits < 0) { + wrap = 0; + windowBits = -windowBits; + } + else { + wrap = (windowBits >> 4) + 1; +#ifdef GUNZIP + if (windowBits < 48) + windowBits &= 15; +#endif + } + + /* set number of window bits, free window if different */ + if (windowBits && (windowBits < 8 || windowBits > 15)) + return Z_STREAM_ERROR; + if (state->window != Z_NULL && state->wbits != (unsigned)windowBits) { + ZFREE(strm, state->window); + state->window = Z_NULL; + } + + /* update state and reset the rest of it */ + state->wrap = wrap; + state->wbits = (unsigned)windowBits; + return inflateReset(strm); +} + +int ZEXPORT inflateInit2_(strm, windowBits, version, stream_size) +z_streamp strm; +int windowBits; +const char *version; +int stream_size; +{ + int ret; + struct inflate_state FAR *state; + + if (version == Z_NULL || version[0] != ZLIB_VERSION[0] || + stream_size != (int)(sizeof(z_stream))) + return Z_VERSION_ERROR; + if (strm == Z_NULL) return Z_STREAM_ERROR; + strm->msg = Z_NULL; /* in case we return an error */ + if (strm->zalloc == (alloc_func)0) { +#ifdef Z_SOLO + return Z_STREAM_ERROR; +#else + strm->zalloc = zcalloc; + strm->opaque = (voidpf)0; +#endif + } + if (strm->zfree == (free_func)0) +#ifdef Z_SOLO + return Z_STREAM_ERROR; +#else + strm->zfree = zcfree; +#endif + state = (struct inflate_state FAR *) + ZALLOC(strm, 1, sizeof(struct inflate_state)); + if (state == Z_NULL) return Z_MEM_ERROR; + Tracev((stderr, "inflate: allocated\n")); + strm->state = (struct internal_state FAR *)state; + state->window = Z_NULL; + ret = inflateReset2(strm, windowBits); + if (ret != Z_OK) { + ZFREE(strm, state); + strm->state = Z_NULL; + } + return ret; +} + +int ZEXPORT inflateInit_(strm, version, stream_size) +z_streamp strm; +const char *version; +int stream_size; +{ + return inflateInit2_(strm, DEF_WBITS, version, stream_size); +} + +int ZEXPORT inflatePrime(strm, bits, value) +z_streamp strm; +int bits; +int value; +{ + struct inflate_state FAR *state; + + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + state = (struct inflate_state FAR *)strm->state; + if (bits < 0) { + state->hold = 0; + state->bits = 0; + return Z_OK; + } + if (bits > 16 || state->bits + bits > 32) return Z_STREAM_ERROR; + value &= (1L << bits) - 1; + state->hold += value << state->bits; + state->bits += bits; + return Z_OK; +} + +/* + Return state with length and distance decoding tables and index sizes set to + fixed code decoding. Normally this returns fixed tables from inffixed.h. + If BUILDFIXED is defined, then instead this routine builds the tables the + first time it's called, and returns those tables the first time and + thereafter. This reduces the size of the code by about 2K bytes, in + exchange for a little execution time. However, BUILDFIXED should not be + used for threaded applications, since the rewriting of the tables and virgin + may not be thread-safe. + */ +local void fixedtables(state) +struct inflate_state FAR *state; +{ +#ifdef BUILDFIXED + static int virgin = 1; + static code *lenfix, *distfix; + static code fixed[544]; + + /* build fixed huffman tables if first call (may not be thread safe) */ + if (virgin) { + unsigned sym, bits; + static code *next; + + /* literal/length table */ + sym = 0; + while (sym < 144) state->lens[sym++] = 8; + while (sym < 256) state->lens[sym++] = 9; + while (sym < 280) state->lens[sym++] = 7; + while (sym < 288) state->lens[sym++] = 8; + next = fixed; + lenfix = next; + bits = 9; + inflate_table(LENS, state->lens, 288, &(next), &(bits), state->work); + + /* distance table */ + sym = 0; + while (sym < 32) state->lens[sym++] = 5; + distfix = next; + bits = 5; + inflate_table(DISTS, state->lens, 32, &(next), &(bits), state->work); + + /* do this just once */ + virgin = 0; + } +#else /* !BUILDFIXED */ +# include "inffixed.h" +#endif /* BUILDFIXED */ + state->lencode = lenfix; + state->lenbits = 9; + state->distcode = distfix; + state->distbits = 5; +} + +#ifdef MAKEFIXED +#include + +/* + Write out the inffixed.h that is #include'd above. Defining MAKEFIXED also + defines BUILDFIXED, so the tables are built on the fly. makefixed() writes + those tables to stdout, which would be piped to inffixed.h. A small program + can simply call makefixed to do this: + + void makefixed(void); + + int main(void) + { + makefixed(); + return 0; + } + + Then that can be linked with zlib built with MAKEFIXED defined and run: + + a.out > inffixed.h + */ +void makefixed() +{ + unsigned low, size; + struct inflate_state state; + + fixedtables(&state); + puts(" /* inffixed.h -- table for decoding fixed codes"); + puts(" * Generated automatically by makefixed()."); + puts(" */"); + puts(""); + puts(" /* WARNING: this file should *not* be used by applications."); + puts(" It is part of the implementation of this library and is"); + puts(" subject to change. Applications should only use zlib.h."); + puts(" */"); + puts(""); + size = 1U << 9; + printf(" static const code lenfix[%u] = {", size); + low = 0; + for (;;) { + if ((low % 7) == 0) printf("\n "); + printf("{%u,%u,%d}", (low & 127) == 99 ? 64 : state.lencode[low].op, + state.lencode[low].bits, state.lencode[low].val); + if (++low == size) break; + putchar(','); + } + puts("\n };"); + size = 1U << 5; + printf("\n static const code distfix[%u] = {", size); + low = 0; + for (;;) { + if ((low % 6) == 0) printf("\n "); + printf("{%u,%u,%d}", state.distcode[low].op, state.distcode[low].bits, + state.distcode[low].val); + if (++low == size) break; + putchar(','); + } + puts("\n };"); +} +#endif /* MAKEFIXED */ + +/* + Update the window with the last wsize (normally 32K) bytes written before + returning. If window does not exist yet, create it. This is only called + when a window is already in use, or when output has been written during this + inflate call, but the end of the deflate stream has not been reached yet. + It is also called to create a window for dictionary data when a dictionary + is loaded. + + Providing output buffers larger than 32K to inflate() should provide a speed + advantage, since only the last 32K of output is copied to the sliding window + upon return from inflate(), and since all distances after the first 32K of + output will fall in the output data, making match copies simpler and faster. + The advantage may be dependent on the size of the processor's data caches. + */ +local int updatewindow(strm, end, copy) +z_streamp strm; +const Bytef *end; +unsigned copy; +{ + struct inflate_state FAR *state; + unsigned dist; + + state = (struct inflate_state FAR *)strm->state; + + /* if it hasn't been done already, allocate space for the window */ + if (state->window == Z_NULL) { + state->window = (unsigned char FAR *) + ZALLOC(strm, 1U << state->wbits, + sizeof(unsigned char)); + if (state->window == Z_NULL) return 1; + } + + /* if window not in use yet, initialize */ + if (state->wsize == 0) { + state->wsize = 1U << state->wbits; + state->wnext = 0; + state->whave = 0; + } + + /* copy state->wsize or less output bytes into the circular window */ + if (copy >= state->wsize) { + zmemcpy(state->window, end - state->wsize, state->wsize); + state->wnext = 0; + state->whave = state->wsize; + } + else { + dist = state->wsize - state->wnext; + if (dist > copy) dist = copy; + zmemcpy(state->window + state->wnext, end - copy, dist); + copy -= dist; + if (copy) { + zmemcpy(state->window, end - copy, copy); + state->wnext = copy; + state->whave = state->wsize; + } + else { + state->wnext += dist; + if (state->wnext == state->wsize) state->wnext = 0; + if (state->whave < state->wsize) state->whave += dist; + } + } + return 0; +} + +/* Macros for inflate(): */ + +/* check function to use adler32() for zlib or crc32() for gzip */ +#ifdef GUNZIP +# define UPDATE(check, buf, len) \ + (state->flags ? crc32(check, buf, len) : adler32(check, buf, len)) +#else +# define UPDATE(check, buf, len) adler32(check, buf, len) +#endif + +/* check macros for header crc */ +#ifdef GUNZIP +# define CRC2(check, word) \ + do { \ + hbuf[0] = (unsigned char)(word); \ + hbuf[1] = (unsigned char)((word) >> 8); \ + check = crc32(check, hbuf, 2); \ + } while (0) + +# define CRC4(check, word) \ + do { \ + hbuf[0] = (unsigned char)(word); \ + hbuf[1] = (unsigned char)((word) >> 8); \ + hbuf[2] = (unsigned char)((word) >> 16); \ + hbuf[3] = (unsigned char)((word) >> 24); \ + check = crc32(check, hbuf, 4); \ + } while (0) +#endif + +/* Load registers with state in inflate() for speed */ +#define LOAD() \ + do { \ + put = strm->next_out; \ + left = strm->avail_out; \ + next = strm->next_in; \ + have = strm->avail_in; \ + hold = state->hold; \ + bits = state->bits; \ + } while (0) + +/* Restore state from registers in inflate() */ +#define RESTORE() \ + do { \ + strm->next_out = put; \ + strm->avail_out = left; \ + strm->next_in = next; \ + strm->avail_in = have; \ + state->hold = hold; \ + state->bits = bits; \ + } while (0) + +/* Clear the input bit accumulator */ +#define INITBITS() \ + do { \ + hold = 0; \ + bits = 0; \ + } while (0) + +/* Get a byte of input into the bit accumulator, or return from inflate() + if there is no input available. */ +#define PULLBYTE() \ + do { \ + if (have == 0) goto inf_leave; \ + have--; \ + hold += (unsigned long)(*next++) << bits; \ + bits += 8; \ + } while (0) + +/* Assure that there are at least n bits in the bit accumulator. If there is + not enough available input to do that, then return from inflate(). */ +#define NEEDBITS(n) \ + do { \ + while (bits < (unsigned)(n)) \ + PULLBYTE(); \ + } while (0) + +/* Return the low n bits of the bit accumulator (n < 16) */ +#define BITS(n) \ + ((unsigned)hold & ((1U << (n)) - 1)) + +/* Remove n bits from the bit accumulator */ +#define DROPBITS(n) \ + do { \ + hold >>= (n); \ + bits -= (unsigned)(n); \ + } while (0) + +/* Remove zero to seven bits as needed to go to a byte boundary */ +#define BYTEBITS() \ + do { \ + hold >>= bits & 7; \ + bits -= bits & 7; \ + } while (0) + +/* + inflate() uses a state machine to process as much input data and generate as + much output data as possible before returning. The state machine is + structured roughly as follows: + + for (;;) switch (state) { + ... + case STATEn: + if (not enough input data or output space to make progress) + return; + ... make progress ... + state = STATEm; + break; + ... + } + + so when inflate() is called again, the same case is attempted again, and + if the appropriate resources are provided, the machine proceeds to the + next state. The NEEDBITS() macro is usually the way the state evaluates + whether it can proceed or should return. NEEDBITS() does the return if + the requested bits are not available. The typical use of the BITS macros + is: + + NEEDBITS(n); + ... do something with BITS(n) ... + DROPBITS(n); + + where NEEDBITS(n) either returns from inflate() if there isn't enough + input left to load n bits into the accumulator, or it continues. BITS(n) + gives the low n bits in the accumulator. When done, DROPBITS(n) drops + the low n bits off the accumulator. INITBITS() clears the accumulator + and sets the number of available bits to zero. BYTEBITS() discards just + enough bits to put the accumulator on a byte boundary. After BYTEBITS() + and a NEEDBITS(8), then BITS(8) would return the next byte in the stream. + + NEEDBITS(n) uses PULLBYTE() to get an available byte of input, or to return + if there is no input available. The decoding of variable length codes uses + PULLBYTE() directly in order to pull just enough bytes to decode the next + code, and no more. + + Some states loop until they get enough input, making sure that enough + state information is maintained to continue the loop where it left off + if NEEDBITS() returns in the loop. For example, want, need, and keep + would all have to actually be part of the saved state in case NEEDBITS() + returns: + + case STATEw: + while (want < need) { + NEEDBITS(n); + keep[want++] = BITS(n); + DROPBITS(n); + } + state = STATEx; + case STATEx: + + As shown above, if the next state is also the next case, then the break + is omitted. + + A state may also return if there is not enough output space available to + complete that state. Those states are copying stored data, writing a + literal byte, and copying a matching string. + + When returning, a "goto inf_leave" is used to update the total counters, + update the check value, and determine whether any progress has been made + during that inflate() call in order to return the proper return code. + Progress is defined as a change in either strm->avail_in or strm->avail_out. + When there is a window, goto inf_leave will update the window with the last + output written. If a goto inf_leave occurs in the middle of decompression + and there is no window currently, goto inf_leave will create one and copy + output to the window for the next call of inflate(). + + In this implementation, the flush parameter of inflate() only affects the + return code (per zlib.h). inflate() always writes as much as possible to + strm->next_out, given the space available and the provided input--the effect + documented in zlib.h of Z_SYNC_FLUSH. Furthermore, inflate() always defers + the allocation of and copying into a sliding window until necessary, which + provides the effect documented in zlib.h for Z_FINISH when the entire input + stream available. So the only thing the flush parameter actually does is: + when flush is set to Z_FINISH, inflate() cannot return Z_OK. Instead it + will return Z_BUF_ERROR if it has not reached the end of the stream. + */ + +int ZEXPORT inflate(strm, flush) +z_streamp strm; +int flush; +{ + struct inflate_state FAR *state; + z_const unsigned char FAR *next; /* next input */ + unsigned char FAR *put; /* next output */ + unsigned have, left; /* available input and output */ + unsigned long hold; /* bit buffer */ + unsigned bits; /* bits in bit buffer */ + unsigned in, out; /* save starting available input and output */ + unsigned copy; /* number of stored or match bytes to copy */ + unsigned char FAR *from; /* where to copy match bytes from */ + code here; /* current decoding table entry */ + code last; /* parent table entry */ + unsigned len; /* length to copy for repeats, bits to drop */ + int ret; /* return code */ +#ifdef GUNZIP + unsigned char hbuf[4]; /* buffer for gzip header crc calculation */ +#endif + static const unsigned short order[19] = /* permutation of code lengths */ + {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15}; + + if (strm == Z_NULL || strm->state == Z_NULL || strm->next_out == Z_NULL || + (strm->next_in == Z_NULL && strm->avail_in != 0)) + return Z_STREAM_ERROR; + + state = (struct inflate_state FAR *)strm->state; + if (state->mode == TYPE) state->mode = TYPEDO; /* skip check */ + LOAD(); + in = have; + out = left; + ret = Z_OK; + for (;;) + switch (state->mode) { + case HEAD: + if (state->wrap == 0) { + state->mode = TYPEDO; + break; + } + NEEDBITS(16); +#ifdef GUNZIP + if ((state->wrap & 2) && hold == 0x8b1f) { /* gzip header */ + state->check = crc32(0L, Z_NULL, 0); + CRC2(state->check, hold); + INITBITS(); + state->mode = FLAGS; + break; + } + state->flags = 0; /* expect zlib header */ + if (state->head != Z_NULL) + state->head->done = -1; + if (!(state->wrap & 1) || /* check if zlib header allowed */ +#else + if ( +#endif + ((BITS(8) << 8) + (hold >> 8)) % 31) { + strm->msg = (char *)"incorrect header check"; + state->mode = BAD; + break; + } + if (BITS(4) != Z_DEFLATED) { + strm->msg = (char *)"unknown compression method"; + state->mode = BAD; + break; + } + DROPBITS(4); + len = BITS(4) + 8; + if (state->wbits == 0) + state->wbits = len; + else if (len > state->wbits) { + strm->msg = (char *)"invalid window size"; + state->mode = BAD; + break; + } + state->dmax = 1U << len; + Tracev((stderr, "inflate: zlib header ok\n")); + strm->adler = state->check = adler32(0L, Z_NULL, 0); + state->mode = hold & 0x200 ? DICTID : TYPE; + INITBITS(); + break; +#ifdef GUNZIP + case FLAGS: + NEEDBITS(16); + state->flags = (int)(hold); + if ((state->flags & 0xff) != Z_DEFLATED) { + strm->msg = (char *)"unknown compression method"; + state->mode = BAD; + break; + } + if (state->flags & 0xe000) { + strm->msg = (char *)"unknown header flags set"; + state->mode = BAD; + break; + } + if (state->head != Z_NULL) + state->head->text = (int)((hold >> 8) & 1); + if (state->flags & 0x0200) CRC2(state->check, hold); + INITBITS(); + state->mode = TIME; + case TIME: + NEEDBITS(32); + if (state->head != Z_NULL) + state->head->time = hold; + if (state->flags & 0x0200) CRC4(state->check, hold); + INITBITS(); + state->mode = OS; + case OS: + NEEDBITS(16); + if (state->head != Z_NULL) { + state->head->xflags = (int)(hold & 0xff); + state->head->os = (int)(hold >> 8); + } + if (state->flags & 0x0200) CRC2(state->check, hold); + INITBITS(); + state->mode = EXLEN; + case EXLEN: + if (state->flags & 0x0400) { + NEEDBITS(16); + state->length = (unsigned)(hold); + if (state->head != Z_NULL) + state->head->extra_len = (unsigned)hold; + if (state->flags & 0x0200) CRC2(state->check, hold); + INITBITS(); + } + else if (state->head != Z_NULL) + state->head->extra = Z_NULL; + state->mode = EXTRA; + case EXTRA: + if (state->flags & 0x0400) { + copy = state->length; + if (copy > have) copy = have; + if (copy) { + if (state->head != Z_NULL && + state->head->extra != Z_NULL) { + len = state->head->extra_len - state->length; + zmemcpy(state->head->extra + len, next, + len + copy > state->head->extra_max ? + state->head->extra_max - len : copy); + } + if (state->flags & 0x0200) + state->check = crc32(state->check, next, copy); + have -= copy; + next += copy; + state->length -= copy; + } + if (state->length) goto inf_leave; + } + state->length = 0; + state->mode = NAME; + case NAME: + if (state->flags & 0x0800) { + if (have == 0) goto inf_leave; + copy = 0; + do { + len = (unsigned)(next[copy++]); + if (state->head != Z_NULL && + state->head->name != Z_NULL && + state->length < state->head->name_max) + state->head->name[state->length++] = len; + } while (len && copy < have); + if (state->flags & 0x0200) + state->check = crc32(state->check, next, copy); + have -= copy; + next += copy; + if (len) goto inf_leave; + } + else if (state->head != Z_NULL) + state->head->name = Z_NULL; + state->length = 0; + state->mode = COMMENT; + case COMMENT: + if (state->flags & 0x1000) { + if (have == 0) goto inf_leave; + copy = 0; + do { + len = (unsigned)(next[copy++]); + if (state->head != Z_NULL && + state->head->comment != Z_NULL && + state->length < state->head->comm_max) + state->head->comment[state->length++] = len; + } while (len && copy < have); + if (state->flags & 0x0200) + state->check = crc32(state->check, next, copy); + have -= copy; + next += copy; + if (len) goto inf_leave; + } + else if (state->head != Z_NULL) + state->head->comment = Z_NULL; + state->mode = HCRC; + case HCRC: + if (state->flags & 0x0200) { + NEEDBITS(16); + if (hold != (state->check & 0xffff)) { + strm->msg = (char *)"header crc mismatch"; + state->mode = BAD; + break; + } + INITBITS(); + } + if (state->head != Z_NULL) { + state->head->hcrc = (int)((state->flags >> 9) & 1); + state->head->done = 1; + } + strm->adler = state->check = crc32(0L, Z_NULL, 0); + state->mode = TYPE; + break; +#endif + case DICTID: + NEEDBITS(32); + strm->adler = state->check = ZSWAP32(hold); + INITBITS(); + state->mode = DICT; + case DICT: + if (state->havedict == 0) { + RESTORE(); + return Z_NEED_DICT; + } + strm->adler = state->check = adler32(0L, Z_NULL, 0); + state->mode = TYPE; + case TYPE: + if (flush == Z_BLOCK || flush == Z_TREES) goto inf_leave; + case TYPEDO: + if (state->last) { + BYTEBITS(); + state->mode = CHECK; + break; + } + NEEDBITS(3); + state->last = BITS(1); + DROPBITS(1); + switch (BITS(2)) { + case 0: /* stored block */ + Tracev((stderr, "inflate: stored block%s\n", + state->last ? " (last)" : "")); + state->mode = STORED; + break; + case 1: /* fixed block */ + fixedtables(state); + Tracev((stderr, "inflate: fixed codes block%s\n", + state->last ? " (last)" : "")); + state->mode = LEN_; /* decode codes */ + if (flush == Z_TREES) { + DROPBITS(2); + goto inf_leave; + } + break; + case 2: /* dynamic block */ + Tracev((stderr, "inflate: dynamic codes block%s\n", + state->last ? " (last)" : "")); + state->mode = TABLE; + break; + case 3: + strm->msg = (char *)"invalid block type"; + state->mode = BAD; + } + DROPBITS(2); + break; + case STORED: + BYTEBITS(); /* go to byte boundary */ + NEEDBITS(32); + if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) { + strm->msg = (char *)"invalid stored block lengths"; + state->mode = BAD; + break; + } + state->length = (unsigned)hold & 0xffff; + Tracev((stderr, "inflate: stored length %u\n", + state->length)); + INITBITS(); + state->mode = COPY_; + if (flush == Z_TREES) goto inf_leave; + case COPY_: + state->mode = COPY; + case COPY: + copy = state->length; + if (copy) { + if (copy > have) copy = have; + if (copy > left) copy = left; + if (copy == 0) goto inf_leave; + zmemcpy(put, next, copy); + have -= copy; + next += copy; + left -= copy; + put += copy; + state->length -= copy; + break; + } + Tracev((stderr, "inflate: stored end\n")); + state->mode = TYPE; + break; + case TABLE: + NEEDBITS(14); + state->nlen = BITS(5) + 257; + DROPBITS(5); + state->ndist = BITS(5) + 1; + DROPBITS(5); + state->ncode = BITS(4) + 4; + DROPBITS(4); +#ifndef PKZIP_BUG_WORKAROUND + if (state->nlen > 286 || state->ndist > 30) { + strm->msg = (char *)"too many length or distance symbols"; + state->mode = BAD; + break; + } +#endif + Tracev((stderr, "inflate: table sizes ok\n")); + state->have = 0; + state->mode = LENLENS; + case LENLENS: + while (state->have < state->ncode) { + NEEDBITS(3); + state->lens[order[state->have++]] = (unsigned short)BITS(3); + DROPBITS(3); + } + while (state->have < 19) + state->lens[order[state->have++]] = 0; + state->next = state->codes; + state->lencode = (const code FAR *)(state->next); + state->lenbits = 7; + ret = inflate_table(CODES, state->lens, 19, &(state->next), + &(state->lenbits), state->work); + if (ret) { + strm->msg = (char *)"invalid code lengths set"; + state->mode = BAD; + break; + } + Tracev((stderr, "inflate: code lengths ok\n")); + state->have = 0; + state->mode = CODELENS; + case CODELENS: + while (state->have < state->nlen + state->ndist) { + for (;;) { + here = state->lencode[BITS(state->lenbits)]; + if ((unsigned)(here.bits) <= bits) break; + PULLBYTE(); + } + if (here.val < 16) { + DROPBITS(here.bits); + state->lens[state->have++] = here.val; + } + else { + if (here.val == 16) { + NEEDBITS(here.bits + 2); + DROPBITS(here.bits); + if (state->have == 0) { + strm->msg = (char *)"invalid bit length repeat"; + state->mode = BAD; + break; + } + len = state->lens[state->have - 1]; + copy = 3 + BITS(2); + DROPBITS(2); + } + else if (here.val == 17) { + NEEDBITS(here.bits + 3); + DROPBITS(here.bits); + len = 0; + copy = 3 + BITS(3); + DROPBITS(3); + } + else { + NEEDBITS(here.bits + 7); + DROPBITS(here.bits); + len = 0; + copy = 11 + BITS(7); + DROPBITS(7); + } + if (state->have + copy > state->nlen + state->ndist) { + strm->msg = (char *)"invalid bit length repeat"; + state->mode = BAD; + break; + } + while (copy--) + state->lens[state->have++] = (unsigned short)len; + } + } + + /* handle error breaks in while */ + if (state->mode == BAD) break; + + /* check for end-of-block code (better have one) */ + if (state->lens[256] == 0) { + strm->msg = (char *)"invalid code -- missing end-of-block"; + state->mode = BAD; + break; + } + + /* build code tables -- note: do not change the lenbits or distbits + values here (9 and 6) without reading the comments in inftrees.h + concerning the ENOUGH constants, which depend on those values */ + state->next = state->codes; + state->lencode = (const code FAR *)(state->next); + state->lenbits = 9; + ret = inflate_table(LENS, state->lens, state->nlen, &(state->next), + &(state->lenbits), state->work); + if (ret) { + strm->msg = (char *)"invalid literal/lengths set"; + state->mode = BAD; + break; + } + state->distcode = (const code FAR *)(state->next); + state->distbits = 6; + ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist, + &(state->next), &(state->distbits), state->work); + if (ret) { + strm->msg = (char *)"invalid distances set"; + state->mode = BAD; + break; + } + Tracev((stderr, "inflate: codes ok\n")); + state->mode = LEN_; + if (flush == Z_TREES) goto inf_leave; + case LEN_: + state->mode = LEN; + case LEN: + if (have >= 6 && left >= 258) { + RESTORE(); + inflate_fast(strm, out); + LOAD(); + if (state->mode == TYPE) + state->back = -1; + break; + } + state->back = 0; + for (;;) { + here = state->lencode[BITS(state->lenbits)]; + if ((unsigned)(here.bits) <= bits) break; + PULLBYTE(); + } + if (here.op && (here.op & 0xf0) == 0) { + last = here; + for (;;) { + here = state->lencode[last.val + + (BITS(last.bits + last.op) >> last.bits)]; + if ((unsigned)(last.bits + here.bits) <= bits) break; + PULLBYTE(); + } + DROPBITS(last.bits); + state->back += last.bits; + } + DROPBITS(here.bits); + state->back += here.bits; + state->length = (unsigned)here.val; + if ((int)(here.op) == 0) { + Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ? + "inflate: literal '%c'\n" : + "inflate: literal 0x%02x\n", here.val)); + state->mode = LIT; + break; + } + if (here.op & 32) { + Tracevv((stderr, "inflate: end of block\n")); + state->back = -1; + state->mode = TYPE; + break; + } + if (here.op & 64) { + strm->msg = (char *)"invalid literal/length code"; + state->mode = BAD; + break; + } + state->extra = (unsigned)(here.op) & 15; + state->mode = LENEXT; + case LENEXT: + if (state->extra) { + NEEDBITS(state->extra); + state->length += BITS(state->extra); + DROPBITS(state->extra); + state->back += state->extra; + } + Tracevv((stderr, "inflate: length %u\n", state->length)); + state->was = state->length; + state->mode = DIST; + case DIST: + for (;;) { + here = state->distcode[BITS(state->distbits)]; + if ((unsigned)(here.bits) <= bits) break; + PULLBYTE(); + } + if ((here.op & 0xf0) == 0) { + last = here; + for (;;) { + here = state->distcode[last.val + + (BITS(last.bits + last.op) >> last.bits)]; + if ((unsigned)(last.bits + here.bits) <= bits) break; + PULLBYTE(); + } + DROPBITS(last.bits); + state->back += last.bits; + } + DROPBITS(here.bits); + state->back += here.bits; + if (here.op & 64) { + strm->msg = (char *)"invalid distance code"; + state->mode = BAD; + break; + } + state->offset = (unsigned)here.val; + state->extra = (unsigned)(here.op) & 15; + state->mode = DISTEXT; + case DISTEXT: + if (state->extra) { + NEEDBITS(state->extra); + state->offset += BITS(state->extra); + DROPBITS(state->extra); + state->back += state->extra; + } +#ifdef INFLATE_STRICT + if (state->offset > state->dmax) { + strm->msg = (char *)"invalid distance too far back"; + state->mode = BAD; + break; + } +#endif + Tracevv((stderr, "inflate: distance %u\n", state->offset)); + state->mode = MATCH; + case MATCH: + if (left == 0) goto inf_leave; + copy = out - left; + if (state->offset > copy) { /* copy from window */ + copy = state->offset - copy; + if (copy > state->whave) { + if (state->sane) { + strm->msg = (char *)"invalid distance too far back"; + state->mode = BAD; + break; + } +#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR + Trace((stderr, "inflate.c too far\n")); + copy -= state->whave; + if (copy > state->length) copy = state->length; + if (copy > left) copy = left; + left -= copy; + state->length -= copy; + do { + *put++ = 0; + } while (--copy); + if (state->length == 0) state->mode = LEN; + break; +#endif + } + if (copy > state->wnext) { + copy -= state->wnext; + from = state->window + (state->wsize - copy); + } + else + from = state->window + (state->wnext - copy); + if (copy > state->length) copy = state->length; + } + else { /* copy from output */ + from = put - state->offset; + copy = state->length; + } + if (copy > left) copy = left; + left -= copy; + state->length -= copy; + do { + *put++ = *from++; + } while (--copy); + if (state->length == 0) state->mode = LEN; + break; + case LIT: + if (left == 0) goto inf_leave; + *put++ = (unsigned char)(state->length); + left--; + state->mode = LEN; + break; + case CHECK: + if (state->wrap) { + NEEDBITS(32); + out -= left; + strm->total_out += out; + state->total += out; + if (out) + strm->adler = state->check = + UPDATE(state->check, put - out, out); + out = left; + if (( +#ifdef GUNZIP + state->flags ? hold : +#endif + ZSWAP32(hold)) != state->check) { + strm->msg = (char *)"incorrect data check"; + state->mode = BAD; + break; + } + INITBITS(); + Tracev((stderr, "inflate: check matches trailer\n")); + } +#ifdef GUNZIP + state->mode = LENGTH; + case LENGTH: + if (state->wrap && state->flags) { + NEEDBITS(32); + if (hold != (state->total & 0xffffffffUL)) { + strm->msg = (char *)"incorrect length check"; + state->mode = BAD; + break; + } + INITBITS(); + Tracev((stderr, "inflate: length matches trailer\n")); + } +#endif + state->mode = DONE; + case DONE: + ret = Z_STREAM_END; + goto inf_leave; + case BAD: + ret = Z_DATA_ERROR; + goto inf_leave; + case MEM: + return Z_MEM_ERROR; + case SYNC: + default: + return Z_STREAM_ERROR; + } + + /* + Return from inflate(), updating the total counts and the check value. + If there was no progress during the inflate() call, return a buffer + error. Call updatewindow() to create and/or update the window state. + Note: a memory error from inflate() is non-recoverable. + */ + inf_leave: + RESTORE(); + if (state->wsize || (out != strm->avail_out && state->mode < BAD && + (state->mode < CHECK || flush != Z_FINISH))) + if (updatewindow(strm, strm->next_out, out - strm->avail_out)) { + state->mode = MEM; + return Z_MEM_ERROR; + } + in -= strm->avail_in; + out -= strm->avail_out; + strm->total_in += in; + strm->total_out += out; + state->total += out; + if (state->wrap && out) + strm->adler = state->check = + UPDATE(state->check, strm->next_out - out, out); + strm->data_type = state->bits + (state->last ? 64 : 0) + + (state->mode == TYPE ? 128 : 0) + + (state->mode == LEN_ || state->mode == COPY_ ? 256 : 0); + if (((in == 0 && out == 0) || flush == Z_FINISH) && ret == Z_OK) + ret = Z_BUF_ERROR; + return ret; +} + +int ZEXPORT inflateEnd(strm) +z_streamp strm; +{ + struct inflate_state FAR *state; + if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0) + return Z_STREAM_ERROR; + state = (struct inflate_state FAR *)strm->state; + if (state->window != Z_NULL) ZFREE(strm, state->window); + ZFREE(strm, strm->state); + strm->state = Z_NULL; + Tracev((stderr, "inflate: end\n")); + return Z_OK; +} + +int ZEXPORT inflateGetDictionary(strm, dictionary, dictLength) +z_streamp strm; +Bytef *dictionary; +uInt *dictLength; +{ + struct inflate_state FAR *state; + + /* check state */ + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + state = (struct inflate_state FAR *)strm->state; + + /* copy dictionary */ + if (state->whave && dictionary != Z_NULL) { + zmemcpy(dictionary, state->window + state->wnext, + state->whave - state->wnext); + zmemcpy(dictionary + state->whave - state->wnext, + state->window, state->wnext); + } + if (dictLength != Z_NULL) + *dictLength = state->whave; + return Z_OK; +} + +int ZEXPORT inflateSetDictionary(strm, dictionary, dictLength) +z_streamp strm; +const Bytef *dictionary; +uInt dictLength; +{ + struct inflate_state FAR *state; + unsigned long dictid; + int ret; + + /* check state */ + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + state = (struct inflate_state FAR *)strm->state; + if (state->wrap != 0 && state->mode != DICT) + return Z_STREAM_ERROR; + + /* check for correct dictionary identifier */ + if (state->mode == DICT) { + dictid = adler32(0L, Z_NULL, 0); + dictid = adler32(dictid, dictionary, dictLength); + if (dictid != state->check) + return Z_DATA_ERROR; + } + + /* copy dictionary to window using updatewindow(), which will amend the + existing dictionary if appropriate */ + ret = updatewindow(strm, dictionary + dictLength, dictLength); + if (ret) { + state->mode = MEM; + return Z_MEM_ERROR; + } + state->havedict = 1; + Tracev((stderr, "inflate: dictionary set\n")); + return Z_OK; +} + +int ZEXPORT inflateGetHeader(strm, head) +z_streamp strm; +gz_headerp head; +{ + struct inflate_state FAR *state; + + /* check state */ + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + state = (struct inflate_state FAR *)strm->state; + if ((state->wrap & 2) == 0) return Z_STREAM_ERROR; + + /* save header structure */ + state->head = head; + head->done = 0; + return Z_OK; +} + +/* + Search buf[0..len-1] for the pattern: 0, 0, 0xff, 0xff. Return when found + or when out of input. When called, *have is the number of pattern bytes + found in order so far, in 0..3. On return *have is updated to the new + state. If on return *have equals four, then the pattern was found and the + return value is how many bytes were read including the last byte of the + pattern. If *have is less than four, then the pattern has not been found + yet and the return value is len. In the latter case, syncsearch() can be + called again with more data and the *have state. *have is initialized to + zero for the first call. + */ +local unsigned syncsearch(have, buf, len) +unsigned FAR *have; +const unsigned char FAR *buf; +unsigned len; +{ + unsigned got; + unsigned next; + + got = *have; + next = 0; + while (next < len && got < 4) { + if ((int)(buf[next]) == (got < 2 ? 0 : 0xff)) + got++; + else if (buf[next]) + got = 0; + else + got = 4 - got; + next++; + } + *have = got; + return next; +} + +int ZEXPORT inflateSync(strm) +z_streamp strm; +{ + unsigned len; /* number of bytes to look at or looked at */ + unsigned long in, out; /* temporary to save total_in and total_out */ + unsigned char buf[4]; /* to restore bit buffer to byte string */ + struct inflate_state FAR *state; + + /* check parameters */ + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + state = (struct inflate_state FAR *)strm->state; + if (strm->avail_in == 0 && state->bits < 8) return Z_BUF_ERROR; + + /* if first time, start search in bit buffer */ + if (state->mode != SYNC) { + state->mode = SYNC; + state->hold <<= state->bits & 7; + state->bits -= state->bits & 7; + len = 0; + while (state->bits >= 8) { + buf[len++] = (unsigned char)(state->hold); + state->hold >>= 8; + state->bits -= 8; + } + state->have = 0; + syncsearch(&(state->have), buf, len); + } + + /* search available input */ + len = syncsearch(&(state->have), strm->next_in, strm->avail_in); + strm->avail_in -= len; + strm->next_in += len; + strm->total_in += len; + + /* return no joy or set up to restart inflate() on a new block */ + if (state->have != 4) return Z_DATA_ERROR; + in = strm->total_in; out = strm->total_out; + inflateReset(strm); + strm->total_in = in; strm->total_out = out; + state->mode = TYPE; + return Z_OK; +} + +/* + Returns true if inflate is currently at the end of a block generated by + Z_SYNC_FLUSH or Z_FULL_FLUSH. This function is used by one PPP + implementation to provide an additional safety check. PPP uses + Z_SYNC_FLUSH but removes the length bytes of the resulting empty stored + block. When decompressing, PPP checks that at the end of input packet, + inflate is waiting for these length bytes. + */ +int ZEXPORT inflateSyncPoint(strm) +z_streamp strm; +{ + struct inflate_state FAR *state; + + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + state = (struct inflate_state FAR *)strm->state; + return state->mode == STORED && state->bits == 0; +} + +int ZEXPORT inflateCopy(dest, source) +z_streamp dest; +z_streamp source; +{ + struct inflate_state FAR *state; + struct inflate_state FAR *copy; + unsigned char FAR *window; + unsigned wsize; + + /* check input */ + if (dest == Z_NULL || source == Z_NULL || source->state == Z_NULL || + source->zalloc == (alloc_func)0 || source->zfree == (free_func)0) + return Z_STREAM_ERROR; + state = (struct inflate_state FAR *)source->state; + + /* allocate space */ + copy = (struct inflate_state FAR *) + ZALLOC(source, 1, sizeof(struct inflate_state)); + if (copy == Z_NULL) return Z_MEM_ERROR; + window = Z_NULL; + if (state->window != Z_NULL) { + window = (unsigned char FAR *) + ZALLOC(source, 1U << state->wbits, sizeof(unsigned char)); + if (window == Z_NULL) { + ZFREE(source, copy); + return Z_MEM_ERROR; + } + } + + /* copy state */ + zmemcpy((voidpf)dest, (voidpf)source, sizeof(z_stream)); + zmemcpy((voidpf)copy, (voidpf)state, sizeof(struct inflate_state)); + if (state->lencode >= state->codes && + state->lencode <= state->codes + ENOUGH - 1) { + copy->lencode = copy->codes + (state->lencode - state->codes); + copy->distcode = copy->codes + (state->distcode - state->codes); + } + copy->next = copy->codes + (state->next - state->codes); + if (window != Z_NULL) { + wsize = 1U << state->wbits; + zmemcpy(window, state->window, wsize); + } + copy->window = window; + dest->state = (struct internal_state FAR *)copy; + return Z_OK; +} + +int ZEXPORT inflateUndermine(strm, subvert) +z_streamp strm; +int subvert; +{ + struct inflate_state FAR *state; + + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + state = (struct inflate_state FAR *)strm->state; + state->sane = !subvert; +#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR + return Z_OK; +#else + state->sane = 1; + return Z_DATA_ERROR; +#endif +} + +long ZEXPORT inflateMark(strm) +z_streamp strm; +{ + struct inflate_state FAR *state; + + if (strm == Z_NULL || strm->state == Z_NULL) return -1L << 16; + state = (struct inflate_state FAR *)strm->state; + return ((long)(state->back) << 16) + + (state->mode == COPY ? state->length : + (state->mode == MATCH ? state->was - state->length : 0)); +} diff --git a/src/3rdparty/zlib/inflate.h b/src/3rdparty/zlib/inflate.h new file mode 100644 index 0000000..95f4986 --- /dev/null +++ b/src/3rdparty/zlib/inflate.h @@ -0,0 +1,122 @@ +/* inflate.h -- internal inflate state definition + * Copyright (C) 1995-2009 Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +/* WARNING: this file should *not* be used by applications. It is + part of the implementation of the compression library and is + subject to change. Applications should only use zlib.h. + */ + +/* define NO_GZIP when compiling if you want to disable gzip header and + trailer decoding by inflate(). NO_GZIP would be used to avoid linking in + the crc code when it is not needed. For shared libraries, gzip decoding + should be left enabled. */ +#ifndef NO_GZIP +# define GUNZIP +#endif + +/* Possible inflate modes between inflate() calls */ +typedef enum { + HEAD, /* i: waiting for magic header */ + FLAGS, /* i: waiting for method and flags (gzip) */ + TIME, /* i: waiting for modification time (gzip) */ + OS, /* i: waiting for extra flags and operating system (gzip) */ + EXLEN, /* i: waiting for extra length (gzip) */ + EXTRA, /* i: waiting for extra bytes (gzip) */ + NAME, /* i: waiting for end of file name (gzip) */ + COMMENT, /* i: waiting for end of comment (gzip) */ + HCRC, /* i: waiting for header crc (gzip) */ + DICTID, /* i: waiting for dictionary check value */ + DICT, /* waiting for inflateSetDictionary() call */ + TYPE, /* i: waiting for type bits, including last-flag bit */ + TYPEDO, /* i: same, but skip check to exit inflate on new block */ + STORED, /* i: waiting for stored size (length and complement) */ + COPY_, /* i/o: same as COPY below, but only first time in */ + COPY, /* i/o: waiting for input or output to copy stored block */ + TABLE, /* i: waiting for dynamic block table lengths */ + LENLENS, /* i: waiting for code length code lengths */ + CODELENS, /* i: waiting for length/lit and distance code lengths */ + LEN_, /* i: same as LEN below, but only first time in */ + LEN, /* i: waiting for length/lit/eob code */ + LENEXT, /* i: waiting for length extra bits */ + DIST, /* i: waiting for distance code */ + DISTEXT, /* i: waiting for distance extra bits */ + MATCH, /* o: waiting for output space to copy string */ + LIT, /* o: waiting for output space to write literal */ + CHECK, /* i: waiting for 32-bit check value */ + LENGTH, /* i: waiting for 32-bit length (gzip) */ + DONE, /* finished check, done -- remain here until reset */ + BAD, /* got a data error -- remain here until reset */ + MEM, /* got an inflate() memory error -- remain here until reset */ + SYNC /* looking for synchronization bytes to restart inflate() */ +} inflate_mode; + +/* + State transitions between above modes - + + (most modes can go to BAD or MEM on error -- not shown for clarity) + + Process header: + HEAD -> (gzip) or (zlib) or (raw) + (gzip) -> FLAGS -> TIME -> OS -> EXLEN -> EXTRA -> NAME -> COMMENT -> + HCRC -> TYPE + (zlib) -> DICTID or TYPE + DICTID -> DICT -> TYPE + (raw) -> TYPEDO + Read deflate blocks: + TYPE -> TYPEDO -> STORED or TABLE or LEN_ or CHECK + STORED -> COPY_ -> COPY -> TYPE + TABLE -> LENLENS -> CODELENS -> LEN_ + LEN_ -> LEN + Read deflate codes in fixed or dynamic block: + LEN -> LENEXT or LIT or TYPE + LENEXT -> DIST -> DISTEXT -> MATCH -> LEN + LIT -> LEN + Process trailer: + CHECK -> LENGTH -> DONE + */ + +/* state maintained between inflate() calls. Approximately 10K bytes. */ +struct inflate_state { + inflate_mode mode; /* current inflate mode */ + int last; /* true if processing last block */ + int wrap; /* bit 0 true for zlib, bit 1 true for gzip */ + int havedict; /* true if dictionary provided */ + int flags; /* gzip header method and flags (0 if zlib) */ + unsigned dmax; /* zlib header max distance (INFLATE_STRICT) */ + unsigned long check; /* protected copy of check value */ + unsigned long total; /* protected copy of output count */ + gz_headerp head; /* where to save gzip header information */ + /* sliding window */ + unsigned wbits; /* log base 2 of requested window size */ + unsigned wsize; /* window size or zero if not using window */ + unsigned whave; /* valid bytes in the window */ + unsigned wnext; /* window write index */ + unsigned char FAR *window; /* allocated sliding window, if needed */ + /* bit accumulator */ + unsigned long hold; /* input bit accumulator */ + unsigned bits; /* number of bits in "in" */ + /* for string and stored block copying */ + unsigned length; /* literal or length of data to copy */ + unsigned offset; /* distance back to copy string from */ + /* for table and code decoding */ + unsigned extra; /* extra bits needed */ + /* fixed and dynamic code tables */ + code const FAR *lencode; /* starting table for length/literal codes */ + code const FAR *distcode; /* starting table for distance codes */ + unsigned lenbits; /* index bits for lencode */ + unsigned distbits; /* index bits for distcode */ + /* dynamic table building */ + unsigned ncode; /* number of code length code lengths */ + unsigned nlen; /* number of length code lengths */ + unsigned ndist; /* number of distance code lengths */ + unsigned have; /* number of code lengths in lens[] */ + code FAR *next; /* next available space in codes[] */ + unsigned short lens[320]; /* temporary storage for code lengths */ + unsigned short work[288]; /* work area for code table building */ + code codes[ENOUGH]; /* space for code tables */ + int sane; /* if false, allow invalid distance too far */ + int back; /* bits back of last unprocessed length/lit */ + unsigned was; /* initial length of match */ +}; diff --git a/src/3rdparty/zlib/inftrees.c b/src/3rdparty/zlib/inftrees.c new file mode 100644 index 0000000..44d89cf --- /dev/null +++ b/src/3rdparty/zlib/inftrees.c @@ -0,0 +1,306 @@ +/* inftrees.c -- generate Huffman trees for efficient decoding + * Copyright (C) 1995-2013 Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +#include "zutil.h" +#include "inftrees.h" + +#define MAXBITS 15 + +const char inflate_copyright[] = + " inflate 1.2.8 Copyright 1995-2013 Mark Adler "; +/* + If you use the zlib library in a product, an acknowledgment is welcome + in the documentation of your product. If for some reason you cannot + include such an acknowledgment, I would appreciate that you keep this + copyright string in the executable of your product. + */ + +/* + Build a set of tables to decode the provided canonical Huffman code. + The code lengths are lens[0..codes-1]. The result starts at *table, + whose indices are 0..2^bits-1. work is a writable array of at least + lens shorts, which is used as a work area. type is the type of code + to be generated, CODES, LENS, or DISTS. On return, zero is success, + -1 is an invalid code, and +1 means that ENOUGH isn't enough. table + on return points to the next available entry's address. bits is the + requested root table index bits, and on return it is the actual root + table index bits. It will differ if the request is greater than the + longest code or if it is less than the shortest code. + */ +int ZLIB_INTERNAL inflate_table(type, lens, codes, table, bits, work) +codetype type; +unsigned short FAR *lens; +unsigned codes; +code FAR * FAR *table; +unsigned FAR *bits; +unsigned short FAR *work; +{ + unsigned len; /* a code's length in bits */ + unsigned sym; /* index of code symbols */ + unsigned min, max; /* minimum and maximum code lengths */ + unsigned root; /* number of index bits for root table */ + unsigned curr; /* number of index bits for current table */ + unsigned drop; /* code bits to drop for sub-table */ + int left; /* number of prefix codes available */ + unsigned used; /* code entries in table used */ + unsigned huff; /* Huffman code */ + unsigned incr; /* for incrementing code, index */ + unsigned fill; /* index for replicating entries */ + unsigned low; /* low bits for current root entry */ + unsigned mask; /* mask for low root bits */ + code here; /* table entry for duplication */ + code FAR *next; /* next available space in table */ + const unsigned short FAR *base; /* base value table to use */ + const unsigned short FAR *extra; /* extra bits table to use */ + int end; /* use base and extra for symbol > end */ + unsigned short count[MAXBITS+1]; /* number of codes of each length */ + unsigned short offs[MAXBITS+1]; /* offsets in table for each length */ + static const unsigned short lbase[31] = { /* Length codes 257..285 base */ + 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31, + 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0}; + static const unsigned short lext[31] = { /* Length codes 257..285 extra */ + 16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18, + 19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 72, 78}; + static const unsigned short dbase[32] = { /* Distance codes 0..29 base */ + 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, + 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145, + 8193, 12289, 16385, 24577, 0, 0}; + static const unsigned short dext[32] = { /* Distance codes 0..29 extra */ + 16, 16, 16, 16, 17, 17, 18, 18, 19, 19, 20, 20, 21, 21, 22, 22, + 23, 23, 24, 24, 25, 25, 26, 26, 27, 27, + 28, 28, 29, 29, 64, 64}; + + /* + Process a set of code lengths to create a canonical Huffman code. The + code lengths are lens[0..codes-1]. Each length corresponds to the + symbols 0..codes-1. The Huffman code is generated by first sorting the + symbols by length from short to long, and retaining the symbol order + for codes with equal lengths. Then the code starts with all zero bits + for the first code of the shortest length, and the codes are integer + increments for the same length, and zeros are appended as the length + increases. For the deflate format, these bits are stored backwards + from their more natural integer increment ordering, and so when the + decoding tables are built in the large loop below, the integer codes + are incremented backwards. + + This routine assumes, but does not check, that all of the entries in + lens[] are in the range 0..MAXBITS. The caller must assure this. + 1..MAXBITS is interpreted as that code length. zero means that that + symbol does not occur in this code. + + The codes are sorted by computing a count of codes for each length, + creating from that a table of starting indices for each length in the + sorted table, and then entering the symbols in order in the sorted + table. The sorted table is work[], with that space being provided by + the caller. + + The length counts are used for other purposes as well, i.e. finding + the minimum and maximum length codes, determining if there are any + codes at all, checking for a valid set of lengths, and looking ahead + at length counts to determine sub-table sizes when building the + decoding tables. + */ + + /* accumulate lengths for codes (assumes lens[] all in 0..MAXBITS) */ + for (len = 0; len <= MAXBITS; len++) + count[len] = 0; + for (sym = 0; sym < codes; sym++) + count[lens[sym]]++; + + /* bound code lengths, force root to be within code lengths */ + root = *bits; + for (max = MAXBITS; max >= 1; max--) + if (count[max] != 0) break; + if (root > max) root = max; + if (max == 0) { /* no symbols to code at all */ + here.op = (unsigned char)64; /* invalid code marker */ + here.bits = (unsigned char)1; + here.val = (unsigned short)0; + *(*table)++ = here; /* make a table to force an error */ + *(*table)++ = here; + *bits = 1; + return 0; /* no symbols, but wait for decoding to report error */ + } + for (min = 1; min < max; min++) + if (count[min] != 0) break; + if (root < min) root = min; + + /* check for an over-subscribed or incomplete set of lengths */ + left = 1; + for (len = 1; len <= MAXBITS; len++) { + left <<= 1; + left -= count[len]; + if (left < 0) return -1; /* over-subscribed */ + } + if (left > 0 && (type == CODES || max != 1)) + return -1; /* incomplete set */ + + /* generate offsets into symbol table for each length for sorting */ + offs[1] = 0; + for (len = 1; len < MAXBITS; len++) + offs[len + 1] = offs[len] + count[len]; + + /* sort symbols by length, by symbol order within each length */ + for (sym = 0; sym < codes; sym++) + if (lens[sym] != 0) work[offs[lens[sym]]++] = (unsigned short)sym; + + /* + Create and fill in decoding tables. In this loop, the table being + filled is at next and has curr index bits. The code being used is huff + with length len. That code is converted to an index by dropping drop + bits off of the bottom. For codes where len is less than drop + curr, + those top drop + curr - len bits are incremented through all values to + fill the table with replicated entries. + + root is the number of index bits for the root table. When len exceeds + root, sub-tables are created pointed to by the root entry with an index + of the low root bits of huff. This is saved in low to check for when a + new sub-table should be started. drop is zero when the root table is + being filled, and drop is root when sub-tables are being filled. + + When a new sub-table is needed, it is necessary to look ahead in the + code lengths to determine what size sub-table is needed. The length + counts are used for this, and so count[] is decremented as codes are + entered in the tables. + + used keeps track of how many table entries have been allocated from the + provided *table space. It is checked for LENS and DIST tables against + the constants ENOUGH_LENS and ENOUGH_DISTS to guard against changes in + the initial root table size constants. See the comments in inftrees.h + for more information. + + sym increments through all symbols, and the loop terminates when + all codes of length max, i.e. all codes, have been processed. This + routine permits incomplete codes, so another loop after this one fills + in the rest of the decoding tables with invalid code markers. + */ + + /* set up for code type */ + switch (type) { + case CODES: + base = extra = work; /* dummy value--not used */ + end = 19; + break; + case LENS: + base = lbase; + base -= 257; + extra = lext; + extra -= 257; + end = 256; + break; + default: /* DISTS */ + base = dbase; + extra = dext; + end = -1; + } + + /* initialize state for loop */ + huff = 0; /* starting code */ + sym = 0; /* starting code symbol */ + len = min; /* starting code length */ + next = *table; /* current table to fill in */ + curr = root; /* current table index bits */ + drop = 0; /* current bits to drop from code for index */ + low = (unsigned)(-1); /* trigger new sub-table when len > root */ + used = 1U << root; /* use root table entries */ + mask = used - 1; /* mask for comparing low */ + + /* check available table space */ + if ((type == LENS && used > ENOUGH_LENS) || + (type == DISTS && used > ENOUGH_DISTS)) + return 1; + + /* process all codes and make table entries */ + for (;;) { + /* create table entry */ + here.bits = (unsigned char)(len - drop); + if ((int)(work[sym]) < end) { + here.op = (unsigned char)0; + here.val = work[sym]; + } + else if ((int)(work[sym]) > end) { + here.op = (unsigned char)(extra[work[sym]]); + here.val = base[work[sym]]; + } + else { + here.op = (unsigned char)(32 + 64); /* end of block */ + here.val = 0; + } + + /* replicate for those indices with low len bits equal to huff */ + incr = 1U << (len - drop); + fill = 1U << curr; + min = fill; /* save offset to next table */ + do { + fill -= incr; + next[(huff >> drop) + fill] = here; + } while (fill != 0); + + /* backwards increment the len-bit code huff */ + incr = 1U << (len - 1); + while (huff & incr) + incr >>= 1; + if (incr != 0) { + huff &= incr - 1; + huff += incr; + } + else + huff = 0; + + /* go to next symbol, update count, len */ + sym++; + if (--(count[len]) == 0) { + if (len == max) break; + len = lens[work[sym]]; + } + + /* create new sub-table if needed */ + if (len > root && (huff & mask) != low) { + /* if first time, transition to sub-tables */ + if (drop == 0) + drop = root; + + /* increment past last table */ + next += min; /* here min is 1 << curr */ + + /* determine length of next table */ + curr = len - drop; + left = (int)(1 << curr); + while (curr + drop < max) { + left -= count[curr + drop]; + if (left <= 0) break; + curr++; + left <<= 1; + } + + /* check for enough space */ + used += 1U << curr; + if ((type == LENS && used > ENOUGH_LENS) || + (type == DISTS && used > ENOUGH_DISTS)) + return 1; + + /* point entry in root table to sub-table */ + low = huff & mask; + (*table)[low].op = (unsigned char)curr; + (*table)[low].bits = (unsigned char)root; + (*table)[low].val = (unsigned short)(next - *table); + } + } + + /* fill in remaining table entry if code is incomplete (guaranteed to have + at most one remaining entry, since if the code is incomplete, the + maximum code length that was allowed to get this far is one bit) */ + if (huff != 0) { + here.op = (unsigned char)64; /* invalid code marker */ + here.bits = (unsigned char)(len - drop); + here.val = (unsigned short)0; + next[huff] = here; + } + + /* set return parameters */ + *table += used; + *bits = root; + return 0; +} diff --git a/src/3rdparty/zlib/inftrees.h b/src/3rdparty/zlib/inftrees.h new file mode 100644 index 0000000..baa53a0 --- /dev/null +++ b/src/3rdparty/zlib/inftrees.h @@ -0,0 +1,62 @@ +/* inftrees.h -- header to use inftrees.c + * Copyright (C) 1995-2005, 2010 Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +/* WARNING: this file should *not* be used by applications. It is + part of the implementation of the compression library and is + subject to change. Applications should only use zlib.h. + */ + +/* Structure for decoding tables. Each entry provides either the + information needed to do the operation requested by the code that + indexed that table entry, or it provides a pointer to another + table that indexes more bits of the code. op indicates whether + the entry is a pointer to another table, a literal, a length or + distance, an end-of-block, or an invalid code. For a table + pointer, the low four bits of op is the number of index bits of + that table. For a length or distance, the low four bits of op + is the number of extra bits to get after the code. bits is + the number of bits in this code or part of the code to drop off + of the bit buffer. val is the actual byte to output in the case + of a literal, the base length or distance, or the offset from + the current table to the next table. Each entry is four bytes. */ +typedef struct { + unsigned char op; /* operation, extra bits, table bits */ + unsigned char bits; /* bits in this part of the code */ + unsigned short val; /* offset in table or code value */ +} code; + +/* op values as set by inflate_table(): + 00000000 - literal + 0000tttt - table link, tttt != 0 is the number of table index bits + 0001eeee - length or distance, eeee is the number of extra bits + 01100000 - end of block + 01000000 - invalid code + */ + +/* Maximum size of the dynamic table. The maximum number of code structures is + 1444, which is the sum of 852 for literal/length codes and 592 for distance + codes. These values were found by exhaustive searches using the program + examples/enough.c found in the zlib distribtution. The arguments to that + program are the number of symbols, the initial root table size, and the + maximum bit length of a code. "enough 286 9 15" for literal/length codes + returns returns 852, and "enough 30 6 15" for distance codes returns 592. + The initial root table size (9 or 6) is found in the fifth argument of the + inflate_table() calls in inflate.c and infback.c. If the root table size is + changed, then these maximum sizes would be need to be recalculated and + updated. */ +#define ENOUGH_LENS 852 +#define ENOUGH_DISTS 592 +#define ENOUGH (ENOUGH_LENS+ENOUGH_DISTS) + +/* Type of code to build for inflate_table() */ +typedef enum { + CODES, + LENS, + DISTS +} codetype; + +int ZLIB_INTERNAL inflate_table OF((codetype type, unsigned short FAR *lens, + unsigned codes, code FAR * FAR *table, + unsigned FAR *bits, unsigned short FAR *work)); diff --git a/src/3rdparty/zlib/treebuild.xml b/src/3rdparty/zlib/treebuild.xml new file mode 100644 index 0000000..38d29d7 --- /dev/null +++ b/src/3rdparty/zlib/treebuild.xml @@ -0,0 +1,116 @@ + + + + zip compression library + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/3rdparty/zlib/trees.c b/src/3rdparty/zlib/trees.c new file mode 100644 index 0000000..1fd7759 --- /dev/null +++ b/src/3rdparty/zlib/trees.c @@ -0,0 +1,1226 @@ +/* trees.c -- output deflated data using Huffman coding + * Copyright (C) 1995-2012 Jean-loup Gailly + * detect_data_type() function provided freely by Cosmin Truta, 2006 + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +/* + * ALGORITHM + * + * The "deflation" process uses several Huffman trees. The more + * common source values are represented by shorter bit sequences. + * + * Each code tree is stored in a compressed form which is itself + * a Huffman encoding of the lengths of all the code strings (in + * ascending order by source values). The actual code strings are + * reconstructed from the lengths in the inflate process, as described + * in the deflate specification. + * + * REFERENCES + * + * Deutsch, L.P.,"'Deflate' Compressed Data Format Specification". + * Available in ftp.uu.net:/pub/archiving/zip/doc/deflate-1.1.doc + * + * Storer, James A. + * Data Compression: Methods and Theory, pp. 49-50. + * Computer Science Press, 1988. ISBN 0-7167-8156-5. + * + * Sedgewick, R. + * Algorithms, p290. + * Addison-Wesley, 1983. ISBN 0-201-06672-6. + */ + +/* @(#) $Id$ */ + +/* #define GEN_TREES_H */ + +#include "deflate.h" + +#ifdef DEBUG +# include +#endif + +/* =========================================================================== + * Constants + */ + +#define MAX_BL_BITS 7 +/* Bit length codes must not exceed MAX_BL_BITS bits */ + +#define END_BLOCK 256 +/* end of block literal code */ + +#define REP_3_6 16 +/* repeat previous bit length 3-6 times (2 bits of repeat count) */ + +#define REPZ_3_10 17 +/* repeat a zero length 3-10 times (3 bits of repeat count) */ + +#define REPZ_11_138 18 +/* repeat a zero length 11-138 times (7 bits of repeat count) */ + +local const int extra_lbits[LENGTH_CODES] /* extra bits for each length code */ + = {0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0}; + +local const int extra_dbits[D_CODES] /* extra bits for each distance code */ + = {0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13}; + +local const int extra_blbits[BL_CODES]/* extra bits for each bit length code */ + = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,3,7}; + +local const uch bl_order[BL_CODES] + = {16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15}; +/* The lengths of the bit length codes are sent in order of decreasing + * probability, to avoid transmitting the lengths for unused bit length codes. + */ + +/* =========================================================================== + * Local data. These are initialized only once. + */ + +#define DIST_CODE_LEN 512 /* see definition of array dist_code below */ + +#if defined(GEN_TREES_H) || !defined(STDC) +/* non ANSI compilers may not accept trees.h */ + +local ct_data static_ltree[L_CODES+2]; +/* The static literal tree. Since the bit lengths are imposed, there is no + * need for the L_CODES extra codes used during heap construction. However + * The codes 286 and 287 are needed to build a canonical tree (see _tr_init + * below). + */ + +local ct_data static_dtree[D_CODES]; +/* The static distance tree. (Actually a trivial tree since all codes use + * 5 bits.) + */ + +uch _dist_code[DIST_CODE_LEN]; +/* Distance codes. The first 256 values correspond to the distances + * 3 .. 258, the last 256 values correspond to the top 8 bits of + * the 15 bit distances. + */ + +uch _length_code[MAX_MATCH-MIN_MATCH+1]; +/* length code for each normalized match length (0 == MIN_MATCH) */ + +local int base_length[LENGTH_CODES]; +/* First normalized length for each code (0 = MIN_MATCH) */ + +local int base_dist[D_CODES]; +/* First normalized distance for each code (0 = distance of 1) */ + +#else +# include "trees.h" +#endif /* GEN_TREES_H */ + +struct static_tree_desc_s { + const ct_data *static_tree; /* static tree or NULL */ + const intf *extra_bits; /* extra bits for each code or NULL */ + int extra_base; /* base index for extra_bits */ + int elems; /* max number of elements in the tree */ + int max_length; /* max bit length for the codes */ +}; + +local static_tree_desc static_l_desc = +{static_ltree, extra_lbits, LITERALS+1, L_CODES, MAX_BITS}; + +local static_tree_desc static_d_desc = +{static_dtree, extra_dbits, 0, D_CODES, MAX_BITS}; + +local static_tree_desc static_bl_desc = +{(const ct_data *)0, extra_blbits, 0, BL_CODES, MAX_BL_BITS}; + +/* =========================================================================== + * Local (static) routines in this file. + */ + +local void tr_static_init OF((void)); +local void init_block OF((deflate_state *s)); +local void pqdownheap OF((deflate_state *s, ct_data *tree, int k)); +local void gen_bitlen OF((deflate_state *s, tree_desc *desc)); +local void gen_codes OF((ct_data *tree, int max_code, ushf *bl_count)); +local void build_tree OF((deflate_state *s, tree_desc *desc)); +local void scan_tree OF((deflate_state *s, ct_data *tree, int max_code)); +local void send_tree OF((deflate_state *s, ct_data *tree, int max_code)); +local int build_bl_tree OF((deflate_state *s)); +local void send_all_trees OF((deflate_state *s, int lcodes, int dcodes, + int blcodes)); +local void compress_block OF((deflate_state *s, const ct_data *ltree, + const ct_data *dtree)); +local int detect_data_type OF((deflate_state *s)); +local unsigned bi_reverse OF((unsigned value, int length)); +local void bi_windup OF((deflate_state *s)); +local void bi_flush OF((deflate_state *s)); +local void copy_block OF((deflate_state *s, charf *buf, unsigned len, + int header)); + +#ifdef GEN_TREES_H +local void gen_trees_header OF((void)); +#endif + +#ifndef DEBUG +# define send_code(s, c, tree) send_bits(s, tree[c].Code, tree[c].Len) + /* Send a code of the given tree. c and tree must not have side effects */ + +#else /* DEBUG */ +# define send_code(s, c, tree) \ + { if (z_verbose>2) fprintf(stderr,"\ncd %3d ",(c)); \ + send_bits(s, tree[c].Code, tree[c].Len); } +#endif + +/* =========================================================================== + * Output a short LSB first on the stream. + * IN assertion: there is enough room in pendingBuf. + */ +#define put_short(s, w) { \ + put_byte(s, (uch)((w) & 0xff)); \ + put_byte(s, (uch)((ush)(w) >> 8)); \ +} + +/* =========================================================================== + * Send a value on a given number of bits. + * IN assertion: length <= 16 and value fits in length bits. + */ +#ifdef DEBUG +local void send_bits OF((deflate_state *s, int value, int length)); + +local void send_bits(s, value, length) + deflate_state *s; + int value; /* value to send */ + int length; /* number of bits */ +{ + Tracevv((stderr," l %2d v %4x ", length, value)); + Assert(length > 0 && length <= 15, "invalid length"); + s->bits_sent += (ulg)length; + + /* If not enough room in bi_buf, use (valid) bits from bi_buf and + * (16 - bi_valid) bits from value, leaving (width - (16-bi_valid)) + * unused bits in value. + */ + if (s->bi_valid > (int)Buf_size - length) { + s->bi_buf |= (ush)value << s->bi_valid; + put_short(s, s->bi_buf); + s->bi_buf = (ush)value >> (Buf_size - s->bi_valid); + s->bi_valid += length - Buf_size; + } else { + s->bi_buf |= (ush)value << s->bi_valid; + s->bi_valid += length; + } +} +#else /* !DEBUG */ + +#define send_bits(s, value, length) \ +{ int len = length;\ + if (s->bi_valid > (int)Buf_size - len) {\ + int val = value;\ + s->bi_buf |= (ush)val << s->bi_valid;\ + put_short(s, s->bi_buf);\ + s->bi_buf = (ush)val >> (Buf_size - s->bi_valid);\ + s->bi_valid += len - Buf_size;\ + } else {\ + s->bi_buf |= (ush)(value) << s->bi_valid;\ + s->bi_valid += len;\ + }\ +} +#endif /* DEBUG */ + + +/* the arguments must not have side effects */ + +/* =========================================================================== + * Initialize the various 'constant' tables. + */ +local void tr_static_init() +{ +#if defined(GEN_TREES_H) || !defined(STDC) + static int static_init_done = 0; + int n; /* iterates over tree elements */ + int bits; /* bit counter */ + int length; /* length value */ + int code; /* code value */ + int dist; /* distance index */ + ush bl_count[MAX_BITS+1]; + /* number of codes at each bit length for an optimal tree */ + + if (static_init_done) return; + + /* For some embedded targets, global variables are not initialized: */ +#ifdef NO_INIT_GLOBAL_POINTERS + static_l_desc.static_tree = static_ltree; + static_l_desc.extra_bits = extra_lbits; + static_d_desc.static_tree = static_dtree; + static_d_desc.extra_bits = extra_dbits; + static_bl_desc.extra_bits = extra_blbits; +#endif + + /* Initialize the mapping length (0..255) -> length code (0..28) */ + length = 0; + for (code = 0; code < LENGTH_CODES-1; code++) { + base_length[code] = length; + for (n = 0; n < (1< dist code (0..29) */ + dist = 0; + for (code = 0 ; code < 16; code++) { + base_dist[code] = dist; + for (n = 0; n < (1<>= 7; /* from now on, all distances are divided by 128 */ + for ( ; code < D_CODES; code++) { + base_dist[code] = dist << 7; + for (n = 0; n < (1<<(extra_dbits[code]-7)); n++) { + _dist_code[256 + dist++] = (uch)code; + } + } + Assert (dist == 256, "tr_static_init: 256+dist != 512"); + + /* Construct the codes of the static literal tree */ + for (bits = 0; bits <= MAX_BITS; bits++) bl_count[bits] = 0; + n = 0; + while (n <= 143) static_ltree[n++].Len = 8, bl_count[8]++; + while (n <= 255) static_ltree[n++].Len = 9, bl_count[9]++; + while (n <= 279) static_ltree[n++].Len = 7, bl_count[7]++; + while (n <= 287) static_ltree[n++].Len = 8, bl_count[8]++; + /* Codes 286 and 287 do not exist, but we must include them in the + * tree construction to get a canonical Huffman tree (longest code + * all ones) + */ + gen_codes((ct_data *)static_ltree, L_CODES+1, bl_count); + + /* The static distance tree is trivial: */ + for (n = 0; n < D_CODES; n++) { + static_dtree[n].Len = 5; + static_dtree[n].Code = bi_reverse((unsigned)n, 5); + } + static_init_done = 1; + +# ifdef GEN_TREES_H + gen_trees_header(); +# endif +#endif /* defined(GEN_TREES_H) || !defined(STDC) */ +} + +/* =========================================================================== + * Genererate the file trees.h describing the static trees. + */ +#ifdef GEN_TREES_H +# ifndef DEBUG +# include +# endif + +# define SEPARATOR(i, last, width) \ + ((i) == (last)? "\n};\n\n" : \ + ((i) % (width) == (width)-1 ? ",\n" : ", ")) + +void gen_trees_header() +{ + FILE *header = fopen("trees.h", "w"); + int i; + + Assert (header != NULL, "Can't open trees.h"); + fprintf(header, + "/* header created automatically with -DGEN_TREES_H */\n\n"); + + fprintf(header, "local const ct_data static_ltree[L_CODES+2] = {\n"); + for (i = 0; i < L_CODES+2; i++) { + fprintf(header, "{{%3u},{%3u}}%s", static_ltree[i].Code, + static_ltree[i].Len, SEPARATOR(i, L_CODES+1, 5)); + } + + fprintf(header, "local const ct_data static_dtree[D_CODES] = {\n"); + for (i = 0; i < D_CODES; i++) { + fprintf(header, "{{%2u},{%2u}}%s", static_dtree[i].Code, + static_dtree[i].Len, SEPARATOR(i, D_CODES-1, 5)); + } + + fprintf(header, "const uch ZLIB_INTERNAL _dist_code[DIST_CODE_LEN] = {\n"); + for (i = 0; i < DIST_CODE_LEN; i++) { + fprintf(header, "%2u%s", _dist_code[i], + SEPARATOR(i, DIST_CODE_LEN-1, 20)); + } + + fprintf(header, + "const uch ZLIB_INTERNAL _length_code[MAX_MATCH-MIN_MATCH+1]= {\n"); + for (i = 0; i < MAX_MATCH-MIN_MATCH+1; i++) { + fprintf(header, "%2u%s", _length_code[i], + SEPARATOR(i, MAX_MATCH-MIN_MATCH, 20)); + } + + fprintf(header, "local const int base_length[LENGTH_CODES] = {\n"); + for (i = 0; i < LENGTH_CODES; i++) { + fprintf(header, "%1u%s", base_length[i], + SEPARATOR(i, LENGTH_CODES-1, 20)); + } + + fprintf(header, "local const int base_dist[D_CODES] = {\n"); + for (i = 0; i < D_CODES; i++) { + fprintf(header, "%5u%s", base_dist[i], + SEPARATOR(i, D_CODES-1, 10)); + } + + fclose(header); +} +#endif /* GEN_TREES_H */ + +/* =========================================================================== + * Initialize the tree data structures for a new zlib stream. + */ +void ZLIB_INTERNAL _tr_init(s) + deflate_state *s; +{ + tr_static_init(); + + s->l_desc.dyn_tree = s->dyn_ltree; + s->l_desc.stat_desc = &static_l_desc; + + s->d_desc.dyn_tree = s->dyn_dtree; + s->d_desc.stat_desc = &static_d_desc; + + s->bl_desc.dyn_tree = s->bl_tree; + s->bl_desc.stat_desc = &static_bl_desc; + + s->bi_buf = 0; + s->bi_valid = 0; +#ifdef DEBUG + s->compressed_len = 0L; + s->bits_sent = 0L; +#endif + + /* Initialize the first block of the first file: */ + init_block(s); +} + +/* =========================================================================== + * Initialize a new block. + */ +local void init_block(s) + deflate_state *s; +{ + int n; /* iterates over tree elements */ + + /* Initialize the trees. */ + for (n = 0; n < L_CODES; n++) s->dyn_ltree[n].Freq = 0; + for (n = 0; n < D_CODES; n++) s->dyn_dtree[n].Freq = 0; + for (n = 0; n < BL_CODES; n++) s->bl_tree[n].Freq = 0; + + s->dyn_ltree[END_BLOCK].Freq = 1; + s->opt_len = s->static_len = 0L; + s->last_lit = s->matches = 0; +} + +#define SMALLEST 1 +/* Index within the heap array of least frequent node in the Huffman tree */ + + +/* =========================================================================== + * Remove the smallest element from the heap and recreate the heap with + * one less element. Updates heap and heap_len. + */ +#define pqremove(s, tree, top) \ +{\ + top = s->heap[SMALLEST]; \ + s->heap[SMALLEST] = s->heap[s->heap_len--]; \ + pqdownheap(s, tree, SMALLEST); \ +} + +/* =========================================================================== + * Compares to subtrees, using the tree depth as tie breaker when + * the subtrees have equal frequency. This minimizes the worst case length. + */ +#define smaller(tree, n, m, depth) \ + (tree[n].Freq < tree[m].Freq || \ + (tree[n].Freq == tree[m].Freq && depth[n] <= depth[m])) + +/* =========================================================================== + * Restore the heap property by moving down the tree starting at node k, + * exchanging a node with the smallest of its two sons if necessary, stopping + * when the heap property is re-established (each father smaller than its + * two sons). + */ +local void pqdownheap(s, tree, k) + deflate_state *s; + ct_data *tree; /* the tree to restore */ + int k; /* node to move down */ +{ + int v = s->heap[k]; + int j = k << 1; /* left son of k */ + while (j <= s->heap_len) { + /* Set j to the smallest of the two sons: */ + if (j < s->heap_len && + smaller(tree, s->heap[j+1], s->heap[j], s->depth)) { + j++; + } + /* Exit if v is smaller than both sons */ + if (smaller(tree, v, s->heap[j], s->depth)) break; + + /* Exchange v with the smallest son */ + s->heap[k] = s->heap[j]; k = j; + + /* And continue down the tree, setting j to the left son of k */ + j <<= 1; + } + s->heap[k] = v; +} + +/* =========================================================================== + * Compute the optimal bit lengths for a tree and update the total bit length + * for the current block. + * IN assertion: the fields freq and dad are set, heap[heap_max] and + * above are the tree nodes sorted by increasing frequency. + * OUT assertions: the field len is set to the optimal bit length, the + * array bl_count contains the frequencies for each bit length. + * The length opt_len is updated; static_len is also updated if stree is + * not null. + */ +local void gen_bitlen(s, desc) + deflate_state *s; + tree_desc *desc; /* the tree descriptor */ +{ + ct_data *tree = desc->dyn_tree; + int max_code = desc->max_code; + const ct_data *stree = desc->stat_desc->static_tree; + const intf *extra = desc->stat_desc->extra_bits; + int base = desc->stat_desc->extra_base; + int max_length = desc->stat_desc->max_length; + int h; /* heap index */ + int n, m; /* iterate over the tree elements */ + int bits; /* bit length */ + int xbits; /* extra bits */ + ush f; /* frequency */ + int overflow = 0; /* number of elements with bit length too large */ + + for (bits = 0; bits <= MAX_BITS; bits++) s->bl_count[bits] = 0; + + /* In a first pass, compute the optimal bit lengths (which may + * overflow in the case of the bit length tree). + */ + tree[s->heap[s->heap_max]].Len = 0; /* root of the heap */ + + for (h = s->heap_max+1; h < HEAP_SIZE; h++) { + n = s->heap[h]; + bits = tree[tree[n].Dad].Len + 1; + if (bits > max_length) bits = max_length, overflow++; + tree[n].Len = (ush)bits; + /* We overwrite tree[n].Dad which is no longer needed */ + + if (n > max_code) continue; /* not a leaf node */ + + s->bl_count[bits]++; + xbits = 0; + if (n >= base) xbits = extra[n-base]; + f = tree[n].Freq; + s->opt_len += (ulg)f * (bits + xbits); + if (stree) s->static_len += (ulg)f * (stree[n].Len + xbits); + } + if (overflow == 0) return; + + Trace((stderr,"\nbit length overflow\n")); + /* This happens for example on obj2 and pic of the Calgary corpus */ + + /* Find the first bit length which could increase: */ + do { + bits = max_length-1; + while (s->bl_count[bits] == 0) bits--; + s->bl_count[bits]--; /* move one leaf down the tree */ + s->bl_count[bits+1] += 2; /* move one overflow item as its brother */ + s->bl_count[max_length]--; + /* The brother of the overflow item also moves one step up, + * but this does not affect bl_count[max_length] + */ + overflow -= 2; + } while (overflow > 0); + + /* Now recompute all bit lengths, scanning in increasing frequency. + * h is still equal to HEAP_SIZE. (It is simpler to reconstruct all + * lengths instead of fixing only the wrong ones. This idea is taken + * from 'ar' written by Haruhiko Okumura.) + */ + for (bits = max_length; bits != 0; bits--) { + n = s->bl_count[bits]; + while (n != 0) { + m = s->heap[--h]; + if (m > max_code) continue; + if ((unsigned) tree[m].Len != (unsigned) bits) { + Trace((stderr,"code %d bits %d->%d\n", m, tree[m].Len, bits)); + s->opt_len += ((long)bits - (long)tree[m].Len) + *(long)tree[m].Freq; + tree[m].Len = (ush)bits; + } + n--; + } + } +} + +/* =========================================================================== + * Generate the codes for a given tree and bit counts (which need not be + * optimal). + * IN assertion: the array bl_count contains the bit length statistics for + * the given tree and the field len is set for all tree elements. + * OUT assertion: the field code is set for all tree elements of non + * zero code length. + */ +local void gen_codes (tree, max_code, bl_count) + ct_data *tree; /* the tree to decorate */ + int max_code; /* largest code with non zero frequency */ + ushf *bl_count; /* number of codes at each bit length */ +{ + ush next_code[MAX_BITS+1]; /* next code value for each bit length */ + ush code = 0; /* running code value */ + int bits; /* bit index */ + int n; /* code index */ + + /* The distribution counts are first used to generate the code values + * without bit reversal. + */ + for (bits = 1; bits <= MAX_BITS; bits++) { + next_code[bits] = code = (code + bl_count[bits-1]) << 1; + } + /* Check that the bit counts in bl_count are consistent. The last code + * must be all ones. + */ + Assert (code + bl_count[MAX_BITS]-1 == (1<dyn_tree; + const ct_data *stree = desc->stat_desc->static_tree; + int elems = desc->stat_desc->elems; + int n, m; /* iterate over heap elements */ + int max_code = -1; /* largest code with non zero frequency */ + int node; /* new node being created */ + + /* Construct the initial heap, with least frequent element in + * heap[SMALLEST]. The sons of heap[n] are heap[2*n] and heap[2*n+1]. + * heap[0] is not used. + */ + s->heap_len = 0, s->heap_max = HEAP_SIZE; + + for (n = 0; n < elems; n++) { + if (tree[n].Freq != 0) { + s->heap[++(s->heap_len)] = max_code = n; + s->depth[n] = 0; + } else { + tree[n].Len = 0; + } + } + + /* The pkzip format requires that at least one distance code exists, + * and that at least one bit should be sent even if there is only one + * possible code. So to avoid special checks later on we force at least + * two codes of non zero frequency. + */ + while (s->heap_len < 2) { + node = s->heap[++(s->heap_len)] = (max_code < 2 ? ++max_code : 0); + tree[node].Freq = 1; + s->depth[node] = 0; + s->opt_len--; if (stree) s->static_len -= stree[node].Len; + /* node is 0 or 1 so it does not have extra bits */ + } + desc->max_code = max_code; + + /* The elements heap[heap_len/2+1 .. heap_len] are leaves of the tree, + * establish sub-heaps of increasing lengths: + */ + for (n = s->heap_len/2; n >= 1; n--) pqdownheap(s, tree, n); + + /* Construct the Huffman tree by repeatedly combining the least two + * frequent nodes. + */ + node = elems; /* next internal node of the tree */ + do { + pqremove(s, tree, n); /* n = node of least frequency */ + m = s->heap[SMALLEST]; /* m = node of next least frequency */ + + s->heap[--(s->heap_max)] = n; /* keep the nodes sorted by frequency */ + s->heap[--(s->heap_max)] = m; + + /* Create a new node father of n and m */ + tree[node].Freq = tree[n].Freq + tree[m].Freq; + s->depth[node] = (uch)((s->depth[n] >= s->depth[m] ? + s->depth[n] : s->depth[m]) + 1); + tree[n].Dad = tree[m].Dad = (ush)node; +#ifdef DUMP_BL_TREE + if (tree == s->bl_tree) { + fprintf(stderr,"\nnode %d(%d), sons %d(%d) %d(%d)", + node, tree[node].Freq, n, tree[n].Freq, m, tree[m].Freq); + } +#endif + /* and insert the new node in the heap */ + s->heap[SMALLEST] = node++; + pqdownheap(s, tree, SMALLEST); + + } while (s->heap_len >= 2); + + s->heap[--(s->heap_max)] = s->heap[SMALLEST]; + + /* At this point, the fields freq and dad are set. We can now + * generate the bit lengths. + */ + gen_bitlen(s, (tree_desc *)desc); + + /* The field len is now set, we can generate the bit codes */ + gen_codes ((ct_data *)tree, max_code, s->bl_count); +} + +/* =========================================================================== + * Scan a literal or distance tree to determine the frequencies of the codes + * in the bit length tree. + */ +local void scan_tree (s, tree, max_code) + deflate_state *s; + ct_data *tree; /* the tree to be scanned */ + int max_code; /* and its largest code of non zero frequency */ +{ + int n; /* iterates over all tree elements */ + int prevlen = -1; /* last emitted length */ + int curlen; /* length of current code */ + int nextlen = tree[0].Len; /* length of next code */ + int count = 0; /* repeat count of the current code */ + int max_count = 7; /* max repeat count */ + int min_count = 4; /* min repeat count */ + + if (nextlen == 0) max_count = 138, min_count = 3; + tree[max_code+1].Len = (ush)0xffff; /* guard */ + + for (n = 0; n <= max_code; n++) { + curlen = nextlen; nextlen = tree[n+1].Len; + if (++count < max_count && curlen == nextlen) { + continue; + } else if (count < min_count) { + s->bl_tree[curlen].Freq += count; + } else if (curlen != 0) { + if (curlen != prevlen) s->bl_tree[curlen].Freq++; + s->bl_tree[REP_3_6].Freq++; + } else if (count <= 10) { + s->bl_tree[REPZ_3_10].Freq++; + } else { + s->bl_tree[REPZ_11_138].Freq++; + } + count = 0; prevlen = curlen; + if (nextlen == 0) { + max_count = 138, min_count = 3; + } else if (curlen == nextlen) { + max_count = 6, min_count = 3; + } else { + max_count = 7, min_count = 4; + } + } +} + +/* =========================================================================== + * Send a literal or distance tree in compressed form, using the codes in + * bl_tree. + */ +local void send_tree (s, tree, max_code) + deflate_state *s; + ct_data *tree; /* the tree to be scanned */ + int max_code; /* and its largest code of non zero frequency */ +{ + int n; /* iterates over all tree elements */ + int prevlen = -1; /* last emitted length */ + int curlen; /* length of current code */ + int nextlen = tree[0].Len; /* length of next code */ + int count = 0; /* repeat count of the current code */ + int max_count = 7; /* max repeat count */ + int min_count = 4; /* min repeat count */ + + /* tree[max_code+1].Len = -1; */ /* guard already set */ + if (nextlen == 0) max_count = 138, min_count = 3; + + for (n = 0; n <= max_code; n++) { + curlen = nextlen; nextlen = tree[n+1].Len; + if (++count < max_count && curlen == nextlen) { + continue; + } else if (count < min_count) { + do { send_code(s, curlen, s->bl_tree); } while (--count != 0); + + } else if (curlen != 0) { + if (curlen != prevlen) { + send_code(s, curlen, s->bl_tree); count--; + } + Assert(count >= 3 && count <= 6, " 3_6?"); + send_code(s, REP_3_6, s->bl_tree); send_bits(s, count-3, 2); + + } else if (count <= 10) { + send_code(s, REPZ_3_10, s->bl_tree); send_bits(s, count-3, 3); + + } else { + send_code(s, REPZ_11_138, s->bl_tree); send_bits(s, count-11, 7); + } + count = 0; prevlen = curlen; + if (nextlen == 0) { + max_count = 138, min_count = 3; + } else if (curlen == nextlen) { + max_count = 6, min_count = 3; + } else { + max_count = 7, min_count = 4; + } + } +} + +/* =========================================================================== + * Construct the Huffman tree for the bit lengths and return the index in + * bl_order of the last bit length code to send. + */ +local int build_bl_tree(s) + deflate_state *s; +{ + int max_blindex; /* index of last bit length code of non zero freq */ + + /* Determine the bit length frequencies for literal and distance trees */ + scan_tree(s, (ct_data *)s->dyn_ltree, s->l_desc.max_code); + scan_tree(s, (ct_data *)s->dyn_dtree, s->d_desc.max_code); + + /* Build the bit length tree: */ + build_tree(s, (tree_desc *)(&(s->bl_desc))); + /* opt_len now includes the length of the tree representations, except + * the lengths of the bit lengths codes and the 5+5+4 bits for the counts. + */ + + /* Determine the number of bit length codes to send. The pkzip format + * requires that at least 4 bit length codes be sent. (appnote.txt says + * 3 but the actual value used is 4.) + */ + for (max_blindex = BL_CODES-1; max_blindex >= 3; max_blindex--) { + if (s->bl_tree[bl_order[max_blindex]].Len != 0) break; + } + /* Update opt_len to include the bit length tree and counts */ + s->opt_len += 3*(max_blindex+1) + 5+5+4; + Tracev((stderr, "\ndyn trees: dyn %ld, stat %ld", + s->opt_len, s->static_len)); + + return max_blindex; +} + +/* =========================================================================== + * Send the header for a block using dynamic Huffman trees: the counts, the + * lengths of the bit length codes, the literal tree and the distance tree. + * IN assertion: lcodes >= 257, dcodes >= 1, blcodes >= 4. + */ +local void send_all_trees(s, lcodes, dcodes, blcodes) + deflate_state *s; + int lcodes, dcodes, blcodes; /* number of codes for each tree */ +{ + int rank; /* index in bl_order */ + + Assert (lcodes >= 257 && dcodes >= 1 && blcodes >= 4, "not enough codes"); + Assert (lcodes <= L_CODES && dcodes <= D_CODES && blcodes <= BL_CODES, + "too many codes"); + Tracev((stderr, "\nbl counts: ")); + send_bits(s, lcodes-257, 5); /* not +255 as stated in appnote.txt */ + send_bits(s, dcodes-1, 5); + send_bits(s, blcodes-4, 4); /* not -3 as stated in appnote.txt */ + for (rank = 0; rank < blcodes; rank++) { + Tracev((stderr, "\nbl code %2d ", bl_order[rank])); + send_bits(s, s->bl_tree[bl_order[rank]].Len, 3); + } + Tracev((stderr, "\nbl tree: sent %ld", s->bits_sent)); + + send_tree(s, (ct_data *)s->dyn_ltree, lcodes-1); /* literal tree */ + Tracev((stderr, "\nlit tree: sent %ld", s->bits_sent)); + + send_tree(s, (ct_data *)s->dyn_dtree, dcodes-1); /* distance tree */ + Tracev((stderr, "\ndist tree: sent %ld", s->bits_sent)); +} + +/* =========================================================================== + * Send a stored block + */ +void ZLIB_INTERNAL _tr_stored_block(s, buf, stored_len, last) + deflate_state *s; + charf *buf; /* input block */ + ulg stored_len; /* length of input block */ + int last; /* one if this is the last block for a file */ +{ + send_bits(s, (STORED_BLOCK<<1)+last, 3); /* send block type */ +#ifdef DEBUG + s->compressed_len = (s->compressed_len + 3 + 7) & (ulg)~7L; + s->compressed_len += (stored_len + 4) << 3; +#endif + copy_block(s, buf, (unsigned)stored_len, 1); /* with header */ +} + +/* =========================================================================== + * Flush the bits in the bit buffer to pending output (leaves at most 7 bits) + */ +void ZLIB_INTERNAL _tr_flush_bits(s) + deflate_state *s; +{ + bi_flush(s); +} + +/* =========================================================================== + * Send one empty static block to give enough lookahead for inflate. + * This takes 10 bits, of which 7 may remain in the bit buffer. + */ +void ZLIB_INTERNAL _tr_align(s) + deflate_state *s; +{ + send_bits(s, STATIC_TREES<<1, 3); + send_code(s, END_BLOCK, static_ltree); +#ifdef DEBUG + s->compressed_len += 10L; /* 3 for block type, 7 for EOB */ +#endif + bi_flush(s); +} + +/* =========================================================================== + * Determine the best encoding for the current block: dynamic trees, static + * trees or store, and output the encoded block to the zip file. + */ +void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last) + deflate_state *s; + charf *buf; /* input block, or NULL if too old */ + ulg stored_len; /* length of input block */ + int last; /* one if this is the last block for a file */ +{ + ulg opt_lenb, static_lenb; /* opt_len and static_len in bytes */ + int max_blindex = 0; /* index of last bit length code of non zero freq */ + + /* Build the Huffman trees unless a stored block is forced */ + if (s->level > 0) { + + /* Check if the file is binary or text */ + if (s->strm->data_type == Z_UNKNOWN) + s->strm->data_type = detect_data_type(s); + + /* Construct the literal and distance trees */ + build_tree(s, (tree_desc *)(&(s->l_desc))); + Tracev((stderr, "\nlit data: dyn %ld, stat %ld", s->opt_len, + s->static_len)); + + build_tree(s, (tree_desc *)(&(s->d_desc))); + Tracev((stderr, "\ndist data: dyn %ld, stat %ld", s->opt_len, + s->static_len)); + /* At this point, opt_len and static_len are the total bit lengths of + * the compressed block data, excluding the tree representations. + */ + + /* Build the bit length tree for the above two trees, and get the index + * in bl_order of the last bit length code to send. + */ + max_blindex = build_bl_tree(s); + + /* Determine the best encoding. Compute the block lengths in bytes. */ + opt_lenb = (s->opt_len+3+7)>>3; + static_lenb = (s->static_len+3+7)>>3; + + Tracev((stderr, "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u ", + opt_lenb, s->opt_len, static_lenb, s->static_len, stored_len, + s->last_lit)); + + if (static_lenb <= opt_lenb) opt_lenb = static_lenb; + + } else { + Assert(buf != (char*)0, "lost buf"); + opt_lenb = static_lenb = stored_len + 5; /* force a stored block */ + } + +#ifdef FORCE_STORED + if (buf != (char*)0) { /* force stored block */ +#else + if (stored_len+4 <= opt_lenb && buf != (char*)0) { + /* 4: two words for the lengths */ +#endif + /* The test buf != NULL is only necessary if LIT_BUFSIZE > WSIZE. + * Otherwise we can't have processed more than WSIZE input bytes since + * the last block flush, because compression would have been + * successful. If LIT_BUFSIZE <= WSIZE, it is never too late to + * transform a block into a stored block. + */ + _tr_stored_block(s, buf, stored_len, last); + +#ifdef FORCE_STATIC + } else if (static_lenb >= 0) { /* force static trees */ +#else + } else if (s->strategy == Z_FIXED || static_lenb == opt_lenb) { +#endif + send_bits(s, (STATIC_TREES<<1)+last, 3); + compress_block(s, (const ct_data *)static_ltree, + (const ct_data *)static_dtree); +#ifdef DEBUG + s->compressed_len += 3 + s->static_len; +#endif + } else { + send_bits(s, (DYN_TREES<<1)+last, 3); + send_all_trees(s, s->l_desc.max_code+1, s->d_desc.max_code+1, + max_blindex+1); + compress_block(s, (const ct_data *)s->dyn_ltree, + (const ct_data *)s->dyn_dtree); +#ifdef DEBUG + s->compressed_len += 3 + s->opt_len; +#endif + } + Assert (s->compressed_len == s->bits_sent, "bad compressed size"); + /* The above check is made mod 2^32, for files larger than 512 MB + * and uLong implemented on 32 bits. + */ + init_block(s); + + if (last) { + bi_windup(s); +#ifdef DEBUG + s->compressed_len += 7; /* align on byte boundary */ +#endif + } + Tracev((stderr,"\ncomprlen %lu(%lu) ", s->compressed_len>>3, + s->compressed_len-7*last)); +} + +/* =========================================================================== + * Save the match info and tally the frequency counts. Return true if + * the current block must be flushed. + */ +int ZLIB_INTERNAL _tr_tally (s, dist, lc) + deflate_state *s; + unsigned dist; /* distance of matched string */ + unsigned lc; /* match length-MIN_MATCH or unmatched char (if dist==0) */ +{ + s->d_buf[s->last_lit] = (ush)dist; + s->l_buf[s->last_lit++] = (uch)lc; + if (dist == 0) { + /* lc is the unmatched char */ + s->dyn_ltree[lc].Freq++; + } else { + s->matches++; + /* Here, lc is the match length - MIN_MATCH */ + dist--; /* dist = match distance - 1 */ + Assert((ush)dist < (ush)MAX_DIST(s) && + (ush)lc <= (ush)(MAX_MATCH-MIN_MATCH) && + (ush)d_code(dist) < (ush)D_CODES, "_tr_tally: bad match"); + + s->dyn_ltree[_length_code[lc]+LITERALS+1].Freq++; + s->dyn_dtree[d_code(dist)].Freq++; + } + +#ifdef TRUNCATE_BLOCK + /* Try to guess if it is profitable to stop the current block here */ + if ((s->last_lit & 0x1fff) == 0 && s->level > 2) { + /* Compute an upper bound for the compressed length */ + ulg out_length = (ulg)s->last_lit*8L; + ulg in_length = (ulg)((long)s->strstart - s->block_start); + int dcode; + for (dcode = 0; dcode < D_CODES; dcode++) { + out_length += (ulg)s->dyn_dtree[dcode].Freq * + (5L+extra_dbits[dcode]); + } + out_length >>= 3; + Tracev((stderr,"\nlast_lit %u, in %ld, out ~%ld(%ld%%) ", + s->last_lit, in_length, out_length, + 100L - out_length*100L/in_length)); + if (s->matches < s->last_lit/2 && out_length < in_length/2) return 1; + } +#endif + return (s->last_lit == s->lit_bufsize-1); + /* We avoid equality with lit_bufsize because of wraparound at 64K + * on 16 bit machines and because stored blocks are restricted to + * 64K-1 bytes. + */ +} + +/* =========================================================================== + * Send the block data compressed using the given Huffman trees + */ +local void compress_block(s, ltree, dtree) + deflate_state *s; + const ct_data *ltree; /* literal tree */ + const ct_data *dtree; /* distance tree */ +{ + unsigned dist; /* distance of matched string */ + int lc; /* match length or unmatched char (if dist == 0) */ + unsigned lx = 0; /* running index in l_buf */ + unsigned code; /* the code to send */ + int extra; /* number of extra bits to send */ + + if (s->last_lit != 0) do { + dist = s->d_buf[lx]; + lc = s->l_buf[lx++]; + if (dist == 0) { + send_code(s, lc, ltree); /* send a literal byte */ + Tracecv(isgraph(lc), (stderr," '%c' ", lc)); + } else { + /* Here, lc is the match length - MIN_MATCH */ + code = _length_code[lc]; + send_code(s, code+LITERALS+1, ltree); /* send the length code */ + extra = extra_lbits[code]; + if (extra != 0) { + lc -= base_length[code]; + send_bits(s, lc, extra); /* send the extra length bits */ + } + dist--; /* dist is now the match distance - 1 */ + code = d_code(dist); + Assert (code < D_CODES, "bad d_code"); + + send_code(s, code, dtree); /* send the distance code */ + extra = extra_dbits[code]; + if (extra != 0) { + dist -= base_dist[code]; + send_bits(s, dist, extra); /* send the extra distance bits */ + } + } /* literal or match pair ? */ + + /* Check that the overlay between pending_buf and d_buf+l_buf is ok: */ + Assert((uInt)(s->pending) < s->lit_bufsize + 2*lx, + "pendingBuf overflow"); + + } while (lx < s->last_lit); + + send_code(s, END_BLOCK, ltree); +} + +/* =========================================================================== + * Check if the data type is TEXT or BINARY, using the following algorithm: + * - TEXT if the two conditions below are satisfied: + * a) There are no non-portable control characters belonging to the + * "black list" (0..6, 14..25, 28..31). + * b) There is at least one printable character belonging to the + * "white list" (9 {TAB}, 10 {LF}, 13 {CR}, 32..255). + * - BINARY otherwise. + * - The following partially-portable control characters form a + * "gray list" that is ignored in this detection algorithm: + * (7 {BEL}, 8 {BS}, 11 {VT}, 12 {FF}, 26 {SUB}, 27 {ESC}). + * IN assertion: the fields Freq of dyn_ltree are set. + */ +local int detect_data_type(s) + deflate_state *s; +{ + /* black_mask is the bit mask of black-listed bytes + * set bits 0..6, 14..25, and 28..31 + * 0xf3ffc07f = binary 11110011111111111100000001111111 + */ + unsigned long black_mask = 0xf3ffc07fUL; + int n; + + /* Check for non-textual ("black-listed") bytes. */ + for (n = 0; n <= 31; n++, black_mask >>= 1) + if ((black_mask & 1) && (s->dyn_ltree[n].Freq != 0)) + return Z_BINARY; + + /* Check for textual ("white-listed") bytes. */ + if (s->dyn_ltree[9].Freq != 0 || s->dyn_ltree[10].Freq != 0 + || s->dyn_ltree[13].Freq != 0) + return Z_TEXT; + for (n = 32; n < LITERALS; n++) + if (s->dyn_ltree[n].Freq != 0) + return Z_TEXT; + + /* There are no "black-listed" or "white-listed" bytes: + * this stream either is empty or has tolerated ("gray-listed") bytes only. + */ + return Z_BINARY; +} + +/* =========================================================================== + * Reverse the first len bits of a code, using straightforward code (a faster + * method would use a table) + * IN assertion: 1 <= len <= 15 + */ +local unsigned bi_reverse(code, len) + unsigned code; /* the value to invert */ + int len; /* its bit length */ +{ + register unsigned res = 0; + do { + res |= code & 1; + code >>= 1, res <<= 1; + } while (--len > 0); + return res >> 1; +} + +/* =========================================================================== + * Flush the bit buffer, keeping at most 7 bits in it. + */ +local void bi_flush(s) + deflate_state *s; +{ + if (s->bi_valid == 16) { + put_short(s, s->bi_buf); + s->bi_buf = 0; + s->bi_valid = 0; + } else if (s->bi_valid >= 8) { + put_byte(s, (Byte)s->bi_buf); + s->bi_buf >>= 8; + s->bi_valid -= 8; + } +} + +/* =========================================================================== + * Flush the bit buffer and align the output on a byte boundary + */ +local void bi_windup(s) + deflate_state *s; +{ + if (s->bi_valid > 8) { + put_short(s, s->bi_buf); + } else if (s->bi_valid > 0) { + put_byte(s, (Byte)s->bi_buf); + } + s->bi_buf = 0; + s->bi_valid = 0; +#ifdef DEBUG + s->bits_sent = (s->bits_sent+7) & ~7; +#endif +} + +/* =========================================================================== + * Copy a stored block, storing first the length and its + * one's complement if requested. + */ +local void copy_block(s, buf, len, header) + deflate_state *s; + charf *buf; /* the input data */ + unsigned len; /* its length */ + int header; /* true if block header must be written */ +{ + bi_windup(s); /* align on byte boundary */ + + if (header) { + put_short(s, (ush)len); + put_short(s, (ush)~len); +#ifdef DEBUG + s->bits_sent += 2*16; +#endif + } +#ifdef DEBUG + s->bits_sent += (ulg)len<<3; +#endif + while (len--) { + put_byte(s, *buf++); + } +} diff --git a/src/3rdparty/zlib/trees.h b/src/3rdparty/zlib/trees.h new file mode 100644 index 0000000..d35639d --- /dev/null +++ b/src/3rdparty/zlib/trees.h @@ -0,0 +1,128 @@ +/* header created automatically with -DGEN_TREES_H */ + +local const ct_data static_ltree[L_CODES+2] = { +{{ 12},{ 8}}, {{140},{ 8}}, {{ 76},{ 8}}, {{204},{ 8}}, {{ 44},{ 8}}, +{{172},{ 8}}, {{108},{ 8}}, {{236},{ 8}}, {{ 28},{ 8}}, {{156},{ 8}}, +{{ 92},{ 8}}, {{220},{ 8}}, {{ 60},{ 8}}, {{188},{ 8}}, {{124},{ 8}}, +{{252},{ 8}}, {{ 2},{ 8}}, {{130},{ 8}}, {{ 66},{ 8}}, {{194},{ 8}}, +{{ 34},{ 8}}, {{162},{ 8}}, {{ 98},{ 8}}, {{226},{ 8}}, {{ 18},{ 8}}, +{{146},{ 8}}, {{ 82},{ 8}}, {{210},{ 8}}, {{ 50},{ 8}}, {{178},{ 8}}, +{{114},{ 8}}, {{242},{ 8}}, {{ 10},{ 8}}, {{138},{ 8}}, {{ 74},{ 8}}, +{{202},{ 8}}, {{ 42},{ 8}}, {{170},{ 8}}, {{106},{ 8}}, {{234},{ 8}}, +{{ 26},{ 8}}, {{154},{ 8}}, {{ 90},{ 8}}, {{218},{ 8}}, {{ 58},{ 8}}, +{{186},{ 8}}, {{122},{ 8}}, {{250},{ 8}}, {{ 6},{ 8}}, {{134},{ 8}}, +{{ 70},{ 8}}, {{198},{ 8}}, {{ 38},{ 8}}, {{166},{ 8}}, {{102},{ 8}}, +{{230},{ 8}}, {{ 22},{ 8}}, {{150},{ 8}}, {{ 86},{ 8}}, {{214},{ 8}}, +{{ 54},{ 8}}, {{182},{ 8}}, {{118},{ 8}}, {{246},{ 8}}, {{ 14},{ 8}}, +{{142},{ 8}}, {{ 78},{ 8}}, {{206},{ 8}}, {{ 46},{ 8}}, {{174},{ 8}}, +{{110},{ 8}}, {{238},{ 8}}, {{ 30},{ 8}}, {{158},{ 8}}, {{ 94},{ 8}}, +{{222},{ 8}}, {{ 62},{ 8}}, {{190},{ 8}}, {{126},{ 8}}, {{254},{ 8}}, +{{ 1},{ 8}}, {{129},{ 8}}, {{ 65},{ 8}}, {{193},{ 8}}, {{ 33},{ 8}}, +{{161},{ 8}}, {{ 97},{ 8}}, {{225},{ 8}}, {{ 17},{ 8}}, {{145},{ 8}}, +{{ 81},{ 8}}, {{209},{ 8}}, {{ 49},{ 8}}, {{177},{ 8}}, {{113},{ 8}}, +{{241},{ 8}}, {{ 9},{ 8}}, {{137},{ 8}}, {{ 73},{ 8}}, {{201},{ 8}}, +{{ 41},{ 8}}, {{169},{ 8}}, {{105},{ 8}}, {{233},{ 8}}, {{ 25},{ 8}}, +{{153},{ 8}}, {{ 89},{ 8}}, {{217},{ 8}}, {{ 57},{ 8}}, {{185},{ 8}}, +{{121},{ 8}}, {{249},{ 8}}, {{ 5},{ 8}}, {{133},{ 8}}, {{ 69},{ 8}}, +{{197},{ 8}}, {{ 37},{ 8}}, {{165},{ 8}}, {{101},{ 8}}, {{229},{ 8}}, +{{ 21},{ 8}}, {{149},{ 8}}, {{ 85},{ 8}}, {{213},{ 8}}, {{ 53},{ 8}}, +{{181},{ 8}}, {{117},{ 8}}, {{245},{ 8}}, {{ 13},{ 8}}, {{141},{ 8}}, +{{ 77},{ 8}}, {{205},{ 8}}, {{ 45},{ 8}}, {{173},{ 8}}, {{109},{ 8}}, +{{237},{ 8}}, {{ 29},{ 8}}, {{157},{ 8}}, {{ 93},{ 8}}, {{221},{ 8}}, +{{ 61},{ 8}}, {{189},{ 8}}, {{125},{ 8}}, {{253},{ 8}}, {{ 19},{ 9}}, +{{275},{ 9}}, {{147},{ 9}}, {{403},{ 9}}, {{ 83},{ 9}}, {{339},{ 9}}, +{{211},{ 9}}, {{467},{ 9}}, {{ 51},{ 9}}, {{307},{ 9}}, {{179},{ 9}}, +{{435},{ 9}}, {{115},{ 9}}, {{371},{ 9}}, {{243},{ 9}}, {{499},{ 9}}, +{{ 11},{ 9}}, {{267},{ 9}}, {{139},{ 9}}, {{395},{ 9}}, {{ 75},{ 9}}, +{{331},{ 9}}, {{203},{ 9}}, {{459},{ 9}}, {{ 43},{ 9}}, {{299},{ 9}}, +{{171},{ 9}}, {{427},{ 9}}, {{107},{ 9}}, {{363},{ 9}}, {{235},{ 9}}, +{{491},{ 9}}, {{ 27},{ 9}}, {{283},{ 9}}, {{155},{ 9}}, {{411},{ 9}}, +{{ 91},{ 9}}, {{347},{ 9}}, {{219},{ 9}}, {{475},{ 9}}, {{ 59},{ 9}}, +{{315},{ 9}}, {{187},{ 9}}, {{443},{ 9}}, {{123},{ 9}}, {{379},{ 9}}, +{{251},{ 9}}, {{507},{ 9}}, {{ 7},{ 9}}, {{263},{ 9}}, {{135},{ 9}}, +{{391},{ 9}}, {{ 71},{ 9}}, {{327},{ 9}}, {{199},{ 9}}, {{455},{ 9}}, +{{ 39},{ 9}}, {{295},{ 9}}, {{167},{ 9}}, {{423},{ 9}}, {{103},{ 9}}, +{{359},{ 9}}, {{231},{ 9}}, {{487},{ 9}}, {{ 23},{ 9}}, {{279},{ 9}}, +{{151},{ 9}}, {{407},{ 9}}, {{ 87},{ 9}}, {{343},{ 9}}, {{215},{ 9}}, +{{471},{ 9}}, {{ 55},{ 9}}, {{311},{ 9}}, {{183},{ 9}}, {{439},{ 9}}, +{{119},{ 9}}, {{375},{ 9}}, {{247},{ 9}}, {{503},{ 9}}, {{ 15},{ 9}}, +{{271},{ 9}}, {{143},{ 9}}, {{399},{ 9}}, {{ 79},{ 9}}, {{335},{ 9}}, +{{207},{ 9}}, {{463},{ 9}}, {{ 47},{ 9}}, {{303},{ 9}}, {{175},{ 9}}, +{{431},{ 9}}, {{111},{ 9}}, {{367},{ 9}}, {{239},{ 9}}, {{495},{ 9}}, +{{ 31},{ 9}}, {{287},{ 9}}, {{159},{ 9}}, {{415},{ 9}}, {{ 95},{ 9}}, +{{351},{ 9}}, {{223},{ 9}}, {{479},{ 9}}, {{ 63},{ 9}}, {{319},{ 9}}, +{{191},{ 9}}, {{447},{ 9}}, {{127},{ 9}}, {{383},{ 9}}, {{255},{ 9}}, +{{511},{ 9}}, {{ 0},{ 7}}, {{ 64},{ 7}}, {{ 32},{ 7}}, {{ 96},{ 7}}, +{{ 16},{ 7}}, {{ 80},{ 7}}, {{ 48},{ 7}}, {{112},{ 7}}, {{ 8},{ 7}}, +{{ 72},{ 7}}, {{ 40},{ 7}}, {{104},{ 7}}, {{ 24},{ 7}}, {{ 88},{ 7}}, +{{ 56},{ 7}}, {{120},{ 7}}, {{ 4},{ 7}}, {{ 68},{ 7}}, {{ 36},{ 7}}, +{{100},{ 7}}, {{ 20},{ 7}}, {{ 84},{ 7}}, {{ 52},{ 7}}, {{116},{ 7}}, +{{ 3},{ 8}}, {{131},{ 8}}, {{ 67},{ 8}}, {{195},{ 8}}, {{ 35},{ 8}}, +{{163},{ 8}}, {{ 99},{ 8}}, {{227},{ 8}} +}; + +local const ct_data static_dtree[D_CODES] = { +{{ 0},{ 5}}, {{16},{ 5}}, {{ 8},{ 5}}, {{24},{ 5}}, {{ 4},{ 5}}, +{{20},{ 5}}, {{12},{ 5}}, {{28},{ 5}}, {{ 2},{ 5}}, {{18},{ 5}}, +{{10},{ 5}}, {{26},{ 5}}, {{ 6},{ 5}}, {{22},{ 5}}, {{14},{ 5}}, +{{30},{ 5}}, {{ 1},{ 5}}, {{17},{ 5}}, {{ 9},{ 5}}, {{25},{ 5}}, +{{ 5},{ 5}}, {{21},{ 5}}, {{13},{ 5}}, {{29},{ 5}}, {{ 3},{ 5}}, +{{19},{ 5}}, {{11},{ 5}}, {{27},{ 5}}, {{ 7},{ 5}}, {{23},{ 5}} +}; + +const uch ZLIB_INTERNAL _dist_code[DIST_CODE_LEN] = { + 0, 1, 2, 3, 4, 4, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, + 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 10, 10, 10, 10, 10, 10, 10, 10, +10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, +11, 11, 11, 11, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, +12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 13, 13, 13, 13, +13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, +13, 13, 13, 13, 13, 13, 13, 13, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, +14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, +14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, +14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 15, 15, 15, 15, 15, 15, 15, 15, +15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, +15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, +15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 0, 0, 16, 17, +18, 18, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22, +23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, +24, 24, 24, 24, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, +26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, +26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27, +27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, +27, 27, 27, 27, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, +28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, +28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, +28, 28, 28, 28, 28, 28, 28, 28, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, +29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, +29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, +29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29 +}; + +const uch ZLIB_INTERNAL _length_code[MAX_MATCH-MIN_MATCH+1]= { + 0, 1, 2, 3, 4, 5, 6, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 12, 12, +13, 13, 13, 13, 14, 14, 14, 14, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16, +17, 17, 17, 17, 17, 17, 17, 17, 18, 18, 18, 18, 18, 18, 18, 18, 19, 19, 19, 19, +19, 19, 19, 19, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, +21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 22, 22, 22, 22, +22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 23, 23, 23, 23, 23, 23, 23, 23, +23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, +24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, +25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, +25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 26, 26, 26, 26, 26, 26, 26, 26, +26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, +26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, +27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 28 +}; + +local const int base_length[LENGTH_CODES] = { +0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 12, 14, 16, 20, 24, 28, 32, 40, 48, 56, +64, 80, 96, 112, 128, 160, 192, 224, 0 +}; + +local const int base_dist[D_CODES] = { + 0, 1, 2, 3, 4, 6, 8, 12, 16, 24, + 32, 48, 64, 96, 128, 192, 256, 384, 512, 768, + 1024, 1536, 2048, 3072, 4096, 6144, 8192, 12288, 16384, 24576 +}; + diff --git a/src/3rdparty/zlib/uncompr.c b/src/3rdparty/zlib/uncompr.c new file mode 100644 index 0000000..242e949 --- /dev/null +++ b/src/3rdparty/zlib/uncompr.c @@ -0,0 +1,59 @@ +/* uncompr.c -- decompress a memory buffer + * Copyright (C) 1995-2003, 2010 Jean-loup Gailly. + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +/* @(#) $Id$ */ + +#define ZLIB_INTERNAL +#include "zlib.h" + +/* =========================================================================== + Decompresses the source buffer into the destination buffer. sourceLen is + the byte length of the source buffer. Upon entry, destLen is the total + size of the destination buffer, which must be large enough to hold the + entire uncompressed data. (The size of the uncompressed data must have + been saved previously by the compressor and transmitted to the decompressor + by some mechanism outside the scope of this compression library.) + Upon exit, destLen is the actual size of the compressed buffer. + + uncompress returns Z_OK if success, Z_MEM_ERROR if there was not + enough memory, Z_BUF_ERROR if there was not enough room in the output + buffer, or Z_DATA_ERROR if the input data was corrupted. +*/ +int ZEXPORT uncompress (dest, destLen, source, sourceLen) + Bytef *dest; + uLongf *destLen; + const Bytef *source; + uLong sourceLen; +{ + z_stream stream; + int err; + + stream.next_in = (z_const Bytef *)source; + stream.avail_in = (uInt)sourceLen; + /* Check for source > 64K on 16-bit machine: */ + if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR; + + stream.next_out = dest; + stream.avail_out = (uInt)*destLen; + if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR; + + stream.zalloc = (alloc_func)0; + stream.zfree = (free_func)0; + + err = inflateInit(&stream); + if (err != Z_OK) return err; + + err = inflate(&stream, Z_FINISH); + if (err != Z_STREAM_END) { + inflateEnd(&stream); + if (err == Z_NEED_DICT || (err == Z_BUF_ERROR && stream.avail_in == 0)) + return Z_DATA_ERROR; + return err; + } + *destLen = stream.total_out; + + err = inflateEnd(&stream); + return err; +} diff --git a/src/3rdparty/zlib/win32/DLL_FAQ.txt b/src/3rdparty/zlib/win32/DLL_FAQ.txt new file mode 100644 index 0000000..12c0090 --- /dev/null +++ b/src/3rdparty/zlib/win32/DLL_FAQ.txt @@ -0,0 +1,397 @@ + + Frequently Asked Questions about ZLIB1.DLL + + +This document describes the design, the rationale, and the usage +of the official DLL build of zlib, named ZLIB1.DLL. If you have +general questions about zlib, you should see the file "FAQ" found +in the zlib distribution, or at the following location: + http://www.gzip.org/zlib/zlib_faq.html + + + 1. What is ZLIB1.DLL, and how can I get it? + + - ZLIB1.DLL is the official build of zlib as a DLL. + (Please remark the character '1' in the name.) + + Pointers to a precompiled ZLIB1.DLL can be found in the zlib + web site at: + http://www.zlib.net/ + + Applications that link to ZLIB1.DLL can rely on the following + specification: + + * The exported symbols are exclusively defined in the source + files "zlib.h" and "zlib.def", found in an official zlib + source distribution. + * The symbols are exported by name, not by ordinal. + * The exported names are undecorated. + * The calling convention of functions is "C" (CDECL). + * The ZLIB1.DLL binary is linked to MSVCRT.DLL. + + The archive in which ZLIB1.DLL is bundled contains compiled + test programs that must run with a valid build of ZLIB1.DLL. + It is recommended to download the prebuilt DLL from the zlib + web site, instead of building it yourself, to avoid potential + incompatibilities that could be introduced by your compiler + and build settings. If you do build the DLL yourself, please + make sure that it complies with all the above requirements, + and it runs with the precompiled test programs, bundled with + the original ZLIB1.DLL distribution. + + If, for any reason, you need to build an incompatible DLL, + please use a different file name. + + + 2. Why did you change the name of the DLL to ZLIB1.DLL? + What happened to the old ZLIB.DLL? + + - The old ZLIB.DLL, built from zlib-1.1.4 or earlier, required + compilation settings that were incompatible to those used by + a static build. The DLL settings were supposed to be enabled + by defining the macro ZLIB_DLL, before including "zlib.h". + Incorrect handling of this macro was silently accepted at + build time, resulting in two major problems: + + * ZLIB_DLL was missing from the old makefile. When building + the DLL, not all people added it to the build options. In + consequence, incompatible incarnations of ZLIB.DLL started + to circulate around the net. + + * When switching from using the static library to using the + DLL, applications had to define the ZLIB_DLL macro and + to recompile all the sources that contained calls to zlib + functions. Failure to do so resulted in creating binaries + that were unable to run with the official ZLIB.DLL build. + + The only possible solution that we could foresee was to make + a binary-incompatible change in the DLL interface, in order to + remove the dependency on the ZLIB_DLL macro, and to release + the new DLL under a different name. + + We chose the name ZLIB1.DLL, where '1' indicates the major + zlib version number. We hope that we will not have to break + the binary compatibility again, at least not as long as the + zlib-1.x series will last. + + There is still a ZLIB_DLL macro, that can trigger a more + efficient build and use of the DLL, but compatibility no + longer dependents on it. + + + 3. Can I build ZLIB.DLL from the new zlib sources, and replace + an old ZLIB.DLL, that was built from zlib-1.1.4 or earlier? + + - In principle, you can do it by assigning calling convention + keywords to the macros ZEXPORT and ZEXPORTVA. In practice, + it depends on what you mean by "an old ZLIB.DLL", because the + old DLL exists in several mutually-incompatible versions. + You have to find out first what kind of calling convention is + being used in your particular ZLIB.DLL build, and to use the + same one in the new build. If you don't know what this is all + about, you might be better off if you would just leave the old + DLL intact. + + + 4. Can I compile my application using the new zlib interface, and + link it to an old ZLIB.DLL, that was built from zlib-1.1.4 or + earlier? + + - The official answer is "no"; the real answer depends again on + what kind of ZLIB.DLL you have. Even if you are lucky, this + course of action is unreliable. + + If you rebuild your application and you intend to use a newer + version of zlib (post- 1.1.4), it is strongly recommended to + link it to the new ZLIB1.DLL. + + + 5. Why are the zlib symbols exported by name, and not by ordinal? + + - Although exporting symbols by ordinal is a little faster, it + is risky. Any single glitch in the maintenance or use of the + DEF file that contains the ordinals can result in incompatible + builds and frustrating crashes. Simply put, the benefits of + exporting symbols by ordinal do not justify the risks. + + Technically, it should be possible to maintain ordinals in + the DEF file, and still export the symbols by name. Ordinals + exist in every DLL, and even if the dynamic linking performed + at the DLL startup is searching for names, ordinals serve as + hints, for a faster name lookup. However, if the DEF file + contains ordinals, the Microsoft linker automatically builds + an implib that will cause the executables linked to it to use + those ordinals, and not the names. It is interesting to + notice that the GNU linker for Win32 does not suffer from this + problem. + + It is possible to avoid the DEF file if the exported symbols + are accompanied by a "__declspec(dllexport)" attribute in the + source files. You can do this in zlib by predefining the + ZLIB_DLL macro. + + + 6. I see that the ZLIB1.DLL functions use the "C" (CDECL) calling + convention. Why not use the STDCALL convention? + STDCALL is the standard convention in Win32, and I need it in + my Visual Basic project! + + (For readability, we use CDECL to refer to the convention + triggered by the "__cdecl" keyword, STDCALL to refer to + the convention triggered by "__stdcall", and FASTCALL to + refer to the convention triggered by "__fastcall".) + + - Most of the native Windows API functions (without varargs) use + indeed the WINAPI convention (which translates to STDCALL in + Win32), but the standard C functions use CDECL. If a user + application is intrinsically tied to the Windows API (e.g. + it calls native Windows API functions such as CreateFile()), + sometimes it makes sense to decorate its own functions with + WINAPI. But if ANSI C or POSIX portability is a goal (e.g. + it calls standard C functions such as fopen()), it is not a + sound decision to request the inclusion of , or to + use non-ANSI constructs, for the sole purpose to make the user + functions STDCALL-able. + + The functionality offered by zlib is not in the category of + "Windows functionality", but is more like "C functionality". + + Technically, STDCALL is not bad; in fact, it is slightly + faster than CDECL, and it works with variable-argument + functions, just like CDECL. It is unfortunate that, in spite + of using STDCALL in the Windows API, it is not the default + convention used by the C compilers that run under Windows. + The roots of the problem reside deep inside the unsafety of + the K&R-style function prototypes, where the argument types + are not specified; but that is another story for another day. + + The remaining fact is that CDECL is the default convention. + Even if an explicit convention is hard-coded into the function + prototypes inside C headers, problems may appear. The + necessity to expose the convention in users' callbacks is one + of these problems. + + The calling convention issues are also important when using + zlib in other programming languages. Some of them, like Ada + (GNAT) and Fortran (GNU G77), have C bindings implemented + initially on Unix, and relying on the C calling convention. + On the other hand, the pre- .NET versions of Microsoft Visual + Basic require STDCALL, while Borland Delphi prefers, although + it does not require, FASTCALL. + + In fairness to all possible uses of zlib outside the C + programming language, we choose the default "C" convention. + Anyone interested in different bindings or conventions is + encouraged to maintain specialized projects. The "contrib/" + directory from the zlib distribution already holds a couple + of foreign bindings, such as Ada, C++, and Delphi. + + + 7. I need a DLL for my Visual Basic project. What can I do? + + - Define the ZLIB_WINAPI macro before including "zlib.h", when + building both the DLL and the user application (except that + you don't need to define anything when using the DLL in Visual + Basic). The ZLIB_WINAPI macro will switch on the WINAPI + (STDCALL) convention. The name of this DLL must be different + than the official ZLIB1.DLL. + + Gilles Vollant has contributed a build named ZLIBWAPI.DLL, + with the ZLIB_WINAPI macro turned on, and with the minizip + functionality built in. For more information, please read + the notes inside "contrib/vstudio/readme.txt", found in the + zlib distribution. + + + 8. I need to use zlib in my Microsoft .NET project. What can I + do? + + - Henrik Ravn has contributed a .NET wrapper around zlib. Look + into contrib/dotzlib/, inside the zlib distribution. + + + 9. If my application uses ZLIB1.DLL, should I link it to + MSVCRT.DLL? Why? + + - It is not required, but it is recommended to link your + application to MSVCRT.DLL, if it uses ZLIB1.DLL. + + The executables (.EXE, .DLL, etc.) that are involved in the + same process and are using the C run-time library (i.e. they + are calling standard C functions), must link to the same + library. There are several libraries in the Win32 system: + CRTDLL.DLL, MSVCRT.DLL, the static C libraries, etc. + Since ZLIB1.DLL is linked to MSVCRT.DLL, the executables that + depend on it should also be linked to MSVCRT.DLL. + + +10. Why are you saying that ZLIB1.DLL and my application should + be linked to the same C run-time (CRT) library? I linked my + application and my DLLs to different C libraries (e.g. my + application to a static library, and my DLLs to MSVCRT.DLL), + and everything works fine. + + - If a user library invokes only pure Win32 API (accessible via + and the related headers), its DLL build will work + in any context. But if this library invokes standard C API, + things get more complicated. + + There is a single Win32 library in a Win32 system. Every + function in this library resides in a single DLL module, that + is safe to call from anywhere. On the other hand, there are + multiple versions of the C library, and each of them has its + own separate internal state. Standalone executables and user + DLLs that call standard C functions must link to a C run-time + (CRT) library, be it static or shared (DLL). Intermixing + occurs when an executable (not necessarily standalone) and a + DLL are linked to different CRTs, and both are running in the + same process. + + Intermixing multiple CRTs is possible, as long as their + internal states are kept intact. The Microsoft Knowledge Base + articles KB94248 "HOWTO: Use the C Run-Time" and KB140584 + "HOWTO: Link with the Correct C Run-Time (CRT) Library" + mention the potential problems raised by intermixing. + + If intermixing works for you, it's because your application + and DLLs are avoiding the corruption of each of the CRTs' + internal states, maybe by careful design, or maybe by fortune. + + Also note that linking ZLIB1.DLL to non-Microsoft CRTs, such + as those provided by Borland, raises similar problems. + + +11. Why are you linking ZLIB1.DLL to MSVCRT.DLL? + + - MSVCRT.DLL exists on every Windows 95 with a new service pack + installed, or with Microsoft Internet Explorer 4 or later, and + on all other Windows 4.x or later (Windows 98, Windows NT 4, + or later). It is freely distributable; if not present in the + system, it can be downloaded from Microsoft or from other + software provider for free. + + The fact that MSVCRT.DLL does not exist on a virgin Windows 95 + is not so problematic. Windows 95 is scarcely found nowadays, + Microsoft ended its support a long time ago, and many recent + applications from various vendors, including Microsoft, do not + even run on it. Furthermore, no serious user should run + Windows 95 without a proper update installed. + + +12. Why are you not linking ZLIB1.DLL to + <> ? + + - We considered and abandoned the following alternatives: + + * Linking ZLIB1.DLL to a static C library (LIBC.LIB, or + LIBCMT.LIB) is not a good option. People are using the DLL + mainly to save disk space. If you are linking your program + to a static C library, you may as well consider linking zlib + in statically, too. + + * Linking ZLIB1.DLL to CRTDLL.DLL looks appealing, because + CRTDLL.DLL is present on every Win32 installation. + Unfortunately, it has a series of problems: it does not + work properly with Microsoft's C++ libraries, it does not + provide support for 64-bit file offsets, (and so on...), + and Microsoft discontinued its support a long time ago. + + * Linking ZLIB1.DLL to MSVCR70.DLL or MSVCR71.DLL, supplied + with the Microsoft .NET platform, and Visual C++ 7.0/7.1, + raises problems related to the status of ZLIB1.DLL as a + system component. According to the Microsoft Knowledge Base + article KB326922 "INFO: Redistribution of the Shared C + Runtime Component in Visual C++ .NET", MSVCR70.DLL and + MSVCR71.DLL are not supposed to function as system DLLs, + because they may clash with MSVCRT.DLL. Instead, the + application's installer is supposed to put these DLLs + (if needed) in the application's private directory. + If ZLIB1.DLL depends on a non-system runtime, it cannot + function as a redistributable system component. + + * Linking ZLIB1.DLL to non-Microsoft runtimes, such as + Borland's, or Cygwin's, raises problems related to the + reliable presence of these runtimes on Win32 systems. + It's easier to let the DLL build of zlib up to the people + who distribute these runtimes, and who may proceed as + explained in the answer to Question 14. + + +13. If ZLIB1.DLL cannot be linked to MSVCR70.DLL or MSVCR71.DLL, + how can I build/use ZLIB1.DLL in Microsoft Visual C++ 7.0 + (Visual Studio .NET) or newer? + + - Due to the problems explained in the Microsoft Knowledge Base + article KB326922 (see the previous answer), the C runtime that + comes with the VC7 environment is no longer considered a + system component. That is, it should not be assumed that this + runtime exists, or may be installed in a system directory. + Since ZLIB1.DLL is supposed to be a system component, it may + not depend on a non-system component. + + In order to link ZLIB1.DLL and your application to MSVCRT.DLL + in VC7, you need the library of Visual C++ 6.0 or older. If + you don't have this library at hand, it's probably best not to + use ZLIB1.DLL. + + We are hoping that, in the future, Microsoft will provide a + way to build applications linked to a proper system runtime, + from the Visual C++ environment. Until then, you have a + couple of alternatives, such as linking zlib in statically. + If your application requires dynamic linking, you may proceed + as explained in the answer to Question 14. + + +14. I need to link my own DLL build to a CRT different than + MSVCRT.DLL. What can I do? + + - Feel free to rebuild the DLL from the zlib sources, and link + it the way you want. You should, however, clearly state that + your build is unofficial. You should give it a different file + name, and/or install it in a private directory that can be + accessed by your application only, and is not visible to the + others (i.e. it's neither in the PATH, nor in the SYSTEM or + SYSTEM32 directories). Otherwise, your build may clash with + applications that link to the official build. + + For example, in Cygwin, zlib is linked to the Cygwin runtime + CYGWIN1.DLL, and it is distributed under the name CYGZ.DLL. + + +15. May I include additional pieces of code that I find useful, + link them in ZLIB1.DLL, and export them? + + - No. A legitimate build of ZLIB1.DLL must not include code + that does not originate from the official zlib source code. + But you can make your own private DLL build, under a different + file name, as suggested in the previous answer. + + For example, zlib is a part of the VCL library, distributed + with Borland Delphi and C++ Builder. The DLL build of VCL + is a redistributable file, named VCLxx.DLL. + + +16. May I remove some functionality out of ZLIB1.DLL, by enabling + macros like NO_GZCOMPRESS or NO_GZIP at compile time? + + - No. A legitimate build of ZLIB1.DLL must provide the complete + zlib functionality, as implemented in the official zlib source + code. But you can make your own private DLL build, under a + different file name, as suggested in the previous answer. + + +17. I made my own ZLIB1.DLL build. Can I test it for compliance? + + - We prefer that you download the official DLL from the zlib + web site. If you need something peculiar from this DLL, you + can send your suggestion to the zlib mailing list. + + However, in case you do rebuild the DLL yourself, you can run + it with the test programs found in the DLL distribution. + Running these test programs is not a guarantee of compliance, + but a failure can imply a detected problem. + +** + +This document is written and maintained by +Cosmin Truta diff --git a/src/3rdparty/zlib/win32/README-WIN32.txt b/src/3rdparty/zlib/win32/README-WIN32.txt new file mode 100644 index 0000000..3d77d52 --- /dev/null +++ b/src/3rdparty/zlib/win32/README-WIN32.txt @@ -0,0 +1,103 @@ +ZLIB DATA COMPRESSION LIBRARY + +zlib 1.2.8 is a general purpose data compression library. All the code is +thread safe. The data format used by the zlib library is described by RFCs +(Request for Comments) 1950 to 1952 in the files +http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format) +and rfc1952.txt (gzip format). + +All functions of the compression library are documented in the file zlib.h +(volunteer to write man pages welcome, contact zlib@gzip.org). Two compiled +examples are distributed in this package, example and minigzip. The example_d +and minigzip_d flavors validate that the zlib1.dll file is working correctly. + +Questions about zlib should be sent to . The zlib home page +is http://zlib.net/ . Before reporting a problem, please check this site to +verify that you have the latest version of zlib; otherwise get the latest +version and check whether the problem still exists or not. + +PLEASE read DLL_FAQ.txt, and the the zlib FAQ http://zlib.net/zlib_faq.html +before asking for help. + + +Manifest: + +The package zlib-1.2.8-win32-x86.zip will contain the following files: + + README-WIN32.txt This document + ChangeLog Changes since previous zlib packages + DLL_FAQ.txt Frequently asked questions about zlib1.dll + zlib.3.pdf Documentation of this library in Adobe Acrobat format + + example.exe A statically-bound example (using zlib.lib, not the dll) + example.pdb Symbolic information for debugging example.exe + + example_d.exe A zlib1.dll bound example (using zdll.lib) + example_d.pdb Symbolic information for debugging example_d.exe + + minigzip.exe A statically-bound test program (using zlib.lib, not the dll) + minigzip.pdb Symbolic information for debugging minigzip.exe + + minigzip_d.exe A zlib1.dll bound test program (using zdll.lib) + minigzip_d.pdb Symbolic information for debugging minigzip_d.exe + + zlib.h Install these files into the compilers' INCLUDE path to + zconf.h compile programs which use zlib.lib or zdll.lib + + zdll.lib Install these files into the compilers' LIB path if linking + zdll.exp a compiled program to the zlib1.dll binary + + zlib.lib Install these files into the compilers' LIB path to link zlib + zlib.pdb into compiled programs, without zlib1.dll runtime dependency + (zlib.pdb provides debugging info to the compile time linker) + + zlib1.dll Install this binary shared library into the system PATH, or + the program's runtime directory (where the .exe resides) + zlib1.pdb Install in the same directory as zlib1.dll, in order to debug + an application crash using WinDbg or similar tools. + +All .pdb files above are entirely optional, but are very useful to a developer +attempting to diagnose program misbehavior or a crash. Many additional +important files for developers can be found in the zlib127.zip source package +available from http://zlib.net/ - review that package's README file for details. + + +Acknowledgments: + +The deflate format used by zlib was defined by Phil Katz. The deflate and +zlib specifications were written by L. Peter Deutsch. Thanks to all the +people who reported problems and suggested various improvements in zlib; they +are too numerous to cite here. + + +Copyright notice: + + (C) 1995-2012 Jean-loup Gailly and Mark Adler + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + + Jean-loup Gailly Mark Adler + jloup@gzip.org madler@alumni.caltech.edu + +If you use the zlib library in a product, we would appreciate *not* receiving +lengthy legal documents to sign. The sources are provided for free but without +warranty of any kind. The library has been entirely written by Jean-loup +Gailly and Mark Adler; it does not include third-party code. + +If you redistribute modified sources, we would appreciate that you include in +the file ChangeLog history information documenting your changes. Please read +the FAQ for more information on the distribution of modified source versions. diff --git a/src/3rdparty/zlib/win32/VisualC.txt b/src/3rdparty/zlib/win32/VisualC.txt new file mode 100644 index 0000000..579a5fc --- /dev/null +++ b/src/3rdparty/zlib/win32/VisualC.txt @@ -0,0 +1,3 @@ + +To build zlib using the Microsoft Visual C++ environment, +use the appropriate project from the projects/ directory. diff --git a/src/3rdparty/zlib/win32/zlib.def b/src/3rdparty/zlib/win32/zlib.def new file mode 100644 index 0000000..face655 --- /dev/null +++ b/src/3rdparty/zlib/win32/zlib.def @@ -0,0 +1,86 @@ +; zlib data compression library +EXPORTS +; basic functions + zlibVersion + deflate + deflateEnd + inflate + inflateEnd +; advanced functions + deflateSetDictionary + deflateCopy + deflateReset + deflateParams + deflateTune + deflateBound + deflatePending + deflatePrime + deflateSetHeader + inflateSetDictionary + inflateGetDictionary + inflateSync + inflateCopy + inflateReset + inflateReset2 + inflatePrime + inflateMark + inflateGetHeader + inflateBack + inflateBackEnd + zlibCompileFlags +; utility functions + compress + compress2 + compressBound + uncompress + gzopen + gzdopen + gzbuffer + gzsetparams + gzread + gzwrite + gzprintf + gzvprintf + gzputs + gzgets + gzputc + gzgetc + gzungetc + gzflush + gzseek + gzrewind + gztell + gzoffset + gzeof + gzdirect + gzclose + gzclose_r + gzclose_w + gzerror + gzclearerr +; large file functions + gzopen64 + gzseek64 + gztell64 + gzoffset64 + adler32_combine64 + crc32_combine64 +; checksum functions + adler32 + crc32 + adler32_combine + crc32_combine +; various hacks, don't look :) + deflateInit_ + deflateInit2_ + inflateInit_ + inflateInit2_ + inflateBackInit_ + gzgetc_ + zError + inflateSyncPoint + get_crc_table + inflateUndermine + inflateResetKeep + deflateResetKeep + gzopen_w diff --git a/src/3rdparty/zlib/win32/zlib1.rc b/src/3rdparty/zlib/win32/zlib1.rc new file mode 100644 index 0000000..5c0feed --- /dev/null +++ b/src/3rdparty/zlib/win32/zlib1.rc @@ -0,0 +1,40 @@ +#include +#include "../zlib.h" + +#ifdef GCC_WINDRES +VS_VERSION_INFO VERSIONINFO +#else +VS_VERSION_INFO VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE +#endif + FILEVERSION ZLIB_VER_MAJOR,ZLIB_VER_MINOR,ZLIB_VER_REVISION,0 + PRODUCTVERSION ZLIB_VER_MAJOR,ZLIB_VER_MINOR,ZLIB_VER_REVISION,0 + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK +#ifdef _DEBUG + FILEFLAGS 1 +#else + FILEFLAGS 0 +#endif + FILEOS VOS__WINDOWS32 + FILETYPE VFT_DLL + FILESUBTYPE 0 // not used +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904E4" + //language ID = U.S. English, char set = Windows, Multilingual + BEGIN + VALUE "FileDescription", "zlib data compression library\0" + VALUE "FileVersion", ZLIB_VERSION "\0" + VALUE "InternalName", "zlib1.dll\0" + VALUE "LegalCopyright", "(C) 1995-2013 Jean-loup Gailly & Mark Adler\0" + VALUE "OriginalFilename", "zlib1.dll\0" + VALUE "ProductName", "zlib\0" + VALUE "ProductVersion", ZLIB_VERSION "\0" + VALUE "Comments", "For more information visit http://www.zlib.net/\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0409, 1252 + END +END diff --git a/src/3rdparty/zlib/zconf.h.cmakein b/src/3rdparty/zlib/zconf.h.cmakein new file mode 100644 index 0000000..043019c --- /dev/null +++ b/src/3rdparty/zlib/zconf.h.cmakein @@ -0,0 +1,513 @@ +/* zconf.h -- configuration of the zlib compression library + * Copyright (C) 1995-2013 Jean-loup Gailly. + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +/* @(#) $Id$ */ + +#ifndef ZCONF_H +#define ZCONF_H +#cmakedefine Z_PREFIX +#cmakedefine Z_HAVE_UNISTD_H + +/* + * If you *really* need a unique prefix for all types and library functions, + * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it. + * Even better than compiling with -DZ_PREFIX would be to use configure to set + * this permanently in zconf.h using "./configure --zprefix". + */ +#ifdef Z_PREFIX /* may be set to #if 1 by ./configure */ +# define Z_PREFIX_SET + +/* all linked symbols */ +# define _dist_code z__dist_code +# define _length_code z__length_code +# define _tr_align z__tr_align +# define _tr_flush_bits z__tr_flush_bits +# define _tr_flush_block z__tr_flush_block +# define _tr_init z__tr_init +# define _tr_stored_block z__tr_stored_block +# define _tr_tally z__tr_tally +# define adler32 z_adler32 +# define adler32_combine z_adler32_combine +# define adler32_combine64 z_adler32_combine64 +# ifndef Z_SOLO +# define compress z_compress +# define compress2 z_compress2 +# define compressBound z_compressBound +# endif +# define crc32 z_crc32 +# define crc32_combine z_crc32_combine +# define crc32_combine64 z_crc32_combine64 +# define deflate z_deflate +# define deflateBound z_deflateBound +# define deflateCopy z_deflateCopy +# define deflateEnd z_deflateEnd +# define deflateInit2_ z_deflateInit2_ +# define deflateInit_ z_deflateInit_ +# define deflateParams z_deflateParams +# define deflatePending z_deflatePending +# define deflatePrime z_deflatePrime +# define deflateReset z_deflateReset +# define deflateResetKeep z_deflateResetKeep +# define deflateSetDictionary z_deflateSetDictionary +# define deflateSetHeader z_deflateSetHeader +# define deflateTune z_deflateTune +# define deflate_copyright z_deflate_copyright +# define get_crc_table z_get_crc_table +# ifndef Z_SOLO +# define gz_error z_gz_error +# define gz_intmax z_gz_intmax +# define gz_strwinerror z_gz_strwinerror +# define gzbuffer z_gzbuffer +# define gzclearerr z_gzclearerr +# define gzclose z_gzclose +# define gzclose_r z_gzclose_r +# define gzclose_w z_gzclose_w +# define gzdirect z_gzdirect +# define gzdopen z_gzdopen +# define gzeof z_gzeof +# define gzerror z_gzerror +# define gzflush z_gzflush +# define gzgetc z_gzgetc +# define gzgetc_ z_gzgetc_ +# define gzgets z_gzgets +# define gzoffset z_gzoffset +# define gzoffset64 z_gzoffset64 +# define gzopen z_gzopen +# define gzopen64 z_gzopen64 +# ifdef _WIN32 +# define gzopen_w z_gzopen_w +# endif +# define gzprintf z_gzprintf +# define gzvprintf z_gzvprintf +# define gzputc z_gzputc +# define gzputs z_gzputs +# define gzread z_gzread +# define gzrewind z_gzrewind +# define gzseek z_gzseek +# define gzseek64 z_gzseek64 +# define gzsetparams z_gzsetparams +# define gztell z_gztell +# define gztell64 z_gztell64 +# define gzungetc z_gzungetc +# define gzwrite z_gzwrite +# endif +# define inflate z_inflate +# define inflateBack z_inflateBack +# define inflateBackEnd z_inflateBackEnd +# define inflateBackInit_ z_inflateBackInit_ +# define inflateCopy z_inflateCopy +# define inflateEnd z_inflateEnd +# define inflateGetHeader z_inflateGetHeader +# define inflateInit2_ z_inflateInit2_ +# define inflateInit_ z_inflateInit_ +# define inflateMark z_inflateMark +# define inflatePrime z_inflatePrime +# define inflateReset z_inflateReset +# define inflateReset2 z_inflateReset2 +# define inflateSetDictionary z_inflateSetDictionary +# define inflateGetDictionary z_inflateGetDictionary +# define inflateSync z_inflateSync +# define inflateSyncPoint z_inflateSyncPoint +# define inflateUndermine z_inflateUndermine +# define inflateResetKeep z_inflateResetKeep +# define inflate_copyright z_inflate_copyright +# define inflate_fast z_inflate_fast +# define inflate_table z_inflate_table +# ifndef Z_SOLO +# define uncompress z_uncompress +# endif +# define zError z_zError +# ifndef Z_SOLO +# define zcalloc z_zcalloc +# define zcfree z_zcfree +# endif +# define zlibCompileFlags z_zlibCompileFlags +# define zlibVersion z_zlibVersion + +/* all zlib typedefs in zlib.h and zconf.h */ +# define Byte z_Byte +# define Bytef z_Bytef +# define alloc_func z_alloc_func +# define charf z_charf +# define free_func z_free_func +# ifndef Z_SOLO +# define gzFile z_gzFile +# endif +# define gz_header z_gz_header +# define gz_headerp z_gz_headerp +# define in_func z_in_func +# define intf z_intf +# define out_func z_out_func +# define uInt z_uInt +# define uIntf z_uIntf +# define uLong z_uLong +# define uLongf z_uLongf +# define voidp z_voidp +# define voidpc z_voidpc +# define voidpf z_voidpf + +/* all zlib structs in zlib.h and zconf.h */ +# define gz_header_s z_gz_header_s +# define internal_state z_internal_state + +#endif + +#if defined(__MSDOS__) && !defined(MSDOS) +# define MSDOS +#endif +#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2) +# define OS2 +#endif +#if defined(_WINDOWS) && !defined(WINDOWS) +# define WINDOWS +#endif +#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__) +# ifndef WIN32 +# define WIN32 +# endif +#endif +#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32) +# if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__) +# ifndef SYS16BIT +# define SYS16BIT +# endif +# endif +#endif + +/* + * Compile with -DMAXSEG_64K if the alloc function cannot allocate more + * than 64k bytes at a time (needed on systems with 16-bit int). + */ +#ifdef SYS16BIT +# define MAXSEG_64K +#endif +#ifdef MSDOS +# define UNALIGNED_OK +#endif + +#ifdef __STDC_VERSION__ +# ifndef STDC +# define STDC +# endif +# if __STDC_VERSION__ >= 199901L +# ifndef STDC99 +# define STDC99 +# endif +# endif +#endif +#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus)) +# define STDC +#endif +#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__)) +# define STDC +#endif +#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32)) +# define STDC +#endif +#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__)) +# define STDC +#endif + +#if defined(__OS400__) && !defined(STDC) /* iSeries (formerly AS/400). */ +# define STDC +#endif + +#ifndef STDC +# ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */ +# define const /* note: need a more gentle solution here */ +# endif +#endif + +#if defined(ZLIB_CONST) && !defined(z_const) +# define z_const const +#else +# define z_const +#endif + +/* Some Mac compilers merge all .h files incorrectly: */ +#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__) +# define NO_DUMMY_DECL +#endif + +/* Maximum value for memLevel in deflateInit2 */ +#ifndef MAX_MEM_LEVEL +# ifdef MAXSEG_64K +# define MAX_MEM_LEVEL 8 +# else +# define MAX_MEM_LEVEL 9 +# endif +#endif + +/* Maximum value for windowBits in deflateInit2 and inflateInit2. + * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files + * created by gzip. (Files created by minigzip can still be extracted by + * gzip.) + */ +#ifndef MAX_WBITS +# define MAX_WBITS 15 /* 32K LZ77 window */ +#endif + +/* The memory requirements for deflate are (in bytes): + (1 << (windowBits+2)) + (1 << (memLevel+9)) + that is: 128K for windowBits=15 + 128K for memLevel = 8 (default values) + plus a few kilobytes for small objects. For example, if you want to reduce + the default memory requirements from 256K to 128K, compile with + make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7" + Of course this will generally degrade compression (there's no free lunch). + + The memory requirements for inflate are (in bytes) 1 << windowBits + that is, 32K for windowBits=15 (default value) plus a few kilobytes + for small objects. +*/ + + /* Type declarations */ + +#ifndef OF /* function prototypes */ +# ifdef STDC +# define OF(args) args +# else +# define OF(args) () +# endif +#endif + +#ifndef Z_ARG /* function prototypes for stdarg */ +# if defined(STDC) || defined(Z_HAVE_STDARG_H) +# define Z_ARG(args) args +# else +# define Z_ARG(args) () +# endif +#endif + +/* The following definitions for FAR are needed only for MSDOS mixed + * model programming (small or medium model with some far allocations). + * This was tested only with MSC; for other MSDOS compilers you may have + * to define NO_MEMCPY in zutil.h. If you don't need the mixed model, + * just define FAR to be empty. + */ +#ifdef SYS16BIT +# if defined(M_I86SM) || defined(M_I86MM) + /* MSC small or medium model */ +# define SMALL_MEDIUM +# ifdef _MSC_VER +# define FAR _far +# else +# define FAR far +# endif +# endif +# if (defined(__SMALL__) || defined(__MEDIUM__)) + /* Turbo C small or medium model */ +# define SMALL_MEDIUM +# ifdef __BORLANDC__ +# define FAR _far +# else +# define FAR far +# endif +# endif +#endif + +#if defined(WINDOWS) || defined(WIN32) + /* If building or using zlib as a DLL, define ZLIB_DLL. + * This is not mandatory, but it offers a little performance increase. + */ +# ifdef ZLIB_DLL +# if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500)) +# ifdef ZLIB_INTERNAL +# define ZEXTERN extern __declspec(dllexport) +# else +# define ZEXTERN extern __declspec(dllimport) +# endif +# endif +# endif /* ZLIB_DLL */ + /* If building or using zlib with the WINAPI/WINAPIV calling convention, + * define ZLIB_WINAPI. + * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI. + */ +# ifdef ZLIB_WINAPI +# ifdef FAR +# undef FAR +# endif +# include + /* No need for _export, use ZLIB.DEF instead. */ + /* For complete Windows compatibility, use WINAPI, not __stdcall. */ +# define ZEXPORT WINAPI +# ifdef WIN32 +# define ZEXPORTVA WINAPIV +# else +# define ZEXPORTVA FAR CDECL +# endif +# endif +#endif + +#if defined (__BEOS__) +# ifdef ZLIB_DLL +# ifdef ZLIB_INTERNAL +# define ZEXPORT __declspec(dllexport) +# define ZEXPORTVA __declspec(dllexport) +# else +# define ZEXPORT __declspec(dllimport) +# define ZEXPORTVA __declspec(dllimport) +# endif +# endif +#endif + +#ifndef ZEXTERN +# define ZEXTERN extern +#endif +#ifndef ZEXPORT +# define ZEXPORT +#endif +#ifndef ZEXPORTVA +# define ZEXPORTVA +#endif + +#ifndef FAR +# define FAR +#endif + +#if !defined(__MACTYPES__) +typedef unsigned char Byte; /* 8 bits */ +#endif +typedef unsigned int uInt; /* 16 bits or more */ +typedef unsigned long uLong; /* 32 bits or more */ + +#ifdef SMALL_MEDIUM + /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */ +# define Bytef Byte FAR +#else + typedef Byte FAR Bytef; +#endif +typedef char FAR charf; +typedef int FAR intf; +typedef uInt FAR uIntf; +typedef uLong FAR uLongf; + +#ifdef STDC + typedef void const *voidpc; + typedef void FAR *voidpf; + typedef void *voidp; +#else + typedef Byte const *voidpc; + typedef Byte FAR *voidpf; + typedef Byte *voidp; +#endif + +#if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC) +# include +# if (UINT_MAX == 0xffffffffUL) +# define Z_U4 unsigned +# elif (ULONG_MAX == 0xffffffffUL) +# define Z_U4 unsigned long +# elif (USHRT_MAX == 0xffffffffUL) +# define Z_U4 unsigned short +# endif +#endif + +#ifdef Z_U4 + typedef Z_U4 z_crc_t; +#else + typedef unsigned long z_crc_t; +#endif + +#ifdef HAVE_UNISTD_H /* may be set to #if 1 by ./configure */ +# define Z_HAVE_UNISTD_H +#endif + +#ifdef HAVE_STDARG_H /* may be set to #if 1 by ./configure */ +# define Z_HAVE_STDARG_H +#endif + +#ifdef STDC +# ifndef Z_SOLO +# include /* for off_t */ +# endif +#endif + +#if defined(STDC) || defined(Z_HAVE_STDARG_H) +# ifndef Z_SOLO +# include /* for va_list */ +# endif +#endif + +#ifdef _WIN32 +# ifndef Z_SOLO +# include /* for wchar_t */ +# endif +#endif + +/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and + * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even + * though the former does not conform to the LFS document), but considering + * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as + * equivalently requesting no 64-bit operations + */ +#if defined(_LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1 +# undef _LARGEFILE64_SOURCE +#endif + +#if defined(__WATCOMC__) && !defined(Z_HAVE_UNISTD_H) +# define Z_HAVE_UNISTD_H +#endif +#ifndef Z_SOLO +# if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE) +# include /* for SEEK_*, off_t, and _LFS64_LARGEFILE */ +# ifdef VMS +# include /* for off_t */ +# endif +# ifndef z_off_t +# define z_off_t off_t +# endif +# endif +#endif + +#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0 +# define Z_LFS64 +#endif + +#if defined(_LARGEFILE64_SOURCE) && defined(Z_LFS64) +# define Z_LARGE64 +#endif + +#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS-0 == 64 && defined(Z_LFS64) +# define Z_WANT64 +#endif + +#if !defined(SEEK_SET) && !defined(Z_SOLO) +# define SEEK_SET 0 /* Seek from beginning of file. */ +# define SEEK_CUR 1 /* Seek from current position. */ +# define SEEK_END 2 /* Set file pointer to EOF plus "offset" */ +#endif + +#ifndef z_off_t +# define z_off_t long +#endif + +#if !defined(_WIN32) && defined(Z_LARGE64) +# define z_off64_t off64_t +#else +# if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO) +# define z_off64_t __int64 +# else +# define z_off64_t z_off_t +# endif +#endif + +/* MVS linker does not support external names larger than 8 bytes */ +#if defined(__MVS__) + #pragma map(deflateInit_,"DEIN") + #pragma map(deflateInit2_,"DEIN2") + #pragma map(deflateEnd,"DEEND") + #pragma map(deflateBound,"DEBND") + #pragma map(inflateInit_,"ININ") + #pragma map(inflateInit2_,"ININ2") + #pragma map(inflateEnd,"INEND") + #pragma map(inflateSync,"INSY") + #pragma map(inflateSetDictionary,"INSEDI") + #pragma map(compressBound,"CMBND") + #pragma map(inflate_table,"INTABL") + #pragma map(inflate_fast,"INFA") + #pragma map(inflate_copyright,"INCOPY") +#endif + +#endif /* ZCONF_H */ diff --git a/src/3rdparty/zlib/zconf.h.in b/src/3rdparty/zlib/zconf.h.in new file mode 100644 index 0000000..9987a77 --- /dev/null +++ b/src/3rdparty/zlib/zconf.h.in @@ -0,0 +1,511 @@ +/* zconf.h -- configuration of the zlib compression library + * Copyright (C) 1995-2013 Jean-loup Gailly. + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +/* @(#) $Id$ */ + +#ifndef ZCONF_H +#define ZCONF_H + +/* + * If you *really* need a unique prefix for all types and library functions, + * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it. + * Even better than compiling with -DZ_PREFIX would be to use configure to set + * this permanently in zconf.h using "./configure --zprefix". + */ +#ifdef Z_PREFIX /* may be set to #if 1 by ./configure */ +# define Z_PREFIX_SET + +/* all linked symbols */ +# define _dist_code z__dist_code +# define _length_code z__length_code +# define _tr_align z__tr_align +# define _tr_flush_bits z__tr_flush_bits +# define _tr_flush_block z__tr_flush_block +# define _tr_init z__tr_init +# define _tr_stored_block z__tr_stored_block +# define _tr_tally z__tr_tally +# define adler32 z_adler32 +# define adler32_combine z_adler32_combine +# define adler32_combine64 z_adler32_combine64 +# ifndef Z_SOLO +# define compress z_compress +# define compress2 z_compress2 +# define compressBound z_compressBound +# endif +# define crc32 z_crc32 +# define crc32_combine z_crc32_combine +# define crc32_combine64 z_crc32_combine64 +# define deflate z_deflate +# define deflateBound z_deflateBound +# define deflateCopy z_deflateCopy +# define deflateEnd z_deflateEnd +# define deflateInit2_ z_deflateInit2_ +# define deflateInit_ z_deflateInit_ +# define deflateParams z_deflateParams +# define deflatePending z_deflatePending +# define deflatePrime z_deflatePrime +# define deflateReset z_deflateReset +# define deflateResetKeep z_deflateResetKeep +# define deflateSetDictionary z_deflateSetDictionary +# define deflateSetHeader z_deflateSetHeader +# define deflateTune z_deflateTune +# define deflate_copyright z_deflate_copyright +# define get_crc_table z_get_crc_table +# ifndef Z_SOLO +# define gz_error z_gz_error +# define gz_intmax z_gz_intmax +# define gz_strwinerror z_gz_strwinerror +# define gzbuffer z_gzbuffer +# define gzclearerr z_gzclearerr +# define gzclose z_gzclose +# define gzclose_r z_gzclose_r +# define gzclose_w z_gzclose_w +# define gzdirect z_gzdirect +# define gzdopen z_gzdopen +# define gzeof z_gzeof +# define gzerror z_gzerror +# define gzflush z_gzflush +# define gzgetc z_gzgetc +# define gzgetc_ z_gzgetc_ +# define gzgets z_gzgets +# define gzoffset z_gzoffset +# define gzoffset64 z_gzoffset64 +# define gzopen z_gzopen +# define gzopen64 z_gzopen64 +# ifdef _WIN32 +# define gzopen_w z_gzopen_w +# endif +# define gzprintf z_gzprintf +# define gzvprintf z_gzvprintf +# define gzputc z_gzputc +# define gzputs z_gzputs +# define gzread z_gzread +# define gzrewind z_gzrewind +# define gzseek z_gzseek +# define gzseek64 z_gzseek64 +# define gzsetparams z_gzsetparams +# define gztell z_gztell +# define gztell64 z_gztell64 +# define gzungetc z_gzungetc +# define gzwrite z_gzwrite +# endif +# define inflate z_inflate +# define inflateBack z_inflateBack +# define inflateBackEnd z_inflateBackEnd +# define inflateBackInit_ z_inflateBackInit_ +# define inflateCopy z_inflateCopy +# define inflateEnd z_inflateEnd +# define inflateGetHeader z_inflateGetHeader +# define inflateInit2_ z_inflateInit2_ +# define inflateInit_ z_inflateInit_ +# define inflateMark z_inflateMark +# define inflatePrime z_inflatePrime +# define inflateReset z_inflateReset +# define inflateReset2 z_inflateReset2 +# define inflateSetDictionary z_inflateSetDictionary +# define inflateGetDictionary z_inflateGetDictionary +# define inflateSync z_inflateSync +# define inflateSyncPoint z_inflateSyncPoint +# define inflateUndermine z_inflateUndermine +# define inflateResetKeep z_inflateResetKeep +# define inflate_copyright z_inflate_copyright +# define inflate_fast z_inflate_fast +# define inflate_table z_inflate_table +# ifndef Z_SOLO +# define uncompress z_uncompress +# endif +# define zError z_zError +# ifndef Z_SOLO +# define zcalloc z_zcalloc +# define zcfree z_zcfree +# endif +# define zlibCompileFlags z_zlibCompileFlags +# define zlibVersion z_zlibVersion + +/* all zlib typedefs in zlib.h and zconf.h */ +# define Byte z_Byte +# define Bytef z_Bytef +# define alloc_func z_alloc_func +# define charf z_charf +# define free_func z_free_func +# ifndef Z_SOLO +# define gzFile z_gzFile +# endif +# define gz_header z_gz_header +# define gz_headerp z_gz_headerp +# define in_func z_in_func +# define intf z_intf +# define out_func z_out_func +# define uInt z_uInt +# define uIntf z_uIntf +# define uLong z_uLong +# define uLongf z_uLongf +# define voidp z_voidp +# define voidpc z_voidpc +# define voidpf z_voidpf + +/* all zlib structs in zlib.h and zconf.h */ +# define gz_header_s z_gz_header_s +# define internal_state z_internal_state + +#endif + +#if defined(__MSDOS__) && !defined(MSDOS) +# define MSDOS +#endif +#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2) +# define OS2 +#endif +#if defined(_WINDOWS) && !defined(WINDOWS) +# define WINDOWS +#endif +#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__) +# ifndef WIN32 +# define WIN32 +# endif +#endif +#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32) +# if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__) +# ifndef SYS16BIT +# define SYS16BIT +# endif +# endif +#endif + +/* + * Compile with -DMAXSEG_64K if the alloc function cannot allocate more + * than 64k bytes at a time (needed on systems with 16-bit int). + */ +#ifdef SYS16BIT +# define MAXSEG_64K +#endif +#ifdef MSDOS +# define UNALIGNED_OK +#endif + +#ifdef __STDC_VERSION__ +# ifndef STDC +# define STDC +# endif +# if __STDC_VERSION__ >= 199901L +# ifndef STDC99 +# define STDC99 +# endif +# endif +#endif +#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus)) +# define STDC +#endif +#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__)) +# define STDC +#endif +#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32)) +# define STDC +#endif +#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__)) +# define STDC +#endif + +#if defined(__OS400__) && !defined(STDC) /* iSeries (formerly AS/400). */ +# define STDC +#endif + +#ifndef STDC +# ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */ +# define const /* note: need a more gentle solution here */ +# endif +#endif + +#if defined(ZLIB_CONST) && !defined(z_const) +# define z_const const +#else +# define z_const +#endif + +/* Some Mac compilers merge all .h files incorrectly: */ +#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__) +# define NO_DUMMY_DECL +#endif + +/* Maximum value for memLevel in deflateInit2 */ +#ifndef MAX_MEM_LEVEL +# ifdef MAXSEG_64K +# define MAX_MEM_LEVEL 8 +# else +# define MAX_MEM_LEVEL 9 +# endif +#endif + +/* Maximum value for windowBits in deflateInit2 and inflateInit2. + * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files + * created by gzip. (Files created by minigzip can still be extracted by + * gzip.) + */ +#ifndef MAX_WBITS +# define MAX_WBITS 15 /* 32K LZ77 window */ +#endif + +/* The memory requirements for deflate are (in bytes): + (1 << (windowBits+2)) + (1 << (memLevel+9)) + that is: 128K for windowBits=15 + 128K for memLevel = 8 (default values) + plus a few kilobytes for small objects. For example, if you want to reduce + the default memory requirements from 256K to 128K, compile with + make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7" + Of course this will generally degrade compression (there's no free lunch). + + The memory requirements for inflate are (in bytes) 1 << windowBits + that is, 32K for windowBits=15 (default value) plus a few kilobytes + for small objects. +*/ + + /* Type declarations */ + +#ifndef OF /* function prototypes */ +# ifdef STDC +# define OF(args) args +# else +# define OF(args) () +# endif +#endif + +#ifndef Z_ARG /* function prototypes for stdarg */ +# if defined(STDC) || defined(Z_HAVE_STDARG_H) +# define Z_ARG(args) args +# else +# define Z_ARG(args) () +# endif +#endif + +/* The following definitions for FAR are needed only for MSDOS mixed + * model programming (small or medium model with some far allocations). + * This was tested only with MSC; for other MSDOS compilers you may have + * to define NO_MEMCPY in zutil.h. If you don't need the mixed model, + * just define FAR to be empty. + */ +#ifdef SYS16BIT +# if defined(M_I86SM) || defined(M_I86MM) + /* MSC small or medium model */ +# define SMALL_MEDIUM +# ifdef _MSC_VER +# define FAR _far +# else +# define FAR far +# endif +# endif +# if (defined(__SMALL__) || defined(__MEDIUM__)) + /* Turbo C small or medium model */ +# define SMALL_MEDIUM +# ifdef __BORLANDC__ +# define FAR _far +# else +# define FAR far +# endif +# endif +#endif + +#if defined(WINDOWS) || defined(WIN32) + /* If building or using zlib as a DLL, define ZLIB_DLL. + * This is not mandatory, but it offers a little performance increase. + */ +# ifdef ZLIB_DLL +# if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500)) +# ifdef ZLIB_INTERNAL +# define ZEXTERN extern __declspec(dllexport) +# else +# define ZEXTERN extern __declspec(dllimport) +# endif +# endif +# endif /* ZLIB_DLL */ + /* If building or using zlib with the WINAPI/WINAPIV calling convention, + * define ZLIB_WINAPI. + * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI. + */ +# ifdef ZLIB_WINAPI +# ifdef FAR +# undef FAR +# endif +# include + /* No need for _export, use ZLIB.DEF instead. */ + /* For complete Windows compatibility, use WINAPI, not __stdcall. */ +# define ZEXPORT WINAPI +# ifdef WIN32 +# define ZEXPORTVA WINAPIV +# else +# define ZEXPORTVA FAR CDECL +# endif +# endif +#endif + +#if defined (__BEOS__) +# ifdef ZLIB_DLL +# ifdef ZLIB_INTERNAL +# define ZEXPORT __declspec(dllexport) +# define ZEXPORTVA __declspec(dllexport) +# else +# define ZEXPORT __declspec(dllimport) +# define ZEXPORTVA __declspec(dllimport) +# endif +# endif +#endif + +#ifndef ZEXTERN +# define ZEXTERN extern +#endif +#ifndef ZEXPORT +# define ZEXPORT +#endif +#ifndef ZEXPORTVA +# define ZEXPORTVA +#endif + +#ifndef FAR +# define FAR +#endif + +#if !defined(__MACTYPES__) +typedef unsigned char Byte; /* 8 bits */ +#endif +typedef unsigned int uInt; /* 16 bits or more */ +typedef unsigned long uLong; /* 32 bits or more */ + +#ifdef SMALL_MEDIUM + /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */ +# define Bytef Byte FAR +#else + typedef Byte FAR Bytef; +#endif +typedef char FAR charf; +typedef int FAR intf; +typedef uInt FAR uIntf; +typedef uLong FAR uLongf; + +#ifdef STDC + typedef void const *voidpc; + typedef void FAR *voidpf; + typedef void *voidp; +#else + typedef Byte const *voidpc; + typedef Byte FAR *voidpf; + typedef Byte *voidp; +#endif + +#if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC) +# include +# if (UINT_MAX == 0xffffffffUL) +# define Z_U4 unsigned +# elif (ULONG_MAX == 0xffffffffUL) +# define Z_U4 unsigned long +# elif (USHRT_MAX == 0xffffffffUL) +# define Z_U4 unsigned short +# endif +#endif + +#ifdef Z_U4 + typedef Z_U4 z_crc_t; +#else + typedef unsigned long z_crc_t; +#endif + +#ifdef HAVE_UNISTD_H /* may be set to #if 1 by ./configure */ +# define Z_HAVE_UNISTD_H +#endif + +#ifdef HAVE_STDARG_H /* may be set to #if 1 by ./configure */ +# define Z_HAVE_STDARG_H +#endif + +#ifdef STDC +# ifndef Z_SOLO +# include /* for off_t */ +# endif +#endif + +#if defined(STDC) || defined(Z_HAVE_STDARG_H) +# ifndef Z_SOLO +# include /* for va_list */ +# endif +#endif + +#ifdef _WIN32 +# ifndef Z_SOLO +# include /* for wchar_t */ +# endif +#endif + +/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and + * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even + * though the former does not conform to the LFS document), but considering + * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as + * equivalently requesting no 64-bit operations + */ +#if defined(_LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1 +# undef _LARGEFILE64_SOURCE +#endif + +#if defined(__WATCOMC__) && !defined(Z_HAVE_UNISTD_H) +# define Z_HAVE_UNISTD_H +#endif +#ifndef Z_SOLO +# if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE) +# include /* for SEEK_*, off_t, and _LFS64_LARGEFILE */ +# ifdef VMS +# include /* for off_t */ +# endif +# ifndef z_off_t +# define z_off_t off_t +# endif +# endif +#endif + +#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0 +# define Z_LFS64 +#endif + +#if defined(_LARGEFILE64_SOURCE) && defined(Z_LFS64) +# define Z_LARGE64 +#endif + +#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS-0 == 64 && defined(Z_LFS64) +# define Z_WANT64 +#endif + +#if !defined(SEEK_SET) && !defined(Z_SOLO) +# define SEEK_SET 0 /* Seek from beginning of file. */ +# define SEEK_CUR 1 /* Seek from current position. */ +# define SEEK_END 2 /* Set file pointer to EOF plus "offset" */ +#endif + +#ifndef z_off_t +# define z_off_t long +#endif + +#if !defined(_WIN32) && defined(Z_LARGE64) +# define z_off64_t off64_t +#else +# if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO) +# define z_off64_t __int64 +# else +# define z_off64_t z_off_t +# endif +#endif + +/* MVS linker does not support external names larger than 8 bytes */ +#if defined(__MVS__) + #pragma map(deflateInit_,"DEIN") + #pragma map(deflateInit2_,"DEIN2") + #pragma map(deflateEnd,"DEEND") + #pragma map(deflateBound,"DEBND") + #pragma map(inflateInit_,"ININ") + #pragma map(inflateInit2_,"ININ2") + #pragma map(inflateEnd,"INEND") + #pragma map(inflateSync,"INSY") + #pragma map(inflateSetDictionary,"INSEDI") + #pragma map(compressBound,"CMBND") + #pragma map(inflate_table,"INTABL") + #pragma map(inflate_fast,"INFA") + #pragma map(inflate_copyright,"INCOPY") +#endif + +#endif /* ZCONF_H */ diff --git a/src/3rdparty/zlib/zconf.h.included b/src/3rdparty/zlib/zconf.h.included new file mode 100644 index 0000000..9987a77 --- /dev/null +++ b/src/3rdparty/zlib/zconf.h.included @@ -0,0 +1,511 @@ +/* zconf.h -- configuration of the zlib compression library + * Copyright (C) 1995-2013 Jean-loup Gailly. + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +/* @(#) $Id$ */ + +#ifndef ZCONF_H +#define ZCONF_H + +/* + * If you *really* need a unique prefix for all types and library functions, + * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it. + * Even better than compiling with -DZ_PREFIX would be to use configure to set + * this permanently in zconf.h using "./configure --zprefix". + */ +#ifdef Z_PREFIX /* may be set to #if 1 by ./configure */ +# define Z_PREFIX_SET + +/* all linked symbols */ +# define _dist_code z__dist_code +# define _length_code z__length_code +# define _tr_align z__tr_align +# define _tr_flush_bits z__tr_flush_bits +# define _tr_flush_block z__tr_flush_block +# define _tr_init z__tr_init +# define _tr_stored_block z__tr_stored_block +# define _tr_tally z__tr_tally +# define adler32 z_adler32 +# define adler32_combine z_adler32_combine +# define adler32_combine64 z_adler32_combine64 +# ifndef Z_SOLO +# define compress z_compress +# define compress2 z_compress2 +# define compressBound z_compressBound +# endif +# define crc32 z_crc32 +# define crc32_combine z_crc32_combine +# define crc32_combine64 z_crc32_combine64 +# define deflate z_deflate +# define deflateBound z_deflateBound +# define deflateCopy z_deflateCopy +# define deflateEnd z_deflateEnd +# define deflateInit2_ z_deflateInit2_ +# define deflateInit_ z_deflateInit_ +# define deflateParams z_deflateParams +# define deflatePending z_deflatePending +# define deflatePrime z_deflatePrime +# define deflateReset z_deflateReset +# define deflateResetKeep z_deflateResetKeep +# define deflateSetDictionary z_deflateSetDictionary +# define deflateSetHeader z_deflateSetHeader +# define deflateTune z_deflateTune +# define deflate_copyright z_deflate_copyright +# define get_crc_table z_get_crc_table +# ifndef Z_SOLO +# define gz_error z_gz_error +# define gz_intmax z_gz_intmax +# define gz_strwinerror z_gz_strwinerror +# define gzbuffer z_gzbuffer +# define gzclearerr z_gzclearerr +# define gzclose z_gzclose +# define gzclose_r z_gzclose_r +# define gzclose_w z_gzclose_w +# define gzdirect z_gzdirect +# define gzdopen z_gzdopen +# define gzeof z_gzeof +# define gzerror z_gzerror +# define gzflush z_gzflush +# define gzgetc z_gzgetc +# define gzgetc_ z_gzgetc_ +# define gzgets z_gzgets +# define gzoffset z_gzoffset +# define gzoffset64 z_gzoffset64 +# define gzopen z_gzopen +# define gzopen64 z_gzopen64 +# ifdef _WIN32 +# define gzopen_w z_gzopen_w +# endif +# define gzprintf z_gzprintf +# define gzvprintf z_gzvprintf +# define gzputc z_gzputc +# define gzputs z_gzputs +# define gzread z_gzread +# define gzrewind z_gzrewind +# define gzseek z_gzseek +# define gzseek64 z_gzseek64 +# define gzsetparams z_gzsetparams +# define gztell z_gztell +# define gztell64 z_gztell64 +# define gzungetc z_gzungetc +# define gzwrite z_gzwrite +# endif +# define inflate z_inflate +# define inflateBack z_inflateBack +# define inflateBackEnd z_inflateBackEnd +# define inflateBackInit_ z_inflateBackInit_ +# define inflateCopy z_inflateCopy +# define inflateEnd z_inflateEnd +# define inflateGetHeader z_inflateGetHeader +# define inflateInit2_ z_inflateInit2_ +# define inflateInit_ z_inflateInit_ +# define inflateMark z_inflateMark +# define inflatePrime z_inflatePrime +# define inflateReset z_inflateReset +# define inflateReset2 z_inflateReset2 +# define inflateSetDictionary z_inflateSetDictionary +# define inflateGetDictionary z_inflateGetDictionary +# define inflateSync z_inflateSync +# define inflateSyncPoint z_inflateSyncPoint +# define inflateUndermine z_inflateUndermine +# define inflateResetKeep z_inflateResetKeep +# define inflate_copyright z_inflate_copyright +# define inflate_fast z_inflate_fast +# define inflate_table z_inflate_table +# ifndef Z_SOLO +# define uncompress z_uncompress +# endif +# define zError z_zError +# ifndef Z_SOLO +# define zcalloc z_zcalloc +# define zcfree z_zcfree +# endif +# define zlibCompileFlags z_zlibCompileFlags +# define zlibVersion z_zlibVersion + +/* all zlib typedefs in zlib.h and zconf.h */ +# define Byte z_Byte +# define Bytef z_Bytef +# define alloc_func z_alloc_func +# define charf z_charf +# define free_func z_free_func +# ifndef Z_SOLO +# define gzFile z_gzFile +# endif +# define gz_header z_gz_header +# define gz_headerp z_gz_headerp +# define in_func z_in_func +# define intf z_intf +# define out_func z_out_func +# define uInt z_uInt +# define uIntf z_uIntf +# define uLong z_uLong +# define uLongf z_uLongf +# define voidp z_voidp +# define voidpc z_voidpc +# define voidpf z_voidpf + +/* all zlib structs in zlib.h and zconf.h */ +# define gz_header_s z_gz_header_s +# define internal_state z_internal_state + +#endif + +#if defined(__MSDOS__) && !defined(MSDOS) +# define MSDOS +#endif +#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2) +# define OS2 +#endif +#if defined(_WINDOWS) && !defined(WINDOWS) +# define WINDOWS +#endif +#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__) +# ifndef WIN32 +# define WIN32 +# endif +#endif +#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32) +# if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__) +# ifndef SYS16BIT +# define SYS16BIT +# endif +# endif +#endif + +/* + * Compile with -DMAXSEG_64K if the alloc function cannot allocate more + * than 64k bytes at a time (needed on systems with 16-bit int). + */ +#ifdef SYS16BIT +# define MAXSEG_64K +#endif +#ifdef MSDOS +# define UNALIGNED_OK +#endif + +#ifdef __STDC_VERSION__ +# ifndef STDC +# define STDC +# endif +# if __STDC_VERSION__ >= 199901L +# ifndef STDC99 +# define STDC99 +# endif +# endif +#endif +#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus)) +# define STDC +#endif +#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__)) +# define STDC +#endif +#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32)) +# define STDC +#endif +#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__)) +# define STDC +#endif + +#if defined(__OS400__) && !defined(STDC) /* iSeries (formerly AS/400). */ +# define STDC +#endif + +#ifndef STDC +# ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */ +# define const /* note: need a more gentle solution here */ +# endif +#endif + +#if defined(ZLIB_CONST) && !defined(z_const) +# define z_const const +#else +# define z_const +#endif + +/* Some Mac compilers merge all .h files incorrectly: */ +#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__) +# define NO_DUMMY_DECL +#endif + +/* Maximum value for memLevel in deflateInit2 */ +#ifndef MAX_MEM_LEVEL +# ifdef MAXSEG_64K +# define MAX_MEM_LEVEL 8 +# else +# define MAX_MEM_LEVEL 9 +# endif +#endif + +/* Maximum value for windowBits in deflateInit2 and inflateInit2. + * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files + * created by gzip. (Files created by minigzip can still be extracted by + * gzip.) + */ +#ifndef MAX_WBITS +# define MAX_WBITS 15 /* 32K LZ77 window */ +#endif + +/* The memory requirements for deflate are (in bytes): + (1 << (windowBits+2)) + (1 << (memLevel+9)) + that is: 128K for windowBits=15 + 128K for memLevel = 8 (default values) + plus a few kilobytes for small objects. For example, if you want to reduce + the default memory requirements from 256K to 128K, compile with + make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7" + Of course this will generally degrade compression (there's no free lunch). + + The memory requirements for inflate are (in bytes) 1 << windowBits + that is, 32K for windowBits=15 (default value) plus a few kilobytes + for small objects. +*/ + + /* Type declarations */ + +#ifndef OF /* function prototypes */ +# ifdef STDC +# define OF(args) args +# else +# define OF(args) () +# endif +#endif + +#ifndef Z_ARG /* function prototypes for stdarg */ +# if defined(STDC) || defined(Z_HAVE_STDARG_H) +# define Z_ARG(args) args +# else +# define Z_ARG(args) () +# endif +#endif + +/* The following definitions for FAR are needed only for MSDOS mixed + * model programming (small or medium model with some far allocations). + * This was tested only with MSC; for other MSDOS compilers you may have + * to define NO_MEMCPY in zutil.h. If you don't need the mixed model, + * just define FAR to be empty. + */ +#ifdef SYS16BIT +# if defined(M_I86SM) || defined(M_I86MM) + /* MSC small or medium model */ +# define SMALL_MEDIUM +# ifdef _MSC_VER +# define FAR _far +# else +# define FAR far +# endif +# endif +# if (defined(__SMALL__) || defined(__MEDIUM__)) + /* Turbo C small or medium model */ +# define SMALL_MEDIUM +# ifdef __BORLANDC__ +# define FAR _far +# else +# define FAR far +# endif +# endif +#endif + +#if defined(WINDOWS) || defined(WIN32) + /* If building or using zlib as a DLL, define ZLIB_DLL. + * This is not mandatory, but it offers a little performance increase. + */ +# ifdef ZLIB_DLL +# if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500)) +# ifdef ZLIB_INTERNAL +# define ZEXTERN extern __declspec(dllexport) +# else +# define ZEXTERN extern __declspec(dllimport) +# endif +# endif +# endif /* ZLIB_DLL */ + /* If building or using zlib with the WINAPI/WINAPIV calling convention, + * define ZLIB_WINAPI. + * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI. + */ +# ifdef ZLIB_WINAPI +# ifdef FAR +# undef FAR +# endif +# include + /* No need for _export, use ZLIB.DEF instead. */ + /* For complete Windows compatibility, use WINAPI, not __stdcall. */ +# define ZEXPORT WINAPI +# ifdef WIN32 +# define ZEXPORTVA WINAPIV +# else +# define ZEXPORTVA FAR CDECL +# endif +# endif +#endif + +#if defined (__BEOS__) +# ifdef ZLIB_DLL +# ifdef ZLIB_INTERNAL +# define ZEXPORT __declspec(dllexport) +# define ZEXPORTVA __declspec(dllexport) +# else +# define ZEXPORT __declspec(dllimport) +# define ZEXPORTVA __declspec(dllimport) +# endif +# endif +#endif + +#ifndef ZEXTERN +# define ZEXTERN extern +#endif +#ifndef ZEXPORT +# define ZEXPORT +#endif +#ifndef ZEXPORTVA +# define ZEXPORTVA +#endif + +#ifndef FAR +# define FAR +#endif + +#if !defined(__MACTYPES__) +typedef unsigned char Byte; /* 8 bits */ +#endif +typedef unsigned int uInt; /* 16 bits or more */ +typedef unsigned long uLong; /* 32 bits or more */ + +#ifdef SMALL_MEDIUM + /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */ +# define Bytef Byte FAR +#else + typedef Byte FAR Bytef; +#endif +typedef char FAR charf; +typedef int FAR intf; +typedef uInt FAR uIntf; +typedef uLong FAR uLongf; + +#ifdef STDC + typedef void const *voidpc; + typedef void FAR *voidpf; + typedef void *voidp; +#else + typedef Byte const *voidpc; + typedef Byte FAR *voidpf; + typedef Byte *voidp; +#endif + +#if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC) +# include +# if (UINT_MAX == 0xffffffffUL) +# define Z_U4 unsigned +# elif (ULONG_MAX == 0xffffffffUL) +# define Z_U4 unsigned long +# elif (USHRT_MAX == 0xffffffffUL) +# define Z_U4 unsigned short +# endif +#endif + +#ifdef Z_U4 + typedef Z_U4 z_crc_t; +#else + typedef unsigned long z_crc_t; +#endif + +#ifdef HAVE_UNISTD_H /* may be set to #if 1 by ./configure */ +# define Z_HAVE_UNISTD_H +#endif + +#ifdef HAVE_STDARG_H /* may be set to #if 1 by ./configure */ +# define Z_HAVE_STDARG_H +#endif + +#ifdef STDC +# ifndef Z_SOLO +# include /* for off_t */ +# endif +#endif + +#if defined(STDC) || defined(Z_HAVE_STDARG_H) +# ifndef Z_SOLO +# include /* for va_list */ +# endif +#endif + +#ifdef _WIN32 +# ifndef Z_SOLO +# include /* for wchar_t */ +# endif +#endif + +/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and + * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even + * though the former does not conform to the LFS document), but considering + * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as + * equivalently requesting no 64-bit operations + */ +#if defined(_LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1 +# undef _LARGEFILE64_SOURCE +#endif + +#if defined(__WATCOMC__) && !defined(Z_HAVE_UNISTD_H) +# define Z_HAVE_UNISTD_H +#endif +#ifndef Z_SOLO +# if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE) +# include /* for SEEK_*, off_t, and _LFS64_LARGEFILE */ +# ifdef VMS +# include /* for off_t */ +# endif +# ifndef z_off_t +# define z_off_t off_t +# endif +# endif +#endif + +#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0 +# define Z_LFS64 +#endif + +#if defined(_LARGEFILE64_SOURCE) && defined(Z_LFS64) +# define Z_LARGE64 +#endif + +#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS-0 == 64 && defined(Z_LFS64) +# define Z_WANT64 +#endif + +#if !defined(SEEK_SET) && !defined(Z_SOLO) +# define SEEK_SET 0 /* Seek from beginning of file. */ +# define SEEK_CUR 1 /* Seek from current position. */ +# define SEEK_END 2 /* Set file pointer to EOF plus "offset" */ +#endif + +#ifndef z_off_t +# define z_off_t long +#endif + +#if !defined(_WIN32) && defined(Z_LARGE64) +# define z_off64_t off64_t +#else +# if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO) +# define z_off64_t __int64 +# else +# define z_off64_t z_off_t +# endif +#endif + +/* MVS linker does not support external names larger than 8 bytes */ +#if defined(__MVS__) + #pragma map(deflateInit_,"DEIN") + #pragma map(deflateInit2_,"DEIN2") + #pragma map(deflateEnd,"DEEND") + #pragma map(deflateBound,"DEBND") + #pragma map(inflateInit_,"ININ") + #pragma map(inflateInit2_,"ININ2") + #pragma map(inflateEnd,"INEND") + #pragma map(inflateSync,"INSY") + #pragma map(inflateSetDictionary,"INSEDI") + #pragma map(compressBound,"CMBND") + #pragma map(inflate_table,"INTABL") + #pragma map(inflate_fast,"INFA") + #pragma map(inflate_copyright,"INCOPY") +#endif + +#endif /* ZCONF_H */ diff --git a/src/3rdparty/zlib/zlib.h b/src/3rdparty/zlib/zlib.h new file mode 100644 index 0000000..3e0c767 --- /dev/null +++ b/src/3rdparty/zlib/zlib.h @@ -0,0 +1,1768 @@ +/* zlib.h -- interface of the 'zlib' general purpose compression library + version 1.2.8, April 28th, 2013 + + Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + + Jean-loup Gailly Mark Adler + jloup@gzip.org madler@alumni.caltech.edu + + + The data format used by the zlib library is described by RFCs (Request for + Comments) 1950 to 1952 in the files http://tools.ietf.org/html/rfc1950 + (zlib format), rfc1951 (deflate format) and rfc1952 (gzip format). +*/ + +#ifndef ZLIB_H +#define ZLIB_H + +#include "zconf.h" + +#ifdef __cplusplus +extern "C" { +#endif + +#define ZLIB_VERSION "1.2.8" +#define ZLIB_VERNUM 0x1280 +#define ZLIB_VER_MAJOR 1 +#define ZLIB_VER_MINOR 2 +#define ZLIB_VER_REVISION 8 +#define ZLIB_VER_SUBREVISION 0 + +/* + The 'zlib' compression library provides in-memory compression and + decompression functions, including integrity checks of the uncompressed data. + This version of the library supports only one compression method (deflation) + but other algorithms will be added later and will have the same stream + interface. + + Compression can be done in a single step if the buffers are large enough, + or can be done by repeated calls of the compression function. In the latter + case, the application must provide more input and/or consume the output + (providing more output space) before each call. + + The compressed data format used by default by the in-memory functions is + the zlib format, which is a zlib wrapper documented in RFC 1950, wrapped + around a deflate stream, which is itself documented in RFC 1951. + + The library also supports reading and writing files in gzip (.gz) format + with an interface similar to that of stdio using the functions that start + with "gz". The gzip format is different from the zlib format. gzip is a + gzip wrapper, documented in RFC 1952, wrapped around a deflate stream. + + This library can optionally read and write gzip streams in memory as well. + + The zlib format was designed to be compact and fast for use in memory + and on communications channels. The gzip format was designed for single- + file compression on file systems, has a larger header than zlib to maintain + directory information, and uses a different, slower check method than zlib. + + The library does not install any signal handler. The decoder checks + the consistency of the compressed data, so the library should never crash + even in case of corrupted input. +*/ + +typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size)); +typedef void (*free_func) OF((voidpf opaque, voidpf address)); + +struct internal_state; + +typedef struct z_stream_s { + z_const Bytef *next_in; /* next input byte */ + uInt avail_in; /* number of bytes available at next_in */ + uLong total_in; /* total number of input bytes read so far */ + + Bytef *next_out; /* next output byte should be put there */ + uInt avail_out; /* remaining free space at next_out */ + uLong total_out; /* total number of bytes output so far */ + + z_const char *msg; /* last error message, NULL if no error */ + struct internal_state FAR *state; /* not visible by applications */ + + alloc_func zalloc; /* used to allocate the internal state */ + free_func zfree; /* used to free the internal state */ + voidpf opaque; /* private data object passed to zalloc and zfree */ + + int data_type; /* best guess about the data type: binary or text */ + uLong adler; /* adler32 value of the uncompressed data */ + uLong reserved; /* reserved for future use */ +} z_stream; + +typedef z_stream FAR *z_streamp; + +/* + gzip header information passed to and from zlib routines. See RFC 1952 + for more details on the meanings of these fields. +*/ +typedef struct gz_header_s { + int text; /* true if compressed data believed to be text */ + uLong time; /* modification time */ + int xflags; /* extra flags (not used when writing a gzip file) */ + int os; /* operating system */ + Bytef *extra; /* pointer to extra field or Z_NULL if none */ + uInt extra_len; /* extra field length (valid if extra != Z_NULL) */ + uInt extra_max; /* space at extra (only when reading header) */ + Bytef *name; /* pointer to zero-terminated file name or Z_NULL */ + uInt name_max; /* space at name (only when reading header) */ + Bytef *comment; /* pointer to zero-terminated comment or Z_NULL */ + uInt comm_max; /* space at comment (only when reading header) */ + int hcrc; /* true if there was or will be a header crc */ + int done; /* true when done reading gzip header (not used + when writing a gzip file) */ +} gz_header; + +typedef gz_header FAR *gz_headerp; + +/* + The application must update next_in and avail_in when avail_in has dropped + to zero. It must update next_out and avail_out when avail_out has dropped + to zero. The application must initialize zalloc, zfree and opaque before + calling the init function. All other fields are set by the compression + library and must not be updated by the application. + + The opaque value provided by the application will be passed as the first + parameter for calls of zalloc and zfree. This can be useful for custom + memory management. The compression library attaches no meaning to the + opaque value. + + zalloc must return Z_NULL if there is not enough memory for the object. + If zlib is used in a multi-threaded application, zalloc and zfree must be + thread safe. + + On 16-bit systems, the functions zalloc and zfree must be able to allocate + exactly 65536 bytes, but will not be required to allocate more than this if + the symbol MAXSEG_64K is defined (see zconf.h). WARNING: On MSDOS, pointers + returned by zalloc for objects of exactly 65536 bytes *must* have their + offset normalized to zero. The default allocation function provided by this + library ensures this (see zutil.c). To reduce memory requirements and avoid + any allocation of 64K objects, at the expense of compression ratio, compile + the library with -DMAX_WBITS=14 (see zconf.h). + + The fields total_in and total_out can be used for statistics or progress + reports. After compression, total_in holds the total size of the + uncompressed data and may be saved for use in the decompressor (particularly + if the decompressor wants to decompress everything in a single step). +*/ + + /* constants */ + +#define Z_NO_FLUSH 0 +#define Z_PARTIAL_FLUSH 1 +#define Z_SYNC_FLUSH 2 +#define Z_FULL_FLUSH 3 +#define Z_FINISH 4 +#define Z_BLOCK 5 +#define Z_TREES 6 +/* Allowed flush values; see deflate() and inflate() below for details */ + +#define Z_OK 0 +#define Z_STREAM_END 1 +#define Z_NEED_DICT 2 +#define Z_ERRNO (-1) +#define Z_STREAM_ERROR (-2) +#define Z_DATA_ERROR (-3) +#define Z_MEM_ERROR (-4) +#define Z_BUF_ERROR (-5) +#define Z_VERSION_ERROR (-6) +/* Return codes for the compression/decompression functions. Negative values + * are errors, positive values are used for special but normal events. + */ + +#define Z_NO_COMPRESSION 0 +#define Z_BEST_SPEED 1 +#define Z_BEST_COMPRESSION 9 +#define Z_DEFAULT_COMPRESSION (-1) +/* compression levels */ + +#define Z_FILTERED 1 +#define Z_HUFFMAN_ONLY 2 +#define Z_RLE 3 +#define Z_FIXED 4 +#define Z_DEFAULT_STRATEGY 0 +/* compression strategy; see deflateInit2() below for details */ + +#define Z_BINARY 0 +#define Z_TEXT 1 +#define Z_ASCII Z_TEXT /* for compatibility with 1.2.2 and earlier */ +#define Z_UNKNOWN 2 +/* Possible values of the data_type field (though see inflate()) */ + +#define Z_DEFLATED 8 +/* The deflate compression method (the only one supported in this version) */ + +#define Z_NULL 0 /* for initializing zalloc, zfree, opaque */ + +#define zlib_version zlibVersion() +/* for compatibility with versions < 1.0.2 */ + + + /* basic functions */ + +ZEXTERN const char * ZEXPORT zlibVersion OF((void)); +/* The application can compare zlibVersion and ZLIB_VERSION for consistency. + If the first character differs, the library code actually used is not + compatible with the zlib.h header file used by the application. This check + is automatically made by deflateInit and inflateInit. + */ + +/* +ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level)); + + Initializes the internal stream state for compression. The fields + zalloc, zfree and opaque must be initialized before by the caller. If + zalloc and zfree are set to Z_NULL, deflateInit updates them to use default + allocation functions. + + The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9: + 1 gives best speed, 9 gives best compression, 0 gives no compression at all + (the input data is simply copied a block at a time). Z_DEFAULT_COMPRESSION + requests a default compromise between speed and compression (currently + equivalent to level 6). + + deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough + memory, Z_STREAM_ERROR if level is not a valid compression level, or + Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible + with the version assumed by the caller (ZLIB_VERSION). msg is set to null + if there is no error message. deflateInit does not perform any compression: + this will be done by deflate(). +*/ + + +ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush)); +/* + deflate compresses as much data as possible, and stops when the input + buffer becomes empty or the output buffer becomes full. It may introduce + some output latency (reading input without producing any output) except when + forced to flush. + + The detailed semantics are as follows. deflate performs one or both of the + following actions: + + - Compress more input starting at next_in and update next_in and avail_in + accordingly. If not all input can be processed (because there is not + enough room in the output buffer), next_in and avail_in are updated and + processing will resume at this point for the next call of deflate(). + + - Provide more output starting at next_out and update next_out and avail_out + accordingly. This action is forced if the parameter flush is non zero. + Forcing flush frequently degrades the compression ratio, so this parameter + should be set only when necessary (in interactive applications). Some + output may be provided even if flush is not set. + + Before the call of deflate(), the application should ensure that at least + one of the actions is possible, by providing more input and/or consuming more + output, and updating avail_in or avail_out accordingly; avail_out should + never be zero before the call. The application can consume the compressed + output when it wants, for example when the output buffer is full (avail_out + == 0), or after each call of deflate(). If deflate returns Z_OK and with + zero avail_out, it must be called again after making room in the output + buffer because there might be more output pending. + + Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to + decide how much data to accumulate before producing output, in order to + maximize compression. + + If the parameter flush is set to Z_SYNC_FLUSH, all pending output is + flushed to the output buffer and the output is aligned on a byte boundary, so + that the decompressor can get all input data available so far. (In + particular avail_in is zero after the call if enough output space has been + provided before the call.) Flushing may degrade compression for some + compression algorithms and so it should be used only when necessary. This + completes the current deflate block and follows it with an empty stored block + that is three bits plus filler bits to the next byte, followed by four bytes + (00 00 ff ff). + + If flush is set to Z_PARTIAL_FLUSH, all pending output is flushed to the + output buffer, but the output is not aligned to a byte boundary. All of the + input data so far will be available to the decompressor, as for Z_SYNC_FLUSH. + This completes the current deflate block and follows it with an empty fixed + codes block that is 10 bits long. This assures that enough bytes are output + in order for the decompressor to finish the block before the empty fixed code + block. + + If flush is set to Z_BLOCK, a deflate block is completed and emitted, as + for Z_SYNC_FLUSH, but the output is not aligned on a byte boundary, and up to + seven bits of the current block are held to be written as the next byte after + the next deflate block is completed. In this case, the decompressor may not + be provided enough bits at this point in order to complete decompression of + the data provided so far to the compressor. It may need to wait for the next + block to be emitted. This is for advanced applications that need to control + the emission of deflate blocks. + + If flush is set to Z_FULL_FLUSH, all output is flushed as with + Z_SYNC_FLUSH, and the compression state is reset so that decompression can + restart from this point if previous compressed data has been damaged or if + random access is desired. Using Z_FULL_FLUSH too often can seriously degrade + compression. + + If deflate returns with avail_out == 0, this function must be called again + with the same value of the flush parameter and more output space (updated + avail_out), until the flush is complete (deflate returns with non-zero + avail_out). In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that + avail_out is greater than six to avoid repeated flush markers due to + avail_out == 0 on return. + + If the parameter flush is set to Z_FINISH, pending input is processed, + pending output is flushed and deflate returns with Z_STREAM_END if there was + enough output space; if deflate returns with Z_OK, this function must be + called again with Z_FINISH and more output space (updated avail_out) but no + more input data, until it returns with Z_STREAM_END or an error. After + deflate has returned Z_STREAM_END, the only possible operations on the stream + are deflateReset or deflateEnd. + + Z_FINISH can be used immediately after deflateInit if all the compression + is to be done in a single step. In this case, avail_out must be at least the + value returned by deflateBound (see below). Then deflate is guaranteed to + return Z_STREAM_END. If not enough output space is provided, deflate will + not return Z_STREAM_END, and it must be called again as described above. + + deflate() sets strm->adler to the adler32 checksum of all input read + so far (that is, total_in bytes). + + deflate() may update strm->data_type if it can make a good guess about + the input data type (Z_BINARY or Z_TEXT). In doubt, the data is considered + binary. This field is only for information purposes and does not affect the + compression algorithm in any manner. + + deflate() returns Z_OK if some progress has been made (more input + processed or more output produced), Z_STREAM_END if all input has been + consumed and all output has been produced (only when flush is set to + Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example + if next_in or next_out was Z_NULL), Z_BUF_ERROR if no progress is possible + (for example avail_in or avail_out was zero). Note that Z_BUF_ERROR is not + fatal, and deflate() can be called again with more input and more output + space to continue compressing. +*/ + + +ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm)); +/* + All dynamically allocated data structures for this stream are freed. + This function discards any unprocessed input and does not flush any pending + output. + + deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the + stream state was inconsistent, Z_DATA_ERROR if the stream was freed + prematurely (some input or output was discarded). In the error case, msg + may be set but then points to a static string (which must not be + deallocated). +*/ + + +/* +ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm)); + + Initializes the internal stream state for decompression. The fields + next_in, avail_in, zalloc, zfree and opaque must be initialized before by + the caller. If next_in is not Z_NULL and avail_in is large enough (the + exact value depends on the compression method), inflateInit determines the + compression method from the zlib header and allocates all data structures + accordingly; otherwise the allocation will be deferred to the first call of + inflate. If zalloc and zfree are set to Z_NULL, inflateInit updates them to + use default allocation functions. + + inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough + memory, Z_VERSION_ERROR if the zlib library version is incompatible with the + version assumed by the caller, or Z_STREAM_ERROR if the parameters are + invalid, such as a null pointer to the structure. msg is set to null if + there is no error message. inflateInit does not perform any decompression + apart from possibly reading the zlib header if present: actual decompression + will be done by inflate(). (So next_in and avail_in may be modified, but + next_out and avail_out are unused and unchanged.) The current implementation + of inflateInit() does not process any header information -- that is deferred + until inflate() is called. +*/ + + +ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush)); +/* + inflate decompresses as much data as possible, and stops when the input + buffer becomes empty or the output buffer becomes full. It may introduce + some output latency (reading input without producing any output) except when + forced to flush. + + The detailed semantics are as follows. inflate performs one or both of the + following actions: + + - Decompress more input starting at next_in and update next_in and avail_in + accordingly. If not all input can be processed (because there is not + enough room in the output buffer), next_in is updated and processing will + resume at this point for the next call of inflate(). + + - Provide more output starting at next_out and update next_out and avail_out + accordingly. inflate() provides as much output as possible, until there is + no more input data or no more space in the output buffer (see below about + the flush parameter). + + Before the call of inflate(), the application should ensure that at least + one of the actions is possible, by providing more input and/or consuming more + output, and updating the next_* and avail_* values accordingly. The + application can consume the uncompressed output when it wants, for example + when the output buffer is full (avail_out == 0), or after each call of + inflate(). If inflate returns Z_OK and with zero avail_out, it must be + called again after making room in the output buffer because there might be + more output pending. + + The flush parameter of inflate() can be Z_NO_FLUSH, Z_SYNC_FLUSH, Z_FINISH, + Z_BLOCK, or Z_TREES. Z_SYNC_FLUSH requests that inflate() flush as much + output as possible to the output buffer. Z_BLOCK requests that inflate() + stop if and when it gets to the next deflate block boundary. When decoding + the zlib or gzip format, this will cause inflate() to return immediately + after the header and before the first block. When doing a raw inflate, + inflate() will go ahead and process the first block, and will return when it + gets to the end of that block, or when it runs out of data. + + The Z_BLOCK option assists in appending to or combining deflate streams. + Also to assist in this, on return inflate() will set strm->data_type to the + number of unused bits in the last byte taken from strm->next_in, plus 64 if + inflate() is currently decoding the last block in the deflate stream, plus + 128 if inflate() returned immediately after decoding an end-of-block code or + decoding the complete header up to just before the first byte of the deflate + stream. The end-of-block will not be indicated until all of the uncompressed + data from that block has been written to strm->next_out. The number of + unused bits may in general be greater than seven, except when bit 7 of + data_type is set, in which case the number of unused bits will be less than + eight. data_type is set as noted here every time inflate() returns for all + flush options, and so can be used to determine the amount of currently + consumed input in bits. + + The Z_TREES option behaves as Z_BLOCK does, but it also returns when the + end of each deflate block header is reached, before any actual data in that + block is decoded. This allows the caller to determine the length of the + deflate block header for later use in random access within a deflate block. + 256 is added to the value of strm->data_type when inflate() returns + immediately after reaching the end of the deflate block header. + + inflate() should normally be called until it returns Z_STREAM_END or an + error. However if all decompression is to be performed in a single step (a + single call of inflate), the parameter flush should be set to Z_FINISH. In + this case all pending input is processed and all pending output is flushed; + avail_out must be large enough to hold all of the uncompressed data for the + operation to complete. (The size of the uncompressed data may have been + saved by the compressor for this purpose.) The use of Z_FINISH is not + required to perform an inflation in one step. However it may be used to + inform inflate that a faster approach can be used for the single inflate() + call. Z_FINISH also informs inflate to not maintain a sliding window if the + stream completes, which reduces inflate's memory footprint. If the stream + does not complete, either because not all of the stream is provided or not + enough output space is provided, then a sliding window will be allocated and + inflate() can be called again to continue the operation as if Z_NO_FLUSH had + been used. + + In this implementation, inflate() always flushes as much output as + possible to the output buffer, and always uses the faster approach on the + first call. So the effects of the flush parameter in this implementation are + on the return value of inflate() as noted below, when inflate() returns early + when Z_BLOCK or Z_TREES is used, and when inflate() avoids the allocation of + memory for a sliding window when Z_FINISH is used. + + If a preset dictionary is needed after this call (see inflateSetDictionary + below), inflate sets strm->adler to the Adler-32 checksum of the dictionary + chosen by the compressor and returns Z_NEED_DICT; otherwise it sets + strm->adler to the Adler-32 checksum of all output produced so far (that is, + total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described + below. At the end of the stream, inflate() checks that its computed adler32 + checksum is equal to that saved by the compressor and returns Z_STREAM_END + only if the checksum is correct. + + inflate() can decompress and check either zlib-wrapped or gzip-wrapped + deflate data. The header type is detected automatically, if requested when + initializing with inflateInit2(). Any information contained in the gzip + header is not retained, so applications that need that information should + instead use raw inflate, see inflateInit2() below, or inflateBack() and + perform their own processing of the gzip header and trailer. When processing + gzip-wrapped deflate data, strm->adler32 is set to the CRC-32 of the output + producted so far. The CRC-32 is checked against the gzip trailer. + + inflate() returns Z_OK if some progress has been made (more input processed + or more output produced), Z_STREAM_END if the end of the compressed data has + been reached and all uncompressed output has been produced, Z_NEED_DICT if a + preset dictionary is needed at this point, Z_DATA_ERROR if the input data was + corrupted (input stream not conforming to the zlib format or incorrect check + value), Z_STREAM_ERROR if the stream structure was inconsistent (for example + next_in or next_out was Z_NULL), Z_MEM_ERROR if there was not enough memory, + Z_BUF_ERROR if no progress is possible or if there was not enough room in the + output buffer when Z_FINISH is used. Note that Z_BUF_ERROR is not fatal, and + inflate() can be called again with more input and more output space to + continue decompressing. If Z_DATA_ERROR is returned, the application may + then call inflateSync() to look for a good compression block if a partial + recovery of the data is desired. +*/ + + +ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm)); +/* + All dynamically allocated data structures for this stream are freed. + This function discards any unprocessed input and does not flush any pending + output. + + inflateEnd returns Z_OK if success, Z_STREAM_ERROR if the stream state + was inconsistent. In the error case, msg may be set but then points to a + static string (which must not be deallocated). +*/ + + + /* Advanced functions */ + +/* + The following functions are needed only in some special applications. +*/ + +/* +ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm, + int level, + int method, + int windowBits, + int memLevel, + int strategy)); + + This is another version of deflateInit with more compression options. The + fields next_in, zalloc, zfree and opaque must be initialized before by the + caller. + + The method parameter is the compression method. It must be Z_DEFLATED in + this version of the library. + + The windowBits parameter is the base two logarithm of the window size + (the size of the history buffer). It should be in the range 8..15 for this + version of the library. Larger values of this parameter result in better + compression at the expense of memory usage. The default value is 15 if + deflateInit is used instead. + + windowBits can also be -8..-15 for raw deflate. In this case, -windowBits + determines the window size. deflate() will then generate raw deflate data + with no zlib header or trailer, and will not compute an adler32 check value. + + windowBits can also be greater than 15 for optional gzip encoding. Add + 16 to windowBits to write a simple gzip header and trailer around the + compressed data instead of a zlib wrapper. The gzip header will have no + file name, no extra data, no comment, no modification time (set to zero), no + header crc, and the operating system will be set to 255 (unknown). If a + gzip stream is being written, strm->adler is a crc32 instead of an adler32. + + The memLevel parameter specifies how much memory should be allocated + for the internal compression state. memLevel=1 uses minimum memory but is + slow and reduces compression ratio; memLevel=9 uses maximum memory for + optimal speed. The default value is 8. See zconf.h for total memory usage + as a function of windowBits and memLevel. + + The strategy parameter is used to tune the compression algorithm. Use the + value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a + filter (or predictor), Z_HUFFMAN_ONLY to force Huffman encoding only (no + string match), or Z_RLE to limit match distances to one (run-length + encoding). Filtered data consists mostly of small values with a somewhat + random distribution. In this case, the compression algorithm is tuned to + compress them better. The effect of Z_FILTERED is to force more Huffman + coding and less string matching; it is somewhat intermediate between + Z_DEFAULT_STRATEGY and Z_HUFFMAN_ONLY. Z_RLE is designed to be almost as + fast as Z_HUFFMAN_ONLY, but give better compression for PNG image data. The + strategy parameter only affects the compression ratio but not the + correctness of the compressed output even if it is not set appropriately. + Z_FIXED prevents the use of dynamic Huffman codes, allowing for a simpler + decoder for special applications. + + deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough + memory, Z_STREAM_ERROR if any parameter is invalid (such as an invalid + method), or Z_VERSION_ERROR if the zlib library version (zlib_version) is + incompatible with the version assumed by the caller (ZLIB_VERSION). msg is + set to null if there is no error message. deflateInit2 does not perform any + compression: this will be done by deflate(). +*/ + +ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm, + const Bytef *dictionary, + uInt dictLength)); +/* + Initializes the compression dictionary from the given byte sequence + without producing any compressed output. When using the zlib format, this + function must be called immediately after deflateInit, deflateInit2 or + deflateReset, and before any call of deflate. When doing raw deflate, this + function must be called either before any call of deflate, or immediately + after the completion of a deflate block, i.e. after all input has been + consumed and all output has been delivered when using any of the flush + options Z_BLOCK, Z_PARTIAL_FLUSH, Z_SYNC_FLUSH, or Z_FULL_FLUSH. The + compressor and decompressor must use exactly the same dictionary (see + inflateSetDictionary). + + The dictionary should consist of strings (byte sequences) that are likely + to be encountered later in the data to be compressed, with the most commonly + used strings preferably put towards the end of the dictionary. Using a + dictionary is most useful when the data to be compressed is short and can be + predicted with good accuracy; the data can then be compressed better than + with the default empty dictionary. + + Depending on the size of the compression data structures selected by + deflateInit or deflateInit2, a part of the dictionary may in effect be + discarded, for example if the dictionary is larger than the window size + provided in deflateInit or deflateInit2. Thus the strings most likely to be + useful should be put at the end of the dictionary, not at the front. In + addition, the current implementation of deflate will use at most the window + size minus 262 bytes of the provided dictionary. + + Upon return of this function, strm->adler is set to the adler32 value + of the dictionary; the decompressor may later use this value to determine + which dictionary has been used by the compressor. (The adler32 value + applies to the whole dictionary even if only a subset of the dictionary is + actually used by the compressor.) If a raw deflate was requested, then the + adler32 value is not computed and strm->adler is not set. + + deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a + parameter is invalid (e.g. dictionary being Z_NULL) or the stream state is + inconsistent (for example if deflate has already been called for this stream + or if not at a block boundary for raw deflate). deflateSetDictionary does + not perform any compression: this will be done by deflate(). +*/ + +ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest, + z_streamp source)); +/* + Sets the destination stream as a complete copy of the source stream. + + This function can be useful when several compression strategies will be + tried, for example when there are several ways of pre-processing the input + data with a filter. The streams that will be discarded should then be freed + by calling deflateEnd. Note that deflateCopy duplicates the internal + compression state which can be quite large, so this strategy is slow and can + consume lots of memory. + + deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not + enough memory, Z_STREAM_ERROR if the source stream state was inconsistent + (such as zalloc being Z_NULL). msg is left unchanged in both source and + destination. +*/ + +ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm)); +/* + This function is equivalent to deflateEnd followed by deflateInit, + but does not free and reallocate all the internal compression state. The + stream will keep the same compression level and any other attributes that + may have been set by deflateInit2. + + deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source + stream state was inconsistent (such as zalloc or state being Z_NULL). +*/ + +ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm, + int level, + int strategy)); +/* + Dynamically update the compression level and compression strategy. The + interpretation of level and strategy is as in deflateInit2. This can be + used to switch between compression and straight copy of the input data, or + to switch to a different kind of input data requiring a different strategy. + If the compression level is changed, the input available so far is + compressed with the old level (and may be flushed); the new level will take + effect only at the next call of deflate(). + + Before the call of deflateParams, the stream state must be set as for + a call of deflate(), since the currently available input may have to be + compressed and flushed. In particular, strm->avail_out must be non-zero. + + deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source + stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR if + strm->avail_out was zero. +*/ + +ZEXTERN int ZEXPORT deflateTune OF((z_streamp strm, + int good_length, + int max_lazy, + int nice_length, + int max_chain)); +/* + Fine tune deflate's internal compression parameters. This should only be + used by someone who understands the algorithm used by zlib's deflate for + searching for the best matching string, and even then only by the most + fanatic optimizer trying to squeeze out the last compressed bit for their + specific input data. Read the deflate.c source code for the meaning of the + max_lazy, good_length, nice_length, and max_chain parameters. + + deflateTune() can be called after deflateInit() or deflateInit2(), and + returns Z_OK on success, or Z_STREAM_ERROR for an invalid deflate stream. + */ + +ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm, + uLong sourceLen)); +/* + deflateBound() returns an upper bound on the compressed size after + deflation of sourceLen bytes. It must be called after deflateInit() or + deflateInit2(), and after deflateSetHeader(), if used. This would be used + to allocate an output buffer for deflation in a single pass, and so would be + called before deflate(). If that first deflate() call is provided the + sourceLen input bytes, an output buffer allocated to the size returned by + deflateBound(), and the flush value Z_FINISH, then deflate() is guaranteed + to return Z_STREAM_END. Note that it is possible for the compressed size to + be larger than the value returned by deflateBound() if flush options other + than Z_FINISH or Z_NO_FLUSH are used. +*/ + +ZEXTERN int ZEXPORT deflatePending OF((z_streamp strm, + unsigned *pending, + int *bits)); +/* + deflatePending() returns the number of bytes and bits of output that have + been generated, but not yet provided in the available output. The bytes not + provided would be due to the available output space having being consumed. + The number of bits of output not provided are between 0 and 7, where they + await more bits to join them in order to fill out a full byte. If pending + or bits are Z_NULL, then those values are not set. + + deflatePending returns Z_OK if success, or Z_STREAM_ERROR if the source + stream state was inconsistent. + */ + +ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm, + int bits, + int value)); +/* + deflatePrime() inserts bits in the deflate output stream. The intent + is that this function is used to start off the deflate output with the bits + leftover from a previous deflate stream when appending to it. As such, this + function can only be used for raw deflate, and must be used before the first + deflate() call after a deflateInit2() or deflateReset(). bits must be less + than or equal to 16, and that many of the least significant bits of value + will be inserted in the output. + + deflatePrime returns Z_OK if success, Z_BUF_ERROR if there was not enough + room in the internal buffer to insert the bits, or Z_STREAM_ERROR if the + source stream state was inconsistent. +*/ + +ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm, + gz_headerp head)); +/* + deflateSetHeader() provides gzip header information for when a gzip + stream is requested by deflateInit2(). deflateSetHeader() may be called + after deflateInit2() or deflateReset() and before the first call of + deflate(). The text, time, os, extra field, name, and comment information + in the provided gz_header structure are written to the gzip header (xflag is + ignored -- the extra flags are set according to the compression level). The + caller must assure that, if not Z_NULL, name and comment are terminated with + a zero byte, and that if extra is not Z_NULL, that extra_len bytes are + available there. If hcrc is true, a gzip header crc is included. Note that + the current versions of the command-line version of gzip (up through version + 1.3.x) do not support header crc's, and will report that it is a "multi-part + gzip file" and give up. + + If deflateSetHeader is not used, the default gzip header has text false, + the time set to zero, and os set to 255, with no extra, name, or comment + fields. The gzip header is returned to the default state by deflateReset(). + + deflateSetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source + stream state was inconsistent. +*/ + +/* +ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm, + int windowBits)); + + This is another version of inflateInit with an extra parameter. The + fields next_in, avail_in, zalloc, zfree and opaque must be initialized + before by the caller. + + The windowBits parameter is the base two logarithm of the maximum window + size (the size of the history buffer). It should be in the range 8..15 for + this version of the library. The default value is 15 if inflateInit is used + instead. windowBits must be greater than or equal to the windowBits value + provided to deflateInit2() while compressing, or it must be equal to 15 if + deflateInit2() was not used. If a compressed stream with a larger window + size is given as input, inflate() will return with the error code + Z_DATA_ERROR instead of trying to allocate a larger window. + + windowBits can also be zero to request that inflate use the window size in + the zlib header of the compressed stream. + + windowBits can also be -8..-15 for raw inflate. In this case, -windowBits + determines the window size. inflate() will then process raw deflate data, + not looking for a zlib or gzip header, not generating a check value, and not + looking for any check values for comparison at the end of the stream. This + is for use with other formats that use the deflate compressed data format + such as zip. Those formats provide their own check values. If a custom + format is developed using the raw deflate format for compressed data, it is + recommended that a check value such as an adler32 or a crc32 be applied to + the uncompressed data as is done in the zlib, gzip, and zip formats. For + most applications, the zlib format should be used as is. Note that comments + above on the use in deflateInit2() applies to the magnitude of windowBits. + + windowBits can also be greater than 15 for optional gzip decoding. Add + 32 to windowBits to enable zlib and gzip decoding with automatic header + detection, or add 16 to decode only the gzip format (the zlib format will + return a Z_DATA_ERROR). If a gzip stream is being decoded, strm->adler is a + crc32 instead of an adler32. + + inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough + memory, Z_VERSION_ERROR if the zlib library version is incompatible with the + version assumed by the caller, or Z_STREAM_ERROR if the parameters are + invalid, such as a null pointer to the structure. msg is set to null if + there is no error message. inflateInit2 does not perform any decompression + apart from possibly reading the zlib header if present: actual decompression + will be done by inflate(). (So next_in and avail_in may be modified, but + next_out and avail_out are unused and unchanged.) The current implementation + of inflateInit2() does not process any header information -- that is + deferred until inflate() is called. +*/ + +ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm, + const Bytef *dictionary, + uInt dictLength)); +/* + Initializes the decompression dictionary from the given uncompressed byte + sequence. This function must be called immediately after a call of inflate, + if that call returned Z_NEED_DICT. The dictionary chosen by the compressor + can be determined from the adler32 value returned by that call of inflate. + The compressor and decompressor must use exactly the same dictionary (see + deflateSetDictionary). For raw inflate, this function can be called at any + time to set the dictionary. If the provided dictionary is smaller than the + window and there is already data in the window, then the provided dictionary + will amend what's there. The application must insure that the dictionary + that was used for compression is provided. + + inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a + parameter is invalid (e.g. dictionary being Z_NULL) or the stream state is + inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the + expected one (incorrect adler32 value). inflateSetDictionary does not + perform any decompression: this will be done by subsequent calls of + inflate(). +*/ + +ZEXTERN int ZEXPORT inflateGetDictionary OF((z_streamp strm, + Bytef *dictionary, + uInt *dictLength)); +/* + Returns the sliding dictionary being maintained by inflate. dictLength is + set to the number of bytes in the dictionary, and that many bytes are copied + to dictionary. dictionary must have enough space, where 32768 bytes is + always enough. If inflateGetDictionary() is called with dictionary equal to + Z_NULL, then only the dictionary length is returned, and nothing is copied. + Similary, if dictLength is Z_NULL, then it is not set. + + inflateGetDictionary returns Z_OK on success, or Z_STREAM_ERROR if the + stream state is inconsistent. +*/ + +ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm)); +/* + Skips invalid compressed data until a possible full flush point (see above + for the description of deflate with Z_FULL_FLUSH) can be found, or until all + available input is skipped. No output is provided. + + inflateSync searches for a 00 00 FF FF pattern in the compressed data. + All full flush points have this pattern, but not all occurrences of this + pattern are full flush points. + + inflateSync returns Z_OK if a possible full flush point has been found, + Z_BUF_ERROR if no more input was provided, Z_DATA_ERROR if no flush point + has been found, or Z_STREAM_ERROR if the stream structure was inconsistent. + In the success case, the application may save the current current value of + total_in which indicates where valid compressed data was found. In the + error case, the application may repeatedly call inflateSync, providing more + input each time, until success or end of the input data. +*/ + +ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest, + z_streamp source)); +/* + Sets the destination stream as a complete copy of the source stream. + + This function can be useful when randomly accessing a large stream. The + first pass through the stream can periodically record the inflate state, + allowing restarting inflate at those points when randomly accessing the + stream. + + inflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not + enough memory, Z_STREAM_ERROR if the source stream state was inconsistent + (such as zalloc being Z_NULL). msg is left unchanged in both source and + destination. +*/ + +ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm)); +/* + This function is equivalent to inflateEnd followed by inflateInit, + but does not free and reallocate all the internal decompression state. The + stream will keep attributes that may have been set by inflateInit2. + + inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source + stream state was inconsistent (such as zalloc or state being Z_NULL). +*/ + +ZEXTERN int ZEXPORT inflateReset2 OF((z_streamp strm, + int windowBits)); +/* + This function is the same as inflateReset, but it also permits changing + the wrap and window size requests. The windowBits parameter is interpreted + the same as it is for inflateInit2. + + inflateReset2 returns Z_OK if success, or Z_STREAM_ERROR if the source + stream state was inconsistent (such as zalloc or state being Z_NULL), or if + the windowBits parameter is invalid. +*/ + +ZEXTERN int ZEXPORT inflatePrime OF((z_streamp strm, + int bits, + int value)); +/* + This function inserts bits in the inflate input stream. The intent is + that this function is used to start inflating at a bit position in the + middle of a byte. The provided bits will be used before any bytes are used + from next_in. This function should only be used with raw inflate, and + should be used before the first inflate() call after inflateInit2() or + inflateReset(). bits must be less than or equal to 16, and that many of the + least significant bits of value will be inserted in the input. + + If bits is negative, then the input stream bit buffer is emptied. Then + inflatePrime() can be called again to put bits in the buffer. This is used + to clear out bits leftover after feeding inflate a block description prior + to feeding inflate codes. + + inflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source + stream state was inconsistent. +*/ + +ZEXTERN long ZEXPORT inflateMark OF((z_streamp strm)); +/* + This function returns two values, one in the lower 16 bits of the return + value, and the other in the remaining upper bits, obtained by shifting the + return value down 16 bits. If the upper value is -1 and the lower value is + zero, then inflate() is currently decoding information outside of a block. + If the upper value is -1 and the lower value is non-zero, then inflate is in + the middle of a stored block, with the lower value equaling the number of + bytes from the input remaining to copy. If the upper value is not -1, then + it is the number of bits back from the current bit position in the input of + the code (literal or length/distance pair) currently being processed. In + that case the lower value is the number of bytes already emitted for that + code. + + A code is being processed if inflate is waiting for more input to complete + decoding of the code, or if it has completed decoding but is waiting for + more output space to write the literal or match data. + + inflateMark() is used to mark locations in the input data for random + access, which may be at bit positions, and to note those cases where the + output of a code may span boundaries of random access blocks. The current + location in the input stream can be determined from avail_in and data_type + as noted in the description for the Z_BLOCK flush parameter for inflate. + + inflateMark returns the value noted above or -1 << 16 if the provided + source stream state was inconsistent. +*/ + +ZEXTERN int ZEXPORT inflateGetHeader OF((z_streamp strm, + gz_headerp head)); +/* + inflateGetHeader() requests that gzip header information be stored in the + provided gz_header structure. inflateGetHeader() may be called after + inflateInit2() or inflateReset(), and before the first call of inflate(). + As inflate() processes the gzip stream, head->done is zero until the header + is completed, at which time head->done is set to one. If a zlib stream is + being decoded, then head->done is set to -1 to indicate that there will be + no gzip header information forthcoming. Note that Z_BLOCK or Z_TREES can be + used to force inflate() to return immediately after header processing is + complete and before any actual data is decompressed. + + The text, time, xflags, and os fields are filled in with the gzip header + contents. hcrc is set to true if there is a header CRC. (The header CRC + was valid if done is set to one.) If extra is not Z_NULL, then extra_max + contains the maximum number of bytes to write to extra. Once done is true, + extra_len contains the actual extra field length, and extra contains the + extra field, or that field truncated if extra_max is less than extra_len. + If name is not Z_NULL, then up to name_max characters are written there, + terminated with a zero unless the length is greater than name_max. If + comment is not Z_NULL, then up to comm_max characters are written there, + terminated with a zero unless the length is greater than comm_max. When any + of extra, name, or comment are not Z_NULL and the respective field is not + present in the header, then that field is set to Z_NULL to signal its + absence. This allows the use of deflateSetHeader() with the returned + structure to duplicate the header. However if those fields are set to + allocated memory, then the application will need to save those pointers + elsewhere so that they can be eventually freed. + + If inflateGetHeader is not used, then the header information is simply + discarded. The header is always checked for validity, including the header + CRC if present. inflateReset() will reset the process to discard the header + information. The application would need to call inflateGetHeader() again to + retrieve the header from the next gzip stream. + + inflateGetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source + stream state was inconsistent. +*/ + +/* +ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits, + unsigned char FAR *window)); + + Initialize the internal stream state for decompression using inflateBack() + calls. The fields zalloc, zfree and opaque in strm must be initialized + before the call. If zalloc and zfree are Z_NULL, then the default library- + derived memory allocation routines are used. windowBits is the base two + logarithm of the window size, in the range 8..15. window is a caller + supplied buffer of that size. Except for special applications where it is + assured that deflate was used with small window sizes, windowBits must be 15 + and a 32K byte window must be supplied to be able to decompress general + deflate streams. + + See inflateBack() for the usage of these routines. + + inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of + the parameters are invalid, Z_MEM_ERROR if the internal state could not be + allocated, or Z_VERSION_ERROR if the version of the library does not match + the version of the header file. +*/ + +typedef unsigned (*in_func) OF((void FAR *, + z_const unsigned char FAR * FAR *)); +typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned)); + +ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm, + in_func in, void FAR *in_desc, + out_func out, void FAR *out_desc)); +/* + inflateBack() does a raw inflate with a single call using a call-back + interface for input and output. This is potentially more efficient than + inflate() for file i/o applications, in that it avoids copying between the + output and the sliding window by simply making the window itself the output + buffer. inflate() can be faster on modern CPUs when used with large + buffers. inflateBack() trusts the application to not change the output + buffer passed by the output function, at least until inflateBack() returns. + + inflateBackInit() must be called first to allocate the internal state + and to initialize the state with the user-provided window buffer. + inflateBack() may then be used multiple times to inflate a complete, raw + deflate stream with each call. inflateBackEnd() is then called to free the + allocated state. + + A raw deflate stream is one with no zlib or gzip header or trailer. + This routine would normally be used in a utility that reads zip or gzip + files and writes out uncompressed files. The utility would decode the + header and process the trailer on its own, hence this routine expects only + the raw deflate stream to decompress. This is different from the normal + behavior of inflate(), which expects either a zlib or gzip header and + trailer around the deflate stream. + + inflateBack() uses two subroutines supplied by the caller that are then + called by inflateBack() for input and output. inflateBack() calls those + routines until it reads a complete deflate stream and writes out all of the + uncompressed data, or until it encounters an error. The function's + parameters and return types are defined above in the in_func and out_func + typedefs. inflateBack() will call in(in_desc, &buf) which should return the + number of bytes of provided input, and a pointer to that input in buf. If + there is no input available, in() must return zero--buf is ignored in that + case--and inflateBack() will return a buffer error. inflateBack() will call + out(out_desc, buf, len) to write the uncompressed data buf[0..len-1]. out() + should return zero on success, or non-zero on failure. If out() returns + non-zero, inflateBack() will return with an error. Neither in() nor out() + are permitted to change the contents of the window provided to + inflateBackInit(), which is also the buffer that out() uses to write from. + The length written by out() will be at most the window size. Any non-zero + amount of input may be provided by in(). + + For convenience, inflateBack() can be provided input on the first call by + setting strm->next_in and strm->avail_in. If that input is exhausted, then + in() will be called. Therefore strm->next_in must be initialized before + calling inflateBack(). If strm->next_in is Z_NULL, then in() will be called + immediately for input. If strm->next_in is not Z_NULL, then strm->avail_in + must also be initialized, and then if strm->avail_in is not zero, input will + initially be taken from strm->next_in[0 .. strm->avail_in - 1]. + + The in_desc and out_desc parameters of inflateBack() is passed as the + first parameter of in() and out() respectively when they are called. These + descriptors can be optionally used to pass any information that the caller- + supplied in() and out() functions need to do their job. + + On return, inflateBack() will set strm->next_in and strm->avail_in to + pass back any unused input that was provided by the last in() call. The + return values of inflateBack() can be Z_STREAM_END on success, Z_BUF_ERROR + if in() or out() returned an error, Z_DATA_ERROR if there was a format error + in the deflate stream (in which case strm->msg is set to indicate the nature + of the error), or Z_STREAM_ERROR if the stream was not properly initialized. + In the case of Z_BUF_ERROR, an input or output error can be distinguished + using strm->next_in which will be Z_NULL only if in() returned an error. If + strm->next_in is not Z_NULL, then the Z_BUF_ERROR was due to out() returning + non-zero. (in() will always be called before out(), so strm->next_in is + assured to be defined if out() returns non-zero.) Note that inflateBack() + cannot return Z_OK. +*/ + +ZEXTERN int ZEXPORT inflateBackEnd OF((z_streamp strm)); +/* + All memory allocated by inflateBackInit() is freed. + + inflateBackEnd() returns Z_OK on success, or Z_STREAM_ERROR if the stream + state was inconsistent. +*/ + +ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void)); +/* Return flags indicating compile-time options. + + Type sizes, two bits each, 00 = 16 bits, 01 = 32, 10 = 64, 11 = other: + 1.0: size of uInt + 3.2: size of uLong + 5.4: size of voidpf (pointer) + 7.6: size of z_off_t + + Compiler, assembler, and debug options: + 8: DEBUG + 9: ASMV or ASMINF -- use ASM code + 10: ZLIB_WINAPI -- exported functions use the WINAPI calling convention + 11: 0 (reserved) + + One-time table building (smaller code, but not thread-safe if true): + 12: BUILDFIXED -- build static block decoding tables when needed + 13: DYNAMIC_CRC_TABLE -- build CRC calculation tables when needed + 14,15: 0 (reserved) + + Library content (indicates missing functionality): + 16: NO_GZCOMPRESS -- gz* functions cannot compress (to avoid linking + deflate code when not needed) + 17: NO_GZIP -- deflate can't write gzip streams, and inflate can't detect + and decode gzip streams (to avoid linking crc code) + 18-19: 0 (reserved) + + Operation variations (changes in library functionality): + 20: PKZIP_BUG_WORKAROUND -- slightly more permissive inflate + 21: FASTEST -- deflate algorithm with only one, lowest compression level + 22,23: 0 (reserved) + + The sprintf variant used by gzprintf (zero is best): + 24: 0 = vs*, 1 = s* -- 1 means limited to 20 arguments after the format + 25: 0 = *nprintf, 1 = *printf -- 1 means gzprintf() not secure! + 26: 0 = returns value, 1 = void -- 1 means inferred string length returned + + Remainder: + 27-31: 0 (reserved) + */ + +#ifndef Z_SOLO + + /* utility functions */ + +/* + The following utility functions are implemented on top of the basic + stream-oriented functions. To simplify the interface, some default options + are assumed (compression level and memory usage, standard memory allocation + functions). The source code of these utility functions can be modified if + you need special options. +*/ + +ZEXTERN int ZEXPORT compress OF((Bytef *dest, uLongf *destLen, + const Bytef *source, uLong sourceLen)); +/* + Compresses the source buffer into the destination buffer. sourceLen is + the byte length of the source buffer. Upon entry, destLen is the total size + of the destination buffer, which must be at least the value returned by + compressBound(sourceLen). Upon exit, destLen is the actual size of the + compressed buffer. + + compress returns Z_OK if success, Z_MEM_ERROR if there was not + enough memory, Z_BUF_ERROR if there was not enough room in the output + buffer. +*/ + +ZEXTERN int ZEXPORT compress2 OF((Bytef *dest, uLongf *destLen, + const Bytef *source, uLong sourceLen, + int level)); +/* + Compresses the source buffer into the destination buffer. The level + parameter has the same meaning as in deflateInit. sourceLen is the byte + length of the source buffer. Upon entry, destLen is the total size of the + destination buffer, which must be at least the value returned by + compressBound(sourceLen). Upon exit, destLen is the actual size of the + compressed buffer. + + compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough + memory, Z_BUF_ERROR if there was not enough room in the output buffer, + Z_STREAM_ERROR if the level parameter is invalid. +*/ + +ZEXTERN uLong ZEXPORT compressBound OF((uLong sourceLen)); +/* + compressBound() returns an upper bound on the compressed size after + compress() or compress2() on sourceLen bytes. It would be used before a + compress() or compress2() call to allocate the destination buffer. +*/ + +ZEXTERN int ZEXPORT uncompress OF((Bytef *dest, uLongf *destLen, + const Bytef *source, uLong sourceLen)); +/* + Decompresses the source buffer into the destination buffer. sourceLen is + the byte length of the source buffer. Upon entry, destLen is the total size + of the destination buffer, which must be large enough to hold the entire + uncompressed data. (The size of the uncompressed data must have been saved + previously by the compressor and transmitted to the decompressor by some + mechanism outside the scope of this compression library.) Upon exit, destLen + is the actual size of the uncompressed buffer. + + uncompress returns Z_OK if success, Z_MEM_ERROR if there was not + enough memory, Z_BUF_ERROR if there was not enough room in the output + buffer, or Z_DATA_ERROR if the input data was corrupted or incomplete. In + the case where there is not enough room, uncompress() will fill the output + buffer with the uncompressed data up to that point. +*/ + + /* gzip file access functions */ + +/* + This library supports reading and writing files in gzip (.gz) format with + an interface similar to that of stdio, using the functions that start with + "gz". The gzip format is different from the zlib format. gzip is a gzip + wrapper, documented in RFC 1952, wrapped around a deflate stream. +*/ + +typedef struct gzFile_s *gzFile; /* semi-opaque gzip file descriptor */ + +/* +ZEXTERN gzFile ZEXPORT gzopen OF((const char *path, const char *mode)); + + Opens a gzip (.gz) file for reading or writing. The mode parameter is as + in fopen ("rb" or "wb") but can also include a compression level ("wb9") or + a strategy: 'f' for filtered data as in "wb6f", 'h' for Huffman-only + compression as in "wb1h", 'R' for run-length encoding as in "wb1R", or 'F' + for fixed code compression as in "wb9F". (See the description of + deflateInit2 for more information about the strategy parameter.) 'T' will + request transparent writing or appending with no compression and not using + the gzip format. + + "a" can be used instead of "w" to request that the gzip stream that will + be written be appended to the file. "+" will result in an error, since + reading and writing to the same gzip file is not supported. The addition of + "x" when writing will create the file exclusively, which fails if the file + already exists. On systems that support it, the addition of "e" when + reading or writing will set the flag to close the file on an execve() call. + + These functions, as well as gzip, will read and decode a sequence of gzip + streams in a file. The append function of gzopen() can be used to create + such a file. (Also see gzflush() for another way to do this.) When + appending, gzopen does not test whether the file begins with a gzip stream, + nor does it look for the end of the gzip streams to begin appending. gzopen + will simply append a gzip stream to the existing file. + + gzopen can be used to read a file which is not in gzip format; in this + case gzread will directly read from the file without decompression. When + reading, this will be detected automatically by looking for the magic two- + byte gzip header. + + gzopen returns NULL if the file could not be opened, if there was + insufficient memory to allocate the gzFile state, or if an invalid mode was + specified (an 'r', 'w', or 'a' was not provided, or '+' was provided). + errno can be checked to determine if the reason gzopen failed was that the + file could not be opened. +*/ + +ZEXTERN gzFile ZEXPORT gzdopen OF((int fd, const char *mode)); +/* + gzdopen associates a gzFile with the file descriptor fd. File descriptors + are obtained from calls like open, dup, creat, pipe or fileno (if the file + has been previously opened with fopen). The mode parameter is as in gzopen. + + The next call of gzclose on the returned gzFile will also close the file + descriptor fd, just like fclose(fdopen(fd, mode)) closes the file descriptor + fd. If you want to keep fd open, use fd = dup(fd_keep); gz = gzdopen(fd, + mode);. The duplicated descriptor should be saved to avoid a leak, since + gzdopen does not close fd if it fails. If you are using fileno() to get the + file descriptor from a FILE *, then you will have to use dup() to avoid + double-close()ing the file descriptor. Both gzclose() and fclose() will + close the associated file descriptor, so they need to have different file + descriptors. + + gzdopen returns NULL if there was insufficient memory to allocate the + gzFile state, if an invalid mode was specified (an 'r', 'w', or 'a' was not + provided, or '+' was provided), or if fd is -1. The file descriptor is not + used until the next gz* read, write, seek, or close operation, so gzdopen + will not detect if fd is invalid (unless fd is -1). +*/ + +ZEXTERN int ZEXPORT gzbuffer OF((gzFile file, unsigned size)); +/* + Set the internal buffer size used by this library's functions. The + default buffer size is 8192 bytes. This function must be called after + gzopen() or gzdopen(), and before any other calls that read or write the + file. The buffer memory allocation is always deferred to the first read or + write. Two buffers are allocated, either both of the specified size when + writing, or one of the specified size and the other twice that size when + reading. A larger buffer size of, for example, 64K or 128K bytes will + noticeably increase the speed of decompression (reading). + + The new buffer size also affects the maximum length for gzprintf(). + + gzbuffer() returns 0 on success, or -1 on failure, such as being called + too late. +*/ + +ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy)); +/* + Dynamically update the compression level or strategy. See the description + of deflateInit2 for the meaning of these parameters. + + gzsetparams returns Z_OK if success, or Z_STREAM_ERROR if the file was not + opened for writing. +*/ + +ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len)); +/* + Reads the given number of uncompressed bytes from the compressed file. If + the input file is not in gzip format, gzread copies the given number of + bytes into the buffer directly from the file. + + After reaching the end of a gzip stream in the input, gzread will continue + to read, looking for another gzip stream. Any number of gzip streams may be + concatenated in the input file, and will all be decompressed by gzread(). + If something other than a gzip stream is encountered after a gzip stream, + that remaining trailing garbage is ignored (and no error is returned). + + gzread can be used to read a gzip file that is being concurrently written. + Upon reaching the end of the input, gzread will return with the available + data. If the error code returned by gzerror is Z_OK or Z_BUF_ERROR, then + gzclearerr can be used to clear the end of file indicator in order to permit + gzread to be tried again. Z_OK indicates that a gzip stream was completed + on the last gzread. Z_BUF_ERROR indicates that the input file ended in the + middle of a gzip stream. Note that gzread does not return -1 in the event + of an incomplete gzip stream. This error is deferred until gzclose(), which + will return Z_BUF_ERROR if the last gzread ended in the middle of a gzip + stream. Alternatively, gzerror can be used before gzclose to detect this + case. + + gzread returns the number of uncompressed bytes actually read, less than + len for end of file, or -1 for error. +*/ + +ZEXTERN int ZEXPORT gzwrite OF((gzFile file, + voidpc buf, unsigned len)); +/* + Writes the given number of uncompressed bytes into the compressed file. + gzwrite returns the number of uncompressed bytes written or 0 in case of + error. +*/ + +ZEXTERN int ZEXPORTVA gzprintf Z_ARG((gzFile file, const char *format, ...)); +/* + Converts, formats, and writes the arguments to the compressed file under + control of the format string, as in fprintf. gzprintf returns the number of + uncompressed bytes actually written, or 0 in case of error. The number of + uncompressed bytes written is limited to 8191, or one less than the buffer + size given to gzbuffer(). The caller should assure that this limit is not + exceeded. If it is exceeded, then gzprintf() will return an error (0) with + nothing written. In this case, there may also be a buffer overflow with + unpredictable consequences, which is possible only if zlib was compiled with + the insecure functions sprintf() or vsprintf() because the secure snprintf() + or vsnprintf() functions were not available. This can be determined using + zlibCompileFlags(). +*/ + +ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s)); +/* + Writes the given null-terminated string to the compressed file, excluding + the terminating null character. + + gzputs returns the number of characters written, or -1 in case of error. +*/ + +ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len)); +/* + Reads bytes from the compressed file until len-1 characters are read, or a + newline character is read and transferred to buf, or an end-of-file + condition is encountered. If any characters are read or if len == 1, the + string is terminated with a null character. If no characters are read due + to an end-of-file or len < 1, then the buffer is left untouched. + + gzgets returns buf which is a null-terminated string, or it returns NULL + for end-of-file or in case of error. If there was an error, the contents at + buf are indeterminate. +*/ + +ZEXTERN int ZEXPORT gzputc OF((gzFile file, int c)); +/* + Writes c, converted to an unsigned char, into the compressed file. gzputc + returns the value that was written, or -1 in case of error. +*/ + +ZEXTERN int ZEXPORT gzgetc OF((gzFile file)); +/* + Reads one byte from the compressed file. gzgetc returns this byte or -1 + in case of end of file or error. This is implemented as a macro for speed. + As such, it does not do all of the checking the other functions do. I.e. + it does not check to see if file is NULL, nor whether the structure file + points to has been clobbered or not. +*/ + +ZEXTERN int ZEXPORT gzungetc OF((int c, gzFile file)); +/* + Push one character back onto the stream to be read as the first character + on the next read. At least one character of push-back is allowed. + gzungetc() returns the character pushed, or -1 on failure. gzungetc() will + fail if c is -1, and may fail if a character has been pushed but not read + yet. If gzungetc is used immediately after gzopen or gzdopen, at least the + output buffer size of pushed characters is allowed. (See gzbuffer above.) + The pushed character will be discarded if the stream is repositioned with + gzseek() or gzrewind(). +*/ + +ZEXTERN int ZEXPORT gzflush OF((gzFile file, int flush)); +/* + Flushes all pending output into the compressed file. The parameter flush + is as in the deflate() function. The return value is the zlib error number + (see function gzerror below). gzflush is only permitted when writing. + + If the flush parameter is Z_FINISH, the remaining data is written and the + gzip stream is completed in the output. If gzwrite() is called again, a new + gzip stream will be started in the output. gzread() is able to read such + concatented gzip streams. + + gzflush should be called only when strictly necessary because it will + degrade compression if called too often. +*/ + +/* +ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile file, + z_off_t offset, int whence)); + + Sets the starting position for the next gzread or gzwrite on the given + compressed file. The offset represents a number of bytes in the + uncompressed data stream. The whence parameter is defined as in lseek(2); + the value SEEK_END is not supported. + + If the file is opened for reading, this function is emulated but can be + extremely slow. If the file is opened for writing, only forward seeks are + supported; gzseek then compresses a sequence of zeroes up to the new + starting position. + + gzseek returns the resulting offset location as measured in bytes from + the beginning of the uncompressed stream, or -1 in case of error, in + particular if the file is opened for writing and the new starting position + would be before the current position. +*/ + +ZEXTERN int ZEXPORT gzrewind OF((gzFile file)); +/* + Rewinds the given file. This function is supported only for reading. + + gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET) +*/ + +/* +ZEXTERN z_off_t ZEXPORT gztell OF((gzFile file)); + + Returns the starting position for the next gzread or gzwrite on the given + compressed file. This position represents a number of bytes in the + uncompressed data stream, and is zero when starting, even if appending or + reading a gzip stream from the middle of a file using gzdopen(). + + gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR) +*/ + +/* +ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile file)); + + Returns the current offset in the file being read or written. This offset + includes the count of bytes that precede the gzip stream, for example when + appending or when using gzdopen() for reading. When reading, the offset + does not include as yet unused buffered input. This information can be used + for a progress indicator. On error, gzoffset() returns -1. +*/ + +ZEXTERN int ZEXPORT gzeof OF((gzFile file)); +/* + Returns true (1) if the end-of-file indicator has been set while reading, + false (0) otherwise. Note that the end-of-file indicator is set only if the + read tried to go past the end of the input, but came up short. Therefore, + just like feof(), gzeof() may return false even if there is no more data to + read, in the event that the last read request was for the exact number of + bytes remaining in the input file. This will happen if the input file size + is an exact multiple of the buffer size. + + If gzeof() returns true, then the read functions will return no more data, + unless the end-of-file indicator is reset by gzclearerr() and the input file + has grown since the previous end of file was detected. +*/ + +ZEXTERN int ZEXPORT gzdirect OF((gzFile file)); +/* + Returns true (1) if file is being copied directly while reading, or false + (0) if file is a gzip stream being decompressed. + + If the input file is empty, gzdirect() will return true, since the input + does not contain a gzip stream. + + If gzdirect() is used immediately after gzopen() or gzdopen() it will + cause buffers to be allocated to allow reading the file to determine if it + is a gzip file. Therefore if gzbuffer() is used, it should be called before + gzdirect(). + + When writing, gzdirect() returns true (1) if transparent writing was + requested ("wT" for the gzopen() mode), or false (0) otherwise. (Note: + gzdirect() is not needed when writing. Transparent writing must be + explicitly requested, so the application already knows the answer. When + linking statically, using gzdirect() will include all of the zlib code for + gzip file reading and decompression, which may not be desired.) +*/ + +ZEXTERN int ZEXPORT gzclose OF((gzFile file)); +/* + Flushes all pending output if necessary, closes the compressed file and + deallocates the (de)compression state. Note that once file is closed, you + cannot call gzerror with file, since its structures have been deallocated. + gzclose must not be called more than once on the same file, just as free + must not be called more than once on the same allocation. + + gzclose will return Z_STREAM_ERROR if file is not valid, Z_ERRNO on a + file operation error, Z_MEM_ERROR if out of memory, Z_BUF_ERROR if the + last read ended in the middle of a gzip stream, or Z_OK on success. +*/ + +ZEXTERN int ZEXPORT gzclose_r OF((gzFile file)); +ZEXTERN int ZEXPORT gzclose_w OF((gzFile file)); +/* + Same as gzclose(), but gzclose_r() is only for use when reading, and + gzclose_w() is only for use when writing or appending. The advantage to + using these instead of gzclose() is that they avoid linking in zlib + compression or decompression code that is not used when only reading or only + writing respectively. If gzclose() is used, then both compression and + decompression code will be included the application when linking to a static + zlib library. +*/ + +ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum)); +/* + Returns the error message for the last error which occurred on the given + compressed file. errnum is set to zlib error number. If an error occurred + in the file system and not in the compression library, errnum is set to + Z_ERRNO and the application may consult errno to get the exact error code. + + The application must not modify the returned string. Future calls to + this function may invalidate the previously returned string. If file is + closed, then the string previously returned by gzerror will no longer be + available. + + gzerror() should be used to distinguish errors from end-of-file for those + functions above that do not distinguish those cases in their return values. +*/ + +ZEXTERN void ZEXPORT gzclearerr OF((gzFile file)); +/* + Clears the error and end-of-file flags for file. This is analogous to the + clearerr() function in stdio. This is useful for continuing to read a gzip + file that is being written concurrently. +*/ + +#endif /* !Z_SOLO */ + + /* checksum functions */ + +/* + These functions are not related to compression but are exported + anyway because they might be useful in applications using the compression + library. +*/ + +ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len)); +/* + Update a running Adler-32 checksum with the bytes buf[0..len-1] and + return the updated checksum. If buf is Z_NULL, this function returns the + required initial value for the checksum. + + An Adler-32 checksum is almost as reliable as a CRC32 but can be computed + much faster. + + Usage example: + + uLong adler = adler32(0L, Z_NULL, 0); + + while (read_buffer(buffer, length) != EOF) { + adler = adler32(adler, buffer, length); + } + if (adler != original_adler) error(); +*/ + +/* +ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2, + z_off_t len2)); + + Combine two Adler-32 checksums into one. For two sequences of bytes, seq1 + and seq2 with lengths len1 and len2, Adler-32 checksums were calculated for + each, adler1 and adler2. adler32_combine() returns the Adler-32 checksum of + seq1 and seq2 concatenated, requiring only adler1, adler2, and len2. Note + that the z_off_t type (like off_t) is a signed integer. If len2 is + negative, the result has no meaning or utility. +*/ + +ZEXTERN uLong ZEXPORT crc32 OF((uLong crc, const Bytef *buf, uInt len)); +/* + Update a running CRC-32 with the bytes buf[0..len-1] and return the + updated CRC-32. If buf is Z_NULL, this function returns the required + initial value for the crc. Pre- and post-conditioning (one's complement) is + performed within this function so it shouldn't be done by the application. + + Usage example: + + uLong crc = crc32(0L, Z_NULL, 0); + + while (read_buffer(buffer, length) != EOF) { + crc = crc32(crc, buffer, length); + } + if (crc != original_crc) error(); +*/ + +/* +ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2)); + + Combine two CRC-32 check values into one. For two sequences of bytes, + seq1 and seq2 with lengths len1 and len2, CRC-32 check values were + calculated for each, crc1 and crc2. crc32_combine() returns the CRC-32 + check value of seq1 and seq2 concatenated, requiring only crc1, crc2, and + len2. +*/ + + + /* various hacks, don't look :) */ + +/* deflateInit and inflateInit are macros to allow checking the zlib version + * and the compiler's view of z_stream: + */ +ZEXTERN int ZEXPORT deflateInit_ OF((z_streamp strm, int level, + const char *version, int stream_size)); +ZEXTERN int ZEXPORT inflateInit_ OF((z_streamp strm, + const char *version, int stream_size)); +ZEXTERN int ZEXPORT deflateInit2_ OF((z_streamp strm, int level, int method, + int windowBits, int memLevel, + int strategy, const char *version, + int stream_size)); +ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int windowBits, + const char *version, int stream_size)); +ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits, + unsigned char FAR *window, + const char *version, + int stream_size)); +#define deflateInit(strm, level) \ + deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream)) +#define inflateInit(strm) \ + inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream)) +#define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \ + deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\ + (strategy), ZLIB_VERSION, (int)sizeof(z_stream)) +#define inflateInit2(strm, windowBits) \ + inflateInit2_((strm), (windowBits), ZLIB_VERSION, \ + (int)sizeof(z_stream)) +#define inflateBackInit(strm, windowBits, window) \ + inflateBackInit_((strm), (windowBits), (window), \ + ZLIB_VERSION, (int)sizeof(z_stream)) + +#ifndef Z_SOLO + +/* gzgetc() macro and its supporting function and exposed data structure. Note + * that the real internal state is much larger than the exposed structure. + * This abbreviated structure exposes just enough for the gzgetc() macro. The + * user should not mess with these exposed elements, since their names or + * behavior could change in the future, perhaps even capriciously. They can + * only be used by the gzgetc() macro. You have been warned. + */ +struct gzFile_s { + unsigned have; + unsigned char *next; + z_off64_t pos; +}; +ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file)); /* backward compatibility */ +#ifdef Z_PREFIX_SET +# undef z_gzgetc +# define z_gzgetc(g) \ + ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g)) +#else +# define gzgetc(g) \ + ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g)) +#endif + +/* provide 64-bit offset functions if _LARGEFILE64_SOURCE defined, and/or + * change the regular functions to 64 bits if _FILE_OFFSET_BITS is 64 (if + * both are true, the application gets the *64 functions, and the regular + * functions are changed to 64 bits) -- in case these are set on systems + * without large file support, _LFS64_LARGEFILE must also be true + */ +#ifdef Z_LARGE64 + ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *)); + ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int)); + ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile)); + ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile)); + ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off64_t)); + ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off64_t)); +#endif + +#if !defined(ZLIB_INTERNAL) && defined(Z_WANT64) +# ifdef Z_PREFIX_SET +# define z_gzopen z_gzopen64 +# define z_gzseek z_gzseek64 +# define z_gztell z_gztell64 +# define z_gzoffset z_gzoffset64 +# define z_adler32_combine z_adler32_combine64 +# define z_crc32_combine z_crc32_combine64 +# else +# define gzopen gzopen64 +# define gzseek gzseek64 +# define gztell gztell64 +# define gzoffset gzoffset64 +# define adler32_combine adler32_combine64 +# define crc32_combine crc32_combine64 +# endif +# ifndef Z_LARGE64 + ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *)); + ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int)); + ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile)); + ZEXTERN z_off_t ZEXPORT gzoffset64 OF((gzFile)); + ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t)); + ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t)); +# endif +#else + ZEXTERN gzFile ZEXPORT gzopen OF((const char *, const char *)); + ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile, z_off_t, int)); + ZEXTERN z_off_t ZEXPORT gztell OF((gzFile)); + ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile)); + ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t)); + ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t)); +#endif + +#else /* Z_SOLO */ + + ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t)); + ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t)); + +#endif /* !Z_SOLO */ + +/* hack for buggy compilers */ +#if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL) + struct internal_state {int dummy;}; +#endif + +/* undocumented functions */ +ZEXTERN const char * ZEXPORT zError OF((int)); +ZEXTERN int ZEXPORT inflateSyncPoint OF((z_streamp)); +ZEXTERN const z_crc_t FAR * ZEXPORT get_crc_table OF((void)); +ZEXTERN int ZEXPORT inflateUndermine OF((z_streamp, int)); +ZEXTERN int ZEXPORT inflateResetKeep OF((z_streamp)); +ZEXTERN int ZEXPORT deflateResetKeep OF((z_streamp)); +#if defined(_WIN32) && !defined(Z_SOLO) +ZEXTERN gzFile ZEXPORT gzopen_w OF((const wchar_t *path, + const char *mode)); +#endif +#if defined(STDC) || defined(Z_HAVE_STDARG_H) +# ifndef Z_SOLO +ZEXTERN int ZEXPORTVA gzvprintf Z_ARG((gzFile file, + const char *format, + va_list va)); +# endif +#endif + +#ifdef __cplusplus +} +#endif + +#endif /* ZLIB_H */ diff --git a/src/3rdparty/zlib/zlib.map b/src/3rdparty/zlib/zlib.map new file mode 100644 index 0000000..55c6647 --- /dev/null +++ b/src/3rdparty/zlib/zlib.map @@ -0,0 +1,83 @@ +ZLIB_1.2.0 { + global: + compressBound; + deflateBound; + inflateBack; + inflateBackEnd; + inflateBackInit_; + inflateCopy; + local: + deflate_copyright; + inflate_copyright; + inflate_fast; + inflate_table; + zcalloc; + zcfree; + z_errmsg; + gz_error; + gz_intmax; + _*; +}; + +ZLIB_1.2.0.2 { + gzclearerr; + gzungetc; + zlibCompileFlags; +} ZLIB_1.2.0; + +ZLIB_1.2.0.8 { + deflatePrime; +} ZLIB_1.2.0.2; + +ZLIB_1.2.2 { + adler32_combine; + crc32_combine; + deflateSetHeader; + inflateGetHeader; +} ZLIB_1.2.0.8; + +ZLIB_1.2.2.3 { + deflateTune; + gzdirect; +} ZLIB_1.2.2; + +ZLIB_1.2.2.4 { + inflatePrime; +} ZLIB_1.2.2.3; + +ZLIB_1.2.3.3 { + adler32_combine64; + crc32_combine64; + gzopen64; + gzseek64; + gztell64; + inflateUndermine; +} ZLIB_1.2.2.4; + +ZLIB_1.2.3.4 { + inflateReset2; + inflateMark; +} ZLIB_1.2.3.3; + +ZLIB_1.2.3.5 { + gzbuffer; + gzoffset; + gzoffset64; + gzclose_r; + gzclose_w; +} ZLIB_1.2.3.4; + +ZLIB_1.2.5.1 { + deflatePending; +} ZLIB_1.2.3.5; + +ZLIB_1.2.5.2 { + deflateResetKeep; + gzgetc_; + inflateResetKeep; +} ZLIB_1.2.5.1; + +ZLIB_1.2.7.1 { + inflateGetDictionary; + gzvprintf; +} ZLIB_1.2.5.2; diff --git a/src/3rdparty/zlib/zlib.pc.cmakein b/src/3rdparty/zlib/zlib.pc.cmakein new file mode 100644 index 0000000..a5e6429 --- /dev/null +++ b/src/3rdparty/zlib/zlib.pc.cmakein @@ -0,0 +1,13 @@ +prefix=@CMAKE_INSTALL_PREFIX@ +exec_prefix=@CMAKE_INSTALL_PREFIX@ +libdir=@INSTALL_LIB_DIR@ +sharedlibdir=@INSTALL_LIB_DIR@ +includedir=@INSTALL_INC_DIR@ + +Name: zlib +Description: zlib compression library +Version: @VERSION@ + +Requires: +Libs: -L${libdir} -L${sharedlibdir} -lz +Cflags: -I${includedir} diff --git a/src/3rdparty/zlib/zlib.pc.in b/src/3rdparty/zlib/zlib.pc.in new file mode 100644 index 0000000..7e5acf9 --- /dev/null +++ b/src/3rdparty/zlib/zlib.pc.in @@ -0,0 +1,13 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +sharedlibdir=@sharedlibdir@ +includedir=@includedir@ + +Name: zlib +Description: zlib compression library +Version: @VERSION@ + +Requires: +Libs: -L${libdir} -L${sharedlibdir} -lz +Cflags: -I${includedir} diff --git a/src/3rdparty/zlib/zlib2ansi b/src/3rdparty/zlib/zlib2ansi new file mode 100644 index 0000000..15e3e16 --- /dev/null +++ b/src/3rdparty/zlib/zlib2ansi @@ -0,0 +1,152 @@ +#!/usr/bin/perl + +# Transform K&R C function definitions into ANSI equivalent. +# +# Author: Paul Marquess +# Version: 1.0 +# Date: 3 October 2006 + +# TODO +# +# Asumes no function pointer parameters. unless they are typedefed. +# Assumes no literal strings that look like function definitions +# Assumes functions start at the beginning of a line + +use strict; +use warnings; + +local $/; +$_ = <>; + +my $sp = qr{ \s* (?: /\* .*? \*/ )? \s* }x; # assume no nested comments + +my $d1 = qr{ $sp (?: [\w\*\s]+ $sp)* $sp \w+ $sp [\[\]\s]* $sp }x ; +my $decl = qr{ $sp (?: \w+ $sp )+ $d1 }xo ; +my $dList = qr{ $sp $decl (?: $sp , $d1 )* $sp ; $sp }xo ; + + +while (s/^ + ( # Start $1 + ( # Start $2 + .*? # Minimal eat content + ( ^ \w [\w\s\*]+ ) # $3 -- function name + \s* # optional whitespace + ) # $2 - Matched up to before parameter list + + \( \s* # Literal "(" + optional whitespace + ( [^\)]+ ) # $4 - one or more anythings except ")" + \s* \) # optional whitespace surrounding a Literal ")" + + ( (?: $dList )+ ) # $5 + + $sp ^ { # literal "{" at start of line + ) # Remember to $1 + //xsom + ) +{ + my $all = $1 ; + my $prefix = $2; + my $param_list = $4 ; + my $params = $5; + + StripComments($params); + StripComments($param_list); + $param_list =~ s/^\s+//; + $param_list =~ s/\s+$//; + + my $i = 0 ; + my %pList = map { $_ => $i++ } + split /\s*,\s*/, $param_list; + my $pMatch = '(\b' . join('|', keys %pList) . '\b)\W*$' ; + + my @params = split /\s*;\s*/, $params; + my @outParams = (); + foreach my $p (@params) + { + if ($p =~ /,/) + { + my @bits = split /\s*,\s*/, $p; + my $first = shift @bits; + $first =~ s/^\s*//; + push @outParams, $first; + $first =~ /^(\w+\s*)/; + my $type = $1 ; + push @outParams, map { $type . $_ } @bits; + } + else + { + $p =~ s/^\s+//; + push @outParams, $p; + } + } + + + my %tmp = map { /$pMatch/; $_ => $pList{$1} } + @outParams ; + + @outParams = map { " $_" } + sort { $tmp{$a} <=> $tmp{$b} } + @outParams ; + + print $prefix ; + print "(\n" . join(",\n", @outParams) . ")\n"; + print "{" ; + +} + +# Output any trailing code. +print ; +exit 0; + + +sub StripComments +{ + + no warnings; + + # Strip C & C++ coments + # From the perlfaq + $_[0] =~ + + s{ + /\* ## Start of /* ... */ comment + [^*]*\*+ ## Non-* followed by 1-or-more *'s + ( + [^/*][^*]*\*+ + )* ## 0-or-more things which don't start with / + ## but do end with '*' + / ## End of /* ... */ comment + + | ## OR C++ Comment + // ## Start of C++ comment // + [^\n]* ## followed by 0-or-more non end of line characters + + | ## OR various things which aren't comments: + + ( + " ## Start of " ... " string + ( + \\. ## Escaped char + | ## OR + [^"\\] ## Non "\ + )* + " ## End of " ... " string + + | ## OR + + ' ## Start of ' ... ' string + ( + \\. ## Escaped char + | ## OR + [^'\\] ## Non '\ + )* + ' ## End of ' ... ' string + + | ## OR + + . ## Anything other char + [^/"'\\]* ## Chars which doesn't start a comment, string or escape + ) + }{$2}gxs; + +} diff --git a/src/3rdparty/zlib/zutil.c b/src/3rdparty/zlib/zutil.c new file mode 100644 index 0000000..23d2ebe --- /dev/null +++ b/src/3rdparty/zlib/zutil.c @@ -0,0 +1,324 @@ +/* zutil.c -- target dependent utility functions for the compression library + * Copyright (C) 1995-2005, 2010, 2011, 2012 Jean-loup Gailly. + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +/* @(#) $Id$ */ + +#include "zutil.h" +#ifndef Z_SOLO +# include "gzguts.h" +#endif + +#ifndef NO_DUMMY_DECL +struct internal_state {int dummy;}; /* for buggy compilers */ +#endif + +z_const char * const z_errmsg[10] = { +"need dictionary", /* Z_NEED_DICT 2 */ +"stream end", /* Z_STREAM_END 1 */ +"", /* Z_OK 0 */ +"file error", /* Z_ERRNO (-1) */ +"stream error", /* Z_STREAM_ERROR (-2) */ +"data error", /* Z_DATA_ERROR (-3) */ +"insufficient memory", /* Z_MEM_ERROR (-4) */ +"buffer error", /* Z_BUF_ERROR (-5) */ +"incompatible version",/* Z_VERSION_ERROR (-6) */ +""}; + + +const char * ZEXPORT zlibVersion() +{ + return ZLIB_VERSION; +} + +uLong ZEXPORT zlibCompileFlags() +{ + uLong flags; + + flags = 0; + switch ((int)(sizeof(uInt))) { + case 2: break; + case 4: flags += 1; break; + case 8: flags += 2; break; + default: flags += 3; + } + switch ((int)(sizeof(uLong))) { + case 2: break; + case 4: flags += 1 << 2; break; + case 8: flags += 2 << 2; break; + default: flags += 3 << 2; + } + switch ((int)(sizeof(voidpf))) { + case 2: break; + case 4: flags += 1 << 4; break; + case 8: flags += 2 << 4; break; + default: flags += 3 << 4; + } + switch ((int)(sizeof(z_off_t))) { + case 2: break; + case 4: flags += 1 << 6; break; + case 8: flags += 2 << 6; break; + default: flags += 3 << 6; + } +#ifdef DEBUG + flags += 1 << 8; +#endif +#if defined(ASMV) || defined(ASMINF) + flags += 1 << 9; +#endif +#ifdef ZLIB_WINAPI + flags += 1 << 10; +#endif +#ifdef BUILDFIXED + flags += 1 << 12; +#endif +#ifdef DYNAMIC_CRC_TABLE + flags += 1 << 13; +#endif +#ifdef NO_GZCOMPRESS + flags += 1L << 16; +#endif +#ifdef NO_GZIP + flags += 1L << 17; +#endif +#ifdef PKZIP_BUG_WORKAROUND + flags += 1L << 20; +#endif +#ifdef FASTEST + flags += 1L << 21; +#endif +#if defined(STDC) || defined(Z_HAVE_STDARG_H) +# ifdef NO_vsnprintf + flags += 1L << 25; +# ifdef HAS_vsprintf_void + flags += 1L << 26; +# endif +# else +# ifdef HAS_vsnprintf_void + flags += 1L << 26; +# endif +# endif +#else + flags += 1L << 24; +# ifdef NO_snprintf + flags += 1L << 25; +# ifdef HAS_sprintf_void + flags += 1L << 26; +# endif +# else +# ifdef HAS_snprintf_void + flags += 1L << 26; +# endif +# endif +#endif + return flags; +} + +#ifdef DEBUG + +# ifndef verbose +# define verbose 0 +# endif +int ZLIB_INTERNAL z_verbose = verbose; + +void ZLIB_INTERNAL z_error (m) + char *m; +{ + fprintf(stderr, "%s\n", m); + exit(1); +} +#endif + +/* exported to allow conversion of error code to string for compress() and + * uncompress() + */ +const char * ZEXPORT zError(err) + int err; +{ + return ERR_MSG(err); +} + +#if defined(_WIN32_WCE) + /* The Microsoft C Run-Time Library for Windows CE doesn't have + * errno. We define it as a global variable to simplify porting. + * Its value is always 0 and should not be used. + */ + int errno = 0; +#endif + +#ifndef HAVE_MEMCPY + +void ZLIB_INTERNAL zmemcpy(dest, source, len) + Bytef* dest; + const Bytef* source; + uInt len; +{ + if (len == 0) return; + do { + *dest++ = *source++; /* ??? to be unrolled */ + } while (--len != 0); +} + +int ZLIB_INTERNAL zmemcmp(s1, s2, len) + const Bytef* s1; + const Bytef* s2; + uInt len; +{ + uInt j; + + for (j = 0; j < len; j++) { + if (s1[j] != s2[j]) return 2*(s1[j] > s2[j])-1; + } + return 0; +} + +void ZLIB_INTERNAL zmemzero(dest, len) + Bytef* dest; + uInt len; +{ + if (len == 0) return; + do { + *dest++ = 0; /* ??? to be unrolled */ + } while (--len != 0); +} +#endif + +#ifndef Z_SOLO + +#ifdef SYS16BIT + +#ifdef __TURBOC__ +/* Turbo C in 16-bit mode */ + +# define MY_ZCALLOC + +/* Turbo C malloc() does not allow dynamic allocation of 64K bytes + * and farmalloc(64K) returns a pointer with an offset of 8, so we + * must fix the pointer. Warning: the pointer must be put back to its + * original form in order to free it, use zcfree(). + */ + +#define MAX_PTR 10 +/* 10*64K = 640K */ + +local int next_ptr = 0; + +typedef struct ptr_table_s { + voidpf org_ptr; + voidpf new_ptr; +} ptr_table; + +local ptr_table table[MAX_PTR]; +/* This table is used to remember the original form of pointers + * to large buffers (64K). Such pointers are normalized with a zero offset. + * Since MSDOS is not a preemptive multitasking OS, this table is not + * protected from concurrent access. This hack doesn't work anyway on + * a protected system like OS/2. Use Microsoft C instead. + */ + +voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, unsigned items, unsigned size) +{ + voidpf buf = opaque; /* just to make some compilers happy */ + ulg bsize = (ulg)items*size; + + /* If we allocate less than 65520 bytes, we assume that farmalloc + * will return a usable pointer which doesn't have to be normalized. + */ + if (bsize < 65520L) { + buf = farmalloc(bsize); + if (*(ush*)&buf != 0) return buf; + } else { + buf = farmalloc(bsize + 16L); + } + if (buf == NULL || next_ptr >= MAX_PTR) return NULL; + table[next_ptr].org_ptr = buf; + + /* Normalize the pointer to seg:0 */ + *((ush*)&buf+1) += ((ush)((uch*)buf-0) + 15) >> 4; + *(ush*)&buf = 0; + table[next_ptr++].new_ptr = buf; + return buf; +} + +void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr) +{ + int n; + if (*(ush*)&ptr != 0) { /* object < 64K */ + farfree(ptr); + return; + } + /* Find the original pointer */ + for (n = 0; n < next_ptr; n++) { + if (ptr != table[n].new_ptr) continue; + + farfree(table[n].org_ptr); + while (++n < next_ptr) { + table[n-1] = table[n]; + } + next_ptr--; + return; + } + ptr = opaque; /* just to make some compilers happy */ + Assert(0, "zcfree: ptr not found"); +} + +#endif /* __TURBOC__ */ + + +#ifdef M_I86 +/* Microsoft C in 16-bit mode */ + +# define MY_ZCALLOC + +#if (!defined(_MSC_VER) || (_MSC_VER <= 600)) +# define _halloc halloc +# define _hfree hfree +#endif + +voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, uInt items, uInt size) +{ + if (opaque) opaque = 0; /* to make compiler happy */ + return _halloc((long)items, size); +} + +void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr) +{ + if (opaque) opaque = 0; /* to make compiler happy */ + _hfree(ptr); +} + +#endif /* M_I86 */ + +#endif /* SYS16BIT */ + + +#ifndef MY_ZCALLOC /* Any system without a special alloc function */ + +#ifndef STDC +extern voidp malloc OF((uInt size)); +extern voidp calloc OF((uInt items, uInt size)); +extern void free OF((voidpf ptr)); +#endif + +voidpf ZLIB_INTERNAL zcalloc (opaque, items, size) + voidpf opaque; + unsigned items; + unsigned size; +{ + if (opaque) items += size - size; /* make compiler happy */ + return sizeof(uInt) > 2 ? (voidpf)malloc(items * size) : + (voidpf)calloc(items, size); +} + +void ZLIB_INTERNAL zcfree (opaque, ptr) + voidpf opaque; + voidpf ptr; +{ + free(ptr); + if (opaque) return; /* make compiler happy */ +} + +#endif /* MY_ZCALLOC */ + +#endif /* !Z_SOLO */ diff --git a/src/3rdparty/zlib/zutil.h b/src/3rdparty/zlib/zutil.h new file mode 100644 index 0000000..24ab06b --- /dev/null +++ b/src/3rdparty/zlib/zutil.h @@ -0,0 +1,253 @@ +/* zutil.h -- internal interface and configuration of the compression library + * Copyright (C) 1995-2013 Jean-loup Gailly. + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +/* WARNING: this file should *not* be used by applications. It is + part of the implementation of the compression library and is + subject to change. Applications should only use zlib.h. + */ + +/* @(#) $Id$ */ + +#ifndef ZUTIL_H +#define ZUTIL_H + +#ifdef HAVE_HIDDEN +# define ZLIB_INTERNAL __attribute__((visibility ("hidden"))) +#else +# define ZLIB_INTERNAL +#endif + +#include "zlib.h" + +#if defined(STDC) && !defined(Z_SOLO) +# if !(defined(_WIN32_WCE) && defined(_MSC_VER)) +# include +# endif +# include +# include +#endif + +#ifdef Z_SOLO + typedef long ptrdiff_t; /* guess -- will be caught if guess is wrong */ +#endif + +#ifndef local +# define local static +#endif +/* compile with -Dlocal if your debugger can't find static symbols */ + +typedef unsigned char uch; +typedef uch FAR uchf; +typedef unsigned short ush; +typedef ush FAR ushf; +typedef unsigned long ulg; + +extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ +/* (size given to avoid silly warnings with Visual C++) */ + +#define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)] + +#define ERR_RETURN(strm,err) \ + return (strm->msg = ERR_MSG(err), (err)) +/* To be used only when the state is known to be valid */ + + /* common constants */ + +#ifndef DEF_WBITS +# define DEF_WBITS MAX_WBITS +#endif +/* default windowBits for decompression. MAX_WBITS is for compression only */ + +#if MAX_MEM_LEVEL >= 8 +# define DEF_MEM_LEVEL 8 +#else +# define DEF_MEM_LEVEL MAX_MEM_LEVEL +#endif +/* default memLevel */ + +#define STORED_BLOCK 0 +#define STATIC_TREES 1 +#define DYN_TREES 2 +/* The three kinds of block type */ + +#define MIN_MATCH 3 +#define MAX_MATCH 258 +/* The minimum and maximum match lengths */ + +#define PRESET_DICT 0x20 /* preset dictionary flag in zlib header */ + + /* target dependencies */ + +#if defined(MSDOS) || (defined(WINDOWS) && !defined(WIN32)) +# define OS_CODE 0x00 +# ifndef Z_SOLO +# if defined(__TURBOC__) || defined(__BORLANDC__) +# if (__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__)) + /* Allow compilation with ANSI keywords only enabled */ + void _Cdecl farfree( void *block ); + void *_Cdecl farmalloc( unsigned long nbytes ); +# else +# include +# endif +# else /* MSC or DJGPP */ +# include +# endif +# endif +#endif + +#ifdef AMIGA +# define OS_CODE 0x01 +#endif + +#if defined(VAXC) || defined(VMS) +# define OS_CODE 0x02 +# define F_OPEN(name, mode) \ + fopen((name), (mode), "mbc=60", "ctx=stm", "rfm=fix", "mrs=512") +#endif + +#if defined(ATARI) || defined(atarist) +# define OS_CODE 0x05 +#endif + +#ifdef OS2 +# define OS_CODE 0x06 +# if defined(M_I86) && !defined(Z_SOLO) +# include +# endif +#endif + +#if defined(MACOS) || defined(TARGET_OS_MAC) +# define OS_CODE 0x07 +# ifndef Z_SOLO +# if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os +# include /* for fdopen */ +# else +# ifndef fdopen +# define fdopen(fd,mode) NULL /* No fdopen() */ +# endif +# endif +# endif +#endif + +#ifdef TOPS20 +# define OS_CODE 0x0a +#endif + +#ifdef WIN32 +# ifndef __CYGWIN__ /* Cygwin is Unix, not Win32 */ +# define OS_CODE 0x0b +# endif +#endif + +#ifdef __50SERIES /* Prime/PRIMOS */ +# define OS_CODE 0x0f +#endif + +#if defined(_BEOS_) || defined(RISCOS) +# define fdopen(fd,mode) NULL /* No fdopen() */ +#endif + +#if (defined(_MSC_VER) && (_MSC_VER > 600)) && !defined __INTERIX +# if defined(_WIN32_WCE) +# define fdopen(fd,mode) NULL /* No fdopen() */ +# ifndef _PTRDIFF_T_DEFINED + typedef int ptrdiff_t; +# define _PTRDIFF_T_DEFINED +# endif +# else +# define fdopen(fd,type) _fdopen(fd,type) +# endif +#endif + +#if defined(__BORLANDC__) && !defined(MSDOS) + #pragma warn -8004 + #pragma warn -8008 + #pragma warn -8066 +#endif + +/* provide prototypes for these when building zlib without LFS */ +#if !defined(_WIN32) && \ + (!defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0) + ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t)); + ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t)); +#endif + + /* common defaults */ + +#ifndef OS_CODE +# define OS_CODE 0x03 /* assume Unix */ +#endif + +#ifndef F_OPEN +# define F_OPEN(name, mode) fopen((name), (mode)) +#endif + + /* functions */ + +#if defined(pyr) || defined(Z_SOLO) +# define NO_MEMCPY +#endif +#if defined(SMALL_MEDIUM) && !defined(_MSC_VER) && !defined(__SC__) + /* Use our own functions for small and medium model with MSC <= 5.0. + * You may have to use the same strategy for Borland C (untested). + * The __SC__ check is for Symantec. + */ +# define NO_MEMCPY +#endif +#if defined(STDC) && !defined(HAVE_MEMCPY) && !defined(NO_MEMCPY) +# define HAVE_MEMCPY +#endif +#ifdef HAVE_MEMCPY +# ifdef SMALL_MEDIUM /* MSDOS small or medium model */ +# define zmemcpy _fmemcpy +# define zmemcmp _fmemcmp +# define zmemzero(dest, len) _fmemset(dest, 0, len) +# else +# define zmemcpy memcpy +# define zmemcmp memcmp +# define zmemzero(dest, len) memset(dest, 0, len) +# endif +#else + void ZLIB_INTERNAL zmemcpy OF((Bytef* dest, const Bytef* source, uInt len)); + int ZLIB_INTERNAL zmemcmp OF((const Bytef* s1, const Bytef* s2, uInt len)); + void ZLIB_INTERNAL zmemzero OF((Bytef* dest, uInt len)); +#endif + +/* Diagnostic functions */ +#ifdef DEBUG +# include + extern int ZLIB_INTERNAL z_verbose; + extern void ZLIB_INTERNAL z_error OF((char *m)); +# define Assert(cond,msg) {if(!(cond)) z_error(msg);} +# define Trace(x) {if (z_verbose>=0) fprintf x ;} +# define Tracev(x) {if (z_verbose>0) fprintf x ;} +# define Tracevv(x) {if (z_verbose>1) fprintf x ;} +# define Tracec(c,x) {if (z_verbose>0 && (c)) fprintf x ;} +# define Tracecv(c,x) {if (z_verbose>1 && (c)) fprintf x ;} +#else +# define Assert(cond,msg) +# define Trace(x) +# define Tracev(x) +# define Tracevv(x) +# define Tracec(c,x) +# define Tracecv(c,x) +#endif + +#ifndef Z_SOLO + voidpf ZLIB_INTERNAL zcalloc OF((voidpf opaque, unsigned items, + unsigned size)); + void ZLIB_INTERNAL zcfree OF((voidpf opaque, voidpf ptr)); +#endif + +#define ZALLOC(strm, items, size) \ + (*((strm)->zalloc))((strm)->opaque, (items), (size)) +#define ZFREE(strm, addr) (*((strm)->zfree))((strm)->opaque, (voidpf)(addr)) +#define TRY_FREE(s, p) {if (p) ZFREE(s, p);} + +/* Reverse the bytes in a 32-bit value */ +#define ZSWAP32(q) ((((q) >> 24) & 0xff) + (((q) >> 8) & 0xff00) + \ + (((q) & 0xff00) << 8) + (((q) & 0xff) << 24)) + +#endif /* ZUTIL_H */ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9c489ef..a32af31 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -91,13 +91,31 @@ install(FILES gmio_support/stl_occ_mesh.cpp DESTINATION src/gmio_support) install(FILES gmio_support/stl_occ_meshvs.cpp DESTINATION src/gmio_support) install(FILES gmio_support/stl_occ_utils.h DESTINATION src/gmio_support) -# Installs for target +# target if(GMIO_BUILD_SHARED_LIBS) add_library(gmio SHARED ${GMIO_SRC_FILES}) else() add_library(gmio STATIC ${GMIO_SRC_FILES}) endif() - + +# zlib +if(GMIO_USE_BUNDLED_ZLIB) + message(STATUS "Building bundled verison of zlib") + add_subdirectory(3rdparty/zlib) + include_directories( + ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/zlib + ${CMAKE_CURRENT_BINARY_DIR}/3rdparty/zlib) + target_link_libraries(gmio zlibstatic) +else() + find_package(ZLIB) + if (NOT(ZLIB_VERSION_MAJOR EQUAL 1) AND NOT(ZLIB_VERSION_MINOR EQUAL 2)) + message(FATAL_ERROR "Incompatible zlib version ${ZLIB_VERSION_STRING} (gmio expects v1.2.x)") + endif() + include_directories(${ZLIB_INCLUDE_DIRS}) + target_link_libraries(gmio ${ZLIB_LIBRARIES}) +endif() + +# Installs for target install(TARGETS gmio RUNTIME DESTINATION lib LIBRARY DESTINATION lib diff --git a/src/gmio_core/error.h b/src/gmio_core/error.h index 82ffe6c..2dc4078 100644 --- a/src/gmio_core/error.h +++ b/src/gmio_core/error.h @@ -39,6 +39,10 @@ #include "global.h" +/*! \c GMIO_ZLIB_ERROR_TAG + * Byte-mask to tag(identify) zlib-specific error codes */ +enum { GMIO_ZLIB_ERROR_TAG = 0x1000000 }; + /*! This enum defines common errors */ enum gmio_error { @@ -68,7 +72,27 @@ enum gmio_error GMIO_ERROR_STDIO, /*! Checking of \c LC_NUMERIC failed(should be "C" or "POSIX") */ - GMIO_ERROR_BAD_LC_NUMERIC + GMIO_ERROR_BAD_LC_NUMERIC, + + /* zlib */ + /*! See \c Z_ERRNO (file operation error) */ + GMIO_ERROR_ZLIB_FILE_OPERATION = GMIO_ZLIB_ERROR_TAG + 0x01, + + /*! See \c Z_STREAM_ERROR */ + GMIO_ERROR_ZLIB_STREAM, + + /*! See \c Z_DATA_ERROR */ + GMIO_ERROR_ZLIB_DATA, + + /*! See \c Z_MEM_ERROR (not enough memory) */ + GMIO_ERROR_ZLIB_MEM, + + /*! See \c Z_BUF_ERROR */ + GMIO_ERROR_ZLIB_BUF, + + /*! See \c Z_VERSION_ERROR (zlib library version is incompatible with the + * version assumed by the caller) */ + GMIO_ERROR_ZLIB_VERSION }; /*! Returns true if code == GMIO_NO_ERROR */ From 9ce3e42fa8629e021ebf7066eb6c6c4159c2aedd Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Thu, 1 Dec 2016 10:03:43 +0100 Subject: [PATCH 09/81] gmio_core: rename error code name GMIO_ERROR_TRANSFER_STOPPED GitHub issue #7 --- src/gmio_core/error.h | 6 +++--- src/gmio_stl/internal/stla_write.c | 2 +- src/gmio_stl/internal/stlb_write.c | 2 +- src/gmio_stl/stla_read.c | 2 +- src/gmio_stl/stlb_read.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/gmio_core/error.h b/src/gmio_core/error.h index 2dc4078..51383cb 100644 --- a/src/gmio_core/error.h +++ b/src/gmio_core/error.h @@ -61,9 +61,9 @@ enum gmio_error /*! An error occurred with gmio_stream */ GMIO_ERROR_STREAM, - /*! Transfer was stopped by user, that is to say - * gmio_transfer::func_is_stop_requested() returned true */ - GMIO_ERROR_TRANSFER_STOPPED, + /*! Task was stopped by user, that is to say + * gmio_task_iface::func_is_stop_requested() returned true */ + GMIO_ERROR_TASK_STOPPED, /*! An error occured after a call to a function * diff --git a/src/gmio_stl/internal/stla_write.c b/src/gmio_stl/internal/stla_write.c index 9dabe48..d809807 100644 --- a/src/gmio_stl/internal/stla_write.c +++ b/src/gmio_stl/internal/stla_write.c @@ -295,7 +295,7 @@ int gmio_stla_write( /* Task control */ if (gmio_no_error(error) && gmio_task_iface_is_stop_requested(task)) - error = GMIO_ERROR_TRANSFER_STOPPED; + error = GMIO_ERROR_TASK_STOPPED; } /* end for (ifacet) */ /* Write end of solid */ diff --git a/src/gmio_stl/internal/stlb_write.c b/src/gmio_stl/internal/stlb_write.c index 20cc745..0155938 100644 --- a/src/gmio_stl/internal/stlb_write.c +++ b/src/gmio_stl/internal/stlb_write.c @@ -167,7 +167,7 @@ int gmio_stlb_write( /* Handle stop request */ if (gmio_no_error(error) && gmio_task_iface_is_stop_requested(task)) - error = GMIO_ERROR_TRANSFER_STOPPED; + error = GMIO_ERROR_TASK_STOPPED; } /* end for */ label_end: diff --git a/src/gmio_stl/stla_read.c b/src/gmio_stl/stla_read.c index 852643c..92d2385 100644 --- a/src/gmio_stl/stla_read.c +++ b/src/gmio_stl/stla_read.c @@ -175,7 +175,7 @@ int gmio_stla_read( if (parse_data.error) error = GMIO_STL_ERROR_PARSING; if (parse_data.strstream_cookie.is_stop_requested) - error = GMIO_ERROR_TRANSFER_STOPPED; + error = GMIO_ERROR_TASK_STOPPED; label_end: gmio_memblock_helper_release(&mblock_helper); diff --git a/src/gmio_stl/stlb_read.c b/src/gmio_stl/stlb_read.c index b71fcc4..b65072f 100644 --- a/src/gmio_stl/stlb_read.c +++ b/src/gmio_stl/stlb_read.c @@ -186,7 +186,7 @@ int gmio_stlb_read( mesh_creator, mblock->ptr, read_facet_count, i_facet); i_facet += read_facet_count; if (gmio_task_iface_is_stop_requested(task)) - error = GMIO_ERROR_TRANSFER_STOPPED; + error = GMIO_ERROR_TASK_STOPPED; } gmio_task_iface_handle_progress(task, i_facet, total_facet_count); } /* end while */ From 4000e76080b287b838f40e8da160ab94b121bb59 Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Mon, 5 Dec 2016 15:10:37 +0100 Subject: [PATCH 10/81] zlib: move detection in root CMakeLists.txt --- CMakeLists.txt | 14 ++++++++++++++ src/CMakeLists.txt | 14 ++------------ src/gmio_core/error.h | 2 +- 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c5eb028..1214a0f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -340,6 +340,20 @@ endif() #set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) +# zlib +if(GMIO_USE_BUNDLED_ZLIB) + message(STATUS "Bundled version of zlib") + set(ZLIB_INCLUDE_DIRS + ${CMAKE_CURRENT_SOURCE_DIR}/src/3rdparty/zlib + ${CMAKE_CURRENT_BINARY_DIR}/src/3rdparty/zlib) + set(ZLIB_LIBRARIES zlibstatic) +else() + find_package(ZLIB) + if (NOT(ZLIB_VERSION_MAJOR EQUAL 1) AND NOT(ZLIB_VERSION_MINOR EQUAL 2)) + message(FATAL_ERROR "Incompatible zlib version ${ZLIB_VERSION_STRING} (gmio expects v1.2.x)") + endif() +endif() + # Sub-directories add_subdirectory(src) add_subdirectory(tests) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a32af31..4b249d6 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -100,20 +100,10 @@ endif() # zlib if(GMIO_USE_BUNDLED_ZLIB) - message(STATUS "Building bundled verison of zlib") add_subdirectory(3rdparty/zlib) - include_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/zlib - ${CMAKE_CURRENT_BINARY_DIR}/3rdparty/zlib) - target_link_libraries(gmio zlibstatic) -else() - find_package(ZLIB) - if (NOT(ZLIB_VERSION_MAJOR EQUAL 1) AND NOT(ZLIB_VERSION_MINOR EQUAL 2)) - message(FATAL_ERROR "Incompatible zlib version ${ZLIB_VERSION_STRING} (gmio expects v1.2.x)") - endif() - include_directories(${ZLIB_INCLUDE_DIRS}) - target_link_libraries(gmio ${ZLIB_LIBRARIES}) endif() +include_directories(${ZLIB_INCLUDE_DIRS}) +target_link_libraries(gmio ${ZLIB_LIBRARIES}) # Installs for target install(TARGETS gmio diff --git a/src/gmio_core/error.h b/src/gmio_core/error.h index 51383cb..f9ca6f5 100644 --- a/src/gmio_core/error.h +++ b/src/gmio_core/error.h @@ -76,7 +76,7 @@ enum gmio_error /* zlib */ /*! See \c Z_ERRNO (file operation error) */ - GMIO_ERROR_ZLIB_FILE_OPERATION = GMIO_ZLIB_ERROR_TAG + 0x01, + GMIO_ERROR_ZLIB_ERRNO = GMIO_ZLIB_ERROR_TAG + 0x01, /*! See \c Z_STREAM_ERROR */ GMIO_ERROR_ZLIB_STREAM, From fbf56aaa78331d3de706854ba0cf924c262c3805 Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Mon, 5 Dec 2016 15:39:03 +0100 Subject: [PATCH 11/81] zlib: don't install headers and misc files --- src/3rdparty/zlib/CMakeLists.txt | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/3rdparty/zlib/CMakeLists.txt b/src/3rdparty/zlib/CMakeLists.txt index 934bd21..b97c3aa 100644 --- a/src/3rdparty/zlib/CMakeLists.txt +++ b/src/3rdparty/zlib/CMakeLists.txt @@ -14,6 +14,14 @@ set(INSTALL_INC_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "Installation d set(INSTALL_MAN_DIR "${CMAKE_INSTALL_PREFIX}/share/man" CACHE PATH "Installation directory for manual pages") set(INSTALL_PKGCONFIG_DIR "${CMAKE_INSTALL_PREFIX}/share/pkgconfig" CACHE PATH "Installation directory for pkgconfig (.pc) files") +# -- Specific for bundled zlib +set(SKIP_INSTALL_HEADERS 1) +set(SKIP_INSTALL_FILES 1) +if(MSVC) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4127 /wd4131") +endif() +# -- + include(CheckTypeSize) include(CheckFunctionExists) include(CheckIncludeFile) @@ -63,7 +71,6 @@ if(MSVC) set(CMAKE_DEBUG_POSTFIX "d") add_definitions(-D_CRT_SECURE_NO_DEPRECATE) add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4127 /wd4131") include_directories(${CMAKE_CURRENT_SOURCE_DIR}) endif() @@ -220,6 +227,9 @@ endif() if(NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL ) install(FILES ${ZLIB_PUBLIC_HDRS} DESTINATION "${INSTALL_INC_DIR}") endif() +if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL ) + install(FILES zlib.3 DESTINATION "${INSTALL_MAN_DIR}/man3") +endif() if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL ) install(FILES ${ZLIB_PC} DESTINATION "${INSTALL_PKGCONFIG_DIR}") endif() From 091f665a6d2392da6395cdcb1b87d461655eaa0b Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Mon, 5 Dec 2016 17:51:27 +0100 Subject: [PATCH 12/81] cmake: build static and DLL targets --- .travis.yml | 20 ++++++------- CMakeLists.txt | 2 +- appveyor.yml | 6 ++-- benchmarks/CMakeLists.txt | 2 +- examples/CMakeLists.txt | 2 +- src/CMakeLists.txt | 50 ++++++++++++++----------------- tests/CMakeLists.txt | 26 ++-------------- tests/fake_support/CMakeLists.txt | 2 +- tests/test_core.c | 2 +- travis-build-script.sh | 6 ++-- 10 files changed, 45 insertions(+), 73 deletions(-) diff --git a/.travis.yml b/.travis.yml index 02fb059..8df475d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,32 +13,32 @@ _anchors: matrix: include: - # Linux GCC-4.6 debug static coveralls + # Linux GCC-4.6 debug coveralls - compiler: gcc env: TRAVIS_BUILD_TYPE=Debug TRAVIS_COVERALLS=ON - # Linux GCC-4.6 debug static google_double-conversion + # Linux GCC-4.6 debug google_double-conversion - compiler: gcc env: TRAVIS_BUILD_TYPE=Debug TRAVIS_FLOAT2STR_LIB=google_doubleconversion - # Linux GCC-4.6 debug dll c90 + # Linux GCC-4.6 debug no-dll c90 - compiler: gcc - env: TRAVIS_BUILD_TYPE=Debug TRAVIS_SHARED_LIBS=ON TRAVIS_STRICT_C90=ON - # Linux GCC-4.9 release static + env: TRAVIS_BUILD_TYPE=Debug TRAVIS_BUILD_DLL=OFF TRAVIS_STRICT_C90=ON + # Linux GCC-4.9 release - compiler: gcc-4.9 addons: *gcc49-packages env: TRAVIS_BUILD_TYPE=Release TRAVIS_GCC_VERSION=4.9 - # OSX Clang debug static + # OSX Clang debug - os: osx compiler: clang env: TRAVIS_BUILD_TYPE=Debug - # OSX Clang debug static google_double-conversion + # OSX Clang debug google_double-conversion - os: osx compiler: clang env: TRAVIS_BUILD_TYPE=Debug TRAVIS_FLOAT2STR_LIB=google_doubleconversion - # OSX Clang debug dll c90 + # OSX Clang debug no-dll c90 - os: osx compiler: clang - env: TRAVIS_BUILD_TYPE=Debug TRAVIS_SHARED_LIBS=ON TRAVIS_STRICT_C90=ON - # OSX Clang release static + env: TRAVIS_BUILD_TYPE=Debug TRAVIS_BUILD_DLL=OFF TRAVIS_STRICT_C90=ON + # OSX Clang release - os: osx compiler: clang env: TRAVIS_BUILD_TYPE=Release diff --git a/CMakeLists.txt b/CMakeLists.txt index 1214a0f..a3c3557 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,8 +67,8 @@ else() endif() # Options +option(GMIO_BUILD_DLL "Build gmio also as a shared library(DLL)" ON) option(GMIO_BUILD_STRICT_C90 "Build gmio library(and tests) with strict conformance to C90 standard" OFF) -option(GMIO_BUILD_SHARED_LIBS "Build gmio as a shared library (DLL)" OFF) option(GMIO_BUILD_BENCHMARKS "Build performance benchmarks for the gmio library" OFF) option(GMIO_BUILD_EXAMPLES "Build gmio examples" OFF) option(GMIO_BUILD_TESTS_FAKE_SUPPORT "Build tests/fake_support target" OFF) diff --git a/appveyor.yml b/appveyor.yml index 7d94b39..9bd76a0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -14,11 +14,11 @@ clone_folder: c:\projects\gmio.git environment: matrix: - - APPVEYOR_SHARED_LIBS: OFF + - APPVEYOR_BUILD_DLL: ON APPVEYOR_CMAKE_GENERATOR: "Visual Studio 12 2013" APPVEYOR_FLOAT2STR_LIB: std - - APPVEYOR_SHARED_LIBS: ON + - APPVEYOR_BUILD_DLL: ON APPVEYOR_CMAKE_GENERATOR: "Visual Studio 12 2013" APPVEYOR_FLOAT2STR_LIB: google_doubleconversion @@ -32,7 +32,7 @@ build_script: -G "%APPVEYOR_CMAKE_GENERATOR%" ^ -DCMAKE_BUILD_TYPE=%CONFIGURATION% ^ -DCMAKE_DEBUG_POSTFIX=_d ^ - -DGMIO_BUILD_SHARED_LIBS=%APPVEYOR_SHARED_LIBS% ^ + -DGMIO_BUILD_DLL=%APPVEYOR_BUILD_DLL% ^ -DGMIO_FLOAT2STR_LIB=%APPVEYOR_FLOAT2STR_LIB% ^ -DGMIO_BUILD_EXAMPLES=ON ^ -DGMIO_BUILD_BENCHMARKS=ON ^ diff --git a/benchmarks/CMakeLists.txt b/benchmarks/CMakeLists.txt index c07c858..c3e5a74 100644 --- a/benchmarks/CMakeLists.txt +++ b/benchmarks/CMakeLists.txt @@ -45,7 +45,7 @@ set(COMMONS_FILES ${COMMONS_FILES}) include_directories(${CMAKE_SOURCE_DIR}/src) include_directories(${CMAKE_BINARY_DIR}/src) # For cmake generated headers include_directories(${CMAKE_BINARY_DIR}/src/gmio_core) -link_libraries(gmio) +link_libraries(gmio_static) if(CMAKE_C_COMPILER_IS_GCC_COMPATIBLE) link_libraries(m) # -lm endif() diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 328b157..b6d60e8 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -30,7 +30,7 @@ include_directories(${CMAKE_SOURCE_DIR}/src) include_directories(${CMAKE_BINARY_DIR}/src/gmio_core) # For cmake generated headers include_directories(${CMAKE_SOURCE_DIR}/tests/fake_support/opencascade) -link_libraries(gmio) +link_libraries(gmio_static) if(CMAKE_C_COMPILER_IS_GCC_COMPATIBLE) link_libraries(m) # -lm endif() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4b249d6..2f2a1b4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -45,16 +45,6 @@ configure_file(gmio_core/version.h.cmake gmio_core/version.h @ONLY) configure_file(gmio_core/config.h.cmake gmio_core/config.h @ONLY) include_directories(${CMAKE_BINARY_DIR}/src/gmio_core) # For cmake generated headers -# Enable DLL generation (export symbols) -if(GMIO_BUILD_SHARED_LIBS) - add_definitions(-DGMIO_DLL - -DGMIO_MAKING_DLL) - if(MSVC) - configure_file(gmio_core/gmio.rc.cmake gmio_core/gmio.rc @ONLY) - set(GMIO_SRC_FILES ${GMIO_SRC_FILES} ${CMAKE_BINARY_DIR}/src/gmio_core/gmio.rc) - endif() -endif() - # Declare installs install(FILES ${CMAKE_BINARY_DIR}/src/gmio_core/version.h DESTINATION include/gmio_core) install(FILES ${CMAKE_BINARY_DIR}/src/gmio_core/config.h DESTINATION include/gmio_core) @@ -63,11 +53,6 @@ file(GLOB GMIO_CORE_HEADERS gmio_core/*.h) install(FILES ${GMIO_CORE_HEADERS} DESTINATION include/gmio_core) # Module libSTL -#if(GMIO_BUILD_SHARED_LIBS) -# add_definitions(-DGMIO_STL_DLL -# -DGMIO_STL_MAKING_DLL) -#endif() - file(GLOB GMIO_LIBSTL_SRC_FILES gmio_stl/* gmio_stl/internal/*) set(GMIO_SRC_FILES ${GMIO_SRC_FILES} ${GMIO_LIBSTL_SRC_FILES}) @@ -83,30 +68,39 @@ install(FILES gmio_support/stream_qt.h DESTINATION include/gmio_support) install(FILES gmio_support/stream_qt.cpp DESTINATION src/gmio_support) # OpenCASCADE support -install(FILES gmio_support/stl_occ_brep.h DESTINATION include/gmio_support) -install(FILES gmio_support/stl_occ_mesh.h DESTINATION include/gmio_support) -install(FILES gmio_support/stl_occ_meshvs.h DESTINATION include/gmio_support) +install(FILES gmio_support/stl_occ_brep.h DESTINATION include/gmio_support) +install(FILES gmio_support/stl_occ_mesh.h DESTINATION include/gmio_support) +install(FILES gmio_support/stl_occ_meshvs.h DESTINATION include/gmio_support) install(FILES gmio_support/stl_occ_brep.cpp DESTINATION src/gmio_support) install(FILES gmio_support/stl_occ_mesh.cpp DESTINATION src/gmio_support) install(FILES gmio_support/stl_occ_meshvs.cpp DESTINATION src/gmio_support) install(FILES gmio_support/stl_occ_utils.h DESTINATION src/gmio_support) -# target -if(GMIO_BUILD_SHARED_LIBS) - add_library(gmio SHARED ${GMIO_SRC_FILES}) -else() - add_library(gmio STATIC ${GMIO_SRC_FILES}) -endif() - # zlib if(GMIO_USE_BUNDLED_ZLIB) add_subdirectory(3rdparty/zlib) endif() include_directories(${ZLIB_INCLUDE_DIRS}) -target_link_libraries(gmio ${ZLIB_LIBRARIES}) + +# target +add_library(gmio_static STATIC ${GMIO_SRC_FILES}) +target_link_libraries(gmio_static ${ZLIB_LIBRARIES}) +if(GMIO_BUILD_DLL) + if(MSVC) + configure_file(gmio_core/gmio.rc.cmake gmio_core/gmio.rc @ONLY) + set(GMIO_SRC_FILES + ${GMIO_SRC_FILES} + ${CMAKE_BINARY_DIR}/src/gmio_core/gmio.rc) + endif() + add_library(gmio SHARED ${GMIO_SRC_FILES}) + set_target_properties( + gmio PROPERTIES COMPILE_DEFINITIONS "GMIO_DLL;GMIO_MAKING_DLL") + target_link_libraries(gmio ${ZLIB_LIBRARIES}) + set(GMIO_DLL_NAME gmio) +endif() # Installs for target -install(TARGETS gmio - RUNTIME DESTINATION lib +install(TARGETS ${GMIO_DLL_NAME} gmio_static + RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 9518771..04dc796 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -29,10 +29,6 @@ enable_testing() set(CMAKE_CTEST_COMMAND ctest -V --timeout 120) -if(WIN32 AND GMIO_BUILD_SHARED_LIBS) - configure_file(win_ctest_cmd.bat.cmake win_ctest_cmd.bat @ONLY) - set(CMAKE_CTEST_COMMAND win_ctest_cmd.bat) -endif() add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND}) include_directories(${CMAKE_BINARY_DIR}/src/gmio_core) # For generated cmake headers @@ -45,19 +41,9 @@ set(GMIO_TEST_CORE_SRC core_utils.c stream_buffer.c ../benchmarks/commons/benchmark_tools.c) -if(GMIO_BUILD_SHARED_LIBS) - # Note_1: MSVC wants it because internal symbols are not exported (GCC - # exports all symbols) - set(GMIO_TEST_CORE_SRC - ${GMIO_TEST_CORE_SRC} - ../src/gmio_core/internal/error_check.c - ../src/gmio_core/internal/locale_utils.c - ../src/gmio_core/internal/numeric_utils.c - ../src/gmio_core/internal/stringstream.c) -endif() add_executable(test_core EXCLUDE_FROM_ALL ${GMIO_TEST_CORE_SRC}) -target_link_libraries(test_core gmio) +target_link_libraries(test_core gmio_static) # test_stl file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/models @@ -67,17 +53,9 @@ set(GMIO_TEST_STL_SRC stl_testcases.c core_utils.c stl_utils.c) -if(GMIO_BUILD_SHARED_LIBS) - # See Note_1 - set(GMIO_TEST_STL_SRC - ${GMIO_TEST_STL_SRC} - ../src/gmio_core/internal/locale_utils.c - ../src/gmio_core/internal/numeric_utils.c - ../src/gmio_stl/internal/stl_error_check.c) -endif() add_executable(test_stl EXCLUDE_FROM_ALL ${GMIO_TEST_STL_SRC}) -target_link_libraries(test_stl gmio) +target_link_libraries(test_stl gmio_static) # fake_support if(GMIO_BUILD_TESTS_FAKE_SUPPORT) diff --git a/tests/fake_support/CMakeLists.txt b/tests/fake_support/CMakeLists.txt index a18f559..8b15601 100644 --- a/tests/fake_support/CMakeLists.txt +++ b/tests/fake_support/CMakeLists.txt @@ -43,7 +43,7 @@ add_executable( ../../src/gmio_support/stl_occ_meshvs.cpp ../../src/gmio_support/stl_occ_brep.cpp ../../src/gmio_support/stream_qt.cpp) -target_link_libraries(fake_support gmio) +target_link_libraries(fake_support gmio_static) include_directories( ${CMAKE_SOURCE_DIR}/src ${CMAKE_CURRENT_SOURCE_DIR}/opencascade diff --git a/tests/test_core.c b/tests/test_core.c index 31f5aa4..d05b48e 100644 --- a/tests/test_core.c +++ b/tests/test_core.c @@ -54,7 +54,7 @@ static const char* test_core__buffer() UTEST_ASSERT(buff.ptr != NULL); UTEST_ASSERT(buff.size == buff_size); UTEST_ASSERT(memcmp(buff.ptr, &zero_buff[0], buff_size) == 0); - /* TODO: make assert succeed with mingw and GMIO_BUILD_SHARED_LIBS=ON + /* TODO: make assert succeed with mingw and gmio as a DLL * In this case free() has not the same address in libgmio.dll and * test_core.exe */ UTEST_ASSERT(buff.func_deallocate == &free); diff --git a/travis-build-script.sh b/travis-build-script.sh index 22cd0db..46aad86 100644 --- a/travis-build-script.sh +++ b/travis-build-script.sh @@ -21,8 +21,8 @@ if [ -n "${TRAVIS_GCC_VERSION}" ]; then export CXX=g++-$TRAVIS_GCC_VERSION; fi -if [ -z "${TRAVIS_SHARED_LIBS}" ]; then - export TRAVIS_SHARED_LIBS=OFF; +if [ -z "${TRAVIS_BUILD_DLL}" ]; then + export TRAVIS_BUILD_DLL=OFF; fi if [ -z "${TRAVIS_STRICT_C90}" ]; then @@ -41,7 +41,7 @@ cmake .. -G "Unix Makefiles" \ -DCMAKE_DEBUG_POSTFIX=_d \ -DCMAKE_BUILD_TYPE=$TRAVIS_BUILD_TYPE \ -DCMAKE_INSTALL_PREFIX=../install \ - -DGMIO_BUILD_SHARED_LIBS=$TRAVIS_SHARED_LIBS \ + -DGMIO_BUILD_DLL=$TRAVIS_BUILD_DLL \ -DGMIO_BUILD_STRICT_C90=$TRAVIS_STRICT_C90 \ -DGMIO_BUILD_EXAMPLES=ON \ -DGMIO_BUILD_BENCHMARKS=ON \ From 456eddc5201e3d140c642bd2ea430e37db49b144 Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Fri, 29 Jul 2016 13:16:25 +0200 Subject: [PATCH 13/81] gmio_amf: add file format support(export only) GitHub issue #6 --- CMakeLists.txt | 5 +- appveyor.yml | 1 + src/3rdparty/base64/b64.c | 258 +++++ src/3rdparty/base64/b64.h | 9 + src/3rdparty/miloyip_itoa/branchlut.c | 293 ++++++ src/3rdparty/miloyip_itoa/branchlut.h | 13 + src/CMakeLists.txt | 12 + src/gmio_amf/amf_document.h | 367 +++++++ src/gmio_amf/amf_error.h | 88 ++ src/gmio_amf/amf_global.h | 66 ++ src/gmio_amf/amf_io.c | 944 ++++++++++++++++++ src/gmio_amf/amf_io.h | 85 ++ src/gmio_amf/amf_io_options.h | 136 +++ src/gmio_core/const_string.h | 87 ++ src/gmio_core/global.h | 4 +- src/gmio_core/internal/float_format_utils.c | 67 ++ src/gmio_core/internal/float_format_utils.h | 45 + .../internal/google_doubleconversion.cpp | 78 +- .../internal/google_doubleconversion.h | 8 + src/gmio_core/internal/itoa.h | 76 ++ src/gmio_core/internal/ostringstream.c | 214 ++++ src/gmio_core/internal/ostringstream.h | 180 ++++ src/gmio_core/internal/string.h | 31 - src/gmio_core/text_format.h | 3 +- src/gmio_stl/internal/stla_write.c | 36 +- src/gmio_stl/stla_read.c | 1 + tests/CMakeLists.txt | 15 +- tests/main_test_amf.c | 55 + tests/main_test_core.c | 1 + tests/stream_buffer.h | 2 +- tests/test_amf_io.c | 268 +++++ tests/test_core_internal.c | 84 ++ 32 files changed, 3441 insertions(+), 91 deletions(-) create mode 100644 src/3rdparty/base64/b64.c create mode 100644 src/3rdparty/base64/b64.h create mode 100644 src/3rdparty/miloyip_itoa/branchlut.c create mode 100644 src/3rdparty/miloyip_itoa/branchlut.h create mode 100644 src/gmio_amf/amf_document.h create mode 100644 src/gmio_amf/amf_error.h create mode 100644 src/gmio_amf/amf_global.h create mode 100644 src/gmio_amf/amf_io.c create mode 100644 src/gmio_amf/amf_io.h create mode 100644 src/gmio_amf/amf_io_options.h create mode 100644 src/gmio_core/const_string.h create mode 100644 src/gmio_core/internal/float_format_utils.c create mode 100644 src/gmio_core/internal/float_format_utils.h create mode 100644 src/gmio_core/internal/itoa.h create mode 100644 src/gmio_core/internal/ostringstream.c create mode 100644 src/gmio_core/internal/ostringstream.h create mode 100644 tests/main_test_amf.c create mode 100644 tests/test_amf_io.c diff --git a/CMakeLists.txt b/CMakeLists.txt index a3c3557..f39d062 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -323,8 +323,11 @@ if(MSVC) #set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /Oi /Qvec-report:2") # Treat some warnings as errors - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /we4133") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /we4013") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /we4024") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /we4057") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /we4090") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /we4133") # Enable /Zc:strictStrings when msvc_ver > 2012 and build_type != Debug if((MSVC_VERSION GREATER 1700) AND NOT (CMAKE_BUILD_TYPE STREQUAL "Debug")) diff --git a/appveyor.yml b/appveyor.yml index 9bd76a0..14df15b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -43,5 +43,6 @@ build_script: - cmake --build . --config %CONFIGURATION% - cmake --build . --target test_core --config %CONFIGURATION% - cmake --build . --target test_stl --config %CONFIGURATION% + - cmake --build . --target test_amf --config %CONFIGURATION% - set PATH=%APPVEYOR_BUILD_FOLDER%\build\src\%CONFIGURATION%;%PATH% - cd tests && ctest . -V -C %CONFIGURATION% diff --git a/src/3rdparty/base64/b64.c b/src/3rdparty/base64/b64.c new file mode 100644 index 0000000..163ab90 --- /dev/null +++ b/src/3rdparty/base64/b64.c @@ -0,0 +1,258 @@ +/*********************************************************************\ + +MODULE NAME: b64.c + +AUTHOR: Bob Trower 2001/08/04 + +PROJECT: Crypt Data Packaging + +COPYRIGHT: Copyright (c) Trantor Standard Systems Inc., 2001 + +NOTES: This source code may be used as you wish, subject to + the MIT license. See the LICENCE section below. + + Canonical source should be at: + http://base64.sourceforge.net + +DESCRIPTION: + This little utility implements the Base64 + Content-Transfer-Encoding standard described in + RFC1113 (http://www.faqs.org/rfcs/rfc1113.html). + + This is the coding scheme used by MIME to allow + binary data to be transferred by SMTP mail. + + Groups of 3 bytes from a binary stream are coded as + groups of 4 bytes in a text stream. + + The input stream is 'padded' with zeros to create + an input that is an even multiple of 3. + + A special character ('=') is used to denote padding so + that the stream can be decoded back to its exact size. + + Encoded output is formatted in lines which should + be a maximum of 72 characters to conform to the + specification. This program defaults to 72 characters, + but will allow more or less through the use of a + switch. The program enforces a minimum line size + of 4 characters. + + Example encoding: + + The stream 'ABCD' is 32 bits long. It is mapped as + follows: + + ABCD + + A (65) B (66) C (67) D (68) (None) (None) + 01000001 01000010 01000011 01000100 + + 16 (Q) 20 (U) 9 (J) 3 (D) 17 (R) 0 (A) NA (=) NA (=) + 010000 010100 001001 000011 010001 000000 000000 000000 + + + QUJDRA== + + Decoding is the process in reverse. A 'decode' lookup + table has been created to avoid string scans. + +DESIGN GOALS: Specifically: + Code is a stand-alone utility to perform base64 + encoding/decoding. It should be genuinely useful + when the need arises and it meets a need that is + likely to occur for some users. + Code acts as sample code to show the author's + design and coding style. + + Generally: + This program is designed to survive: + Everything you need is in a single source file. + It compiles cleanly using a vanilla ANSI C compiler. + It does its job correctly with a minimum of fuss. + The code is not overly clever, not overly simplistic + and not overly verbose. + Access is 'cut and paste' from a web page. + Terms of use are reasonable. + +VALIDATION: Non-trivial code is never without errors. This + file likely has some problems, since it has only + been tested by the author. It is expected with most + source code that there is a period of 'burn-in' when + problems are identified and corrected. That being + said, it is possible to have 'reasonably correct' + code by following a regime of unit test that covers + the most likely cases and regression testing prior + to release. This has been done with this code and + it has a good probability of performing as expected. + + Unit Test Cases: + + case 0:empty file: + CASE0.DAT -> -> + (Zero length target file created + on both encode and decode.) + + case 1:One input character: + CASE1.DAT A -> QQ== -> A + + case 2:Two input characters: + CASE2.DAT AB -> QUI= -> AB + + case 3:Three input characters: + CASE3.DAT ABC -> QUJD -> ABC + + case 4:Four input characters: + case4.dat ABCD -> QUJDRA== -> ABCD + + case 5:All chars from 0 to ff, linesize set to 50: + + AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8gISIj + JCUmJygpKissLS4vMDEyMzQ1Njc4OTo7PD0+P0BBQkNERUZH + SElKS0xNTk9QUVJTVFVWV1hZWltcXV5fYGFiY2RlZmdoaWpr + bG1ub3BxcnN0dXZ3eHl6e3x9fn+AgYKDhIWGh4iJiouMjY6P + kJGSk5SVlpeYmZqbnJ2en6ChoqOkpaanqKmqq6ytrq+wsbKz + tLW2t7i5uru8vb6/wMHCw8TFxsfIycrLzM3Oz9DR0tPU1dbX + 2Nna29zd3t/g4eLj5OXm5+jp6uvs7e7v8PHy8/T19vf4+fr7 + /P3+/w== + + case 6:Mime Block from e-mail: + (Data same as test case 5) + + case 7: Large files: + Tested 28 MB file in/out. + + case 8: Random Binary Integrity: + This binary program (b64.exe) was encoded to base64, + back to binary and then executed. + + case 9 Stress: + All files in a working directory encoded/decoded + and compared with file comparison utility to + ensure that multiple runs do not cause problems + such as exhausting file handles, tmp storage, etc. + + ------------- + + Syntax, operation and failure: + All options/switches tested. Performs as + expected. + + case 10: + No Args -- Shows Usage Screen + Return Code 1 (Invalid Syntax) + case 11: + One Arg (invalid) -- Shows Usage Screen + Return Code 1 (Invalid Syntax) + case 12: + One Arg Help (-?) -- Shows detailed Usage Screen. + Return Code 0 (Success -- help request is valid). + case 13: + One Arg Help (-h) -- Shows detailed Usage Screen. + Return Code 0 (Success -- help request is valid). + case 14: + One Arg (valid) -- Uses stdin/stdout (filter) + Return Code 0 (Sucess) + case 15: + Two Args (invalid file) -- shows system error. + Return Code 2 (File Error) + case 16: + Encode non-existent file -- shows system error. + Return Code 2 (File Error) + case 17: + Out of disk space -- shows system error. + Return Code 3 (File I/O Error) + case 18: + Too many args -- shows system error. + Return Code 1 (Invalid Syntax) + + ------------- + + Compile/Regression test: + gcc compiled binary under Cygwin + Microsoft Visual Studio under Windows 2000 + Microsoft Version 6.0 C under Windows 2000 + +DEPENDENCIES: None + +LICENCE: Copyright (c) 2001 Bob Trower, Trantor Standard Systems Inc. + + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated + documentation files (the "Software"), to deal in the + Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, + sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, + subject to the following conditions: + + The above copyright notice and this permission notice shall + be included in all copies or substantial portions of the + Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY + KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE + WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR + PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS + OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR + OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR + OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +VERSION HISTORY: + Bob Trower 2001/08/04 -- Create Version 0.00.00B + Bob Trower 2001/08/17 -- Correct documentation, messages. + -- Correct help for linesize syntax. + -- Force error on too many arguments. + Bob Trower 2001/08/19 -- Add sourceforge.net reference to + help screen prior to release. + Bob Trower 2004/10/22 -- Cosmetics for package/release. + Bob Trower 2008/02/28 -- More Cosmetics for package/release. + Bob Trower 2011/02/14 -- Cast altered to fix warning in VS6. + Bob Trower 2015/10/29 -- Change *bug* from 0 to EOF in putc + invocation. BIG shout out to people + reviewing on sourceforge, + particularly rachidc, jorgeventura + and zeroxia. + -- Change date format to conform with + latest convention. + +\******************************************************************* */ + +#include "b64.h" + +/* +** Translation Table as described in RFC1113 +*/ +static const char cb64[]="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; + +/* +** Translation Table to decode (created by author) +*/ +static const char cd64[]="|$$$}rstuvwxyz{$$$$$$$>?@ABCDEFGHIJKLMNOPQRSTUVW$$$$$$XYZ[\\]^_`abcdefghijklmnopq"; + +/* +** encodeblock +** +** encode 3 8-bit binary bytes as 4 '6-bit' characters +*/ +void b64_encodeblock( const unsigned char *in, unsigned char *out, size_t len ) +{ + out[0] = (unsigned char) cb64[ (int)(in[0] >> 2) ]; + out[1] = (unsigned char) cb64[ (int)(((in[0] & 0x03) << 4) | ((in[1] & 0xf0) >> 4)) ]; + out[2] = (unsigned char) (len > 1 ? cb64[ (int)(((in[1] & 0x0f) << 2) | ((in[2] & 0xc0) >> 6)) ] : '='); + out[3] = (unsigned char) (len > 2 ? cb64[ (int)(in[2] & 0x3f) ] : '='); +} + +/* +** decodeblock +** +** decode 4 '6-bit' characters into 3 8-bit binary bytes +*/ +void b64_decodeblock( const unsigned char *in, unsigned char *out ) +{ + out[ 0 ] = (unsigned char ) (in[0] << 2 | in[1] >> 4); + out[ 1 ] = (unsigned char ) (in[1] << 4 | in[2] >> 2); + out[ 2 ] = (unsigned char ) (((in[2] << 6) & 0xc0) | in[3]); +} + diff --git a/src/3rdparty/base64/b64.h b/src/3rdparty/base64/b64.h new file mode 100644 index 0000000..f29fb2d --- /dev/null +++ b/src/3rdparty/base64/b64.h @@ -0,0 +1,9 @@ +#ifndef BASE64_B64_H +#define BASE64_B64_H + +#include + +void b64_encodeblock(const unsigned char* in, unsigned char* out, size_t len); +void b64_decodeblock(const unsigned char* in, unsigned char* out); + +#endif /* BASE64_B64_H */ diff --git a/src/3rdparty/miloyip_itoa/branchlut.c b/src/3rdparty/miloyip_itoa/branchlut.c new file mode 100644 index 0000000..24a8147 --- /dev/null +++ b/src/3rdparty/miloyip_itoa/branchlut.c @@ -0,0 +1,293 @@ +/* + * Original code from Milo Yip + * https://github.com/miloyip/itoa-benchmark/src/branchlut.cpp + * commit #27c6059 + * + * Adapted to be C90 compatible + */ + +#include "branchlut.h" + +static const char gDigitsLut[200] = { + '0','0','0','1','0','2','0','3','0','4','0','5','0','6','0','7','0','8','0','9', + '1','0','1','1','1','2','1','3','1','4','1','5','1','6','1','7','1','8','1','9', + '2','0','2','1','2','2','2','3','2','4','2','5','2','6','2','7','2','8','2','9', + '3','0','3','1','3','2','3','3','3','4','3','5','3','6','3','7','3','8','3','9', + '4','0','4','1','4','2','4','3','4','4','4','5','4','6','4','7','4','8','4','9', + '5','0','5','1','5','2','5','3','5','4','5','5','5','6','5','7','5','8','5','9', + '6','0','6','1','6','2','6','3','6','4','6','5','6','6','6','7','6','8','6','9', + '7','0','7','1','7','2','7','3','7','4','7','5','7','6','7','7','7','8','7','9', + '8','0','8','1','8','2','8','3','8','4','8','5','8','6','8','7','8','8','8','9', + '9','0','9','1','9','2','9','3','9','4','9','5','9','6','9','7','9','8','9','9' +}; + +/* + * Branching for different cases (forward) + * Use lookup table of two digits + */ + +char* u32toa_branchlut(uint32_t value, char* buffer) { + if (value < 10000) { + const uint32_t d1 = (value / 100) << 1; + const uint32_t d2 = (value % 100) << 1; + + if (value >= 1000) + *buffer++ = gDigitsLut[d1]; + if (value >= 100) + *buffer++ = gDigitsLut[d1 + 1]; + if (value >= 10) + *buffer++ = gDigitsLut[d2]; + *buffer++ = gDigitsLut[d2 + 1]; + } + else if (value < 100000000) { + /* value = bbbbcccc */ + const uint32_t b = value / 10000; + const uint32_t c = value % 10000; + + const uint32_t d1 = (b / 100) << 1; + const uint32_t d2 = (b % 100) << 1; + + const uint32_t d3 = (c / 100) << 1; + const uint32_t d4 = (c % 100) << 1; + + if (value >= 10000000) + *buffer++ = gDigitsLut[d1]; + if (value >= 1000000) + *buffer++ = gDigitsLut[d1 + 1]; + if (value >= 100000) + *buffer++ = gDigitsLut[d2]; + *buffer++ = gDigitsLut[d2 + 1]; + + *buffer++ = gDigitsLut[d3]; + *buffer++ = gDigitsLut[d3 + 1]; + *buffer++ = gDigitsLut[d4]; + *buffer++ = gDigitsLut[d4 + 1]; + } + else { + /* value = aabbbbcccc in decimal */ + + const uint32_t a = value / 100000000; /* 1 to 42 */ + value %= 100000000; + + if (a >= 10) { + const unsigned i = a << 1; + *buffer++ = gDigitsLut[i]; + *buffer++ = gDigitsLut[i + 1]; + } + else + *buffer++ = '0' + (char)a; + + { + const uint32_t b = value / 10000; /* 0 to 9999 */ + const uint32_t c = value % 10000; /* 0 to 9999 */ + + const uint32_t d1 = (b / 100) << 1; + const uint32_t d2 = (b % 100) << 1; + + const uint32_t d3 = (c / 100) << 1; + const uint32_t d4 = (c % 100) << 1; + + *buffer++ = gDigitsLut[d1]; + *buffer++ = gDigitsLut[d1 + 1]; + *buffer++ = gDigitsLut[d2]; + *buffer++ = gDigitsLut[d2 + 1]; + *buffer++ = gDigitsLut[d3]; + *buffer++ = gDigitsLut[d3 + 1]; + *buffer++ = gDigitsLut[d4]; + *buffer++ = gDigitsLut[d4 + 1]; + } + } + /**buffer++ = '\0';*/ + return buffer; +} + +char* i32toa_branchlut(int32_t value, char* buffer) { + uint32_t u = (uint32_t)value; + if (value < 0) { + *buffer++ = '-'; + u = ~u + 1; + } + + return u32toa_branchlut(u, buffer); +} + +#ifdef GMIO_HAVE_INT64_TYPE +/* C90 does not support ULL literals */ +#define GMIO_UINT64_C(high32, low32) (((uint64_t)(high32) << 32) | (low32)) +static const uint64_t one_e16 = GMIO_UINT64_C(0x002386f2, 0x6fc10000); +static const uint64_t one_e15 = GMIO_UINT64_C(0x00038d7e, 0xa4c68000); +static const uint64_t one_e14 = GMIO_UINT64_C(0x00005af3, 0x107a4000); +static const uint64_t one_e13 = GMIO_UINT64_C(0x00000918, 0x4e72a000); +static const uint64_t one_e12 = GMIO_UINT64_C(0x000000e8, 0xd4a51000); +static const uint64_t one_e11 = GMIO_UINT64_C(0x00000017, 0x4876e800); +static const uint64_t one_e10 = GMIO_UINT64_C(0x00000002, 0x540be400); + +char* u64toa_branchlut(uint64_t value, char* buffer) { + if (value < 100000000) { + uint32_t v = (uint32_t)value; + if (v < 10000) { + const uint32_t d1 = (v / 100) << 1; + const uint32_t d2 = (v % 100) << 1; + + if (v >= 1000) + *buffer++ = gDigitsLut[d1]; + if (v >= 100) + *buffer++ = gDigitsLut[d1 + 1]; + if (v >= 10) + *buffer++ = gDigitsLut[d2]; + *buffer++ = gDigitsLut[d2 + 1]; + } + else { + /* value = bbbbcccc */ + const uint32_t b = v / 10000; + const uint32_t c = v % 10000; + + const uint32_t d1 = (b / 100) << 1; + const uint32_t d2 = (b % 100) << 1; + + const uint32_t d3 = (c / 100) << 1; + const uint32_t d4 = (c % 100) << 1; + + if (value >= 10000000) + *buffer++ = gDigitsLut[d1]; + if (value >= 1000000) + *buffer++ = gDigitsLut[d1 + 1]; + if (value >= 100000) + *buffer++ = gDigitsLut[d2]; + *buffer++ = gDigitsLut[d2 + 1]; + + *buffer++ = gDigitsLut[d3]; + *buffer++ = gDigitsLut[d3 + 1]; + *buffer++ = gDigitsLut[d4]; + *buffer++ = gDigitsLut[d4 + 1]; + } + } + else if (value < one_e16) { + const uint32_t v0 = (uint32_t)(value / 100000000); + const uint32_t v1 = (uint32_t)(value % 100000000); + + const uint32_t b0 = v0 / 10000; + const uint32_t c0 = v0 % 10000; + + const uint32_t d1 = (b0 / 100) << 1; + const uint32_t d2 = (b0 % 100) << 1; + + const uint32_t d3 = (c0 / 100) << 1; + const uint32_t d4 = (c0 % 100) << 1; + + const uint32_t b1 = v1 / 10000; + const uint32_t c1 = v1 % 10000; + + const uint32_t d5 = (b1 / 100) << 1; + const uint32_t d6 = (b1 % 100) << 1; + + const uint32_t d7 = (c1 / 100) << 1; + const uint32_t d8 = (c1 % 100) << 1; + + if (value >= one_e15) + *buffer++ = gDigitsLut[d1]; + if (value >= one_e14) + *buffer++ = gDigitsLut[d1 + 1]; + if (value >= one_e13) + *buffer++ = gDigitsLut[d2]; + if (value >= one_e12) + *buffer++ = gDigitsLut[d2 + 1]; + if (value >= one_e11) + *buffer++ = gDigitsLut[d3]; + if (value >= one_e10) + *buffer++ = gDigitsLut[d3 + 1]; + if (value >= 1000000000) + *buffer++ = gDigitsLut[d4]; + if (value >= 100000000) + *buffer++ = gDigitsLut[d4 + 1]; + + *buffer++ = gDigitsLut[d5]; + *buffer++ = gDigitsLut[d5 + 1]; + *buffer++ = gDigitsLut[d6]; + *buffer++ = gDigitsLut[d6 + 1]; + *buffer++ = gDigitsLut[d7]; + *buffer++ = gDigitsLut[d7 + 1]; + *buffer++ = gDigitsLut[d8]; + *buffer++ = gDigitsLut[d8 + 1]; + } + else { + const uint32_t a = (uint32_t)(value / one_e16); /* 1 to 1844 */ + value %= one_e16; + + if (a < 10) + *buffer++ = '0' + (char)a; + else if (a < 100) { + const uint32_t i = a << 1; + *buffer++ = gDigitsLut[i]; + *buffer++ = gDigitsLut[i + 1]; + } + else if (a < 1000) { + const uint32_t i = (a % 100) << 1; + *buffer++ = '0' + (char)(a / 100); + *buffer++ = gDigitsLut[i]; + *buffer++ = gDigitsLut[i + 1]; + } + else { + const uint32_t i = (a / 100) << 1; + const uint32_t j = (a % 100) << 1; + *buffer++ = gDigitsLut[i]; + *buffer++ = gDigitsLut[i + 1]; + *buffer++ = gDigitsLut[j]; + *buffer++ = gDigitsLut[j + 1]; + } + + { + const uint32_t v0 = (uint32_t)(value / 100000000); + const uint32_t v1 = (uint32_t)(value % 100000000); + + const uint32_t b0 = v0 / 10000; + const uint32_t c0 = v0 % 10000; + + const uint32_t d1 = (b0 / 100) << 1; + const uint32_t d2 = (b0 % 100) << 1; + + const uint32_t d3 = (c0 / 100) << 1; + const uint32_t d4 = (c0 % 100) << 1; + + const uint32_t b1 = v1 / 10000; + const uint32_t c1 = v1 % 10000; + + const uint32_t d5 = (b1 / 100) << 1; + const uint32_t d6 = (b1 % 100) << 1; + + const uint32_t d7 = (c1 / 100) << 1; + const uint32_t d8 = (c1 % 100) << 1; + + *buffer++ = gDigitsLut[d1]; + *buffer++ = gDigitsLut[d1 + 1]; + *buffer++ = gDigitsLut[d2]; + *buffer++ = gDigitsLut[d2 + 1]; + *buffer++ = gDigitsLut[d3]; + *buffer++ = gDigitsLut[d3 + 1]; + *buffer++ = gDigitsLut[d4]; + *buffer++ = gDigitsLut[d4 + 1]; + *buffer++ = gDigitsLut[d5]; + *buffer++ = gDigitsLut[d5 + 1]; + *buffer++ = gDigitsLut[d6]; + *buffer++ = gDigitsLut[d6 + 1]; + *buffer++ = gDigitsLut[d7]; + *buffer++ = gDigitsLut[d7 + 1]; + *buffer++ = gDigitsLut[d8]; + *buffer++ = gDigitsLut[d8 + 1]; + } + } + + /**buffer++ = '\0';*/ + return buffer; +} + +char* i64toa_branchlut(int64_t value, char* buffer) { + uint64_t u = (uint64_t)value; + if (value < 0) { + *buffer++ = '-'; + u = ~u + 1; + } + + return u64toa_branchlut(u, buffer); +} +#endif /* GMIO_HAVE_INT64_TYPE */ diff --git a/src/3rdparty/miloyip_itoa/branchlut.h b/src/3rdparty/miloyip_itoa/branchlut.h new file mode 100644 index 0000000..dabe51d --- /dev/null +++ b/src/3rdparty/miloyip_itoa/branchlut.h @@ -0,0 +1,13 @@ +#ifndef MILOYIP_ITOA_BRANCHLUT_H +#define MILOYIP_ITOA_BRANCHLUT_H + +#include "../../gmio_core/global.h" + +char* u32toa_branchlut(uint32_t value, char* buffer); +char* i32toa_branchlut(int32_t value, char* buffer); +#ifdef GMIO_HAVE_INT64_TYPE +char* u64toa_branchlut(uint64_t value, char* buffer); +char* i64toa_branchlut(int64_t value, char* buffer); +#endif + +#endif /* MILOYIP_ITOA_BRANCHLUT_H */ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2f2a1b4..1ce8cf5 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -39,6 +39,12 @@ file(GLOB GMIO_SRC_FILES gmio_core/* gmio_core/internal/*) if(GMIO_STR2FLOAT_LIBCODE EQUAL 2 OR GMIO_FLOAT2STR_LIBCODE EQUAL 2) file(GLOB GMIO_3RDPARTY_FILES 3rdparty/double-conversion/*) endif() +set(GMIO_3RDPARTY_FILES + ${GMIO_3RDPARTY_FILES} + 3rdparty/miloyip_itoa/branchlut.h + 3rdparty/miloyip_itoa/branchlut.c + 3rdparty/base64/b64.h + 3rdparty/base64/b64.c) set(GMIO_SRC_FILES ${GMIO_SRC_FILES} ${GMIO_3RDPARTY_FILES}) configure_file(gmio_core/version.h.cmake gmio_core/version.h @ONLY) @@ -59,6 +65,12 @@ set(GMIO_SRC_FILES ${GMIO_SRC_FILES} ${GMIO_LIBSTL_SRC_FILES}) file(GLOB GMIO_LIBSTL_HEADERS gmio_stl/*.h) install(FILES ${GMIO_LIBSTL_HEADERS} DESTINATION include/gmio_stl) +# Module libAMF +file(GLOB GMIO_LIBAMF_SRC_FILES gmio_amf/* gmio_amf/internal/*) +set(GMIO_SRC_FILES ${GMIO_SRC_FILES} ${GMIO_LIBAMF_SRC_FILES}) + +file(GLOB GMIO_LIBAMF_HEADERS gmio_amf/*.h) +install(FILES ${GMIO_LIBAMF_HEADERS} DESTINATION include/gmio_amf) # Common for support modules install(FILES gmio_support/support_global.h DESTINATION include/gmio_support) diff --git a/src/gmio_amf/amf_document.h b/src/gmio_amf/amf_document.h new file mode 100644 index 0000000..a2158b4 --- /dev/null +++ b/src/gmio_amf/amf_document.h @@ -0,0 +1,367 @@ +/**************************************************************************** +** Copyright (c) 2016, Fougue Ltd. +** All rights reserved. +** +** Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions +** are met: +** +** 1. Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** +** 2. Redistributions in binary form must reproduce the above +** copyright notice, this list of conditions and the following +** disclaimer in the documentation and/or other materials provided +** with the distribution. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +****************************************************************************/ + +/*! \file amf_document.h + * Structures for AMF document + * + * \addtogroup gmio_amf + * @{ + */ + +#ifndef GMIO_AMF_DOCUMENT_H +#define GMIO_AMF_DOCUMENT_H + +#include "amf_global.h" + +#include "../gmio_core/endian.h" +#include "../gmio_core/memblock.h" +#include "../gmio_core/vecgeom.h" + +#include + +struct gmio_amf_metadata +{ + const char* type; /* UTF8-encoded */ + const char* data; /* UTF8-encoded */ +}; + +struct gmio_amf_color +{ + double r; /* in [0,1] */ + double g; /* in [0,1] */ + double b; /* in [0,1] */ + double a; /* in [0,1] optional */ + const char* r_formula; + const char* g_formula; + const char* b_formula; + const char* a_formula; +}; + +struct gmio_amf_material +{ + uint32_t id; /* XML:integer */ + struct gmio_amf_color color; + uint32_t composite_count; + uint32_t metadata_count; +}; + +struct gmio_amf_composite +{ + uint32_t materialid; /* XML:nonNegativeInteger, required */ + double value; /* governs the percent of material */ + const char* value_formula; +}; + +struct gmio_amf_vertex +{ + struct gmio_vec3d coords; + bool has_normal; + struct gmio_vec3d normal; /* XML:NegOneToOne: -1 <= coord <= 1 */ + bool has_color; + struct gmio_amf_color color; /* XML:Color */ + uint32_t metadata_count; +}; + +struct gmio_amf_edge +{ + uint32_t v1; /* XML:nonNegativeInteger */ + uint32_t v2; /* XML:nonNegativeInteger */ + /* Direction vectors */ + struct gmio_vec3d d1; /* XML:NegOneToOne: -1 <= coord <= 1 */ + struct gmio_vec3d d2; /* XML:NegOneToOne: -1 <= coord <= 1 */ +}; + +struct gmio_amf_texmap +{ + uint32_t rtexid; /* XML:nonNegativeInteger */ + uint32_t gtexid; /* XML:nonNegativeInteger */ + uint32_t btexid; /* XML:nonNegativeInteger */ + uint32_t atexid; /* XML:nonNegativeInteger */ + struct gmio_vec3d utex; /* XML:Coords : any value */ + struct gmio_vec3d vtex; /* XML:Coords : any value */ + bool has_wtex; + struct gmio_vec3d wtex; /* XML:Coords : any value */ +}; + +struct gmio_amf_triangle +{ + uint32_t v1; /* XML:nonNegativeInteger */ + uint32_t v2; /* XML:nonNegativeInteger */ + uint32_t v3; /* XML:nonNegativeInteger */ + bool has_texmap; + struct gmio_amf_texmap texmap; /* XML:TexMap */ + bool has_color; + struct gmio_amf_color color; /* XML:Color */ +}; + +enum gmio_amf_volume_type +{ + GMIO_AMF_VOLUME_TYPE_OBJECT = 0, + GMIO_AMF_VOLUME_TYPE_SUPPORT +}; + +struct gmio_amf_volume +{ + uint32_t materialid; /* XML:nonNegativeInteger */ + enum gmio_amf_volume_type type; + uint32_t triangle_count; /* Should be >= 4 */ + uint32_t metadata_count; + bool has_color; + struct gmio_amf_color color; /* XML:Color */ +}; + +struct gmio_amf_mesh +{ + uint32_t vertex_count; + uint32_t edge_count; + uint32_t volume_count; +}; + +struct gmio_amf_object +{ + uint32_t id; /* XML:integer */ + uint32_t mesh_count; + uint32_t metadata_count; + bool has_color; + struct gmio_amf_color color; /* XML:Color */ +}; + +struct gmio_amf_constellation +{ + uint32_t id; /* XML:integer */ + uint32_t instance_count; /* Should be >= 2 */ + uint32_t metadata_count; +}; + +struct gmio_amf_instance +{ + uint32_t objectid; /* XML:nonNegativeInteger */ + struct gmio_vec3d delta; /* Any value */ + struct gmio_vec3d rot; /* XML:Degrees: -360 <= coord < 360 */ +}; + +enum gmio_amf_texture_type +{ + GMIO_AMF_TEXTURE_TYPE_GRAYSCALE +}; + +struct gmio_amf_texture +{ + uint32_t id; /* XML:integer */ + uint32_t width; /* XML:nonNegativeInteger */ + uint32_t height; /* XML:nonNegativeInteger */ + uint32_t depth; /* XML:nonNegativeInteger */ + bool tiled; + enum gmio_amf_texture_type type; + struct gmio_memblock binary_data; /* Will be converted to base64 */ +}; + +enum gmio_amf_unit +{ + GMIO_AMF_UNIT_UNKNOWN, + GMIO_AMF_UNIT_MILLIMETER, + GMIO_AMF_UNIT_INCH, + GMIO_AMF_UNIT_FEET, + GMIO_AMF_UNIT_METER, + GMIO_AMF_UNIT_MICRON +}; + +enum gmio_amf_document_element +{ + GMIO_AMF_DOCUMENT_ELEMENT_OBJECT, + GMIO_AMF_DOCUMENT_ELEMENT_MATERIAL, + GMIO_AMF_DOCUMENT_ELEMENT_TEXTURE, + GMIO_AMF_DOCUMENT_ELEMENT_CONSTELLATION, + GMIO_AMF_DOCUMENT_ELEMENT_METADATA +}; + +enum gmio_amf_mesh_element +{ + GMIO_AMF_MESH_ELEMENT_VERTEX, + GMIO_AMF_MESH_ELEMENT_EDGE, + GMIO_AMF_MESH_ELEMENT_VOLUME +}; + +struct gmio_amf_object_mesh_element_index +{ + uint32_t object_index; + uint32_t mesh_index; + uint32_t value; +}; + +/* Note: version is 1.2 */ +struct gmio_amf_document +{ + /*! Opaque pointer on the user AMF document, passed as first argument to + * hook functions */ + const void* cookie; + + enum gmio_amf_unit unit; + uint32_t object_count; /* Must be >= 1 */ + uint32_t material_count; + uint32_t texture_count; + uint32_t constellation_count; + uint32_t metadata_count; + + /*! Pointer on a function that retrieves the i-th document sub-element + * + * \p element is the type of the sub-element of interest.\n + * \p element_index is the index of the sub-element within the AMF + * document.\n + * The domain of this index depends on \p element : + * + * + * + * + * + * + * + *
Element type Domain of index
OBJECT [0 .. object_count[
MATERIAL [0 .. material_count[
TEXTURE [0 .. texture_count[
CONSTELLATION [0 .. constellation_count[
METADATA [0 .. metadata_count[
+ * + * + * + * + * + * + * + * + *
Element type gmio type
OBJECT gmio_amf_object
MATERIAL gmio_amf_material
TEXTURE gmio_amf_texture
CONSTELLATION gmio_amf_constellation
METADATA gmio_amf_metadata
+ */ + void (*func_get_document_element)( + const void* cookie, + enum gmio_amf_document_element element, + uint32_t element_index, + void* ptr_element); + + /*! Pointer on a function that retrieves the i-th \c composite within a + * \c material element */ + void (*func_get_material_composite)( + const void* cookie, + uint32_t material_index, + uint32_t composite_index, + struct gmio_amf_composite* ptr_composite); + + /*! Pointer on a function that retrieves the i-th \c instance within a + * \c constellation element */ + void (*func_get_constellation_instance)( + const void* cookie, + uint32_t constellation_index, + uint32_t instance_index, + struct gmio_amf_instance* ptr_instance); + + /*! Pointer on a function that retrieves the i-th \c mesh within an + * \c object element */ + void (*func_get_object_mesh)( + const void* cookie, + uint32_t object_index, + uint32_t mesh_index, + struct gmio_amf_mesh* ptr_mesh); + + /*! Pointer on a function that retrieves the i-th sub-element of a \c mesh + * element + * + * \p element is the type of the sub-element of interest.\n + * \p element_index is the index of the sub-element within the \c mesh + * element.\n + * The domain of this index(ie. \c value field) depends on \p element : + * + * + * + * + * + *
Element type Domain of index
VERTEX [0 .. gmio_amf_mesh::vertex_count[
EDGE [0 .. gmio_amf_mesh::edge_count[
VOLUME [0 .. gmio_amf_mesh::volume_count[
+ * + * The concrete type of \p ptr_struct_element depends on \p element : + * + * + * + * + * + *
Element type gmio type
VERTEX gmio_amf_vertex
EDGE gmio_amf_edge
VOLUME gmio_amf_volume
+ */ + void (*func_get_object_mesh_element)( + const void* cookie, + enum gmio_amf_mesh_element element, + const struct gmio_amf_object_mesh_element_index* element_index, + void* ptr_element); + + /*! Pointer on a function that retrieves the i-th \c triangle within a + * mesh \c volume element */ + void (*func_get_object_mesh_volume_triangle)( + const void* cookie, + const struct gmio_amf_object_mesh_element_index* volume_index, + uint32_t triangle_index, + struct gmio_amf_triangle* ptr_triangle); + + /* Function pointers to retrieve metadata */ + + /*! Pointer on a function that retrieves the i-th metadata assigned to a + * document sub-element(being \c material, \c object or \c constellation ) + * + * \p element is the type of the sub-element of interest, it can + * take one of this value : + * \li GMIO_AMF_DOCUMENT_ELEMENT_MATERIAL + * \li GMIO_AMF_DOCUMENT_ELEMENT_OBJECT + * \li GMIO_AMF_DOCUMENT_ELEMENT_CONSTELLATION + * + * \p element_index is the index of the sub-element within the AMF + * document.\n + * The domain of this index depends on \p element : + * + * + * + * + * + *
Element type Domain of index
MATERIAL [0 .. material_count[
OBJECT [0 .. object_count[
CONSTELLATION [0 .. constellation_count[
+ */ + void (*func_get_document_element_metadata)( + const void* cookie, + enum gmio_amf_document_element element, + uint32_t element_index, + uint32_t metadata_index, + struct gmio_amf_metadata* ptr_metadata); + + /*! Pointer on a function that retrieves the i-th metadata assigned to a + * mesh vertex */ + void (*func_get_object_mesh_vertex_metadata)( + const void* cookie, + const struct gmio_amf_object_mesh_element_index* vertex_index, + uint32_t metadata_index, + struct gmio_amf_metadata* ptr_metadata); + + /*! Pointer on a function that retrieves the i-th metadata assigned to a + * mesh volume */ + void (*func_get_object_mesh_volume_metadata)( + const void* cookie, + const struct gmio_amf_object_mesh_element_index* volume_index, + uint32_t metadata_index, + struct gmio_amf_metadata* ptr_metadata); +}; + +#endif /* GMIO_AMF_DOCUMENT_H */ diff --git a/src/gmio_amf/amf_error.h b/src/gmio_amf/amf_error.h new file mode 100644 index 0000000..b1c8d76 --- /dev/null +++ b/src/gmio_amf/amf_error.h @@ -0,0 +1,88 @@ +/**************************************************************************** +** Copyright (c) 2016, Fougue Ltd. +** All rights reserved. +** +** Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions +** are met: +** +** 1. Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** +** 2. Redistributions in binary form must reproduce the above +** copyright notice, this list of conditions and the following +** disclaimer in the documentation and/or other materials provided +** with the distribution. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +****************************************************************************/ + +/*! \file amf_error.h + * List of errors specific to AMF I/O functions + * + * \addtogroup gmio_amf + * @{ + */ + +#ifndef GMIO_AMF_ERROR_H +#define GMIO_AMF_ERROR_H + +/*! \c GMIO_AMF_ERROR_TAG + * Byte-mask to tag(identify) AMF-specific error codes */ +enum { GMIO_AMF_ERROR_TAG = 0x12000000 }; + +/*! This enum defines the specific error codes reported by AMF read/write + * functions */ +enum gmio_amf_error +{ + /*! The input gmio_amf_document is \c NULL */ + GMIO_AMF_ERROR_NULL_DOCUMENT = GMIO_AMF_ERROR_TAG + 0x01, + + /*! Function pointer gmio_amf_document::func_get_document_element + * is \c NULL */ + GMIO_AMF_ERROR_NULL_FUNC_GET_DOCUMENT_ELEMENT, + + /*! Function pointer gmio_amf_document::func_get_constellation_instance + * is \c NULL */ + GMIO_AMF_ERROR_NULL_FUNC_GET_CONSTELLATION_INSTANCE, + + /*! Function pointer gmio_amf_document::func_get_object_mesh is \c NULL */ + GMIO_AMF_ERROR_NULL_FUNC_GET_OBJECT_MESH, + + /*! Function pointer gmio_amf_document::func_get_object_mesh_element + * is \c NULL */ + GMIO_AMF_ERROR_NULL_FUNC_GET_OBJECT_MESH_ELEMENT, + + /*! Function pointer gmio_amf_document::func_get_object_mesh_volume_triangle + * is \c NULL */ + GMIO_AMF_ERROR_NULL_FUNC_GET_OBJECT_MESH_VOLUME_TRIANGLE, + + /*! Function pointer gmio_amf_document::func_get_document_element_metadata + * is \c NULL while some gmio_amf_material::metadata_count > 0 */ + GMIO_AMF_ERROR_NULL_FUNC_GET_DOCUMENT_ELEMENT_METADATA, + + /*! Function pointer gmio_amf_document::func_get_material_composite + * is \c NULL while some gmio_amf_material::composite_count > 0 */ + GMIO_AMF_ERROR_NULL_FUNC_GET_MATERIAL_COMPOSITE, + + /*! Function pointer gmio_amf_document::func_get_object_mesh_vertex_metadata + * is \c NULL while some gmio_amf_vertex::metadata_count > 0 */ + GMIO_AMF_ERROR_NULL_FUNC_GET_OBJECT_MESH_VERTEX_METADATA, + + /*! Function pointer gmio_amf_document::func_get_object_mesh_volume_metadata + * is \c NULL while some gmio_amf_volume::metadata_count > 0 */ + GMIO_AMF_ERROR_NULL_FUNC_GET_OBJECT_MESH_VOLUME_METADATA +}; + +#endif /* GMIO_AMF_ERROR_H */ +/*! @} */ diff --git a/src/gmio_amf/amf_global.h b/src/gmio_amf/amf_global.h new file mode 100644 index 0000000..dc92177 --- /dev/null +++ b/src/gmio_amf/amf_global.h @@ -0,0 +1,66 @@ +/**************************************************************************** +** Copyright (c) 2016, Fougue Ltd. +** All rights reserved. +** +** Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions +** are met: +** +** 1. Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** +** 2. Redistributions in binary form must reproduce the above +** copyright notice, this list of conditions and the following +** disclaimer in the documentation and/or other materials provided +** with the distribution. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +****************************************************************************/ + +/*! \file amf_global.h + * Global declarations for the AMF module + * + * \defgroup gmio_amf gmioAMF + * Provides API to handle input/output operations with the AMF file format + * + * In addition, the gmioAMF module has the following advatanges: + * \li The user keeps its own geometry data structures, no conversion needed. + * \li Fixed memory consumption and independant of the geometry size + * + * In this module, the name of all entities(structures, functions, ...) are + * prefixed either with \c gmio_amf + * + * + * + * + * + * + * + * + * + * + *
Functions Structures
Writegmio_amf_write()
+ * gmio_amf_write_file()		gmio_amf_document
+ * gmio_amf_write_options
+ * + * \addtogroup gmio_amf + * @{ + */ + +#ifndef GMIO_AMF_GLOBAL_H +#define GMIO_AMF_GLOBAL_H + +#include "../gmio_core/global.h" + +#endif /* GMIO_AMF_GLOBAL_H */ +/*! @} */ diff --git a/src/gmio_amf/amf_io.c b/src/gmio_amf/amf_io.c new file mode 100644 index 0000000..2d51e2a --- /dev/null +++ b/src/gmio_amf/amf_io.c @@ -0,0 +1,944 @@ +/**************************************************************************** +** Copyright (c) 2016, Fougue Ltd. +** All rights reserved. +** +** Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions +** are met: +** +** 1. Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** +** 2. Redistributions in binary form must reproduce the above +** copyright notice, this list of conditions and the following +** disclaimer in the documentation and/or other materials provided +** with the distribution. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +****************************************************************************/ + +#include "amf_io.h" +#include "amf_error.h" + +#include "../gmio_core/error.h" +#include "../gmio_core/internal/error_check.h" +#include "../gmio_core/internal/float_format_utils.h" +#include "../gmio_core/internal/helper_memblock.h" +#include "../gmio_core/internal/helper_stream.h" +#include "../gmio_core/internal/helper_task_iface.h" +#include "../gmio_core/internal/ostringstream.h" + +#include +#include + +/* Writing(output) context */ +struct gmio_amf_wcontext +{ + const struct gmio_amf_write_options* options; + struct gmio_ostringstream* sstream; + const struct gmio_amf_document* document; + const struct gmio_task_iface* task_iface; + intmax_t task_progress_current; + intmax_t task_progress_max; + struct gmio_ostringstream_format_float f64_format; + int error; + + /* zlib specific */ + struct gmio_memblock z_memblock; + struct z_stream_s z_stream; + int z_flush; +}; + +GMIO_INLINE bool gmio_amf_wcontext_set_error( + struct gmio_amf_wcontext* context, int error) +{ + context->error = error; + return gmio_no_error(error); +} + +GMIO_INLINE void gmio_amf_wcontext_incr_task_progress( + struct gmio_amf_wcontext* context) +{ + ++(context->task_progress_current); +} + +/* Writes double value or its formula (if any) to stream */ +static void gmio_amf_write_double( + struct gmio_amf_wcontext* context, + double value, + const char* value_formula) +{ + struct gmio_ostringstream* sstream = context->sstream; + if (value_formula == NULL || *value_formula == '\0') + gmio_ostringstream_write_f64(sstream, value, &context->f64_format); + else + gmio_ostringstream_write_str(sstream, value_formula); +} + +/* Writes gmio_amf_color component to stream */ +static void gmio_amf_write_color_component( + struct gmio_amf_wcontext* context, + double value, + const char* value_formula) +{ + struct gmio_ostringstream* sstream = context->sstream; + if (value_formula == NULL || *value_formula == '\0') { + gmio_ostringstream_write_f64(sstream, value, &context->f64_format); + } + else { + gmio_ostringstream_write_xmlcdata_open(sstream); + gmio_ostringstream_write_str(sstream, value_formula); + gmio_ostringstream_write_xmlcdata_close(sstream); + } +} + +/* Writes gmio_amf_color to stream */ +static void gmio_amf_write_color( + struct gmio_amf_wcontext* context, + const struct gmio_amf_color* color) +{ + struct gmio_ostringstream* sstream = context->sstream; + gmio_ostringstream_write_chararray(sstream, ""); + gmio_amf_write_color_component(context, color->r, color->r_formula); + gmio_ostringstream_write_chararray(sstream, ""); + gmio_amf_write_color_component(context, color->g, color->g_formula); + gmio_ostringstream_write_chararray(sstream, ""); + gmio_amf_write_color_component(context, color->b, color->b_formula); + gmio_ostringstream_write_chararray(sstream, ""); + gmio_amf_write_color_component(context, color->a, color->a_formula); + gmio_ostringstream_write_chararray(sstream, "\n"); +} + +/* Writes gmio_amf_metadata to stream */ +static void gmio_amf_write_metadata( + struct gmio_ostringstream* sstream, + const struct gmio_amf_metadata* metadata) +{ + gmio_ostringstream_write_chararray(sstream, "type); + gmio_ostringstream_write_char(sstream, '>'); + gmio_ostringstream_write_str(sstream, metadata->data); + gmio_ostringstream_write_chararray(sstream, "\n"); +} + +/* Writes to stream */ +static void gmio_amf_write_amf_begin( + struct gmio_ostringstream* sstream, + const struct gmio_amf_document* doc) +{ + gmio_ostringstream_write_chararray( + sstream, "\n"); + gmio_ostringstream_write_chararray(sstream, "unit != GMIO_AMF_UNIT_UNKNOWN) { + const char* unit_str = ""; + switch (doc->unit) { + case GMIO_AMF_UNIT_MILLIMETER: + unit_str = "millimeter"; break; + case GMIO_AMF_UNIT_INCH: + unit_str = "inch"; break; + case GMIO_AMF_UNIT_FEET: + unit_str = "feet"; break; + case GMIO_AMF_UNIT_METER: + unit_str = "meter"; break; + case GMIO_AMF_UNIT_MICRON: + unit_str = "micron"; break; + case GMIO_AMF_UNIT_UNKNOWN: /* Silent compiler warning */ + break; + } + gmio_ostringstream_write_xmlattr_str(sstream, "unit", unit_str); + } + gmio_ostringstream_write_xmlattr_str(sstream, "version", "1.2"); + gmio_ostringstream_write_chararray(sstream, ">\n"); +} + +/* Writes document metadata to stream */ +static bool gmio_amf_write_root_metadata( + struct gmio_amf_wcontext* context) +{ + const struct gmio_amf_document* doc = context->document; + struct gmio_amf_metadata metadata = {0}; + uint32_t imeta; + for (imeta = 0; imeta < doc->metadata_count; ++imeta) { + doc->func_get_document_element( + doc->cookie, + GMIO_AMF_DOCUMENT_ELEMENT_METADATA, imeta, &metadata); + gmio_amf_write_metadata(context->sstream, &metadata); + gmio_amf_wcontext_incr_task_progress(context); + } + return gmio_no_error(context->error); +} + +/* Writes document materials to stream */ +static bool gmio_amf_write_root_materials( + struct gmio_amf_wcontext* context) +{ + const struct gmio_amf_document* doc = context->document; + struct gmio_ostringstream* sstream = context->sstream; + struct gmio_amf_material material = {0}; + uint32_t imat; + for (imat = 0; imat < doc->material_count; ++imat) { + doc->func_get_document_element( + doc->cookie, + GMIO_AMF_DOCUMENT_ELEMENT_MATERIAL, imat, &material); + gmio_ostringstream_write_chararray(sstream, "'); + /* Write material elements */ + if (material.metadata_count > 0) { + uint32_t imeta; + struct gmio_amf_metadata metadata = {0}; + /* Check function pointer is defined */ + if (doc->func_get_document_element_metadata == NULL) { + return gmio_amf_wcontext_set_error( + context, + GMIO_AMF_ERROR_NULL_FUNC_GET_DOCUMENT_ELEMENT_METADATA); + } + for (imeta = 0; imeta < material.metadata_count; ++imeta) { + doc->func_get_document_element_metadata( + doc->cookie, + GMIO_AMF_DOCUMENT_ELEMENT_MATERIAL, + imat, + imeta, + &metadata); + gmio_amf_write_metadata(sstream, &metadata); + } + } + /* Write material element */ + gmio_amf_write_color(context, &material.color); + /* Write material elements */ + if (material.composite_count > 0) { + struct gmio_amf_composite composite = {0}; + uint32_t icomp; + /* Check function pointer is defined */ + if (doc->func_get_material_composite == NULL) { + return gmio_amf_wcontext_set_error( + context, + GMIO_AMF_ERROR_NULL_FUNC_GET_MATERIAL_COMPOSITE); + } + for (icomp = 0; icomp < material.composite_count; ++icomp) { + doc->func_get_material_composite( + doc->cookie, imat, icomp, &composite); + gmio_ostringstream_write_chararray(sstream, "'); + gmio_ostringstream_write_xmlcdata_open(sstream); + gmio_amf_write_double( + context, composite.value, composite.value_formula); + gmio_ostringstream_write_xmlcdata_close(sstream); + gmio_ostringstream_write_chararray(sstream, "\n"); + } + } + gmio_ostringstream_write_chararray(sstream, "\n"); + gmio_amf_wcontext_incr_task_progress(context); + } + return gmio_no_error(context->error); +} + +/* Write gmio_amf_texmap to stream */ +static void gmio_amf_write_texmap( + struct gmio_ostringstream* sstream, + const struct gmio_amf_texmap* texmap) +{ + /* Write triangle element */ + gmio_ostringstream_write_chararray(sstream, "rtexid); + gmio_ostringstream_write_xmlattr_u32(sstream, "gtexid", texmap->gtexid); + gmio_ostringstream_write_xmlattr_u32(sstream, "btexid", texmap->btexid); + gmio_ostringstream_write_xmlattr_u32(sstream, "atexid", texmap->atexid); + gmio_ostringstream_write_char(sstream, '>'); + /* Write triangle elements */ + gmio_ostringstream_write_xmlelt_f64(sstream, "utex1", texmap->utex.x); + gmio_ostringstream_write_xmlelt_f64(sstream, "utex2", texmap->utex.y); + gmio_ostringstream_write_xmlelt_f64(sstream, "utex3", texmap->utex.z); + /* Write triangle elements */ + gmio_ostringstream_write_xmlelt_f64(sstream, "vtex1", texmap->vtex.x); + gmio_ostringstream_write_xmlelt_f64(sstream, "vtex2", texmap->vtex.y); + gmio_ostringstream_write_xmlelt_f64(sstream, "vtex3", texmap->vtex.z); + /* Write triangle elements */ + if (texmap->has_wtex) { + gmio_ostringstream_write_xmlelt_f64(sstream, "wtex1", texmap->wtex.x); + gmio_ostringstream_write_xmlelt_f64(sstream, "wtex2", texmap->wtex.y); + gmio_ostringstream_write_xmlelt_f64(sstream, "wtex3", texmap->wtex.z); + } + gmio_ostringstream_write_chararray(sstream, "\n"); +} + +/* Writes gmio_amf_mesh to stream */ +static bool gmio_amf_write_mesh( + struct gmio_amf_wcontext* context, + const struct gmio_amf_mesh* mesh, + const struct gmio_amf_object_mesh_element_index* base_mesh_element_index) +{ + const struct gmio_amf_document* doc = context->document; + struct gmio_ostringstream* sstream = context->sstream; + struct gmio_amf_object_mesh_element_index mesh_elt_index = + *base_mesh_element_index; + const struct gmio_ostringstream_format_float* f64_format = + &context->f64_format; + struct gmio_amf_vertex vertex = {0}; + uint32_t ivert; + /* Write mesh element */ + gmio_ostringstream_write_chararray(sstream, "\n"); + for (ivert = 0; ivert < mesh->vertex_count; ++ivert) { + mesh_elt_index.value = ivert; + doc->func_get_object_mesh_element( + doc->cookie, + GMIO_AMF_MESH_ELEMENT_VERTEX, &mesh_elt_index, &vertex); + /* Write element */ + gmio_ostringstream_write_chararray(sstream, ""); + gmio_ostringstream_write_chararray(sstream, ""); + gmio_ostringstream_write_f64(sstream, vertex.coords.x, f64_format); + gmio_ostringstream_write_chararray(sstream, ""); + gmio_ostringstream_write_f64(sstream, vertex.coords.y, f64_format); + gmio_ostringstream_write_chararray(sstream, ""); + gmio_ostringstream_write_f64(sstream, vertex.coords.z, f64_format); + gmio_ostringstream_write_chararray(sstream, ""); + /* Write element */ + if (vertex.has_color) + gmio_amf_write_color(context, &vertex.color); + /* Write element */ + if (vertex.has_normal) { + gmio_ostringstream_write_chararray(sstream, ""); + gmio_ostringstream_write_f64(sstream, vertex.normal.x, f64_format); + gmio_ostringstream_write_chararray(sstream, ""); + gmio_ostringstream_write_f64(sstream, vertex.normal.y, f64_format); + gmio_ostringstream_write_chararray(sstream, ""); + gmio_ostringstream_write_f64(sstream, vertex.normal.z, f64_format); + gmio_ostringstream_write_chararray(sstream, "\n"); + } + /* Write elements */ + if (vertex.metadata_count > 0) { + struct gmio_amf_metadata metadata = {0}; + uint32_t imeta; + /* Check function pointer */ + if (doc->func_get_object_mesh_vertex_metadata == NULL) { + return gmio_amf_wcontext_set_error( + context, + GMIO_AMF_ERROR_NULL_FUNC_GET_OBJECT_MESH_VERTEX_METADATA); + } + for (imeta = 0; imeta < vertex.metadata_count; ++imeta) { + doc->func_get_object_mesh_vertex_metadata( + doc->cookie, &mesh_elt_index, imeta, &metadata); + gmio_amf_write_metadata(sstream, &metadata); + } + } + gmio_ostringstream_write_chararray(sstream, "\n"); + gmio_amf_wcontext_incr_task_progress(context); + if (gmio_error(context->error)) + return false; + } + /* Write mesh vertices elements */ + if (mesh->edge_count > 0) { + struct gmio_amf_edge edge = {0}; + uint32_t iedge; + for (iedge = 0; iedge < mesh->edge_count; ++iedge) { + mesh_elt_index.value = iedge; + doc->func_get_object_mesh_element( + doc->cookie, + GMIO_AMF_MESH_ELEMENT_EDGE, &mesh_elt_index, &edge); + gmio_ostringstream_write_chararray(sstream, ""); + gmio_ostringstream_write_u32(sstream, edge.v1); + gmio_ostringstream_write_chararray(sstream, ""); + gmio_ostringstream_write_f64(sstream, edge.d1.x, f64_format); + gmio_ostringstream_write_chararray(sstream, ""); + gmio_ostringstream_write_f64(sstream, edge.d1.y, f64_format); + gmio_ostringstream_write_chararray(sstream, ""); + gmio_ostringstream_write_f64(sstream, edge.d1.z, f64_format); + gmio_ostringstream_write_chararray(sstream, ""); + gmio_ostringstream_write_u32(sstream, edge.v2); + gmio_ostringstream_write_chararray(sstream, ""); + gmio_ostringstream_write_f64(sstream, edge.d2.x, f64_format); + gmio_ostringstream_write_chararray(sstream, ""); + gmio_ostringstream_write_f64(sstream, edge.d2.y, f64_format); + gmio_ostringstream_write_chararray(sstream, ""); + gmio_ostringstream_write_f64(sstream, edge.d2.z, f64_format); + gmio_ostringstream_write_chararray(sstream, "\n"); + gmio_amf_wcontext_incr_task_progress(context); + if (gmio_error(context->error)) + return false; + } + } + gmio_ostringstream_write_chararray(sstream, "\n"); + /* Write mesh elements */ + if (mesh->volume_count > 0) { + struct gmio_amf_volume volume = {0}; + uint32_t ivol; + for (ivol = 0; ivol < mesh->volume_count; ++ivol) { + const char* str_volume_type = ""; + mesh_elt_index.value = ivol; + doc->func_get_object_mesh_element( + doc->cookie, + GMIO_AMF_MESH_ELEMENT_VOLUME, &mesh_elt_index, &volume); + /* Write element begin */ + gmio_ostringstream_write_chararray(sstream, "'); + /* Write volume elements */ + if (volume.metadata_count > 0) { + struct gmio_amf_metadata metadata = {0}; + uint32_t imeta; + /* Check function pointer */ + if (doc->func_get_object_mesh_volume_metadata == NULL) { + return gmio_amf_wcontext_set_error( + context, + GMIO_AMF_ERROR_NULL_FUNC_GET_OBJECT_MESH_VOLUME_METADATA); + } + for (imeta = 0; imeta < volume.metadata_count; ++imeta) { + doc->func_get_object_mesh_volume_metadata( + doc->cookie, &mesh_elt_index, imeta, &metadata); + gmio_amf_write_metadata(sstream, &metadata); + } + } + /* Write volume element */ + if (volume.has_color) + gmio_amf_write_color(context, &volume.color); + /* Write elements */ + if (volume.triangle_count > 0) { + struct gmio_amf_triangle triangle = {0}; + uint32_t itri; + for (itri = 0; itri < volume.triangle_count; ++itri) { + doc->func_get_object_mesh_volume_triangle( + doc->cookie, &mesh_elt_index, itri, &triangle); + gmio_ostringstream_write_chararray(sstream, ""); + /* Write triangle element */ + if (triangle.has_color) + gmio_amf_write_color(context, &triangle.color); + /* Write triangle elements */ + gmio_ostringstream_write_chararray(sstream, ""); + gmio_ostringstream_write_u32(sstream, triangle.v1); + gmio_ostringstream_write_chararray(sstream, ""); + gmio_ostringstream_write_u32(sstream, triangle.v2); + gmio_ostringstream_write_chararray(sstream, ""); + gmio_ostringstream_write_u32(sstream, triangle.v3); + gmio_ostringstream_write_chararray(sstream, ""); + /* Write triangle element */ + if (triangle.has_texmap) + gmio_amf_write_texmap(sstream, &triangle.texmap); + gmio_ostringstream_write_chararray(sstream, "\n"); + gmio_amf_wcontext_incr_task_progress(context); + if (gmio_error(context->error)) + return false; + } + } + gmio_ostringstream_write_chararray(sstream, "\n"); + } + } + gmio_ostringstream_write_chararray(sstream, "\n"); + return gmio_no_error(context->error); +} + +/* Writes document objects to stream */ +static bool gmio_amf_write_root_objects(struct gmio_amf_wcontext* context) +{ + const struct gmio_amf_document* doc = context->document; + struct gmio_ostringstream* sstream = context->sstream; + struct gmio_amf_object object = {0}; + uint32_t iobj; + for (iobj = 0; iobj < doc->object_count; ++iobj) { + doc->func_get_document_element( + doc->cookie, + GMIO_AMF_DOCUMENT_ELEMENT_OBJECT, iobj, &object); + /* Open object element */ + gmio_ostringstream_write_chararray(sstream, "'); + /* Write metadata elements */ + if (object.metadata_count > 0) { + struct gmio_amf_metadata metadata = {0}; + uint32_t imeta; + /* Check function pointer */ + if (doc->func_get_document_element_metadata == NULL) { + return gmio_amf_wcontext_set_error( + context, + GMIO_AMF_ERROR_NULL_FUNC_GET_DOCUMENT_ELEMENT_METADATA); + } + for (imeta = 0; imeta < object.metadata_count; ++imeta) { + doc->func_get_document_element_metadata( + doc->cookie, + GMIO_AMF_DOCUMENT_ELEMENT_OBJECT, + iobj, + imeta, + &metadata); + gmio_amf_write_metadata(sstream, &metadata); + } + } + /* Write color element if any */ + if (object.has_color) + gmio_amf_write_color(context, &object.color); + /* Write mesh elements */ + if (object.mesh_count > 0) { + struct gmio_amf_mesh mesh = {0}; + uint32_t imesh; + for (imesh = 0; imesh < object.mesh_count; ++imesh) { + struct gmio_amf_object_mesh_element_index base_mesh_elt_index; + doc->func_get_object_mesh(doc->cookie, iobj, imesh, &mesh); + base_mesh_elt_index.object_index = iobj; + base_mesh_elt_index.mesh_index = imesh; + base_mesh_elt_index.value = 0; + gmio_amf_write_mesh(context, &mesh, &base_mesh_elt_index); + if (gmio_error(context->error)) + return false; + } + } + /* Close object element */ + gmio_ostringstream_write_chararray(sstream, "\n"); + } + return gmio_no_error(context->error); +} + +/* Writes document objects to stream */ +static bool gmio_amf_write_root_textures(struct gmio_amf_wcontext* context) +{ + const struct gmio_amf_document* doc = context->document; + struct gmio_ostringstream* sstream = context->sstream; + struct gmio_amf_texture texture = {0}; + uint32_t itex; + for (itex = 0; itex < doc->texture_count; ++itex) { + const char* str_texture_type = ""; + doc->func_get_document_element( + doc->cookie, + GMIO_AMF_DOCUMENT_ELEMENT_TEXTURE, itex, &texture); + gmio_ostringstream_write_chararray(sstream, "'); + gmio_ostringstream_write_base64( + sstream, + texture.binary_data.ptr, + texture.binary_data.size); + gmio_ostringstream_write_chararray(sstream, "\n"); + gmio_amf_wcontext_incr_task_progress(context); + if (gmio_error(context->error)) + return false; + } + return gmio_no_error(context->error); +} + +/* Writes document constellations to stream */ +static bool gmio_amf_write_root_constellations( + struct gmio_amf_wcontext* context) +{ + const struct gmio_amf_document* doc = context->document; + struct gmio_ostringstream* sstream = context->sstream; + struct gmio_amf_constellation constellation = {0}; + uint32_t icons; + for (icons = 0; icons < doc->constellation_count; ++icons) { + doc->func_get_document_element( + doc->cookie, + GMIO_AMF_DOCUMENT_ELEMENT_CONSTELLATION, icons, &constellation); + gmio_ostringstream_write_chararray(sstream, "'); + /* Write constellation elements */ + if (constellation.metadata_count > 0) { + struct gmio_amf_metadata metadata = {0}; + uint32_t imeta; + /* Check function pointer */ + if (doc->func_get_document_element_metadata == NULL) { + return gmio_amf_wcontext_set_error( + context, + GMIO_AMF_ERROR_NULL_FUNC_GET_DOCUMENT_ELEMENT_METADATA); + } + for (imeta = 0; imeta < constellation.metadata_count; ++imeta) { + doc->func_get_document_element_metadata( + doc->cookie, + GMIO_AMF_DOCUMENT_ELEMENT_CONSTELLATION, + icons, + imeta, + &metadata); + gmio_amf_write_metadata(sstream, &metadata); + } + } + /* Write constellation elements */ + if (constellation.instance_count > 0) { + struct gmio_amf_instance instance = {0}; + uint32_t iinst; + for (iinst = 0; iinst < constellation.instance_count; ++iinst) { + doc->func_get_constellation_instance( + doc->cookie, icons, iinst, &instance); + gmio_ostringstream_write_chararray(sstream, "'); + gmio_ostringstream_write_xmlelt_f64( + sstream, "deltax", instance.delta.x); + gmio_ostringstream_write_xmlelt_f64( + sstream, "deltay", instance.delta.y); + gmio_ostringstream_write_xmlelt_f64( + sstream, "deltaz", instance.delta.z); + gmio_ostringstream_write_xmlelt_f64( + sstream, "rx", instance.rot.x); + gmio_ostringstream_write_xmlelt_f64( + sstream, "ry", instance.rot.y); + gmio_ostringstream_write_xmlelt_f64( + sstream, "rz", instance.rot.z); + gmio_ostringstream_write_chararray(sstream, "\n"); + gmio_amf_wcontext_incr_task_progress(context); + if (gmio_error(context->error)) + return false; + } + } + gmio_ostringstream_write_chararray(sstream, "\n"); + } + return gmio_no_error(context->error); +} + +/* Returns true if internal document data are roughly accessible */ +static bool gmio_amf_check_error( + int* error, const struct gmio_amf_document* doc) +{ + if (doc == NULL) { + *error = GMIO_AMF_ERROR_NULL_DOCUMENT; + } + else if (doc->func_get_document_element == NULL) { + *error = GMIO_AMF_ERROR_NULL_FUNC_GET_DOCUMENT_ELEMENT; + } + else if (doc->constellation_count > 0 + && doc->func_get_constellation_instance == NULL) + { + *error = GMIO_AMF_ERROR_NULL_FUNC_GET_CONSTELLATION_INSTANCE; + } + else if (doc->func_get_object_mesh == NULL) { + *error = GMIO_AMF_ERROR_NULL_FUNC_GET_OBJECT_MESH; + } + else if (doc->func_get_object_mesh_element == NULL) { + *error = GMIO_AMF_ERROR_NULL_FUNC_GET_OBJECT_MESH_ELEMENT; + } + else if (doc->func_get_object_mesh_volume_triangle == NULL) { + *error = GMIO_AMF_ERROR_NULL_FUNC_GET_OBJECT_MESH_VOLUME_TRIANGLE; + } + return gmio_no_error(*error); +} + +/* Converts zlib error to gmio "zlib-specific" error */ +static int zlib_error_to_gmio_error(int error) +{ + switch (error) { + case Z_OK: return GMIO_ERROR_OK; + case Z_ERRNO: return GMIO_ERROR_ZLIB_ERRNO; + case Z_STREAM_ERROR: return GMIO_ERROR_ZLIB_STREAM; + case Z_DATA_ERROR: return GMIO_ERROR_ZLIB_DATA; + case Z_MEM_ERROR: return GMIO_ERROR_ZLIB_MEM; + case Z_BUF_ERROR: return GMIO_ERROR_ZLIB_BUF; + case Z_VERSION_ERROR: return GMIO_ERROR_ZLIB_VERSION; + } + return GMIO_ERROR_UNKNOWN; +} + +/* Helper for gmio_amf_ostringstream_write() to write zlib compressed data */ +static size_t gmio_amf_ostringstream_write_zlib( + struct gmio_amf_wcontext* context, + struct gmio_stream* stream, + const char* ptr, + size_t len) +{ + struct gmio_memblock* z_mblock = &context->z_memblock; + struct z_stream_s* z_stream = &context->z_stream; + size_t total_written_len = 0; + int z_retcode = Z_OK; + z_stream->next_in = (z_const Bytef*)ptr; + z_stream->avail_in = len; /* TODO: use better cast */ + /* Run zlib deflate() on input until output buffer not full + * Finish compression when zflush == Z_FINISH */ + do { + z_stream->next_out = z_mblock->ptr; + z_stream->avail_out = z_mblock->size; + z_retcode = deflate(z_stream, context->z_flush); + /* Check state not clobbered */ + if (z_retcode == Z_STREAM_ERROR) { + context->error = zlib_error_to_gmio_error(z_retcode); + return total_written_len; + } + /* Write zlib output to stream */ + { + const size_t z_out_len = + z_mblock->size - z_stream->avail_out; + const size_t written_len = + gmio_stream_write_bytes(stream, z_mblock->ptr, z_out_len); + total_written_len += written_len; + if (written_len != z_out_len || gmio_stream_error(stream)) { + context->error = GMIO_ERROR_STREAM; + return total_written_len; + } + } + } while (z_stream->avail_out == 0); + /* Check all input was used */ + if (z_stream->avail_in != 0) { + /* TODO: set more precise error */ + context->error = GMIO_ERROR_UNKNOWN; + return total_written_len; + } + /* Check stream is complete */ + if (context->z_flush == Z_FINISH && z_retcode != Z_STREAM_END) { + /* TODO: set more precise error */ + context->error = GMIO_ERROR_UNKNOWN; + return total_written_len; + } + return total_written_len; + + /* zlib official "howto" from http://zlib.net/zlib_how.html */ +#if 0 + /* compress until end of file */ + do { + strm.avail_in = fread(in, 1, CHUNK, source); + if (ferror(source)) { + deflateEnd(&strm); + return Z_ERRNO; + } + flush = feof(source) ? Z_FINISH : Z_NO_FLUSH; + strm.next_in = in; + /* run deflate() on input until output buffer not full, finish + compression if all of source has been read in */ + do { + strm.avail_out = CHUNK; + strm.next_out = out; + + ret = deflate(&strm, flush); /* no bad return value */ + assert(ret != Z_STREAM_ERROR); /* state not clobbered */ + + have = CHUNK - strm.avail_out; + if (fwrite(out, 1, have, dest) != have || ferror(dest)) { + deflateEnd(&strm); + return Z_ERRNO; + } + } while (strm.avail_out == 0); + assert(strm.avail_in == 0); /* all input will be used */ + /* done when last data in file processed */ + } while (flush != Z_FINISH); + assert(ret == Z_STREAM_END); /* stream will be complete */ + + /* clean up and return */ + deflateEnd(&strm); + return Z_OK; +#endif +} + +/* Function called through gmio_ostringstream::func_stream_write */ +static size_t gmio_amf_ostringstream_write( + void* cookie, struct gmio_stream* stream, const char* ptr, size_t len) +{ + struct gmio_amf_wcontext* context = (struct gmio_amf_wcontext*)cookie; + size_t len_written = 0; + if (gmio_no_error(context->error)) { + if (context->options->compress) { + len_written = + gmio_amf_ostringstream_write_zlib(context, stream, ptr, len); + } + else { + len_written = gmio_stream_write_bytes(stream, ptr, len); + if (len_written != len) + context->error = GMIO_ERROR_STREAM; + } + if (gmio_no_error(context->error)) { + gmio_task_iface_handle_progress( + context->task_iface, + context->task_progress_current, + context->task_progress_max); + if (gmio_task_iface_is_stop_requested(context->task_iface)) + context->error = GMIO_ERROR_TASK_STOPPED; + } + } + return len_written; +} + +/* Returns computation upper limit of the task progress */ +static intmax_t gmio_amf_task_progress_max(const struct gmio_amf_document* doc) +{ + intmax_t progress_max = 0; + progress_max += doc->metadata_count; + progress_max += doc->material_count; + progress_max += doc->texture_count; + /* Add total object(vertex_count + edge_count + triangle_count) */ + { + struct gmio_amf_object object = {0}; + uint32_t iobj; + for (iobj = 0; iobj < doc->object_count; ++iobj) { + struct gmio_amf_mesh mesh = {0}; + uint32_t imesh; + doc->func_get_document_element( + doc->cookie, + GMIO_AMF_DOCUMENT_ELEMENT_OBJECT, iobj, &object); + for (imesh = 0; imesh < object.mesh_count; ++imesh) { + doc->func_get_object_mesh(doc->cookie, iobj, imesh, &mesh); + progress_max += mesh.vertex_count; + progress_max += mesh.edge_count; + { + struct gmio_amf_object_mesh_element_index mesh_elt_index; + uint32_t ivol; + mesh_elt_index.object_index = iobj; + mesh_elt_index.mesh_index = imesh; + mesh_elt_index.value = 0; + for (ivol = 0; ivol < mesh.volume_count; ++ivol) { + struct gmio_amf_volume volume = {0}; + mesh_elt_index.value = ivol; + doc->func_get_object_mesh_element( + doc->cookie, + GMIO_AMF_MESH_ELEMENT_VOLUME, + &mesh_elt_index, + &volume); + progress_max += volume.triangle_count; + } + } + } + } + } + /* Add total constellation(instance_count) */ + { + struct gmio_amf_constellation constellation = {0}; + uint32_t icons; + for (icons = 0; icons < doc->constellation_count; ++icons) { + doc->func_get_document_element( + doc->cookie, + GMIO_AMF_DOCUMENT_ELEMENT_CONSTELLATION, + icons, + &constellation); + progress_max += constellation.instance_count; + } + } + return progress_max; +} + +int gmio_amf_write( + struct gmio_stream* stream, + const struct gmio_amf_document* doc, + const struct gmio_amf_write_options* opts) +{ + /* Constants */ + static const struct gmio_amf_write_options default_write_opts = {0}; + struct gmio_memblock_helper mblock_helper = + gmio_memblock_helper(opts != NULL ? &opts->stream_memblock : NULL); + const struct gmio_memblock* memblock = &mblock_helper.memblock; + + /* Variables */ + struct gmio_amf_wcontext context = {0}; + struct gmio_ostringstream sstream = + gmio_ostringstream( + *stream, gmio_string(memblock->ptr, 0, memblock->size)); + + opts = opts != NULL ? opts : &default_write_opts; + + /* Check validity of input parameters */ + context.error = GMIO_ERROR_OK; + /* TODO: check stream function pointers */ + if (!gmio_check_memblock(&context.error, memblock)) + goto label_end; + if (!gmio_amf_check_error(&context.error, doc)) + goto label_end; + + /* Initialize writing context */ + { + const struct gmio_string_16 f64_stdio_format = + gmio_to_stdio_float_format( + opts->float64_format, opts->float64_prec); + context.options = opts; + context.sstream = &sstream; + context.document = doc; + context.task_iface = &opts->task_iface; + context.task_progress_current = 0; + if (context.task_iface->func_handle_progress != NULL) + context.task_progress_max += gmio_amf_task_progress_max(doc); + context.f64_format.printf_format = f64_stdio_format.array; + context.f64_format.text_format = opts->float64_format; + context.f64_format.precision = + opts->float64_prec != 0 ? opts->float64_prec : 16; + + /* Initialize internal zlib stream for compression */ + if (opts->compress) { + const struct gmio_zlib_compress_options* z_opts = + &opts->z_compress_options; + const size_t mblock_halfsize = memblock->size / 2; + int z_init_error = Z_OK; + context.sstream->strbuff.capacity = mblock_halfsize; + context.z_memblock = + gmio_memblock( + (uint8_t*)memblock->ptr + mblock_halfsize, + mblock_halfsize, + NULL); + z_init_error = + deflateInit2( + &context.z_stream, + z_opts->level, + Z_DEFLATED, /* Method */ + 15, /* Window bits(default value) */ + z_opts->memory_usage, + z_opts->strategy); + if (z_init_error != Z_OK) { + context.error = zlib_error_to_gmio_error(z_init_error); + goto label_end; + } + context.z_flush = Z_NO_FLUSH; + } + } + + sstream.cookie = &context; + sstream.func_stream_write = &gmio_amf_ostringstream_write; + + gmio_amf_write_amf_begin(&sstream, doc); + if (!gmio_amf_write_root_metadata(&context)) + goto label_end; + if (!gmio_amf_write_root_materials(&context)) + goto label_end; + if (!gmio_amf_write_root_objects(&context)) + goto label_end; + if (!gmio_amf_write_root_textures(&context)) + goto label_end; + if (!gmio_amf_write_root_constellations(&context)) + goto label_end; + + if (opts->compress) { + gmio_ostringstream_flush(&sstream); + context.z_flush = Z_FINISH; + } + gmio_ostringstream_write_chararray(&sstream, "\n"); + gmio_ostringstream_flush(&sstream); + +label_end: + if (opts->compress) + deflateEnd(&context.z_stream); + gmio_memblock_helper_release(&mblock_helper); + return context.error; +} + +int gmio_amf_write_file( + const char* filepath, + const struct gmio_amf_document* doc, + const struct gmio_amf_write_options* opts) +{ + const bool compress = opts != NULL ? opts->compress : false; + FILE* file = fopen(filepath, compress ? "wb" : "w"); + if (file != NULL) { + struct gmio_stream stream = gmio_stream_stdio(file); + const int error = gmio_amf_write(&stream, doc, opts); + fclose(file); + return error; + } + return GMIO_ERROR_STDIO; +} diff --git a/src/gmio_amf/amf_io.h b/src/gmio_amf/amf_io.h new file mode 100644 index 0000000..fb3db88 --- /dev/null +++ b/src/gmio_amf/amf_io.h @@ -0,0 +1,85 @@ +/**************************************************************************** +** Copyright (c) 2016, Fougue Ltd. +** All rights reserved. +** +** Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions +** are met: +** +** 1. Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** +** 2. Redistributions in binary form must reproduce the above +** copyright notice, this list of conditions and the following +** disclaimer in the documentation and/or other materials provided +** with the distribution. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +****************************************************************************/ + +/*! \file amf_io.h + * AMF read/write functions + * + * \addtogroup gmio_amf + * @{ + */ + +#ifndef GMIO_AMF_IO_H +#define GMIO_AMF_IO_H + +#include "amf_global.h" +#include "amf_document.h" +#include "amf_io_options.h" +#include "../gmio_core/stream.h" + +GMIO_C_LINKAGE_BEGIN + +/*! Writes AMF document to stream + * + * \pre stream != NULL + * \pre doc != NULL + * + * \p options may be \c NULL in this case default values are used + * + * \return Error code (see gmio_core/error.h and amf_error.h) + * + * \sa gmio_amf_write_file() + */ +GMIO_API int gmio_amf_write( + struct gmio_stream* stream, + const struct gmio_amf_document* doc, + const struct gmio_amf_write_options* opts); + +/*! Writes AMF document to stream + * + * This is just a facility function over gmio_amf_write(). The internal stream + * object is created to read file at \p filepath + * + * \pre filepath != \c NULL \n + * The file is opened with \c fopen() so \p filepath shall follow the file + * name specifications of the running environment + * \pre doc != NULL + * + * \return Error code (see gmio_core/error.h and amf_error.h) + * + * \sa gmio_amf_write(), gmio_stream_stdio(FILE*) + */ +GMIO_API int gmio_amf_write_file( + const char* filepath, + const struct gmio_amf_document* doc, + const struct gmio_amf_write_options* opts); + +GMIO_C_LINKAGE_END + +#endif /* GMIO_AMF_IO_H */ +/*! @} */ diff --git a/src/gmio_amf/amf_io_options.h b/src/gmio_amf/amf_io_options.h new file mode 100644 index 0000000..722a205 --- /dev/null +++ b/src/gmio_amf/amf_io_options.h @@ -0,0 +1,136 @@ +/**************************************************************************** +** Copyright (c) 2016, Fougue Ltd. +** All rights reserved. +** +** Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions +** are met: +** +** 1. Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** +** 2. Redistributions in binary form must reproduce the above +** copyright notice, this list of conditions and the following +** disclaimer in the documentation and/or other materials provided +** with the distribution. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +****************************************************************************/ + +/*! \file amf_io_options.h + * Options for AMF read/write functions + * + * \addtogroup gmio_amf + * @{ + */ + +#ifndef GMIO_AMF_IO_OPTIONS_H +#define GMIO_AMF_IO_OPTIONS_H + +#include "amf_global.h" +#include "../gmio_core/memblock.h" +#include "../gmio_core/task_iface.h" +#include "../gmio_core/text_format.h" + +/*! zlib compression level, specific values */ +enum gmio_zlib_compress_level +{ + GMIO_ZLIB_COMPRESS_LEVEL_NONE = -1, /*! Maps to Z_NO_COMPRESSION */ + GMIO_ZLIB_COMPRESS_LEVEL_DEFAULT = 0, /*! Maps to Z_DEFAULT_COMPRESSION */ + GMIO_ZLIB_COMPRESS_LEVEL_BEST_SPEED = 1, /*! Maps to Z_BEST_SPEED */ + GMIO_ZLIB_COMPRESS_LEVEL_BEST_SIZE = 9 /*! Maps to Z_BEST_COMPRESSION */ +}; + +/*! zlib compression strategy */ +enum gmio_zlib_compress_strategy +{ + GMIO_ZLIB_COMPRESSION_STRATEGY_DEFAULT = 0, + GMIO_ZLIB_COMPRESSION_STRATEGY_FILTERED = 1, + GMIO_ZLIB_COMPRESSION_STRATEGY_HUFFMAN_ONLY = 2, + GMIO_ZLIB_COMPRESSION_STRATEGY_RLE = 3, + GMIO_ZLIB_COMPRESSION_STRATEGY_FIXED = 4 +}; + +/*! zlib compression options + * + * Initialising gmio_zlib_compress_options with \c {0} (or \c {} in C++) is the + * convenient way to set default values. + */ +struct gmio_zlib_compress_options +{ + /*! Compression level + * + * \c 0 : default compression + * \c 1 : best speed + * \c 9 : best compression */ + uint8_t level; + + /*! Compression strategy + * + * \c 0 : default strategy + * \c 1 : filtered + * \c 9 : best compression */ + enum gmio_zlib_compress_strategy strategy; + + /*! Specifies how much memory should be allocated for the internal + * compression state + * + * The value must belongs to \c [1..9] or equals to \c 0 which maps to the + * default usage. + * + * \c 1 uses minimum memory but is slow and reduces compression ratio + * \c 9 uses maximum memory for optimal speed + */ + uint8_t memory_usage; +}; + +/*! Options of function gmio_amf_write() + * + * Initialising gmio_amf_write_options with \c {0} (or \c {} in C++) is the + * convenient way to set default values(passing \c NULL to gmio_amf_write() has + * the same effect). + */ +struct gmio_amf_write_options +{ + /*! Used by the stream to bufferize I/O operations + * + * If null, then a temporary memblock is created with the global default + * constructor function + * + * \sa gmio_memblock_isnull() + * \sa gmio_memblock_default() */ + struct gmio_memblock stream_memblock; + + /*! Optional interface by which the I/O operation can be controlled */ + struct gmio_task_iface task_iface; + + /*! The format used when writting double values as strings + * + * Defaulted to \c GMIO_FLOAT_TEXT_FORMAT_DECIMAL_LOWERCASE when calling + * gmio_amf_write() with \c options==NULL + */ + enum gmio_float_text_format float64_format; + + /*! The maximum number of significant digits when writting double values + * + * Defaulted to \c 16 when calling gmio_amf_write() with \c options==NULL + */ + uint8_t float64_prec; + + /* ZIP compression */ + + bool compress; + struct gmio_zlib_compress_options z_compress_options; +}; + +#endif /* GMIO_AMF_IO_OPTIONS_H */ diff --git a/src/gmio_core/const_string.h b/src/gmio_core/const_string.h new file mode 100644 index 0000000..5096044 --- /dev/null +++ b/src/gmio_core/const_string.h @@ -0,0 +1,87 @@ +/**************************************************************************** +** Copyright (c) 2016, Fougue Ltd. +** All rights reserved. +** +** Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions +** are met: +** +** 1. Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** +** 2. Redistributions in binary form must reproduce the above +** copyright notice, this list of conditions and the following +** disclaimer in the documentation and/or other materials provided +** with the distribution. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +****************************************************************************/ + +/*! \file const_string.h + * Declaration of gmio_const_string and utility functions + * + * \addtogroup gmio_core + * @{ + */ + +#ifndef GMIO_CONST_STRING_H +#define GMIO_CONST_STRING_H + +#include "global.h" + +#include + +/*! Stores a read-only string of 8-bit chars + * + * For faster lookups, it knowns the length of its contents. + */ +struct gmio_const_string +{ + const char* ptr; /*!< Contents */ + size_t len; /*!< Size(length) of current contents */ +}; + +/*! Expands to bracket initialization of a gmio_const_string from const char[] + * + * Example: + * \code{.c} + * static const char token[] = "woops"; + * struct gmio_const_string token_s = GMIO_CONST_STRING_FROM_ARRAY(token); + * \endcode + */ +#define GMIO_CONST_STRING_FROM_ARRAY(array) { &(array)[0], sizeof(array) - 1 } + +/*! Returns an initialized gmio_const_string object */ +GMIO_INLINE struct gmio_const_string gmio_const_string(const char* ptr, size_t len); + +/*! Returns \c true if \p str has no characters, otherwise returns \c false */ +GMIO_INLINE bool gmio_const_string_is_empty(const struct gmio_const_string* str); + +/* + * -- Implementation + */ + +struct gmio_const_string gmio_const_string(const char* ptr, size_t len) +{ + struct gmio_const_string cstr; + cstr.ptr = ptr; + cstr.len = len; + return cstr; +} + +bool gmio_const_string_is_empty(const struct gmio_const_string* str) +{ + return str->ptr == NULL || str->len == 0; +} + +#endif /* GMIO_CONST_STRING_H */ diff --git a/src/gmio_core/global.h b/src/gmio_core/global.h index ead7555..a2fe994 100644 --- a/src/gmio_core/global.h +++ b/src/gmio_core/global.h @@ -92,8 +92,8 @@ /* GMIO_HAVE_INT64_TYPE */ #if defined(GMIO_HAVE_INT64_T) \ - || defined(GMIO_HAVE_MSVC_INT64) \ - || defined(GMIO_HAVE_LONG_LONG) + || defined(GMIO_HAVE_MSVC_INT64) \ + || defined(GMIO_HAVE_LONG_LONG) # define GMIO_HAVE_INT64_TYPE #endif diff --git a/src/gmio_core/internal/float_format_utils.c b/src/gmio_core/internal/float_format_utils.c new file mode 100644 index 0000000..86b1088 --- /dev/null +++ b/src/gmio_core/internal/float_format_utils.c @@ -0,0 +1,67 @@ +/**************************************************************************** +** Copyright (c) 2016, Fougue Ltd. +** All rights reserved. +** +** Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions +** are met: +** +** 1. Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** +** 2. Redistributions in binary form must reproduce the above +** copyright notice, this list of conditions and the following +** disclaimer in the documentation and/or other materials provided +** with the distribution. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +****************************************************************************/ + +#include "float_format_utils.h" + +#include + +char gmio_float_text_format_to_stdio_specifier( + enum gmio_float_text_format format) +{ + switch (format) { + case GMIO_FLOAT_TEXT_FORMAT_DECIMAL_LOWERCASE: return 'f'; + case GMIO_FLOAT_TEXT_FORMAT_DECIMAL_UPPERCASE: return 'F'; + case GMIO_FLOAT_TEXT_FORMAT_SCIENTIFIC_LOWERCASE: return 'e'; + case GMIO_FLOAT_TEXT_FORMAT_SCIENTIFIC_UPPERCASE: return 'E'; + case GMIO_FLOAT_TEXT_FORMAT_SHORTEST_LOWERCASE: return 'g'; + case GMIO_FLOAT_TEXT_FORMAT_SHORTEST_UPPERCASE: return 'G'; + } + /* Default, should not be here */ + return GMIO_FLOAT_TEXT_FORMAT_DECIMAL_LOWERCASE; +} + +char* gmio_write_stdio_float_format(char* buffer, char specifier, uint8_t prec) +{ + int prec_len = 0; + + buffer[0] = '%'; + buffer[1] = '.'; + prec_len = sprintf(buffer + 2, "%u", prec); + buffer[2 + prec_len] = specifier; + return buffer + 3 + prec_len; +} + +struct gmio_string_16 gmio_to_stdio_float_format( + enum gmio_float_text_format format, uint8_t prec) +{ + struct gmio_string_16 buff = {0}; + const char spec = gmio_float_text_format_to_stdio_specifier(format); + gmio_write_stdio_float_format(buff.array, spec, prec); + return buff; +} diff --git a/src/gmio_core/internal/float_format_utils.h b/src/gmio_core/internal/float_format_utils.h new file mode 100644 index 0000000..025cfa6 --- /dev/null +++ b/src/gmio_core/internal/float_format_utils.h @@ -0,0 +1,45 @@ +/**************************************************************************** +** Copyright (c) 2016, Fougue Ltd. +** All rights reserved. +** +** Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions +** are met: +** +** 1. Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** +** 2. Redistributions in binary form must reproduce the above +** copyright notice, this list of conditions and the following +** disclaimer in the documentation and/or other materials provided +** with the distribution. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +****************************************************************************/ + +#ifndef GMIO_INTERNAL_FLOAT_FORMAT_UTILS_H +#define GMIO_INTERNAL_FLOAT_FORMAT_UTILS_H + +#include "../text_format.h" + +char gmio_float_text_format_to_stdio_specifier( + enum gmio_float_text_format format); + +char* gmio_write_stdio_float_format( + char* buffer, char specifier, uint8_t prec); + +struct gmio_string_16 { char array[16]; }; +struct gmio_string_16 gmio_to_stdio_float_format( + enum gmio_float_text_format format, uint8_t prec); + +#endif /* GMIO_INTERNAL_FLOAT_FORMAT_UTILS_H */ diff --git a/src/gmio_core/internal/google_doubleconversion.cpp b/src/gmio_core/internal/google_doubleconversion.cpp index 35be396..e9b80a7 100644 --- a/src/gmio_core/internal/google_doubleconversion.cpp +++ b/src/gmio_core/internal/google_doubleconversion.cpp @@ -38,17 +38,20 @@ #include -inline float gmio_snanf() -{ - return std::numeric_limits::signaling_NaN(); -} +namespace { -inline float gmio_inff() -{ - return std::numeric_limits::infinity(); -} +template T gmio_snan() +{ return std::numeric_limits::signaling_NaN(); } -float gmio_str2float_googledoubleconversion(const char* num, size_t numlen) +template T gmio_inf() +{ return std::numeric_limits::infinity(); } + +template struct FloatTraits {}; +template<> struct FloatTraits { static float zero() { return 0.f; } }; +template<> struct FloatTraits { static double zero() { return 0.; } }; + +template +T gmio_generic_str2float_googledoubleconversion(const char* num, size_t numlen) { // Important note: implementation adapted from Qt5 source code // qtbase/src/corelib/tools/qlocale_tools.cpp @@ -74,14 +77,14 @@ float gmio_str2float_googledoubleconversion(const char* num, size_t numlen) bool ok = false; int processed = 0; - float f = 0.f; + T f = FloatTraits::zero(); static const int conv_flags = double_conversion::StringToDoubleConverter::NO_FLAGS; if (*num == '\0') { ok = false; processed = 0; - return 0.f; + return FloatTraits::zero(); } ok = true; @@ -90,38 +93,38 @@ float gmio_str2float_googledoubleconversion(const char* num, size_t numlen) // or sscanf, we don't allow "-nan" or "+nan" if (gmio_ascii_stricmp(num, "nan") == 0) { processed = 3; - return gmio_snanf(); + return gmio_snan(); } else if ((num[0] == '-' || num[0] == '+') && gmio_ascii_stricmp(num + 1, "nan") == 0) { processed = 0; ok = false; - return 0.f; + return FloatTraits::zero(); } // Infinity values are implementation defined in the sscanf case. In the // libdouble-conversion case we need infinity as overflow marker if (gmio_ascii_stricmp(num, "+inf") == 0) { processed = 4; - return gmio_inff(); + return gmio_inf(); } else if (gmio_ascii_stricmp(num, "inf") == 0) { processed = 3; - return gmio_inff(); + return gmio_inf(); } else if (gmio_ascii_stricmp(num, "-inf") == 0) { processed = 4; - return -gmio_inff(); + return -gmio_inf(); } static const double_conversion::StringToDoubleConverter conv( - conv_flags, 0.0, gmio_snanf(), 0, 0); + conv_flags, 0., gmio_snan(), NULL, NULL); f = conv.StringToFloat(num, static_cast(numlen), &processed); if (!gmio_isfinite(f)) { ok = false; if (gmio_isnan(f)) { // Garbage found. We don't accept it and return 0 processed = 0; - return 0.f; + return FloatTraits::zero(); } else { // Overflow. That's not OK, but we still return infinity return f; @@ -145,8 +148,9 @@ float gmio_str2float_googledoubleconversion(const char* num, size_t numlen) return f; } -int gmio_float2str_googledoubleconversion( - float value, +template +int gmio_generic_float2str_googledoubleconversion( + T value, char *buff, size_t bufflen, gmio_float_text_format textformat, @@ -181,4 +185,38 @@ int gmio_float2str_googledoubleconversion( return result_builder.position(); } +} // Anonymous namespace + +float gmio_str2float_googledoubleconversion(const char* num, size_t numlen) +{ + return ::gmio_generic_str2float_googledoubleconversion(num, numlen); +} + +double gmio_str2double_googledoubleconversion(const char* num, size_t numlen) +{ + return ::gmio_generic_str2float_googledoubleconversion(num, numlen); +} + +int gmio_float2str_googledoubleconversion( + float value, + char *buff, + size_t bufflen, + gmio_float_text_format textformat, + uint8_t prec) +{ + return gmio_generic_float2str_googledoubleconversion( + value, buff, bufflen, textformat, prec); +} + +int gmio_double2str_googledoubleconversion( + double value, + char* buff, + size_t bufflen, + enum gmio_float_text_format textformat, + uint8_t prec) +{ + return gmio_generic_float2str_googledoubleconversion( + value, buff, bufflen, textformat, prec); +} + #endif /* GMIO_STR2FLOAT_LIB == LIB_GOOGLE_DOUBLE_CONVERSION */ diff --git a/src/gmio_core/internal/google_doubleconversion.h b/src/gmio_core/internal/google_doubleconversion.h index e7e3533..dc3310b 100644 --- a/src/gmio_core/internal/google_doubleconversion.h +++ b/src/gmio_core/internal/google_doubleconversion.h @@ -42,12 +42,20 @@ GMIO_C_LINKAGE_BEGIN float gmio_str2float_googledoubleconversion(const char* num, size_t numlen); +double gmio_str2double_googledoubleconversion(const char* num, size_t numlen); + int gmio_float2str_googledoubleconversion( float value, char* buff, size_t bufflen, enum gmio_float_text_format textformat, uint8_t prec); +int gmio_double2str_googledoubleconversion( + double value, + char* buff, + size_t bufflen, + enum gmio_float_text_format textformat, + uint8_t prec); GMIO_C_LINKAGE_END #endif /* GMIO_INTERNAL_GOOGLE_DOUBLECONVERSION_H */ diff --git a/src/gmio_core/internal/itoa.h b/src/gmio_core/internal/itoa.h new file mode 100644 index 0000000..f017543 --- /dev/null +++ b/src/gmio_core/internal/itoa.h @@ -0,0 +1,76 @@ +/**************************************************************************** +** Copyright (c) 2016, Fougue Ltd. +** All rights reserved. +** +** Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions +** are met: +** +** 1. Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** +** 2. Redistributions in binary form must reproduce the above +** copyright notice, this list of conditions and the following +** disclaimer in the documentation and/or other materials provided +** with the distribution. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +****************************************************************************/ + +#ifndef GMIO_INTERNAL_ITOA_H +#define GMIO_INTERNAL_ITOA_H + +#include "../global.h" + +GMIO_INLINE char* gmio_u32toa(uint32_t value, char* str); +GMIO_INLINE char* gmio_i32toa(int32_t value, char* str); +#ifdef GMIO_HAVE_INT64_TYPE +GMIO_INLINE char* gmio_u64toa(uint64_t value, char* str); +GMIO_INLINE char* gmio_i64toa(int64_t value, char* str); +#endif + +/* + * Implementation + */ + +#include "../../3rdparty/miloyip_itoa/branchlut.h" + +char* gmio_u32toa(uint32_t value, char* str) +{ + if (value < 10) { + *str++ = '0' + (char)value; + return str; + } + else { + return u32toa_branchlut(value, str); + } +} + +char* gmio_i32toa(int32_t value, char* str) +{ + return i32toa_branchlut(value, str); +} + +#ifdef GMIO_HAVE_INT64_TYPE +char* gmio_u64toa(uint64_t value, char* str) +{ + return u64toa_branchlut(value, str); +} + +char* gmio_i64toa(int64_t value, char* str) +{ + return i64toa_branchlut(value, str); +} +#endif /* GMIO_HAVE_INT64_TYPE */ + +#endif /* GMIO_INTERNAL_ITOA_H */ diff --git a/src/gmio_core/internal/ostringstream.c b/src/gmio_core/internal/ostringstream.c new file mode 100644 index 0000000..80f9898 --- /dev/null +++ b/src/gmio_core/internal/ostringstream.c @@ -0,0 +1,214 @@ +/**************************************************************************** +** Copyright (c) 2016, Fougue Ltd. +** All rights reserved. +** +** Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions +** are met: +** +** 1. Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** +** 2. Redistributions in binary form must reproduce the above +** copyright notice, this list of conditions and the following +** disclaimer in the documentation and/or other materials provided +** with the distribution. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +****************************************************************************/ + +#include "ostringstream.h" + +#include "helper_stream.h" +#include "itoa.h" +#include "min_max.h" +#include "../../3rdparty/base64/b64.h" + +#if GMIO_FLOAT2STR_LIB == GMIO_FLOAT2STR_LIB_STD +# include "c99_stdio_compat.h" +#elif GMIO_FLOAT2STR_LIB == GMIO_FLOAT2STR_LIB_DOUBLE_CONVERSION +# include "google_doubleconversion.h" +#endif + +#include + +GMIO_INLINE char* gmio_ostringstream_strbuff_pos( + const struct gmio_ostringstream* sstream) +{ + return sstream->strbuff.ptr + sstream->strbuff.len; +} + +GMIO_INLINE size_t gmio_string_remaining_capacity(const struct gmio_string* str) +{ + return str->capacity - str->len; +} + +struct gmio_ostringstream gmio_ostringstream( + const struct gmio_stream stream, const struct gmio_string strbuff) +{ + struct gmio_ostringstream sstream = {0}; + sstream.stream = stream; + sstream.strbuff = strbuff; + sstream.func_stream_write = gmio_ostringstream_default_func_write; + return sstream; +} + + +size_t gmio_ostringstream_default_func_write( + void* cookie, struct gmio_stream* stream, const char* ptr, size_t len) +{ + GMIO_UNUSED(cookie); + return gmio_stream_write_bytes(stream, ptr, len); +} + +void gmio_ostringstream_write_str( + struct gmio_ostringstream *sstream, const char *str) +{ + gmio_ostringstream_write_nstr(sstream, str, strlen(str)); +} + +void gmio_ostringstream_write_nstr( + struct gmio_ostringstream *sstream, const char *str, size_t n) +{ + struct gmio_string* strbuff = &sstream->strbuff; + if (n > strbuff->capacity) { + /* No need to bufferize copy */ + gmio_ostringstream_flush(sstream); + sstream->func_stream_write(sstream->cookie, &sstream->stream, str, n); + } + else { + /* str fits in sstream->strbuff */ + if (n >= gmio_string_remaining_capacity(strbuff)) + gmio_ostringstream_flush(sstream); + strncpy(gmio_ostringstream_strbuff_pos(sstream), str, n); + strbuff->len += n; + } +} + +void gmio_ostringstream_write_xmlattr_str( + struct gmio_ostringstream *sstream, const char *attr, const char *val) +{ + gmio_ostringstream_write_char(sstream, ' '); + gmio_ostringstream_write_str(sstream, attr); + gmio_ostringstream_write_chararray(sstream, "=\""); + gmio_ostringstream_write_str(sstream, val); + gmio_ostringstream_write_char(sstream, '\"'); +} + +void gmio_ostringstream_write_xmlattr_u32( + struct gmio_ostringstream *sstream, const char *attr, uint32_t val) +{ + gmio_ostringstream_write_char(sstream, ' '); + gmio_ostringstream_write_str(sstream, attr); + gmio_ostringstream_write_chararray(sstream, "=\""); + gmio_ostringstream_write_u32(sstream, val); + gmio_ostringstream_write_char(sstream, '\"'); +} + +void gmio_ostringstream_write_u32( + struct gmio_ostringstream *sstream, uint32_t value) +{ + struct gmio_string* buff = &sstream->strbuff; + char* buffpos; + const char* newbuffpos; + if (gmio_string_remaining_capacity(buff) < 10) + gmio_ostringstream_flush(sstream); + buffpos = buff->ptr + buff->len; + newbuffpos = gmio_u32toa(value, buffpos); + buff->len += newbuffpos - buffpos; +} + +void gmio_ostringstream_write_i32( + struct gmio_ostringstream *sstream, int32_t value) +{ + struct gmio_string* buff = &sstream->strbuff; + char* buffpos; + const char* newbuffpos; + if (gmio_string_remaining_capacity(buff) < 11) /* 10 digits + '-' sign */ + gmio_ostringstream_flush(sstream); + buffpos = buff->ptr + buff->len; + newbuffpos = gmio_i32toa(value, buffpos); + buff->len += newbuffpos - buffpos; +} + +void gmio_ostringstream_write_xmlelt_f64( + struct gmio_ostringstream *sstream, const char *elt, double val) +{ + const size_t elt_strlen = strlen(elt); + gmio_ostringstream_write_char(sstream, '<'); + gmio_ostringstream_write_nstr(sstream, elt, elt_strlen); + gmio_ostringstream_write_char(sstream, '>'); + gmio_ostringstream_write_f64(sstream, val, NULL); + gmio_ostringstream_write_nstr(sstream, "'); +} + +void gmio_ostringstream_write_f64( + struct gmio_ostringstream *sstream, + double value, + const struct gmio_ostringstream_format_float *format) +{ + static const struct gmio_ostringstream_format_float default_format = { + "%.16g", GMIO_FLOAT_TEXT_FORMAT_SHORTEST_UPPERCASE, 16 }; + const struct gmio_ostringstream_format_float* nformat = + format != NULL ? format : &default_format; + struct gmio_string* buff = &sstream->strbuff; + int written_count = 0; + if (buff->capacity - buff->len < 32) + gmio_ostringstream_flush(sstream); +#if GMIO_FLOAT2STR_LIB == GMIO_FLOAT2STR_LIB_STD + written_count = gmio_snprintf( + buff->ptr + buff->len, + buff->capacity - buff->len, + nformat->printf_format, + value); +#elif GMIO_FLOAT2STR_LIB == GMIO_FLOAT2STR_LIB_DOUBLE_CONVERSION + written_count = gmio_double2str_googledoubleconversion( + value, + buff->ptr + buff->len, + buff->capacity - buff->len, + nformat->text_format, + nformat->precision); +#endif + buff->len += written_count; +} + +void gmio_ostringstream_write_base64( + struct gmio_ostringstream *sstream, + const unsigned char *input, + size_t len) +{ + struct gmio_string* buff = &sstream->strbuff; + size_t pos = 0; + while (pos < len) { + const size_t remaining_len = len - pos; + unsigned char* output; + if (gmio_string_remaining_capacity(buff) < 4) + gmio_ostringstream_flush(sstream); + output = (unsigned char*)(buff->ptr + buff->len); + if (remaining_len >= 3) { + b64_encodeblock(input + pos, output, 3); + } + else { + unsigned char temp_in[3] = {0}; + if (remaining_len > 0) + temp_in[0] = *(input + pos); + if (remaining_len > 1) + temp_in[1] = *(input + pos + 1); + b64_encodeblock(temp_in, output, remaining_len); + } + pos += 3; + buff->len += 4; + } +} diff --git a/src/gmio_core/internal/ostringstream.h b/src/gmio_core/internal/ostringstream.h new file mode 100644 index 0000000..144be21 --- /dev/null +++ b/src/gmio_core/internal/ostringstream.h @@ -0,0 +1,180 @@ +/**************************************************************************** +** Copyright (c) 2016, Fougue Ltd. +** All rights reserved. +** +** Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions +** are met: +** +** 1. Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** +** 2. Redistributions in binary form must reproduce the above +** copyright notice, this list of conditions and the following +** disclaimer in the documentation and/or other materials provided +** with the distribution. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +****************************************************************************/ + +#ifndef GMIO_INTERNAL_OSTRINGSTREAM_H +#define GMIO_INTERNAL_OSTRINGSTREAM_H + +#include "../global.h" +#include "../stream.h" +#include "../text_format.h" +#include "string.h" + +/*! Output stream that operates on a string + * + * To be used with API below. + */ +struct gmio_ostringstream +{ + /*! Stream to iterate over */ + struct gmio_stream stream; + + /*! Holds contents chunk to write in stream(when full) */ + struct gmio_string strbuff; + + /*! Data to be passed to callback func_stream_write */ + void* cookie; + + /*! Pointer on a function called each time next contents chunk has to be + * written */ + size_t (*func_stream_write)( + void* cookie, struct gmio_stream* stream, const char* ptr, size_t len); +}; + +/*! Returns an initialized gmio_ostringstream object */ +struct gmio_ostringstream gmio_ostringstream( + const struct gmio_stream stream, + const struct gmio_string strbuff); + +/*! Default function for gmio_ostringstream::func_stream_write */ +size_t gmio_ostringstream_default_func_write( + void* cookie, struct gmio_stream* stream, const char* ptr, size_t len); + +/*! Writes null-terminated C string \p str to ostringstream \p sstream */ +void gmio_ostringstream_write_str( + struct gmio_ostringstream* sstream, const char* str); + +/*! Writes the first \p n characters from C string \p str to ostringstream + * \p sstream */ +void gmio_ostringstream_write_nstr( + struct gmio_ostringstream* sstream, const char* str, size_t n); + +/*! Writes the character \p array to ostringstream \p sstream + * + * It is a facility around gmio_ostringstream_write_nstr() for string literals + * and char[] + * \code + * const char str[] = "stuff"; + * gmio_ostringstream_write_chararray(sstream, "something"); + * gmio_ostringstream_write_chararray(sstream, str); + * \endcode + */ +#define gmio_ostringstream_write_chararray(sstream, array) \ + gmio_ostringstream_write_nstr((sstream), (array), sizeof(array) - 1) + +/*! Writes character \p c to ostringstream \p sstream */ +GMIO_INLINE void gmio_ostringstream_write_char( + struct gmio_ostringstream* sstream, char c); + +/*! Writes uint32 \p value to ostringstream \p sstream */ +void gmio_ostringstream_write_u32( + struct gmio_ostringstream* sstream, uint32_t value); + +/*! Writes int32 \p value to ostringstream \p sstream */ +void gmio_ostringstream_write_i32( + struct gmio_ostringstream* sstream, int32_t value); + +/*! Format specification for float numbers(single or double precision) */ +struct gmio_ostringstream_format_float +{ + const char* printf_format; /* printf-like format(eg. "%.7f") */ + enum gmio_float_text_format text_format; + uint8_t precision; +}; + +/*! Writes double \p value to ostringstream \p sstream */ +void gmio_ostringstream_write_f64( + struct gmio_ostringstream* sstream, + double value, + const struct gmio_ostringstream_format_float* format); + +/*! Writes \p input encoded to base64 */ +void gmio_ostringstream_write_base64( + struct gmio_ostringstream* sstream, + const unsigned char* input, + size_t len); + +/*! Write pending bytes within sstream->strbuff */ +GMIO_INLINE void gmio_ostringstream_flush(struct gmio_ostringstream* sstream); + +/* XML */ + +/*! Write XML attribute of name \p attr and value \p val */ +void gmio_ostringstream_write_xmlattr_str( + struct gmio_ostringstream* sstream, const char* attr, const char* val); +void gmio_ostringstream_write_xmlattr_u32( + struct gmio_ostringstream* sstream, const char* attr, uint32_t val); + +/*! Write XML element containing \p val : val */ +void gmio_ostringstream_write_xmlelt_f64( + struct gmio_ostringstream* sstream, const char* elt, double val); + + +GMIO_INLINE void gmio_ostringstream_write_xmlcdata_open( + struct gmio_ostringstream* sstream); +GMIO_INLINE void gmio_ostringstream_write_xmlcdata_close( + struct gmio_ostringstream* sstream); + + +/* + * -- Implementation + */ + +void gmio_ostringstream_write_char( + struct gmio_ostringstream* sstream, char c) +{ + struct gmio_string* strbuff = &sstream->strbuff; + if (strbuff->len >= strbuff->capacity) + gmio_ostringstream_flush(sstream); + strbuff->ptr[strbuff->len] = c; + ++strbuff->len; +} + +void gmio_ostringstream_flush(struct gmio_ostringstream* sstream) +{ + struct gmio_string* strbuff = &sstream->strbuff; + if (strbuff->len > 0) { + /* Don't check bytecount returned is != strbuff->len because some + * write() functions may compress data */ + sstream->func_stream_write( + sstream->cookie, &sstream->stream, strbuff->ptr, strbuff->len); + strbuff->len = 0; + } +} + +void gmio_ostringstream_write_xmlcdata_open(struct gmio_ostringstream *sstream) +{ + gmio_ostringstream_write_chararray(sstream, ""); +} + +#endif /* GMIO_INTERNAL_OSTRINGSTREAM_H */ diff --git a/src/gmio_core/internal/string.h b/src/gmio_core/internal/string.h index e4ed3f7..f496bc7 100644 --- a/src/gmio_core/internal/string.h +++ b/src/gmio_core/internal/string.h @@ -34,16 +34,6 @@ #include -/*! Stores a read-only string of 8-bit chars - * - * For faster lookups, it knowns the length of its contents. - */ -struct gmio_const_string -{ - const char* ptr; /*!< Contents */ - size_t len; /*!< Size(length) of current contents */ -}; - /*! Stores a mutable string of 8-bit chars * * For faster lookups, it knowns the length of its contents. Length must not @@ -56,19 +46,6 @@ struct gmio_string size_t capacity; /*!< Maximum contents size */ }; -/*! Expands to bracket initialization of a gmio_const_string from const char[] - * - * Example: - * \code{.c} - * static const char token[] = "woops"; - * struct gmio_const_string token_s = GMIO_CONST_STRING_FROM_ARRAY(token); - * \endcode - */ -#define GMIO_CONST_STRING_FROM_ARRAY(array) { &(array)[0], sizeof(array) - 1 } - -/*! Returns an initialized struct gmio_const_string object */ -GMIO_INLINE struct gmio_const_string gmio_const_string(const char* ptr, size_t len); - /*! Returns an initialized struct gmio_string object * * gmio_string::capacity is set to max(len,capacity) @@ -99,14 +76,6 @@ GMIO_INLINE char* gmio_cstr_copy( #include #include "min_max.h" -struct gmio_const_string gmio_const_string(const char* ptr, size_t len) -{ - struct gmio_const_string cstr; - cstr.ptr = ptr; - cstr.len = len; - return cstr; -} - struct gmio_string gmio_string(char* ptr, size_t len, size_t capacity) { struct gmio_string str; diff --git a/src/gmio_core/text_format.h b/src/gmio_core/text_format.h index e9d295c..98c99d7 100644 --- a/src/gmio_core/text_format.h +++ b/src/gmio_core/text_format.h @@ -39,7 +39,8 @@ #include "global.h" -/*! This enum defines the various formats to textually represent a float */ +/*! This enum defines the various formats to textually represent a float(single + * or double precision) */ enum gmio_float_text_format { /*! Decimal floating point, lowercase (ex: 392.65) */ diff --git a/src/gmio_stl/internal/stla_write.c b/src/gmio_stl/internal/stla_write.c index d809807..61860ac 100644 --- a/src/gmio_stl/internal/stla_write.c +++ b/src/gmio_stl/internal/stla_write.c @@ -37,6 +37,7 @@ #include "../../gmio_core/task_iface.h" #include "../../gmio_core/text_format.h" #include "../../gmio_core/internal/error_check.h" +#include "../../gmio_core/internal/float_format_utils.h" #include "../../gmio_core/internal/helper_memblock.h" #include "../../gmio_core/internal/helper_stream.h" #include "../../gmio_core/internal/helper_task_iface.h" @@ -117,33 +118,6 @@ GMIO_INLINE char* gmio_write_rawstr_eol(char* buffer, const char* str) return gmio_write_eol(buffer); } -GMIO_INLINE char gmio_float_text_format_to_specifier( - enum gmio_float_text_format format) -{ - switch (format) { - case GMIO_FLOAT_TEXT_FORMAT_DECIMAL_LOWERCASE: return 'f'; - case GMIO_FLOAT_TEXT_FORMAT_DECIMAL_UPPERCASE: return 'F'; - case GMIO_FLOAT_TEXT_FORMAT_SCIENTIFIC_LOWERCASE: return 'e'; - case GMIO_FLOAT_TEXT_FORMAT_SCIENTIFIC_UPPERCASE: return 'E'; - case GMIO_FLOAT_TEXT_FORMAT_SHORTEST_LOWERCASE: return 'g'; - case GMIO_FLOAT_TEXT_FORMAT_SHORTEST_UPPERCASE: return 'G'; - } - /* Default, should not be here */ - return GMIO_FLOAT_TEXT_FORMAT_DECIMAL_LOWERCASE; -} - -GMIO_INLINE char* gmio_write_stdio_format( - char* buffer, char format_specifier, uint8_t prec) -{ - int prec_len = 0; - - buffer[0] = '%'; - buffer[1] = '.'; - prec_len = sprintf(buffer + 2, "%u", prec); - buffer[2 + prec_len] = format_specifier; - return buffer + 3 + prec_len; -} - struct gmio_vec3f_text_format { enum gmio_float_text_format coord_format; @@ -223,13 +197,13 @@ int gmio_stla_write( { const uint8_t f32_prec = vec_txtformat.coord_prec; enum gmio_float_text_format f32_format = opts->stla_float32_format; - const char f32_spec = gmio_float_text_format_to_specifier(f32_format); + const char f32_spec = gmio_float_text_format_to_stdio_specifier(f32_format); char* buffpos = vec_txtformat.str_printf_format; - buffpos = gmio_write_stdio_format(buffpos, f32_spec, f32_prec); + buffpos = gmio_write_stdio_float_format(buffpos, f32_spec, f32_prec); buffpos = gmio_write_char(buffpos, ' '); - buffpos = gmio_write_stdio_format(buffpos, f32_spec, f32_prec); + buffpos = gmio_write_stdio_float_format(buffpos, f32_spec, f32_prec); buffpos = gmio_write_char(buffpos, ' '); - buffpos = gmio_write_stdio_format(buffpos, f32_spec, f32_prec); + buffpos = gmio_write_stdio_float_format(buffpos, f32_spec, f32_prec); *buffpos = 0; } diff --git a/src/gmio_stl/stla_read.c b/src/gmio_stl/stla_read.c index 92d2385..34384a9 100644 --- a/src/gmio_stl/stla_read.c +++ b/src/gmio_stl/stla_read.c @@ -35,6 +35,7 @@ #include "internal/stl_error_check.h" #include "internal/stla_parsing.h" +#include "../gmio_core/const_string.h" #include "../gmio_core/error.h" #include "../gmio_core/internal/c99_stdio_compat.h" #include "../gmio_core/internal/error_check.h" diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 04dc796..bc59774 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -32,6 +32,7 @@ set(CMAKE_CTEST_COMMAND ctest -V --timeout 120) add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND}) include_directories(${CMAKE_BINARY_DIR}/src/gmio_core) # For generated cmake headers +include_directories(${ZLIB_INCLUDE_DIRS}) file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/temp) @@ -41,7 +42,6 @@ set(GMIO_TEST_CORE_SRC core_utils.c stream_buffer.c ../benchmarks/commons/benchmark_tools.c) - add_executable(test_core EXCLUDE_FROM_ALL ${GMIO_TEST_CORE_SRC}) target_link_libraries(test_core gmio_static) @@ -53,10 +53,17 @@ set(GMIO_TEST_STL_SRC stl_testcases.c core_utils.c stl_utils.c) - add_executable(test_stl EXCLUDE_FROM_ALL ${GMIO_TEST_STL_SRC}) target_link_libraries(test_stl gmio_static) +# test_amf +set(GMIO_TEST_AMF_SRC + main_test_amf.c + stream_buffer.c) +add_executable(test_amf EXCLUDE_FROM_ALL ${GMIO_TEST_AMF_SRC}) +target_link_libraries(test_amf gmio_static) +target_link_libraries(test_amf ${ZLIB_LIBRARIES}) + # fake_support if(GMIO_BUILD_TESTS_FAKE_SUPPORT) add_subdirectory(fake_support) @@ -72,5 +79,5 @@ endif() # Declare tests add_test(NAME test_core COMMAND test_core) add_test(NAME test_stl COMMAND test_stl) - -add_dependencies(check test_core test_stl) +add_test(NAME test_amf COMMAND test_amf) +add_dependencies(check test_core test_stl test_amf) diff --git a/tests/main_test_amf.c b/tests/main_test_amf.c new file mode 100644 index 0000000..71eae47 --- /dev/null +++ b/tests/main_test_amf.c @@ -0,0 +1,55 @@ +/**************************************************************************** +** Copyright (c) 2016, Fougue Ltd. +** All rights reserved. +** +** Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions +** are met: +** +** 1. Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** +** 2. Redistributions in binary form must reproduce the above +** copyright notice, this list of conditions and the following +** disclaimer in the documentation and/or other materials provided +** with the distribution. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +****************************************************************************/ + +#include "utest_lib.h" + +#include "../src/gmio_core/global.h" +#include "../src/gmio_core/memblock.h" + +#include "test_amf_io.c" + +#include + +/* Static memblock */ +struct gmio_memblock gmio_memblock_for_tests() +{ + return gmio_memblock_malloc(512 * 1024); /* 512KB */ +} + +const char* all_tests() +{ + UTEST_SUITE_START(); + + gmio_memblock_set_default_constructor(gmio_memblock_for_tests); + + UTEST_RUN(test_amf_write); + + return NULL; +} +UTEST_MAIN(all_tests) diff --git a/tests/main_test_core.c b/tests/main_test_core.c index c6339dc..aa6bb30 100644 --- a/tests/main_test_core.c +++ b/tests/main_test_core.c @@ -51,6 +51,7 @@ const char* all_tests() UTEST_RUN(test_internal__fast_atof); UTEST_RUN(test_internal__locale_utils); UTEST_RUN(test_internal__error_check); + UTEST_RUN(test_internal__ostringstream); UTEST_RUN(test_internal__safe_cast); UTEST_RUN(test_internal__stringstream); UTEST_RUN(test_internal__string_ascii_utils); diff --git a/tests/stream_buffer.h b/tests/stream_buffer.h index f3d9050..1d95794 100644 --- a/tests/stream_buffer.h +++ b/tests/stream_buffer.h @@ -52,6 +52,6 @@ struct gmio_ro_buffer gmio_ro_buffer(const void* ptr, size_t len, size_t pos); struct gmio_rw_buffer gmio_rw_buffer(void* ptr, size_t len, size_t pos); struct gmio_stream gmio_istream_buffer(struct gmio_ro_buffer* buff); -struct gmio_stream gmio_iostream_buffer(struct gmio_rw_buffer* buff); +struct gmio_stream gmio_stream_buffer(struct gmio_rw_buffer* buff); #endif /* GMIO_STREAM_BUFFER_H */ diff --git a/tests/test_amf_io.c b/tests/test_amf_io.c new file mode 100644 index 0000000..188daa3 --- /dev/null +++ b/tests/test_amf_io.c @@ -0,0 +1,268 @@ +/**************************************************************************** +** Copyright (c) 2016, Fougue Ltd. +** All rights reserved. +** +** Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions +** are met: +** +** 1. Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** +** 2. Redistributions in binary form must reproduce the above +** copyright notice, this list of conditions and the following +** disclaimer in the documentation and/or other materials provided +** with the distribution. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +****************************************************************************/ + +#include "utest_assert.h" + +#include "core_utils.h" +#include "stream_buffer.h" + +#include "../src/gmio_core/error.h" +#include "../src/gmio_core/internal/helper_stream.h" +#include "../src/gmio_amf/amf_error.h" +#include "../src/gmio_amf/amf_io.h" + +#include +#include +#include + +struct __tamf__material +{ + double color[3]; + const char* name; +}; + +struct __tamf__triangle +{ + uint32_t vertex[3]; +}; + +struct __tamf__mesh +{ + const struct gmio_vec3d* vec_vertex; + uint32_t vertex_count; + const struct __tamf__triangle* vec_triangle; + uint32_t triangle_count; +}; + +struct __tamf__document +{ + const struct __tamf__material* vec_material; + struct __tamf__mesh mesh; +}; + +static void __tamf__get_document_element( + const void* cookie, + enum gmio_amf_document_element element, + uint32_t element_index, + void* ptr_element) +{ + const struct __tamf__document* doc = + (const struct __tamf__document*)cookie; + switch (element) { + case GMIO_AMF_DOCUMENT_ELEMENT_OBJECT: { + struct gmio_amf_object* ptr_object = + (struct gmio_amf_object*)ptr_element; + ptr_object->id = element_index; + ptr_object->mesh_count = 1; + break; + } + case GMIO_AMF_DOCUMENT_ELEMENT_MATERIAL: { + struct gmio_amf_material* ptr_material = + (struct gmio_amf_material*)ptr_element; + const struct __tamf__material* imat = &doc->vec_material[element_index]; + ptr_material->metadata_count = 1; + ptr_material->id = element_index; + ptr_material->color.r = imat->color[0]; + ptr_material->color.g = imat->color[1]; + ptr_material->color.b = imat->color[2]; + break; + } + case GMIO_AMF_DOCUMENT_ELEMENT_TEXTURE: + break; + case GMIO_AMF_DOCUMENT_ELEMENT_CONSTELLATION: + break; + case GMIO_AMF_DOCUMENT_ELEMENT_METADATA: + break; + } +} + +static void __tamf__get_object_mesh( + const void* cookie, + uint32_t object_index, + uint32_t mesh_index, + struct gmio_amf_mesh* ptr_mesh) +{ + const struct __tamf__document* doc = + (const struct __tamf__document*)cookie; + GMIO_UNUSED(object_index); + GMIO_UNUSED(mesh_index); + ptr_mesh->vertex_count = doc->mesh.vertex_count; + ptr_mesh->edge_count = 0; + ptr_mesh->volume_count = 1; +} + +static void __tamf__get_object_mesh_element( + const void* cookie, + enum gmio_amf_mesh_element element, + const struct gmio_amf_object_mesh_element_index* element_index, + void* ptr_element) +{ + const struct __tamf__document* doc = (const struct __tamf__document*)cookie; + switch (element) { + case GMIO_AMF_MESH_ELEMENT_VERTEX: { + struct gmio_amf_vertex* ptr_vertex = (struct gmio_amf_vertex*)ptr_element; + ptr_vertex->coords = doc->mesh.vec_vertex[element_index->value]; + break; + } + case GMIO_AMF_MESH_ELEMENT_EDGE: + break; + case GMIO_AMF_MESH_ELEMENT_VOLUME: { + struct gmio_amf_volume* ptr_volume = (struct gmio_amf_volume*)ptr_element; + ptr_volume->materialid = 1; + ptr_volume->triangle_count = doc->mesh.triangle_count; + break; + } + } +} + +static void __tamf__get_object_mesh_volume_triangle( + const void* cookie, + const struct gmio_amf_object_mesh_element_index* volume_index, + uint32_t triangle_index, + struct gmio_amf_triangle* ptr_triangle) +{ + const struct __tamf__document* doc = (const struct __tamf__document*)cookie; + const struct __tamf__triangle* tri = &doc->mesh.vec_triangle[triangle_index]; + GMIO_UNUSED(volume_index); + ptr_triangle->v1 = tri->vertex[0]; + ptr_triangle->v2 = tri->vertex[1]; + ptr_triangle->v3 = tri->vertex[2]; +} + +static void __tamf__get_document_element_metadata( + const void* cookie, + enum gmio_amf_document_element element, + uint32_t element_index, + uint32_t metadata_index, + struct gmio_amf_metadata* ptr_metadata) +{ + const struct __tamf__document* doc = (const struct __tamf__document*)cookie; + GMIO_UNUSED(metadata_index); + if (element == GMIO_AMF_DOCUMENT_ELEMENT_MATERIAL) { + ptr_metadata->type = "name"; + ptr_metadata->data = doc->vec_material[element_index].name; + } +} + +static const char* test_amf_write() +{ + { + struct gmio_stream stream = {0}; + struct gmio_amf_document doc = {0}; + const int error = gmio_amf_write(&stream, &doc, NULL); + UTEST_ASSERT(gmio_error(error)); + } + + { + static const size_t wbuffsize = 8192; + struct gmio_rw_buffer wbuff = {0}; + struct gmio_stream stream = gmio_stream_buffer(&wbuff); + struct gmio_amf_document doc = {0}; + struct gmio_amf_write_options options = {0}; + + const struct __tamf__material testmaterials[] = { + { { 1., 0., 0. }, "red" }, + { { 0., 1., 0. }, "green" }, + { { 0., 0., 1. }, "blue" }, + { { 1., 1., 1. }, "white" } + }; + const struct gmio_vec3d testvertices[] = { + { 0., 0., 0.}, + { 1., 0., 0.}, + { 1., -1., 0.}, + { 0., -1., 0.}, + { 1., 0., 1.}, + { 1., -1., 1.}, + { 0., 0., 1.}, + { 0., -1., 1.} + }; + const struct __tamf__triangle testtriangles[] = { + { 0, 1, 2}, + { 0, 2, 3}, + { 1, 5, 2}, + { 1, 4, 5}, + { 6, 5, 7}, + { 6, 4, 5}, + { 0, 6, 7}, + { 0, 7, 3}, + { 0, 6, 4}, + { 0, 4, 1}, + { 3, 7, 5}, + { 3, 5, 2} + }; + struct __tamf__document testdoc = {0}; + + wbuff.ptr = calloc(wbuffsize, 1); + wbuff.len = wbuffsize; + + testdoc.vec_material = testmaterials; + testdoc.mesh.vec_vertex = testvertices; + testdoc.mesh.vertex_count = GMIO_ARRAY_SIZE(testvertices); + testdoc.mesh.vec_triangle = testtriangles; + testdoc.mesh.triangle_count = GMIO_ARRAY_SIZE(testtriangles); + + doc.cookie = &testdoc; + doc.unit = GMIO_AMF_UNIT_MILLIMETER; + doc.func_get_document_element = &__tamf__get_document_element; + doc.func_get_object_mesh = &__tamf__get_object_mesh; + doc.func_get_object_mesh_element = &__tamf__get_object_mesh_element; + doc.func_get_object_mesh_volume_triangle = + &__tamf__get_object_mesh_volume_triangle; + doc.func_get_document_element_metadata = + &__tamf__get_document_element_metadata; + doc.object_count = 1; + doc.material_count = GMIO_ARRAY_SIZE(testmaterials); + + options.float64_prec = 9; + + /* Write as raw contents(uncompressed) */ + { + const int error = gmio_amf_write(&stream, &doc, &options); + if (gmio_error(error)) + printf("\n0x%x\n", error); + UTEST_COMPARE_INT(error, GMIO_ERROR_OK); + printf("%s\n", wbuff.ptr); + } + +#if 0 + /* Write compressed */ + { + int error = GMIO_ERROR_OK; + wbuff.pos = 0; + options.compress = true; + error = gmio_amf_write(&stream, &doc, &options); + UTEST_COMPARE_INT(error, GMIO_ERROR_OK); + } +#endif + + free(wbuff.ptr); + } + + return NULL; +} diff --git a/tests/test_core_internal.c b/tests/test_core_internal.c index 6298436..e53a3d8 100644 --- a/tests/test_core_internal.c +++ b/tests/test_core_internal.c @@ -39,6 +39,7 @@ #include "../src/gmio_core/internal/fast_atof.h" #include "../src/gmio_core/internal/locale_utils.h" #include "../src/gmio_core/internal/numeric_utils.h" +#include "../src/gmio_core/internal/ostringstream.h" #include "../src/gmio_core/internal/safe_cast.h" #include "../src/gmio_core/internal/stringstream.h" #include "../src/gmio_core/internal/stringstream_fast_atof.h" @@ -282,6 +283,89 @@ static const char* test_internal__stringstream() return NULL; } +static const char* test_internal__ostringstream() +{ + static const size_t size = 8192; + char* input = malloc(size); + char* output = malloc(size); + char strbuff[256] = {0}; + struct gmio_rw_buffer rwbuff = gmio_rw_buffer(output, size, 0); + struct gmio_ostringstream sstream = + gmio_ostringstream( + gmio_stream_buffer(&rwbuff), + gmio_string(strbuff, 0, sizeof(strbuff) - 1)); + + { /* Create "input" string */ + size_t i = 0; + for (i = 0; i < size; ++i) { + const char c = 32 + (i % 94); /* Printable ASCII chars */ + input[i] = c; + } + /* Test gmio_ostringstream_write_char() */ + for (i = 0; i < size; ++i) + gmio_ostringstream_write_char(&sstream, input[i]); + gmio_ostringstream_flush(&sstream); + UTEST_ASSERT(strncmp(input, output, size) == 0); + + /* Test gmio_ostringstream_write_[ui]32() */ + { + static const char result[] = + "20 12345 0 -1 -12345678 4294967295 2147483647"; + static const unsigned result_len = sizeof(result) - 1; + rwbuff.pos = 0; + gmio_ostringstream_write_u32(&sstream, 20); + gmio_ostringstream_write_char(&sstream, ' '); + gmio_ostringstream_write_u32(&sstream, 12345); + gmio_ostringstream_write_char(&sstream, ' '); + gmio_ostringstream_write_u32(&sstream, 0); + gmio_ostringstream_write_char(&sstream, ' '); + gmio_ostringstream_write_i32(&sstream, -1); + gmio_ostringstream_write_char(&sstream, ' '); + gmio_ostringstream_write_i32(&sstream, -12345678); + gmio_ostringstream_write_char(&sstream, ' '); + gmio_ostringstream_write_u32(&sstream, (uint32_t)-1); + gmio_ostringstream_write_char(&sstream, ' '); + gmio_ostringstream_write_i32(&sstream, ((uint32_t)1 << 31) - 1); + gmio_ostringstream_flush(&sstream); + UTEST_ASSERT(strncmp(result, sstream.strbuff.ptr, result_len) == 0); + UTEST_ASSERT(strncmp(result, output, result_len) == 0); + } + + /* Test gmio_ostringstream_write_base64() */ + { + static const char str[] = "Fougue+gmio"; + static const char str_b64[] = "Rm91Z3VlK2dtaW8="; + static const unsigned str_len = sizeof(str) - 1; + static const unsigned str_b64_len = sizeof(str_b64) - 1; + rwbuff.pos = 0; + gmio_ostringstream_write_base64( + &sstream, (unsigned const char*)str, str_len); + gmio_ostringstream_flush(&sstream); + UTEST_ASSERT(strncmp(str_b64, sstream.strbuff.ptr, str_b64_len) == 0); + UTEST_ASSERT(strncmp(str_b64, output, str_b64_len) == 0); + } + + /* Test gmio_ostringstream_write_xml...() */ + { + static const char result[] = + " foo=\"crac\" bar=\"456789\""; + static const unsigned result_len = sizeof(result) - 1; + rwbuff.pos = 0; + gmio_ostringstream_write_xmlattr_str(&sstream, "foo", "crac"); + gmio_ostringstream_write_xmlattr_u32(&sstream, "bar", 456789); + gmio_ostringstream_write_xmlcdata_open(&sstream); + gmio_ostringstream_write_xmlcdata_close(&sstream); + gmio_ostringstream_flush(&sstream); + UTEST_ASSERT(strncmp(result, sstream.strbuff.ptr, result_len) == 0); + UTEST_ASSERT(strncmp(result, output, result_len) == 0); + } + } + + free(input); + free(output); + return NULL; +} + static const char* test_internal__string_ascii_utils() { char c; /* for loop counter */ From d859adf366dffbbe8328ab5abed9e605f5db61b2 Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Thu, 8 Dec 2016 16:02:35 +0100 Subject: [PATCH 14/81] gmio_core: move gmio_zlib_compress_options in zlib_compress.h Also add internal/zlib_utils.h --- src/gmio_amf/amf_io.c | 34 ++-------- src/gmio_amf/amf_io_options.h | 53 +--------------- src/gmio_core/error.h | 9 ++- src/gmio_core/internal/zlib_utils.c | 95 ++++++++++++++++++++++++++++ src/gmio_core/internal/zlib_utils.h | 49 +++++++++++++++ src/gmio_core/zlib_compress.h | 96 +++++++++++++++++++++++++++++ 6 files changed, 254 insertions(+), 82 deletions(-) create mode 100644 src/gmio_core/internal/zlib_utils.c create mode 100644 src/gmio_core/internal/zlib_utils.h create mode 100644 src/gmio_core/zlib_compress.h diff --git a/src/gmio_amf/amf_io.c b/src/gmio_amf/amf_io.c index 2d51e2a..d3e7531 100644 --- a/src/gmio_amf/amf_io.c +++ b/src/gmio_amf/amf_io.c @@ -37,6 +37,7 @@ #include "../gmio_core/internal/helper_stream.h" #include "../gmio_core/internal/helper_task_iface.h" #include "../gmio_core/internal/ostringstream.h" +#include "../gmio_core/internal/zlib_utils.h" #include #include @@ -638,21 +639,6 @@ static bool gmio_amf_check_error( return gmio_no_error(*error); } -/* Converts zlib error to gmio "zlib-specific" error */ -static int zlib_error_to_gmio_error(int error) -{ - switch (error) { - case Z_OK: return GMIO_ERROR_OK; - case Z_ERRNO: return GMIO_ERROR_ZLIB_ERRNO; - case Z_STREAM_ERROR: return GMIO_ERROR_ZLIB_STREAM; - case Z_DATA_ERROR: return GMIO_ERROR_ZLIB_DATA; - case Z_MEM_ERROR: return GMIO_ERROR_ZLIB_MEM; - case Z_BUF_ERROR: return GMIO_ERROR_ZLIB_BUF; - case Z_VERSION_ERROR: return GMIO_ERROR_ZLIB_VERSION; - } - return GMIO_ERROR_UNKNOWN; -} - /* Helper for gmio_amf_ostringstream_write() to write zlib compressed data */ static size_t gmio_amf_ostringstream_write_zlib( struct gmio_amf_wcontext* context, @@ -872,28 +858,18 @@ int gmio_amf_write( /* Initialize internal zlib stream for compression */ if (opts->compress) { - const struct gmio_zlib_compress_options* z_opts = - &opts->z_compress_options; const size_t mblock_halfsize = memblock->size / 2; - int z_init_error = Z_OK; context.sstream->strbuff.capacity = mblock_halfsize; context.z_memblock = gmio_memblock( (uint8_t*)memblock->ptr + mblock_halfsize, mblock_halfsize, NULL); - z_init_error = - deflateInit2( - &context.z_stream, - z_opts->level, - Z_DEFLATED, /* Method */ - 15, /* Window bits(default value) */ - z_opts->memory_usage, - z_opts->strategy); - if (z_init_error != Z_OK) { - context.error = zlib_error_to_gmio_error(z_init_error); + context.error = + gmio_zlib_compress_init( + &context.z_stream, &opts->z_compress_options); + if (gmio_error(context.error)) goto label_end; - } context.z_flush = Z_NO_FLUSH; } } diff --git a/src/gmio_amf/amf_io_options.h b/src/gmio_amf/amf_io_options.h index 722a205..74cd9ad 100644 --- a/src/gmio_amf/amf_io_options.h +++ b/src/gmio_amf/amf_io_options.h @@ -41,58 +41,7 @@ #include "../gmio_core/memblock.h" #include "../gmio_core/task_iface.h" #include "../gmio_core/text_format.h" - -/*! zlib compression level, specific values */ -enum gmio_zlib_compress_level -{ - GMIO_ZLIB_COMPRESS_LEVEL_NONE = -1, /*! Maps to Z_NO_COMPRESSION */ - GMIO_ZLIB_COMPRESS_LEVEL_DEFAULT = 0, /*! Maps to Z_DEFAULT_COMPRESSION */ - GMIO_ZLIB_COMPRESS_LEVEL_BEST_SPEED = 1, /*! Maps to Z_BEST_SPEED */ - GMIO_ZLIB_COMPRESS_LEVEL_BEST_SIZE = 9 /*! Maps to Z_BEST_COMPRESSION */ -}; - -/*! zlib compression strategy */ -enum gmio_zlib_compress_strategy -{ - GMIO_ZLIB_COMPRESSION_STRATEGY_DEFAULT = 0, - GMIO_ZLIB_COMPRESSION_STRATEGY_FILTERED = 1, - GMIO_ZLIB_COMPRESSION_STRATEGY_HUFFMAN_ONLY = 2, - GMIO_ZLIB_COMPRESSION_STRATEGY_RLE = 3, - GMIO_ZLIB_COMPRESSION_STRATEGY_FIXED = 4 -}; - -/*! zlib compression options - * - * Initialising gmio_zlib_compress_options with \c {0} (or \c {} in C++) is the - * convenient way to set default values. - */ -struct gmio_zlib_compress_options -{ - /*! Compression level - * - * \c 0 : default compression - * \c 1 : best speed - * \c 9 : best compression */ - uint8_t level; - - /*! Compression strategy - * - * \c 0 : default strategy - * \c 1 : filtered - * \c 9 : best compression */ - enum gmio_zlib_compress_strategy strategy; - - /*! Specifies how much memory should be allocated for the internal - * compression state - * - * The value must belongs to \c [1..9] or equals to \c 0 which maps to the - * default usage. - * - * \c 1 uses minimum memory but is slow and reduces compression ratio - * \c 9 uses maximum memory for optimal speed - */ - uint8_t memory_usage; -}; +#include "../gmio_core/zlib_compress.h" /*! Options of function gmio_amf_write() * diff --git a/src/gmio_core/error.h b/src/gmio_core/error.h index f9ca6f5..4783c77 100644 --- a/src/gmio_core/error.h +++ b/src/gmio_core/error.h @@ -92,7 +92,14 @@ enum gmio_error /*! See \c Z_VERSION_ERROR (zlib library version is incompatible with the * version assumed by the caller) */ - GMIO_ERROR_ZLIB_VERSION + GMIO_ERROR_ZLIB_VERSION, + + /*! Invalid compression level, see gmio_zlib_compress_options::level */ + GMIO_ERROR_ZLIB_INVALID_COMPRESS_LEVEL, + + /*! Invalid compression memory usage, see + * gmio_zlib_compress_options::memory_usage */ + GMIO_ERROR_ZLIB_INVALID_COMPRESS_MEMORY_USAGE }; /*! Returns true if code == GMIO_NO_ERROR */ diff --git a/src/gmio_core/internal/zlib_utils.c b/src/gmio_core/internal/zlib_utils.c new file mode 100644 index 0000000..e458ad8 --- /dev/null +++ b/src/gmio_core/internal/zlib_utils.c @@ -0,0 +1,95 @@ +/**************************************************************************** +** Copyright (c) 2016, Fougue Ltd. +** All rights reserved. +** +** Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions +** are met: +** +** 1. Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** +** 2. Redistributions in binary form must reproduce the above +** copyright notice, this list of conditions and the following +** disclaimer in the documentation and/or other materials provided +** with the distribution. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +****************************************************************************/ + +#include "zlib_utils.h" +#include "../error.h" + +/* Converts zlib error to gmio "zlib-specific" error */ +int zlib_error_to_gmio_error(int z_error) +{ + switch (z_error) { + case Z_OK: return GMIO_ERROR_OK; + case Z_ERRNO: return GMIO_ERROR_ZLIB_ERRNO; + case Z_STREAM_ERROR: return GMIO_ERROR_ZLIB_STREAM; + case Z_DATA_ERROR: return GMIO_ERROR_ZLIB_DATA; + case Z_MEM_ERROR: return GMIO_ERROR_ZLIB_MEM; + case Z_BUF_ERROR: return GMIO_ERROR_ZLIB_BUF; + case Z_VERSION_ERROR: return GMIO_ERROR_ZLIB_VERSION; + } + return GMIO_ERROR_UNKNOWN; +} + +static int gmio_to_zlib_compress_level(int gmio_compress_level) +{ + if (gmio_compress_level == GMIO_ZLIB_COMPRESS_LEVEL_DEFAULT) + return Z_DEFAULT_COMPRESSION; + else if (gmio_compress_level == GMIO_ZLIB_COMPRESS_LEVEL_NONE) + return Z_NO_COMPRESSION; + return gmio_compress_level; +} + +static int gmio_to_zlib_compress_memusage(int gmio_compress_memusage) +{ + if (gmio_compress_memusage == 0) + return 8; + return gmio_compress_memusage; +} + +int gmio_zlib_compress_init( + struct z_stream_s* z_stream, + const struct gmio_zlib_compress_options* z_opts) +{ + const int zlib_compress_level = + gmio_to_zlib_compress_level(z_opts->level); + const int zlib_compress_memusage = + gmio_to_zlib_compress_memusage(z_opts->memory_usage); + const int z_init_error = + deflateInit2_( + z_stream, + zlib_compress_level, + Z_DEFLATED, /* Method */ + 15, /* Window bits(default value) */ + zlib_compress_memusage, + z_opts->strategy, + ZLIB_VERSION, + sizeof(struct z_stream_s)); + return zlib_error_to_gmio_error(z_init_error); +} + +bool gmio_check_zlib_compress_options( + int* error, const struct gmio_zlib_compress_options* z_opts) +{ + if (z_opts != NULL) { + if (!(-1 <= z_opts->level && z_opts->level <= 9)) + *error = GMIO_ERROR_ZLIB_INVALID_COMPRESS_LEVEL; + if (!(0 <= z_opts->memory_usage && z_opts->memory_usage <= 9)) + *error = GMIO_ERROR_ZLIB_INVALID_COMPRESS_MEMORY_USAGE; + } + return gmio_no_error(*error); +} diff --git a/src/gmio_core/internal/zlib_utils.h b/src/gmio_core/internal/zlib_utils.h new file mode 100644 index 0000000..6957ede --- /dev/null +++ b/src/gmio_core/internal/zlib_utils.h @@ -0,0 +1,49 @@ +/**************************************************************************** +** Copyright (c) 2016, Fougue Ltd. +** All rights reserved. +** +** Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions +** are met: +** +** 1. Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** +** 2. Redistributions in binary form must reproduce the above +** copyright notice, this list of conditions and the following +** disclaimer in the documentation and/or other materials provided +** with the distribution. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +****************************************************************************/ + +#ifndef GMIO_INTERNAL_ZLIB_UTILS_H +#define GMIO_INTERNAL_ZLIB_UTILS_H + +#include "../global.h" +#include "../zlib_compress.h" +#include + +/* Converts zlib error to gmio "zlib-specific" error */ +int zlib_error_to_gmio_error(int z_error); + +/* Wrapper around deflateInit2(), returns a converted gmio error code */ +int gmio_zlib_compress_init( + struct z_stream_s* z_stream, + const struct gmio_zlib_compress_options* z_opts); + +/* Checks zlib compression options */ +bool gmio_check_zlib_compress_options( + int* error, const struct gmio_zlib_compress_options* z_opts); + +#endif /* GMIO_INTERNAL_ZLIB_UTILS_H */ diff --git a/src/gmio_core/zlib_compress.h b/src/gmio_core/zlib_compress.h new file mode 100644 index 0000000..2bdcf90 --- /dev/null +++ b/src/gmio_core/zlib_compress.h @@ -0,0 +1,96 @@ +/**************************************************************************** +** Copyright (c) 2016, Fougue Ltd. +** All rights reserved. +** +** Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions +** are met: +** +** 1. Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** +** 2. Redistributions in binary form must reproduce the above +** copyright notice, this list of conditions and the following +** disclaimer in the documentation and/or other materials provided +** with the distribution. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +****************************************************************************/ + +/*! \file zlib_compress.h + * Options for using compression with zlib + * + * \addtogroup gmio_core + * @{ + */ + +#ifndef GMIO_ZLIB_COMPRESS_H +#define GMIO_ZLIB_COMPRESS_H + +#include "global.h" + +/* TODO: check enum values in unit tests*/ +/*! zlib compression level, specific values */ +enum gmio_zlib_compress_level +{ + GMIO_ZLIB_COMPRESS_LEVEL_NONE = -1, /*! -> Z_NO_COMPRESSION */ + GMIO_ZLIB_COMPRESS_LEVEL_DEFAULT = 0, /*! -> Z_DEFAULT_COMPRESSION */ + GMIO_ZLIB_COMPRESS_LEVEL_BEST_SPEED = 1, /*! -> Z_BEST_SPEED */ + GMIO_ZLIB_COMPRESS_LEVEL_BEST_SIZE = 9 /*! -> Z_BEST_COMPRESSION */ +}; + +/* TODO: check enum values in unit tests*/ +/*! zlib compression strategy */ +enum gmio_zlib_compress_strategy +{ + GMIO_ZLIB_COMPRESSION_STRATEGY_DEFAULT = 0, /*! -> Z_DEFAULT_STRATEGY */ + GMIO_ZLIB_COMPRESSION_STRATEGY_FILTERED = 1, /*! -> Z_FILTERED */ + GMIO_ZLIB_COMPRESSION_STRATEGY_HUFFMAN_ONLY = 2, /*! -> Z_HUFFMAN_ONLY */ + GMIO_ZLIB_COMPRESSION_STRATEGY_RLE = 3, /*! -> Z_RLE */ + GMIO_ZLIB_COMPRESSION_STRATEGY_FIXED = 4 /*! -> Z_FIXED */ +}; + +/*! zlib compression options + * + * Initialising gmio_zlib_compress_options with \c {0} (or \c {} in C++) is the + * convenient way to set default values. + */ +struct gmio_zlib_compress_options +{ + /*! Compression level + * + * \c 0 : default compression + * \c 1 : best speed + * \c 9 : best compression */ + uint8_t level; + + /*! Compression strategy + * + * \c 0 : default strategy + * \c 1 : filtered + * \c 9 : best compression */ + enum gmio_zlib_compress_strategy strategy; + + /*! Specifies how much memory should be allocated for the internal + * compression state + * + * The value must belongs to \c [1..9] or equals to \c 0 which maps to the + * default usage. + * + * \c 1 uses minimum memory but is slow and reduces compression ratio + * \c 9 uses maximum memory for optimal speed + */ + uint8_t memory_usage; +}; + +#endif /* GMIO_ZLIB_COMPRESS_H */ From f369553af98a98b2156f96c96645b82dbd971c5e Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Wed, 14 Dec 2016 15:28:51 +0100 Subject: [PATCH 15/81] gmio_core: add 64b functions in byte_codec.h --- src/gmio_core/internal/byte_codec.h | 113 ++++++++++++++++++++++------ tests/test_core_internal.c | 39 ++++++++-- 2 files changed, 120 insertions(+), 32 deletions(-) diff --git a/src/gmio_core/internal/byte_codec.h b/src/gmio_core/internal/byte_codec.h index 6f2caff..82543bd 100644 --- a/src/gmio_core/internal/byte_codec.h +++ b/src/gmio_core/internal/byte_codec.h @@ -32,54 +32,81 @@ #include "../global.h" -/*! Reads a 16bit integer from memory-location \p bytes (little-endian) */ -GMIO_INLINE uint16_t gmio_decode_uint16_le(const uint8_t* bytes) +/* Functions that read NNbit uint from memory (little-endian) + * uintNN_t gmio_decode_uintNN_le(const uint8_t* bytes) + * + * Functions that read NNbit uint from memory (big-endian) + * uintNN_t gmio_decode_uintNN_be(const uint8_t* bytes) + * + * Functions that writes NNbit uint to memory in little-endian + * uintNN_t gmio_encode_uintNN_le(uintNN_t val, uint8_t* bytes); + * + * Functions that writes NNbit uint to memory in big-endian + * uintNN_t gmio_encode_uintNN_be(uintNN_t val, uint8_t* bytes); + */ + +GMIO_INLINE uint16_t gmio_decode_uint16_le(const uint8_t* bytes); +GMIO_INLINE uint16_t gmio_decode_uint16_be(const uint8_t* bytes); +GMIO_INLINE void gmio_encode_uint16_le(uint16_t val, uint8_t* bytes); +GMIO_INLINE void gmio_encode_uint16_be(uint16_t val, uint8_t* bytes); + +GMIO_INLINE uint32_t gmio_decode_uint32_le(const uint8_t* bytes); +GMIO_INLINE uint32_t gmio_decode_uint32_be(const uint8_t* bytes); +GMIO_INLINE void gmio_encode_uint32_le(uint32_t val, uint8_t* bytes); +GMIO_INLINE void gmio_encode_uint32_be(uint32_t val, uint8_t* bytes); + +#ifdef GMIO_HAVE_INT64_TYPE +GMIO_INLINE uint64_t gmio_decode_uint64_le(const uint8_t* bytes); +GMIO_INLINE uint64_t gmio_decode_uint64_be(const uint8_t* bytes); +GMIO_INLINE void gmio_encode_uint64_le(uint64_t val, uint8_t* bytes); +GMIO_INLINE void gmio_encode_uint64_be(uint64_t val, uint8_t* bytes); +#endif /* GMIO_HAVE_INT64_TYPE */ + + + +/* + * Implementation + */ + +uint16_t gmio_decode_uint16_le(const uint8_t* bytes) { /* |0 |1 | */ /* |BB|AA| -> 0xAABB */ return (bytes[1] << 8) | bytes[0]; } -/*! Reads a 16bit integer from memory-location \p bytes (big-endian) */ -GMIO_INLINE uint16_t gmio_decode_uint16_be(const uint8_t* bytes) +uint16_t gmio_decode_uint16_be(const uint8_t* bytes) { /* |0 |1 | */ /* |AA|BB| -> 0xAABB */ return (bytes[0] << 8) | bytes[1]; } -/*! Writes 16bit integer \p val to the memory location at \p bytes in - * little-endian */ -GMIO_INLINE void gmio_encode_uint16_le(uint16_t val, uint8_t* bytes) +void gmio_encode_uint16_le(uint16_t val, uint8_t* bytes) { bytes[0] = val & 0xFF; bytes[1] = (val >> 8) & 0xFF; } -/*! Reads a 32bit integer from memory-location \p bytes (little-endian) */ -GMIO_INLINE uint32_t gmio_decode_uint32_le(const uint8_t* bytes) +void gmio_encode_uint16_be(uint16_t val, uint8_t* bytes) +{ + bytes[0] = (val >> 8) & 0xFF; + bytes[1] = val & 0xFF; +} + +uint32_t gmio_decode_uint32_le(const uint8_t* bytes) { /* |DD|CC|BB|AA| -> 0xAABBCCDD */ return bytes[0] | (bytes[1] << 8) | (bytes[2] << 16) | (bytes[3] << 24); } -/*! Reads a 32bit integer from memory-location \p bytes (mixed-endian) */ -GMIO_INLINE uint32_t gmio_decode_uint32_me(const uint8_t* bytes) -{ - /* |DD|CC|BB|AA| -> 0xCCDDAABB */ - return (bytes[0] << 16) | (bytes[1] << 24) | (bytes[3] << 8) | bytes[2]; -} - -/*! Reads a 32bit integer from memory-location \p bytes (big-endian) */ -GMIO_INLINE uint32_t gmio_decode_uint32_be(const uint8_t* bytes) +uint32_t gmio_decode_uint32_be(const uint8_t* bytes) { /* |DD|CC|BB|AA| -> 0xDDCCBBAA */ return bytes[3] | (bytes[2] << 8) | (bytes[1] << 16) | (bytes[0] << 24); } -/*! Writes 32bit integer \p val to the memory location at \p bytes in - * little-endian */ -GMIO_INLINE void gmio_encode_uint32_le(uint32_t val, uint8_t* bytes) +void gmio_encode_uint32_le(uint32_t val, uint8_t* bytes) { bytes[0] = val & 0xFF; bytes[1] = (val >> 8) & 0xFF; @@ -87,9 +114,7 @@ GMIO_INLINE void gmio_encode_uint32_le(uint32_t val, uint8_t* bytes) bytes[3] = (val >> 24) & 0xFF; } -/*! Writes 32bit integer \p val to the memory location at \p bytes in - * big-endian */ -GMIO_INLINE void gmio_encode_uint32_be(uint32_t val, uint8_t* bytes) +void gmio_encode_uint32_be(uint32_t val, uint8_t* bytes) { bytes[0] = (val >> 24) & 0xFF; bytes[1] = (val >> 16) & 0xFF; @@ -97,4 +122,44 @@ GMIO_INLINE void gmio_encode_uint32_be(uint32_t val, uint8_t* bytes) bytes[3] = val & 0xFF; } +#ifdef GMIO_HAVE_INT64_TYPE + +uint64_t gmio_decode_uint64_le(const uint8_t* bytes) +{ + const uint64_t h32 = gmio_decode_uint32_le(bytes + 4); /* Decode high 32b */ + return (h32 << 32) | gmio_decode_uint32_le(bytes); +} + +uint64_t gmio_decode_uint64_be(const uint8_t* bytes) +{ + const uint64_t l32 = gmio_decode_uint32_be(bytes); /* Decode low 32b */ + return (l32 << 32) | gmio_decode_uint32_be(bytes + 4); +} + +void gmio_encode_uint64_le(uint64_t val, uint8_t* bytes) +{ + bytes[0] = val & 0xFF; + bytes[1] = (val >> 8) & 0xFF; + bytes[2] = (val >> 16) & 0xFF; + bytes[3] = (val >> 24) & 0xFF; + bytes[4] = (val >> 32) & 0xFF; + bytes[5] = (val >> 40) & 0xFF; + bytes[6] = (val >> 48) & 0xFF; + bytes[7] = (val >> 56) & 0xFF; +} + +void gmio_encode_uint64_be(uint64_t val, uint8_t* bytes) +{ + bytes[0] = (val >> 56) & 0xFF; + bytes[1] = (val >> 48) & 0xFF; + bytes[2] = (val >> 40) & 0xFF; + bytes[3] = (val >> 32) & 0xFF; + bytes[4] = (val >> 24) & 0xFF; + bytes[5] = (val >> 16) & 0xFF; + bytes[6] = (val >> 8) & 0xFF; + bytes[7] = val & 0xFF; +} + +#endif /* GMIO_HAVE_INT64_TYPE */ + #endif /* GMIO_INTERNAL_BYTE_CODEC_H */ diff --git a/tests/test_core_internal.c b/tests/test_core_internal.c index e53a3d8..28d5c20 100644 --- a/tests/test_core_internal.c +++ b/tests/test_core_internal.c @@ -60,21 +60,44 @@ static const char* test_internal__byte_swap() static const char* test_internal__byte_codec() { { /* decode */ - const uint8_t data[] = { 0x11, 0x22, 0x33, 0x44 }; + const uint8_t data[] = { 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88 }; UTEST_ASSERT(gmio_decode_uint16_le(data) == 0x2211); UTEST_ASSERT(gmio_decode_uint16_be(data) == 0x1122); UTEST_ASSERT(gmio_decode_uint32_le(data) == 0x44332211); UTEST_ASSERT(gmio_decode_uint32_be(data) == 0x11223344); +#ifdef GMIO_HAVE_INT64_TYPE + UTEST_ASSERT(gmio_decode_uint64_le(data) == 0x8877665544332211); + UTEST_ASSERT(gmio_decode_uint64_be(data) == 0x1122334455667788); +#endif } { /* encode */ - uint8_t data[] = { 0, 0, 0, 0 }; - gmio_encode_uint16_le(0x1122, data); - UTEST_ASSERT(data[0] == 0x22 && data[1] == 0x11); - gmio_encode_uint32_le(0x11223344, data); - UTEST_ASSERT(data[0] == 0x44 && data[1] == 0x33 && data[2] == 0x22 && data[3] == 0x11); - gmio_encode_uint32_be(0x11223344, data); - UTEST_ASSERT(data[3] == 0x44 && data[2] == 0x33 && data[1] == 0x22 && data[0] == 0x11); + uint8_t bytes[8] = { 0, 0, 0, 0, 0, 0, 0, 0 }; + + gmio_encode_uint16_le(0x1122, bytes); + UTEST_ASSERT(bytes[0] == 0x22 && bytes[1] == 0x11); + gmio_encode_uint16_be(0x1122, bytes); + UTEST_ASSERT(bytes[0] == 0x11 && bytes[1] == 0x22); + + gmio_encode_uint32_le(0x11223344, bytes); + static const uint8_t bytes_uint32_le[] = { 0x44, 0x33, 0x22, 0x11 }; + UTEST_ASSERT(memcmp(bytes, bytes_uint32_le, 4) == 0); + + gmio_encode_uint32_be(0x11223344, bytes); + static const uint8_t bytes_uint32_be[] = { 0x11, 0x22, 0x33, 0x44 }; + UTEST_ASSERT(memcmp(bytes, bytes_uint32_be, 4) == 0); + +#ifdef GMIO_HAVE_INT64_TYPE + gmio_encode_uint64_le(0x1122334455667788, bytes); + static const uint8_t bytes_uint64_le[] = + { 0x88, 0x77, 0x66, 0x55, 0x44, 0x33, 0x22, 0x11 }; + UTEST_ASSERT(memcmp(bytes, bytes_uint64_le, 8) == 0); + + gmio_encode_uint64_be(0x1122334455667788, bytes); + static const uint8_t bytes_uint64_be[] = + { 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88 }; + UTEST_ASSERT(memcmp(bytes, bytes_uint64_be, 8) == 0); +#endif } return NULL; From d8da7293efcccd1d2f2f49ae518be576399a6f26 Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Wed, 14 Dec 2016 15:46:59 +0100 Subject: [PATCH 16/81] Drop C90 support for C99 instead --- .travis.yml | 7 ---- CMakeLists.txt | 52 ++++++++++++--------------- README.md | 2 +- appveyor.yml | 7 ++-- src/3rdparty/miloyip_itoa/branchlut.c | 4 +-- travis-build-script.sh | 10 ------ 6 files changed, 27 insertions(+), 55 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8df475d..cccf757 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,9 +19,6 @@ matrix: # Linux GCC-4.6 debug google_double-conversion - compiler: gcc env: TRAVIS_BUILD_TYPE=Debug TRAVIS_FLOAT2STR_LIB=google_doubleconversion - # Linux GCC-4.6 debug no-dll c90 - - compiler: gcc - env: TRAVIS_BUILD_TYPE=Debug TRAVIS_BUILD_DLL=OFF TRAVIS_STRICT_C90=ON # Linux GCC-4.9 release - compiler: gcc-4.9 addons: *gcc49-packages @@ -34,10 +31,6 @@ matrix: - os: osx compiler: clang env: TRAVIS_BUILD_TYPE=Debug TRAVIS_FLOAT2STR_LIB=google_doubleconversion - # OSX Clang debug no-dll c90 - - os: osx - compiler: clang - env: TRAVIS_BUILD_TYPE=Debug TRAVIS_BUILD_DLL=OFF TRAVIS_STRICT_C90=ON # OSX Clang release - os: osx compiler: clang diff --git a/CMakeLists.txt b/CMakeLists.txt index f39d062..24e027b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -68,7 +68,6 @@ endif() # Options option(GMIO_BUILD_DLL "Build gmio also as a shared library(DLL)" ON) -option(GMIO_BUILD_STRICT_C90 "Build gmio library(and tests) with strict conformance to C90 standard" OFF) option(GMIO_BUILD_BENCHMARKS "Build performance benchmarks for the gmio library" OFF) option(GMIO_BUILD_EXAMPLES "Build gmio examples" OFF) option(GMIO_BUILD_TESTS_FAKE_SUPPORT "Build tests/fake_support target" OFF) @@ -123,19 +122,14 @@ message(STATUS "GMIO_TARGET_ARCH_BIT_SIZE = ${GMIO_TARGET_ARCH_BIT_SIZE}") include(TestBigEndian) test_big_endian(GMIO_HOST_IS_BIG_ENDIAN) -# Adapt C compiler flags to satisfy the GMIO_BUILD_STRICT_C90 option -# It must be done before checking non ANSI features(C99, POSIX, ...) -if(GMIO_BUILD_STRICT_C90) - if(CMAKE_C_COMPILER_IS_GCC_COMPATIBLE) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ansi -pedantic-errors") - elseif(MSVC) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /Za") - endif() +# Adapt C compiler flags to enable strict ISO C99 conformance +if(CMAKE_C_COMPILER_IS_GCC_COMPATIBLE) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -pedantic-errors") endif() set(CMAKE_REQUIRED_FLAGS "${CMAKE_C_FLAGS}") -# Some compilers (like GCC v4.9) don't disable in C90 mode +# Some compilers (like GCC v4.9) don't disable when needed check_include_files(stdint.h GMIO_HAVE_STDINT_H) # Find size of short, int and long types @@ -167,29 +161,27 @@ elseif(HAVE_GMIO_SIZEOF_LONG_LONG) set(GMIO_HAVE_LONG_LONG ${HAVE_GMIO_SIZEOF_LONG_LONG}) endif() -# Check C99 features -if(NOT GMIO_BUILD_STRICT_C90) - if(CMAKE_C_COMPILER_IS_GCC_COMPATIBLE) - list(APPEND CMAKE_REQUIRED_LIBRARIES m) # -lm - endif() - check_function_exists(powf GMIO_HAVE_POWF_FUNC) - check_function_exists(sqrtf GMIO_HAVE_SQRTF_FUNC) - check_function_exists(strtof GMIO_HAVE_STRTOF_FUNC) - check_symbol_exists(isfinite math.h GMIO_HAVE_ISFINITE_MACRO) - check_symbol_exists(isnan math.h GMIO_HAVE_ISNAN_MACRO) - set(CMAKE_REQUIRED_LIBRARIES) # Pop changes +# Check Available C99 features +if(CMAKE_C_COMPILER_IS_GCC_COMPATIBLE) + list(APPEND CMAKE_REQUIRED_LIBRARIES m) # -lm +endif() +check_function_exists(powf GMIO_HAVE_POWF_FUNC) +check_function_exists(sqrtf GMIO_HAVE_SQRTF_FUNC) +check_function_exists(strtof GMIO_HAVE_STRTOF_FUNC) +check_symbol_exists(isfinite math.h GMIO_HAVE_ISFINITE_MACRO) +check_symbol_exists(isnan math.h GMIO_HAVE_ISNAN_MACRO) +set(CMAKE_REQUIRED_LIBRARIES) # Pop changes - check_include_files(stdbool.h GMIO_HAVE_STDBOOL_H) +check_include_files(stdbool.h GMIO_HAVE_STDBOOL_H) - check_function_exists(snprintf GMIO_HAVE_SNPRINTF_FUNC) - if(WIN32 AND NOT GMIO_HAVE_SNPRINTF_FUNC) - check_function_exists(_snprintf GMIO_HAVE_WIN__SNPRINTF_FUNC) - endif() +check_function_exists(snprintf GMIO_HAVE_SNPRINTF_FUNC) +if(WIN32 AND NOT GMIO_HAVE_SNPRINTF_FUNC) + check_function_exists(_snprintf GMIO_HAVE_WIN__SNPRINTF_FUNC) +endif() - check_function_exists(vsnprintf GMIO_HAVE_VSNPRINTF_FUNC) - if(WIN32 AND NOT GMIO_HAVE_VSNPRINTF_FUNC) - check_function_exists(_vsnprintf GMIO_HAVE_WIN__VSNPRINTF_FUNC) - endif() +check_function_exists(vsnprintf GMIO_HAVE_VSNPRINTF_FUNC) +if(WIN32 AND NOT GMIO_HAVE_VSNPRINTF_FUNC) + check_function_exists(_vsnprintf GMIO_HAVE_WIN__VSNPRINTF_FUNC) endif() # Check POSIX features diff --git a/README.md b/README.md index 7082478..927690f 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ gmio is a reusable C library providing complete I/O support for various CAD file formats(eg. [STL](https://en.wikipedia.org/wiki/STL_%28file_format%29)) gmio aims to be [fast](https://github.com/fougue/gmio/wiki/4.-Benchmarks), -portable(C90 conformance) and feature-rich. +portable(C99 conformance) and feature-rich. Main highlights: diff --git a/appveyor.yml b/appveyor.yml index 14df15b..d1a365a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -14,12 +14,10 @@ clone_folder: c:\projects\gmio.git environment: matrix: - - APPVEYOR_BUILD_DLL: ON - APPVEYOR_CMAKE_GENERATOR: "Visual Studio 12 2013" + - APPVEYOR_CMAKE_GENERATOR: "Visual Studio 12 2013" APPVEYOR_FLOAT2STR_LIB: std - - APPVEYOR_BUILD_DLL: ON - APPVEYOR_CMAKE_GENERATOR: "Visual Studio 12 2013" + - APPVEYOR_CMAKE_GENERATOR: "Visual Studio 12 2013" APPVEYOR_FLOAT2STR_LIB: google_doubleconversion build: @@ -32,7 +30,6 @@ build_script: -G "%APPVEYOR_CMAKE_GENERATOR%" ^ -DCMAKE_BUILD_TYPE=%CONFIGURATION% ^ -DCMAKE_DEBUG_POSTFIX=_d ^ - -DGMIO_BUILD_DLL=%APPVEYOR_BUILD_DLL% ^ -DGMIO_FLOAT2STR_LIB=%APPVEYOR_FLOAT2STR_LIB% ^ -DGMIO_BUILD_EXAMPLES=ON ^ -DGMIO_BUILD_BENCHMARKS=ON ^ diff --git a/src/3rdparty/miloyip_itoa/branchlut.c b/src/3rdparty/miloyip_itoa/branchlut.c index 24a8147..d892ec5 100644 --- a/src/3rdparty/miloyip_itoa/branchlut.c +++ b/src/3rdparty/miloyip_itoa/branchlut.c @@ -3,7 +3,7 @@ * https://github.com/miloyip/itoa-benchmark/src/branchlut.cpp * commit #27c6059 * - * Adapted to be C90 compatible + * Adapted to be C99 compatible */ #include "branchlut.h" @@ -112,7 +112,7 @@ char* i32toa_branchlut(int32_t value, char* buffer) { } #ifdef GMIO_HAVE_INT64_TYPE -/* C90 does not support ULL literals */ +/* In case the compiler does not support ULL literals(C99) */ #define GMIO_UINT64_C(high32, low32) (((uint64_t)(high32) << 32) | (low32)) static const uint64_t one_e16 = GMIO_UINT64_C(0x002386f2, 0x6fc10000); static const uint64_t one_e15 = GMIO_UINT64_C(0x00038d7e, 0xa4c68000); diff --git a/travis-build-script.sh b/travis-build-script.sh index 46aad86..e506a29 100644 --- a/travis-build-script.sh +++ b/travis-build-script.sh @@ -21,14 +21,6 @@ if [ -n "${TRAVIS_GCC_VERSION}" ]; then export CXX=g++-$TRAVIS_GCC_VERSION; fi -if [ -z "${TRAVIS_BUILD_DLL}" ]; then - export TRAVIS_BUILD_DLL=OFF; -fi - -if [ -z "${TRAVIS_STRICT_C90}" ]; then - export TRAVIS_STRICT_C90=OFF; -fi - if [ -z "${TRAVIS_FLOAT2STR_LIB}" ]; then export TRAVIS_FLOAT2STR_LIB=std; fi @@ -41,8 +33,6 @@ cmake .. -G "Unix Makefiles" \ -DCMAKE_DEBUG_POSTFIX=_d \ -DCMAKE_BUILD_TYPE=$TRAVIS_BUILD_TYPE \ -DCMAKE_INSTALL_PREFIX=../install \ - -DGMIO_BUILD_DLL=$TRAVIS_BUILD_DLL \ - -DGMIO_BUILD_STRICT_C90=$TRAVIS_STRICT_C90 \ -DGMIO_BUILD_EXAMPLES=ON \ -DGMIO_BUILD_BENCHMARKS=ON \ -DGMIO_BUILD_BENCHMARK_ASSIMP=OFF \ From 73eb7a522ec94b5787383c4a3328212a6ea9286e Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Fri, 23 Dec 2016 13:04:52 +0100 Subject: [PATCH 17/81] gmio_core/internal: add ZIP utils --- src/gmio_core/internal/zip_utils.c | 361 +++++++++++++++++++++++++++++ src/gmio_core/internal/zip_utils.h | 284 +++++++++++++++++++++++ 2 files changed, 645 insertions(+) create mode 100644 src/gmio_core/internal/zip_utils.c create mode 100644 src/gmio_core/internal/zip_utils.h diff --git a/src/gmio_core/internal/zip_utils.c b/src/gmio_core/internal/zip_utils.c new file mode 100644 index 0000000..22575a9 --- /dev/null +++ b/src/gmio_core/internal/zip_utils.c @@ -0,0 +1,361 @@ +/**************************************************************************** +** Copyright (c) 2016, Fougue Ltd. +** All rights reserved. +** +** Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions +** are met: +** +** 1. Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** +** 2. Redistributions in binary form must reproduce the above +** copyright notice, this list of conditions and the following +** disclaimer in the documentation and/or other materials provided +** with the distribution. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +****************************************************************************/ + +#include "zip_utils.h" + +#include "../error.h" +#include "byte_codec.h" +#include "helper_stream.h" +#include + +/* ---------- + * Constants + * ---------- */ + +enum { + GMIO_ZIP_SIZE_LOCAL_FILE_HEADER = 4 + 5*2 + 3*4 + 2*2, + GMIO_ZIP_SIZE_CENTRAL_DIRECTORY_HEADER = 4 + 6*2 + 3*4 + 5*2 +2*4, + GMIO_ZIP64_SIZE_DATA_DESCRIPTOR = 4 + 2*8, + GMIO_ZIP_SIZE_DATA_DESCRIPTOR = 4 + 2*4, + GMIO_ZIP_SIZE_END_OF_CENTRAL_DIRECTORY_RECORD = 4 + 4*2 + 2*4 + 2 +}; + +/* ---------- + * Internal functions + * ---------- */ + +/* See http://www.vsft.com/hal/dostime.htm */ +static uint32_t gmio_to_msdos_datetime(const struct tm* datetime) +{ + const uint32_t msdos_datetime = + /* Time */ + (datetime->tm_sec) /* bit 0-4 */ + | (datetime->tm_min << 5) /* bit 5-10 */ + | (datetime->tm_hour << 11) /* bit 11-15 */ + /* Date */ + | (datetime->tm_mday << 16) /* bit 16-20 */ + | ((datetime->tm_mon + 1) << 21) /* bit 21-24 */ + | ((datetime->tm_year - 80) << 25); /* bit 21-24 */ + return msdos_datetime; +} + +/* Returns a non-null datetime, if arg is NULL it returns current gmtime() */ +static const struct tm* gmio_nonnull_datetime(const struct tm* datetime) +{ + if (datetime == NULL) { + const time_t current_time = time(NULL); + return gmtime(¤t_time); /* UTC time */ + } + return datetime; +} + +#ifdef GMIO_HAVE_INT64_TYPE +/* Encodes little-endian 64b val in buffer and returns advanced buffer pos */ +static uint8_t* gmio_adv_encode_uint64_le(uint64_t val, uint8_t* bytes) +{ + gmio_encode_uint64_le(val, bytes); + return bytes + 8; +} +#endif + +/* Encodes little-endian 32b val in buffer and returns advanced buffer pos */ +static uint8_t* gmio_adv_encode_uint32_le(uint32_t val, uint8_t* bytes) +{ + gmio_encode_uint32_le(val, bytes); + return bytes + 4; +} + +/* Encodes little-endian 16b val in buffer and returns advanced buffer pos */ +static uint8_t* gmio_adv_encode_uint16_le(uint16_t val, uint8_t* bytes) +{ + gmio_encode_uint16_le(val, bytes); + return bytes + 2; +} + +/* Helper to facilitate return from gmio_zip_write_xxx() API functions */ +static size_t gmio_zip_write_returnhelper( + struct gmio_stream* stream, size_t written, size_t expected, int* error) +{ + if (error != NULL) { + const bool no_error = written == expected && !gmio_stream_error(stream); + *error = no_error ? GMIO_ERROR_OK : GMIO_ERROR_STREAM; + } + return written; +} + +/* ---------- + * API functions + * ---------- */ + +size_t gmio_zip_write_local_file_header( + struct gmio_stream* stream, + const struct gmio_zip_local_file_header* info, + int* error) +{ + uint8_t fixed_data[GMIO_ZIP_SIZE_LOCAL_FILE_HEADER]; + uint8_t* buff = fixed_data; + + const bool use_data_descriptor = + info->general_purpose_flags & GMIO_ZIP_GENERAL_PURPOSE_FLAG_USE_DATA_DESCRIPTOR; + + /* 4-bytes magic number 0x04034b50 */ + buff = gmio_adv_encode_uint32_le(0x04034b50, buff); + /* 2-bytes version needed to extract */ + buff = gmio_adv_encode_uint16_le(info->version_needed_to_extract, buff); + /* 2-bytes general purpose bit flag */ + buff = gmio_adv_encode_uint16_le(info->general_purpose_flags, buff); + /* 2-bytes compression method */ + buff = gmio_adv_encode_uint16_le(info->compress_method, buff); + /* 2-bytes last mod file time */ + /* 2-bytes last mod file date */ + const struct tm* lastmod = gmio_nonnull_datetime(info->lastmod_datetime); + buff = gmio_adv_encode_uint32_le(gmio_to_msdos_datetime(lastmod), buff); + /* 4-bytes crc-32 */ + buff = gmio_adv_encode_uint32_le( + use_data_descriptor ? 0 : info->crc32, buff); + /* 4-bytes compressed size */ + buff = gmio_adv_encode_uint32_le( + use_data_descriptor ? 0 : info->compressed_size, buff); + /* 4-bytes uncompressed size */ + buff = gmio_adv_encode_uint32_le( + use_data_descriptor ? 0 : info->uncompressed_size, buff); + /* 2-bytes file name length */ + buff = gmio_adv_encode_uint16_le(info->filename_len, buff); + /* 2-bytes extra field length */ + buff = gmio_adv_encode_uint16_le(info->extrafield_len, buff); + + /* Write to stream */ + const size_t expected_written_len = + sizeof(fixed_data) + info->filename_len + info->extrafield_len; + size_t written_len = 0; + written_len += + gmio_stream_write_bytes(stream, fixed_data, sizeof(fixed_data)); + written_len += + gmio_stream_write_bytes(stream, info->filename, info->filename_len); + written_len += + gmio_stream_write_bytes(stream, info->extrafield, info->extrafield_len); + return gmio_zip_write_returnhelper( + stream, written_len, expected_written_len, error); +} + +size_t gmio_zip_write_data_descriptor( + struct gmio_stream *stream, + const struct gmio_zip_data_descriptor *info, + int* error) +{ + const size_t fixed_data_len = + info->use_zip64 ? + GMIO_ZIP64_SIZE_DATA_DESCRIPTOR : + GMIO_ZIP_SIZE_DATA_DESCRIPTOR; + uint8_t fixed_data[GMIO_ZIP64_SIZE_DATA_DESCRIPTOR]; + uint8_t* buff = fixed_data; + + /* 4-bytes crc-32 */ + buff = gmio_adv_encode_uint32_le(info->crc32, buff); + /* Compressed size and uncompressed size (4 or 8 bytes) */ + if (info->use_zip64) { +#ifdef GMIO_HAVE_INT64_TYPE + buff = gmio_adv_encode_uint64_le(info->compressed_size, buff); + buff = gmio_adv_encode_uint64_le(info->uncompressed_size, buff); +#else + return GMIO_ERROR_UNKNOWN; /* TODO: error code */ +#endif + } + else { + if (info->compressed_size <= UINT32_MAX + && info->uncompressed_size <= UINT32_MAX) + { + buff = gmio_adv_encode_uint32_le((uint32_t)info->compressed_size, buff); + buff = gmio_adv_encode_uint32_le((uint32_t)info->uncompressed_size, buff); + } + else { + return GMIO_ERROR_UNKNOWN; /* TODO: error code */ + } + } + + /* Write to stream */ + const size_t written_len = + gmio_stream_write_bytes(stream, fixed_data, fixed_data_len); + return gmio_zip_write_returnhelper( + stream, written_len, fixed_data_len, error); +} + +size_t gmio_zip_write_central_directory_header( + struct gmio_stream *stream, + const struct gmio_zip_central_directory_header *info, + int* error) +{ + uint8_t fixed_data[GMIO_ZIP_SIZE_CENTRAL_DIRECTORY_HEADER]; + uint8_t* buff = fixed_data; + + /* 4-bytes magic number 0x02014b50 */ + buff = gmio_adv_encode_uint32_le(0x02014b50, buff); + /* 2-bytes version made by */ + buff = gmio_adv_encode_uint16_le(info->version_made_by, buff); + /* 2-bytes version needed to extract */ + buff = gmio_adv_encode_uint16_le(info->version_needed_to_extract, buff); + /* 2-bytes general purpose bit flag */ + buff = gmio_adv_encode_uint16_le(info->general_purpose_flags, buff); + /* 2-bytes compression method */ + buff = gmio_adv_encode_uint16_le(info->compress_method, buff); + /* 2-bytes last mod file time */ + /* 2-bytes last mod file date */ + const struct tm* lastmod = gmio_nonnull_datetime(info->lastmod_datetime); + buff = gmio_adv_encode_uint32_le(gmio_to_msdos_datetime(lastmod), buff); + /* 4-bytes crc-32 */ + buff = gmio_adv_encode_uint32_le(info->crc32, buff); + /* 4-bytes compressed size */ + const uint32_t compressed_size = + info->use_zip64 ? UINT32_MAX : info->compressed_size; + buff = gmio_adv_encode_uint32_le(compressed_size, buff); + /* 4-bytes uncompressed size */ + const uint32_t uncompressed_size = + info->use_zip64 ? UINT32_MAX : info->uncompressed_size; + buff = gmio_adv_encode_uint32_le(uncompressed_size, buff); + /* 2-bytes file name length */ + buff = gmio_adv_encode_uint16_le(info->filename_len, buff); + /* 2-bytes extra field length */ + buff = gmio_adv_encode_uint16_le(info->extrafield_len, buff); + /* 2-bytes file comment length */ + buff = gmio_adv_encode_uint16_le(info->filecomment_len, buff); + /* 2-bytes disk number start */ + buff = gmio_adv_encode_uint16_le(info->disk_nb_start, buff); + /* 2-bytes internal file attributes */ + buff = gmio_adv_encode_uint16_le(info->internal_file_attrs, buff); + /* 4-bytes external file attributes */ + buff = gmio_adv_encode_uint32_le(info->external_file_attrs, buff); + /* 4-bytes relative offset of local header */ + const uint32_t relative_offset_local_header = + info->use_zip64 ? UINT32_MAX : info->relative_offset_local_header; + buff = gmio_adv_encode_uint32_le(relative_offset_local_header, buff); + + /* Write to stream */ + const size_t expected_written_len = + sizeof(fixed_data) + + info->filename_len + info->extrafield_len + info->filecomment_len; + size_t written_len = 0; + written_len += + gmio_stream_write_bytes(stream, fixed_data, sizeof(fixed_data)); + written_len += + gmio_stream_write_bytes(stream, info->filename, info->filename_len); + written_len += + gmio_stream_write_bytes(stream, info->extrafield, info->extrafield_len); + written_len += + gmio_stream_write_bytes(stream, info->filecomment, info->filecomment_len); + return gmio_zip_write_returnhelper( + stream, written_len, expected_written_len, error); +} + +size_t gmio_zip64_write_extrafield_extended_info( + uint8_t *buff, + size_t buff_capacity, + const struct gmio_zip64_extrablock_extended_info *info, + int* error) +{ + if (buff_capacity < GMIO_ZIP64_SIZE_EXTRAFIELD_EXTENDED_INFO) { + *error = GMIO_ERROR_INVALID_MEMBLOCK_SIZE; + return 0; + } +#ifdef GMIO_HAVE_INT64_TYPE + /* Tag */ + buff = gmio_adv_encode_uint16_le(0x0001, buff); + /* Size of the "extra" block */ + buff = gmio_adv_encode_uint16_le( + GMIO_ZIP64_SIZE_EXTRAFIELD_EXTENDED_INFO - 2, buff); + /* Original uncompressed file size */ + buff = gmio_adv_encode_uint64_le(info->uncompressed_size, buff); + /* Size of compressed data */ + buff = gmio_adv_encode_uint64_le(info->compressed_size, buff); + /* Offset of local header record */ + buff = gmio_adv_encode_uint64_le(info->relative_offset_local_header, buff); + /* Number of the disk on which this file starts */ + buff = gmio_adv_encode_uint32_le(info->disk_nb_start, buff); + *error = GMIO_ERROR_OK; + return GMIO_ZIP64_SIZE_EXTRAFIELD_EXTENDED_INFO; +#else + *error = GMIO_ERROR_UNKNOWN; /* TODO: error code */ + return 0; +#endif +} + +size_t gmio_zip_write_end_of_central_directory_record( + struct gmio_stream *stream, + const struct gmio_zip_end_of_central_directory_record *info, + int* error) +{ + uint8_t fixed_data[GMIO_ZIP_SIZE_END_OF_CENTRAL_DIRECTORY_RECORD]; + uint8_t* buff = fixed_data; + + /* 4-bytes magic number 0x06054b50 */ + buff = gmio_adv_encode_uint32_le(0x06054b50, buff); + + /* 2-bytes number of this disk */ + const uint16_t disk_nb = info->use_zip64 ? UINT16_MAX : info->disk_nb; + buff = gmio_adv_encode_uint16_le(disk_nb, buff); + + /* 2-bytes number of the disk with the start of the central directory */ + const uint16_t disk_nb_with_start_of_central_dir = + info->use_zip64 ? UINT16_MAX : info->disk_nb_with_start_of_central_dir; + buff = gmio_adv_encode_uint16_le(disk_nb_with_start_of_central_dir, buff); + + /* 2-bytes total number of entries in the central directory on this disk */ + const uint16_t total_entry_count_in_central_dir_on_disk = + info->use_zip64 ? UINT16_MAX : info->total_entry_count_in_central_dir_on_disk; + buff = gmio_adv_encode_uint16_le(total_entry_count_in_central_dir_on_disk, buff); + + /* 2-bytes total number of entries in the central directory */ + const uint16_t total_entry_count_in_central_dir = + info->use_zip64 ? UINT16_MAX : info->total_entry_count_in_central_dir; + buff = gmio_adv_encode_uint16_le(total_entry_count_in_central_dir, buff); + + /* 4-bytes size of the central directory */ + const uint32_t central_dir_size = + info->use_zip64 ? UINT32_MAX : info->central_dir_size; + buff = gmio_adv_encode_uint32_le(central_dir_size, buff); + + /* 4-bytes offset of start of central directory with respect to the starting + * disk number */ + const uint32_t start_offset_central_dir_from_disk_start_nb = + info->use_zip64 ? UINT32_MAX : info->start_offset_central_dir_from_disk_start_nb; + buff = gmio_adv_encode_uint32_le(start_offset_central_dir_from_disk_start_nb, buff); + + /* 2-bytes .ZIP file comment length */ + buff = gmio_adv_encode_uint16_le(info->filecomment_len, buff); + + /* Write to stream */ + const size_t expected_written_len = + sizeof(fixed_data) + info->filecomment_len; + size_t written_len = 0; + written_len += + gmio_stream_write_bytes(stream, fixed_data, sizeof(fixed_data)); + written_len += + gmio_stream_write_bytes(stream, info->filecomment, info->filecomment_len); + return gmio_zip_write_returnhelper( + stream, written_len, expected_written_len, error); +} diff --git a/src/gmio_core/internal/zip_utils.h b/src/gmio_core/internal/zip_utils.h new file mode 100644 index 0000000..85eccf9 --- /dev/null +++ b/src/gmio_core/internal/zip_utils.h @@ -0,0 +1,284 @@ +/**************************************************************************** +** Copyright (c) 2016, Fougue Ltd. +** All rights reserved. +** +** Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions +** are met: +** +** 1. Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** +** 2. Redistributions in binary form must reproduce the above +** copyright notice, this list of conditions and the following +** disclaimer in the documentation and/or other materials provided +** with the distribution. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +****************************************************************************/ + +#ifndef GMIO_INTERNAL_ZIP_UTILS_H +#define GMIO_INTERNAL_ZIP_UTILS_H + +#include "../global.h" + +#include "../stream.h" +#include + +enum gmio_zip_compress_method { + GMIO_ZIP_COMPRESS_METHOD_NO_COMPRESSION = 0, + GMIO_ZIP_COMPRESS_METHOD_SHRUNK = 1, + GMIO_ZIP_COMPRESS_METHOD_REDUCE_FACTOR_1 = 2, + GMIO_ZIP_COMPRESS_METHOD_REDUCE_FACTOR_2 = 3, + GMIO_ZIP_COMPRESS_METHOD_REDUCE_FACTOR_3 = 4, + GMIO_ZIP_COMPRESS_METHOD_REDUCE_FACTOR_4 = 5, + GMIO_ZIP_COMPRESS_METHOD_IMPLODE = 6, + GMIO_ZIP_COMPRESS_METHOD_DEFLATE = 8, + GMIO_ZIP_COMPRESS_METHOD_DEFLATE64 = 9, + GMIO_ZIP_COMPRESS_METHOD_PKWARE_IMPLODE = 10, + GMIO_ZIP_COMPRESS_METHOD_BZIP2 = 12, + GMIO_ZIP_COMPRESS_METHOD_LZMA = 14, + GMIO_ZIP_COMPRESS_METHOD_IBM_TERSE = 18, + GMIO_ZIP_COMPRESS_METHOD_IBM_LZ77 = 19, + GMIO_ZIP_COMPRESS_METHOD_WAVPACK = 97, + GMIO_ZIP_COMPRESS_METHOD_PPMD_VERSION_I_REV_1 = 98 +}; + +enum gmio_zip_general_purpose_flag { + /*! Bit_0: if set, indicates that the file is encrypted */ + GMIO_ZIP_GENERAL_PURPOSE_FLAG_FILE_ENCRYPTED = 0x0001, + + /* For Method 6 - Imploding */ + /*! Bit_1: if set, indicates an 8K sliding dictionary was used. If clear, + * then a 4K sliding dictionary was used */ + GMIO_ZIP_GENERAL_PURPOSE_FLAG_IMPLODE_8K_SLIDING_DICT = 0x0002, + /*! Bit_2: if set, indicates 3 Shannon-Fano trees were used to encode the + * sliding dictionary output. If clear, then 2 Shannon-Fano trees + * were used */ + GMIO_ZIP_GENERAL_PURPOSE_FLAG_IMPLODE_3_SHANNON_FANO_TREES = 0x0004, + + /* For Methods 8 and 9 - Deflating */ + /*! Bit_2=0 Bit_1=0 -> Normal (-en) compression option was used */ + GMIO_ZIP_GENERAL_PURPOSE_FLAG_DEFLATE_COMPRESS_NORMAL = 0x0000, + /*! Bit_2=0 Bit_1=1 -> Maximum (-exx/-ex) compression option was used */ + GMIO_ZIP_GENERAL_PURPOSE_FLAG_DEFLATE_COMPRESS_MAX = 0x0002, + /*! Bit_2=1 Bit_1=0 -> Fast (-ef) compression option was used */ + GMIO_ZIP_GENERAL_PURPOSE_FLAG_DEFLATE_COMPRESS_FAST = 0x0004, + /*! Bit_2=1 Bit_1=1 -> Super Fast (-es) compression option was used */ + GMIO_ZIP_GENERAL_PURPOSE_FLAG_DEFLATE_COMPRESS_SUPER_FAST = 0x0006, + + /* For Method 14 - LZMA */ + /*! Bit_1: if set, indicates an end-of-stream (EOS) marker is used to mark + * the end of the compressed data stream. If clear, then an EOS + * marker is not present and the compressed data size must be known + * to extract */ + GMIO_ZIP_GENERAL_PURPOSE_FLAG_LZMA_USE_EOS_MARKER = 0x0002, + + /*! Bit_3: if set, the fields crc-32, compressed size and uncompressed size + * are set to zero in the local header. + * The correct values are put in the data descriptor immediately + * following the compressed data */ + GMIO_ZIP_GENERAL_PURPOSE_FLAG_USE_DATA_DESCRIPTOR = 0x0008, + + /*! Bit_5: if set, indicates that the file is compressed patched data. + * (Note: Requires PKZIP version 2.70 or greater) */ + GMIO_ZIP_GENERAL_PURPOSE_FLAG_COMPRESSED_PATCHED_DATA = 0x0020, + + /*! Bit_6: Strong encryption. If set, you MUST set the version needed to + * extract value to at least 50 and you MUST also set bit 0. If AES + * encryption is used, the version needed to extract value MUST be + * at least 51. */ + GMIO_ZIP_GENERAL_PURPOSE_FLAG_STRONG_ENCRYPTION = 0x0040, + + /*! Bit_11: Language encoding flag (EFS). If set, the filename and comment + * fields for this file MUST be encoded using UTF-8 */ + GMIO_ZIP_GENERAL_PURPOSE_FLAG_ENCODING_UTF8 = 0x0800, + + /*! Bit_13: Set when encrypting the Central Directory to indicate selected + * data values in the Local Header are masked to hide their actual + * values */ + GMIO_ZIP_GENERAL_PURPOSE_FLAG_MASK_LOCAL_HEADER = 0x2000 +}; + +/*! Header ID mapping defined by PKWARE */ +enum gmio_zip_pkware_headerid +{ + GMIO_ZIP_PKWARE_HEADERID_ZIP64_EXTENDED_INFO = 0x0001, + GMIO_ZIP_PKWARE_HEADERID_AV_INFO = 0x0007, + GMIO_ZIP_PKWARE_HEADERID_EXTENDED_LANGUAGE_ENCODE_DATA = 0x0008, + GMIO_ZIP_PKWARE_HEADERID_OS2 = 0x0009, + GMIO_ZIP_PKWARE_HEADERID_NTFS = 0x000A, + GMIO_ZIP_PKWARE_HEADERID_OPENVMS = 0x000C, + GMIO_ZIP_PKWARE_HEADERID_UNIX = 0x000D, + GMIO_ZIP_PKWARE_HEADERID_STREAM_AND_FORK_DESCRIPTORS = 0x000E, + GMIO_ZIP_PKWARE_HEADERID_PATCH_DESCRIPTOR = 0x000F, + GMIO_ZIP_PKWARE_HEADERID_PKCS7_X509_CERT = 0x0014, + GMIO_ZIP_PKWARE_HEADERID_X509_CERTID_FOR_FILE = 0x0015, + GMIO_ZIP_PKWARE_HEADERID_X509_CERTID_FOR_CENTRAL_DIRECTORY = 0x0016, + GMIO_ZIP_PKWARE_HEADERID_STRONG_ENCRYPTION_HEADER = 0x0017, + GMIO_ZIP_PKWARE_HEADERID_RECORD_MANAGEMENT_CONTROLS = 0x0018, + GMIO_ZIP_PKWARE_HEADERID_PKCS7_ENCRYPTION_RECIPIENT_CERT_LIST = 0x0019 +}; + +enum gmio_zip_feature_version { + GMIO_ZIP_FEATURE_VERSION_DEFAULT = 10, + GMIO_ZIP_FEATURE_VERSION_FILE_VOLUME_LABEL = 11, + GMIO_ZIP_FEATURE_VERSION_FILE_FOLDER = 20, + GMIO_ZIP_FEATURE_VERSION_FILE_COMPRESSED_DEFLATE = 20, + GMIO_ZIP_FEATURE_VERSION_FILE_ENCRYPTED_PKWARE = 20, + GMIO_ZIP_FEATURE_VERSION_FILE_COMPRESSED_DEFLATE64 = 21, + GMIO_ZIP_FEATURE_VERSION_FILE_COMPRESSED_PKWARE_DCL_IMPLODE = 25, + GMIO_ZIP_FEATURE_VERSION_FILE_PATCH_DATA_SET = 27, + GMIO_ZIP_FEATURE_VERSION_FILE_ZIP64_FORMAT_EXTENSIONS = 45, + GMIO_ZIP_FEATURE_VERSION_FILE_COMPRESSED_BZIP2 = 46, + GMIO_ZIP_FEATURE_VERSION_FILE_ENCRYPTED_DES = 50, + GMIO_ZIP_FEATURE_VERSION_FILE_ENCRYPTED_3DES = 50, + GMIO_ZIP_FEATURE_VERSION_FILE_ENCRYPTED_RC2 = 50, + GMIO_ZIP_FEATURE_VERSION_FILE_ENCRYPTED_RC4 = 50, + GMIO_ZIP_FEATURE_VERSION_FILE_ENCRYPTED_AES = 51, + GMIO_ZIP_FEATURE_VERSION_FILE_ENCRYPTED_RC2_CORRECTED = 51, + GMIO_ZIP_FEATURE_VERSION_FILE_ENCRYPTED_RC2_64_CORRECTED = 52, + GMIO_ZIP_FEATURE_VERSION_FILE_ENCRYPTED_NON_OAEP_KEY_WRAP = 61, + GMIO_ZIP_FEATURE_VERSION_CENTRAL_DIRECTORY_ENCRYPTION = 62, + GMIO_ZIP_FEATURE_VERSION_FILE_COMPRESSED_LZMA = 63, + GMIO_ZIP_FEATURE_VERSION_FILE_COMPRESSED_PPMD_PLUS = 63, + GMIO_ZIP_FEATURE_VERSION_FILE_ENCRYPTED_BLOWFISH = 63, + GMIO_ZIP_FEATURE_VERSION_FILE_ENCRYPTED_TWOFISH = 63 +}; + +/*! Zip local file header */ +struct gmio_zip_local_file_header { + enum gmio_zip_feature_version version_needed_to_extract; + uint16_t general_purpose_flags; + enum gmio_zip_compress_method compress_method; + const struct tm* lastmod_datetime; + uint32_t crc32; + uint32_t compressed_size; + uint32_t uncompressed_size; + const char* filename; + const uint8_t* extrafield; + uint16_t filename_len; + uint16_t extrafield_len; +}; + +/*! Zip data descriptor */ +struct gmio_zip_data_descriptor { + bool use_zip64; + uint32_t crc32; + uintmax_t compressed_size; + uintmax_t uncompressed_size; +}; + +/*! Zip central directory header */ +struct gmio_zip_central_directory_header { + bool use_zip64; + uint16_t version_made_by; + enum gmio_zip_feature_version version_needed_to_extract; + uint16_t general_purpose_flags; + enum gmio_zip_compress_method compress_method; + const struct tm* lastmod_datetime; + uint32_t crc32; + uint32_t compressed_size; + uint32_t uncompressed_size; + uint16_t filename_len; + uint16_t extrafield_len; + uint16_t filecomment_len; + uint16_t disk_nb_start; + uint16_t internal_file_attrs; + uint32_t external_file_attrs; + uint32_t relative_offset_local_header; + const char* filename; + const uint8_t* extrafield; + const char* filecomment; +}; + +enum { + GMIO_ZIP64_SIZE_EXTRAFIELD_EXTENDED_INFO = 2*2 + 3*8 + 4 +}; + +/*! Zip64 extended info (extra field) */ +struct gmio_zip64_extrablock_extended_info { + uintmax_t compressed_size; + uintmax_t uncompressed_size; + uintmax_t relative_offset_local_header; + uint32_t disk_nb_start; +}; + +/*! Zip end of central directory record */ +struct gmio_zip_end_of_central_directory_record { + bool use_zip64; + uint16_t disk_nb; + uint16_t disk_nb_with_start_of_central_dir; + uint16_t total_entry_count_in_central_dir_on_disk; + uint16_t total_entry_count_in_central_dir; + uint32_t central_dir_size; + uint32_t start_offset_central_dir_from_disk_start_nb; + uint16_t filecomment_len; + const char* filecomment; +}; + +/*! Zip64 end of central directory record */ +struct gmio_zip64_end_of_central_directory_record { + uintmax_t remaining_record_size; /* should be 64b */ + uint16_t version_made_by; + enum gmio_zip_feature_version version_needed_to_extract; + uint32_t disk_nb; + uint32_t disk_nb_with_start_of_central_dir; + uintmax_t total_entry_count_in_central_dir_on_disk; /* should be 64b */ + uintmax_t total_entry_count_in_central_dir; /* should be 64b */ + uintmax_t central_dir_size; /* should be 64b */ + uintmax_t start_offset_central_dir_from_disk_start_nb; /* should be 64b */ + const uint8_t* extensible_data_sector; /* Reserved for use by PKWARE */ +}; + +struct gmio_zip_write_result { + int error; + size_t written_len; +}; + +/*! Writes ZIP local file header to \p stream */ +size_t gmio_zip_write_local_file_header( + struct gmio_stream* stream, + const struct gmio_zip_local_file_header* info, + int* error); + +/*! Writes ZIP data descriptor to \p stream */ +size_t gmio_zip_write_data_descriptor( + struct gmio_stream* stream, + const struct gmio_zip_data_descriptor* info, + int* error); + +/*! Writes ZIP central directory header to \p stream */ +size_t gmio_zip_write_central_directory_header( + struct gmio_stream* stream, + const struct gmio_zip_central_directory_header* info, + int* error); + +/*! Writes ZIP local file header to \p buff + * + * Returns \c GMIO_ERROR_INVALID_MEMBLOCK_SIZE if \p buff_capacity is less than + * \c GMIO_ZIP64_SIZE_EXTRAFIELD_EXTENDED_INFO + */ +size_t gmio_zip64_write_extrafield_extended_info( + uint8_t* buff, + size_t buff_capacity, + const struct gmio_zip64_extrablock_extended_info* info, + int* error); + +/*! Writes ZIP end of central directory record \p stream */ +size_t gmio_zip_write_end_of_central_directory_record( + struct gmio_stream* stream, + const struct gmio_zip_end_of_central_directory_record* info, + int* error); + +#endif /* GMIO_INTERNAL_ZIP_UTILS_H */ From a2ad3b9d4b5a77584be04c67d90f7a2607122ef0 Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Fri, 23 Dec 2016 13:06:24 +0100 Subject: [PATCH 18/81] gmio_amf: add ZIP archiving (Zip64 format to be further supported) --- src/gmio_amf/amf_document.h | 34 ++- src/gmio_amf/amf_io.c | 338 ++++++++++++++++------------ src/gmio_amf/amf_io_options.h | 4 +- src/gmio_core/global.h | 5 + src/gmio_core/internal/zlib_utils.c | 43 ++-- tests/test_amf_io.c | 79 ++++++- 6 files changed, 326 insertions(+), 177 deletions(-) diff --git a/src/gmio_amf/amf_document.h b/src/gmio_amf/amf_document.h index a2158b4..d08116e 100644 --- a/src/gmio_amf/amf_document.h +++ b/src/gmio_amf/amf_document.h @@ -47,16 +47,16 @@ struct gmio_amf_metadata { - const char* type; /* UTF8-encoded */ - const char* data; /* UTF8-encoded */ + const char* type; /*!< UTF8-encoded */ + const char* data; /*!< UTF8-encoded */ }; struct gmio_amf_color { - double r; /* in [0,1] */ - double g; /* in [0,1] */ - double b; /* in [0,1] */ - double a; /* in [0,1] optional */ + double r; /*!< Red channel in [0,1] */ + double g; /*!< Green channel in [0,1] */ + double b; /*!< Blue channel in [0,1] */ + double a; /*!< Optional alpha(transparency) channel in [0,1] */ const char* r_formula; const char* g_formula; const char* b_formula; @@ -71,13 +71,19 @@ struct gmio_amf_material uint32_t metadata_count; }; +/*! Proportion of the composition of another material + * + * The proportion can be specified as a formula(with \c value_formula) or as a + * constant mixing(with \c value). + */ struct gmio_amf_composite { uint32_t materialid; /* XML:nonNegativeInteger, required */ - double value; /* governs the percent of material */ + double value; /*!< governs the percent of material */ const char* value_formula; }; +/*! Vertex within an AMF mesh */ struct gmio_amf_vertex { struct gmio_vec3d coords; @@ -88,6 +94,7 @@ struct gmio_amf_vertex uint32_t metadata_count; }; +/*! Edge within an AMF mesh, for curved triangles */ struct gmio_amf_edge { uint32_t v1; /* XML:nonNegativeInteger */ @@ -126,11 +133,12 @@ enum gmio_amf_volume_type GMIO_AMF_VOLUME_TYPE_SUPPORT }; +/*! Volume within an AMF mesh */ struct gmio_amf_volume { uint32_t materialid; /* XML:nonNegativeInteger */ enum gmio_amf_volume_type type; - uint32_t triangle_count; /* Should be >= 4 */ + uint32_t triangle_count; /*!< Should be >= 4 */ uint32_t metadata_count; bool has_color; struct gmio_amf_color color; /* XML:Color */ @@ -155,10 +163,11 @@ struct gmio_amf_object struct gmio_amf_constellation { uint32_t id; /* XML:integer */ - uint32_t instance_count; /* Should be >= 2 */ + uint32_t instance_count; /*!< Should be >= 2 */ uint32_t metadata_count; }; +/*! Instance within an AMF constellation */ struct gmio_amf_instance { uint32_t objectid; /* XML:nonNegativeInteger */ @@ -179,9 +188,10 @@ struct gmio_amf_texture uint32_t depth; /* XML:nonNegativeInteger */ bool tiled; enum gmio_amf_texture_type type; - struct gmio_memblock binary_data; /* Will be converted to base64 */ + struct gmio_memblock binary_data; /*!< Will be converted to base64 */ }; +/*! Units supported by AMF */ enum gmio_amf_unit { GMIO_AMF_UNIT_UNKNOWN, @@ -192,6 +202,7 @@ enum gmio_amf_unit GMIO_AMF_UNIT_MICRON }; +/*! The direct elements of an AMF document(ie. inside ...) */ enum gmio_amf_document_element { GMIO_AMF_DOCUMENT_ELEMENT_OBJECT, @@ -201,6 +212,7 @@ enum gmio_amf_document_element GMIO_AMF_DOCUMENT_ELEMENT_METADATA }; +/*! The direct elements of an AMF mesh(ie. inside ...) */ enum gmio_amf_mesh_element { GMIO_AMF_MESH_ELEMENT_VERTEX, @@ -223,7 +235,7 @@ struct gmio_amf_document const void* cookie; enum gmio_amf_unit unit; - uint32_t object_count; /* Must be >= 1 */ + uint32_t object_count; /*!< Must be >= 1 */ uint32_t material_count; uint32_t texture_count; uint32_t constellation_count; diff --git a/src/gmio_amf/amf_io.c b/src/gmio_amf/amf_io.c index d3e7531..d3f746b 100644 --- a/src/gmio_amf/amf_io.c +++ b/src/gmio_amf/amf_io.c @@ -37,6 +37,7 @@ #include "../gmio_core/internal/helper_stream.h" #include "../gmio_core/internal/helper_task_iface.h" #include "../gmio_core/internal/ostringstream.h" +#include "../gmio_core/internal/zip_utils.h" #include "../gmio_core/internal/zlib_utils.h" #include @@ -58,8 +59,12 @@ struct gmio_amf_wcontext struct gmio_memblock z_memblock; struct z_stream_s z_stream; int z_flush; + uintmax_t z_compressed_size; + uintmax_t z_uncompressed_size; + uint32_t z_crc32; }; +/* Helper to set error code of the writing context */ GMIO_INLINE bool gmio_amf_wcontext_set_error( struct gmio_amf_wcontext* context, int error) { @@ -67,6 +72,7 @@ GMIO_INLINE bool gmio_amf_wcontext_set_error( return gmio_no_error(error); } +/* Helper to increment the current task progress of the writing context */ GMIO_INLINE void gmio_amf_wcontext_incr_task_progress( struct gmio_amf_wcontext* context) { @@ -163,13 +169,11 @@ static void gmio_amf_write_amf_begin( } /* Writes document metadata to stream */ -static bool gmio_amf_write_root_metadata( - struct gmio_amf_wcontext* context) +static bool gmio_amf_write_root_metadata(struct gmio_amf_wcontext* context) { const struct gmio_amf_document* doc = context->document; struct gmio_amf_metadata metadata = {0}; - uint32_t imeta; - for (imeta = 0; imeta < doc->metadata_count; ++imeta) { + for (uint32_t imeta = 0; imeta < doc->metadata_count; ++imeta) { doc->func_get_document_element( doc->cookie, GMIO_AMF_DOCUMENT_ELEMENT_METADATA, imeta, &metadata); @@ -180,31 +184,27 @@ static bool gmio_amf_write_root_metadata( } /* Writes document materials to stream */ -static bool gmio_amf_write_root_materials( - struct gmio_amf_wcontext* context) +static bool gmio_amf_write_root_materials(struct gmio_amf_wcontext* context) { const struct gmio_amf_document* doc = context->document; struct gmio_ostringstream* sstream = context->sstream; struct gmio_amf_material material = {0}; - uint32_t imat; - for (imat = 0; imat < doc->material_count; ++imat) { + for (uint32_t imat = 0; imat < doc->material_count; ++imat) { doc->func_get_document_element( doc->cookie, GMIO_AMF_DOCUMENT_ELEMENT_MATERIAL, imat, &material); gmio_ostringstream_write_chararray(sstream, "'); + gmio_ostringstream_write_chararray(sstream, ">\n"); /* Write material elements */ if (material.metadata_count > 0) { - uint32_t imeta; - struct gmio_amf_metadata metadata = {0}; - /* Check function pointer is defined */ if (doc->func_get_document_element_metadata == NULL) { return gmio_amf_wcontext_set_error( context, GMIO_AMF_ERROR_NULL_FUNC_GET_DOCUMENT_ELEMENT_METADATA); } - for (imeta = 0; imeta < material.metadata_count; ++imeta) { + struct gmio_amf_metadata metadata = {0}; + for (uint32_t imeta = 0; imeta < material.metadata_count; ++imeta) { doc->func_get_document_element_metadata( doc->cookie, GMIO_AMF_DOCUMENT_ELEMENT_MATERIAL, @@ -218,15 +218,13 @@ static bool gmio_amf_write_root_materials( gmio_amf_write_color(context, &material.color); /* Write material elements */ if (material.composite_count > 0) { - struct gmio_amf_composite composite = {0}; - uint32_t icomp; - /* Check function pointer is defined */ if (doc->func_get_material_composite == NULL) { return gmio_amf_wcontext_set_error( context, GMIO_AMF_ERROR_NULL_FUNC_GET_MATERIAL_COMPOSITE); } - for (icomp = 0; icomp < material.composite_count; ++icomp) { + struct gmio_amf_composite composite = {0}; + for (uint32_t icomp = 0; icomp < material.composite_count; ++icomp) { doc->func_get_material_composite( doc->cookie, imat, icomp, &composite); gmio_ostringstream_write_chararray(sstream, "f64_format; - struct gmio_amf_vertex vertex = {0}; - uint32_t ivert; /* Write mesh element */ - gmio_ostringstream_write_chararray(sstream, "\n"); - for (ivert = 0; ivert < mesh->vertex_count; ++ivert) { + struct gmio_amf_vertex vertex = {0}; + gmio_ostringstream_write_chararray(sstream, "\n\n"); + for (uint32_t ivert = 0; ivert < mesh->vertex_count; ++ivert) { mesh_elt_index.value = ivert; doc->func_get_object_mesh_element( doc->cookie, @@ -320,15 +317,13 @@ static bool gmio_amf_write_mesh( } /* Write elements */ if (vertex.metadata_count > 0) { - struct gmio_amf_metadata metadata = {0}; - uint32_t imeta; - /* Check function pointer */ if (doc->func_get_object_mesh_vertex_metadata == NULL) { return gmio_amf_wcontext_set_error( context, GMIO_AMF_ERROR_NULL_FUNC_GET_OBJECT_MESH_VERTEX_METADATA); } - for (imeta = 0; imeta < vertex.metadata_count; ++imeta) { + struct gmio_amf_metadata metadata = {0}; + for (uint32_t imeta = 0; imeta < vertex.metadata_count; ++imeta) { doc->func_get_object_mesh_vertex_metadata( doc->cookie, &mesh_elt_index, imeta, &metadata); gmio_amf_write_metadata(sstream, &metadata); @@ -342,8 +337,7 @@ static bool gmio_amf_write_mesh( /* Write mesh vertices elements */ if (mesh->edge_count > 0) { struct gmio_amf_edge edge = {0}; - uint32_t iedge; - for (iedge = 0; iedge < mesh->edge_count; ++iedge) { + for (uint32_t iedge = 0; iedge < mesh->edge_count; ++iedge) { mesh_elt_index.value = iedge; doc->func_get_object_mesh_element( doc->cookie, @@ -374,9 +368,7 @@ static bool gmio_amf_write_mesh( /* Write mesh elements */ if (mesh->volume_count > 0) { struct gmio_amf_volume volume = {0}; - uint32_t ivol; - for (ivol = 0; ivol < mesh->volume_count; ++ivol) { - const char* str_volume_type = ""; + for (uint32_t ivol = 0; ivol < mesh->volume_count; ++ivol) { mesh_elt_index.value = ivol; doc->func_get_object_mesh_element( doc->cookie, @@ -385,6 +377,7 @@ static bool gmio_amf_write_mesh( gmio_ostringstream_write_chararray(sstream, "'); + gmio_ostringstream_write_chararray(sstream, ">\n"); /* Write volume elements */ if (volume.metadata_count > 0) { - struct gmio_amf_metadata metadata = {0}; - uint32_t imeta; - /* Check function pointer */ if (doc->func_get_object_mesh_volume_metadata == NULL) { return gmio_amf_wcontext_set_error( context, GMIO_AMF_ERROR_NULL_FUNC_GET_OBJECT_MESH_VOLUME_METADATA); } - for (imeta = 0; imeta < volume.metadata_count; ++imeta) { + struct gmio_amf_metadata metadata = {0}; + for (uint32_t imeta = 0; imeta < volume.metadata_count; ++imeta) { doc->func_get_object_mesh_volume_metadata( doc->cookie, &mesh_elt_index, imeta, &metadata); gmio_amf_write_metadata(sstream, &metadata); @@ -415,8 +406,7 @@ static bool gmio_amf_write_mesh( /* Write elements */ if (volume.triangle_count > 0) { struct gmio_amf_triangle triangle = {0}; - uint32_t itri; - for (itri = 0; itri < volume.triangle_count; ++itri) { + for (uint32_t itri = 0; itri < volume.triangle_count; ++itri) { doc->func_get_object_mesh_volume_triangle( doc->cookie, &mesh_elt_index, itri, &triangle); gmio_ostringstream_write_chararray(sstream, ""); @@ -453,26 +443,23 @@ static bool gmio_amf_write_root_objects(struct gmio_amf_wcontext* context) const struct gmio_amf_document* doc = context->document; struct gmio_ostringstream* sstream = context->sstream; struct gmio_amf_object object = {0}; - uint32_t iobj; - for (iobj = 0; iobj < doc->object_count; ++iobj) { + for (uint32_t iobj = 0; iobj < doc->object_count; ++iobj) { doc->func_get_document_element( doc->cookie, GMIO_AMF_DOCUMENT_ELEMENT_OBJECT, iobj, &object); /* Open object element */ gmio_ostringstream_write_chararray(sstream, "'); + gmio_ostringstream_write_chararray(sstream, ">\n"); /* Write metadata elements */ if (object.metadata_count > 0) { - struct gmio_amf_metadata metadata = {0}; - uint32_t imeta; - /* Check function pointer */ if (doc->func_get_document_element_metadata == NULL) { return gmio_amf_wcontext_set_error( context, GMIO_AMF_ERROR_NULL_FUNC_GET_DOCUMENT_ELEMENT_METADATA); } - for (imeta = 0; imeta < object.metadata_count; ++imeta) { + struct gmio_amf_metadata metadata = {0}; + for (uint32_t imeta = 0; imeta < object.metadata_count; ++imeta) { doc->func_get_document_element_metadata( doc->cookie, GMIO_AMF_DOCUMENT_ELEMENT_OBJECT, @@ -488,8 +475,7 @@ static bool gmio_amf_write_root_objects(struct gmio_amf_wcontext* context) /* Write mesh elements */ if (object.mesh_count > 0) { struct gmio_amf_mesh mesh = {0}; - uint32_t imesh; - for (imesh = 0; imesh < object.mesh_count; ++imesh) { + for (uint32_t imesh = 0; imesh < object.mesh_count; ++imesh) { struct gmio_amf_object_mesh_element_index base_mesh_elt_index; doc->func_get_object_mesh(doc->cookie, iobj, imesh, &mesh); base_mesh_elt_index.object_index = iobj; @@ -512,9 +498,7 @@ static bool gmio_amf_write_root_textures(struct gmio_amf_wcontext* context) const struct gmio_amf_document* doc = context->document; struct gmio_ostringstream* sstream = context->sstream; struct gmio_amf_texture texture = {0}; - uint32_t itex; - for (itex = 0; itex < doc->texture_count; ++itex) { - const char* str_texture_type = ""; + for (uint32_t itex = 0; itex < doc->texture_count; ++itex) { doc->func_get_document_element( doc->cookie, GMIO_AMF_DOCUMENT_ELEMENT_TEXTURE, itex, &texture); @@ -525,6 +509,7 @@ static bool gmio_amf_write_root_textures(struct gmio_amf_wcontext* context) gmio_ostringstream_write_xmlattr_u32(sstream, "depth", texture.depth); gmio_ostringstream_write_xmlattr_str( sstream, "tiled", texture.tiled ? "true" : "false"); + const char* str_texture_type = ""; switch (texture.type) { case GMIO_AMF_TEXTURE_TYPE_GRAYSCALE: str_texture_type = "grayscale"; break; @@ -544,31 +529,27 @@ static bool gmio_amf_write_root_textures(struct gmio_amf_wcontext* context) } /* Writes document constellations to stream */ -static bool gmio_amf_write_root_constellations( - struct gmio_amf_wcontext* context) +static bool gmio_amf_write_root_constellations(struct gmio_amf_wcontext* context) { const struct gmio_amf_document* doc = context->document; struct gmio_ostringstream* sstream = context->sstream; struct gmio_amf_constellation constellation = {0}; - uint32_t icons; - for (icons = 0; icons < doc->constellation_count; ++icons) { + for (uint32_t icons = 0; icons < doc->constellation_count; ++icons) { doc->func_get_document_element( doc->cookie, GMIO_AMF_DOCUMENT_ELEMENT_CONSTELLATION, icons, &constellation); gmio_ostringstream_write_chararray(sstream, "'); + gmio_ostringstream_write_chararray(sstream, ">\n"); /* Write constellation elements */ if (constellation.metadata_count > 0) { - struct gmio_amf_metadata metadata = {0}; - uint32_t imeta; - /* Check function pointer */ if (doc->func_get_document_element_metadata == NULL) { return gmio_amf_wcontext_set_error( context, GMIO_AMF_ERROR_NULL_FUNC_GET_DOCUMENT_ELEMENT_METADATA); } - for (imeta = 0; imeta < constellation.metadata_count; ++imeta) { + struct gmio_amf_metadata metadata = {0}; + for (uint32_t imeta = 0; imeta < constellation.metadata_count; ++imeta) { doc->func_get_document_element_metadata( doc->cookie, GMIO_AMF_DOCUMENT_ELEMENT_CONSTELLATION, @@ -581,8 +562,7 @@ static bool gmio_amf_write_root_constellations( /* Write constellation elements */ if (constellation.instance_count > 0) { struct gmio_amf_instance instance = {0}; - uint32_t iinst; - for (iinst = 0; iinst < constellation.instance_count; ++iinst) { + for (uint32_t iinst = 0; iinst < constellation.instance_count; ++iinst) { doc->func_get_constellation_instance( doc->cookie, icons, iinst, &instance); gmio_ostringstream_write_chararray(sstream, "z_stream; size_t total_written_len = 0; int z_retcode = Z_OK; + + context->z_uncompressed_size += len; + context->z_crc32 = crc32(context->z_crc32, (const Bytef*)ptr, len); + z_stream->next_in = (z_const Bytef*)ptr; - z_stream->avail_in = len; /* TODO: use better cast */ + z_stream->avail_in = len; /* Run zlib deflate() on input until output buffer not full * Finish compression when zflush == Z_FINISH */ do { @@ -688,10 +672,16 @@ static size_t gmio_amf_ostringstream_write_zlib( context->error = GMIO_ERROR_UNKNOWN; return total_written_len; } + context->z_compressed_size += total_written_len; return total_written_len; /* zlib official "howto" from http://zlib.net/zlib_how.html */ #if 0 + int ret, flush; + unsigned have; + z_stream strm; + unsigned char in[CHUNK]; + unsigned char out[CHUNK]; /* compress until end of file */ do { strm.avail_in = fread(in, 1, CHUNK, source); @@ -702,7 +692,7 @@ static size_t gmio_amf_ostringstream_write_zlib( flush = feof(source) ? Z_FINISH : Z_NO_FLUSH; strm.next_in = in; /* run deflate() on input until output buffer not full, finish - compression if all of source has been read in */ + * compression if all of source has been read in */ do { strm.avail_out = CHUNK; strm.next_out = out; @@ -763,120 +753,145 @@ static intmax_t gmio_amf_task_progress_max(const struct gmio_amf_document* doc) progress_max += doc->material_count; progress_max += doc->texture_count; /* Add total object(vertex_count + edge_count + triangle_count) */ - { - struct gmio_amf_object object = {0}; - uint32_t iobj; - for (iobj = 0; iobj < doc->object_count; ++iobj) { - struct gmio_amf_mesh mesh = {0}; - uint32_t imesh; - doc->func_get_document_element( - doc->cookie, - GMIO_AMF_DOCUMENT_ELEMENT_OBJECT, iobj, &object); - for (imesh = 0; imesh < object.mesh_count; ++imesh) { - doc->func_get_object_mesh(doc->cookie, iobj, imesh, &mesh); - progress_max += mesh.vertex_count; - progress_max += mesh.edge_count; - { - struct gmio_amf_object_mesh_element_index mesh_elt_index; - uint32_t ivol; - mesh_elt_index.object_index = iobj; - mesh_elt_index.mesh_index = imesh; - mesh_elt_index.value = 0; - for (ivol = 0; ivol < mesh.volume_count; ++ivol) { - struct gmio_amf_volume volume = {0}; - mesh_elt_index.value = ivol; - doc->func_get_object_mesh_element( - doc->cookie, - GMIO_AMF_MESH_ELEMENT_VOLUME, - &mesh_elt_index, - &volume); - progress_max += volume.triangle_count; - } - } + struct gmio_amf_object object = {0}; + for (uint32_t iobj = 0; iobj < doc->object_count; ++iobj) { + doc->func_get_document_element( + doc->cookie, + GMIO_AMF_DOCUMENT_ELEMENT_OBJECT, iobj, &object); + struct gmio_amf_mesh mesh = {0}; + for (uint32_t imesh = 0; imesh < object.mesh_count; ++imesh) { + doc->func_get_object_mesh(doc->cookie, iobj, imesh, &mesh); + progress_max += mesh.vertex_count; + progress_max += mesh.edge_count; + struct gmio_amf_object_mesh_element_index mesh_elt_index; + mesh_elt_index.object_index = iobj; + mesh_elt_index.mesh_index = imesh; + mesh_elt_index.value = 0; + for (uint32_t ivol = 0; ivol < mesh.volume_count; ++ivol) { + struct gmio_amf_volume volume = {0}; + mesh_elt_index.value = ivol; + doc->func_get_object_mesh_element( + doc->cookie, + GMIO_AMF_MESH_ELEMENT_VOLUME, + &mesh_elt_index, + &volume); + progress_max += volume.triangle_count; } } } /* Add total constellation(instance_count) */ - { - struct gmio_amf_constellation constellation = {0}; - uint32_t icons; - for (icons = 0; icons < doc->constellation_count; ++icons) { - doc->func_get_document_element( - doc->cookie, - GMIO_AMF_DOCUMENT_ELEMENT_CONSTELLATION, - icons, - &constellation); - progress_max += constellation.instance_count; - } + struct gmio_amf_constellation constellation = {0}; + for (uint32_t icons = 0; icons < doc->constellation_count; ++icons) { + doc->func_get_document_element( + doc->cookie, + GMIO_AMF_DOCUMENT_ELEMENT_CONSTELLATION, + icons, + &constellation); + progress_max += constellation.instance_count; } return progress_max; } +struct gmio_zip_entry_filename { + const char* ptr; + uint16_t len; +}; + +/* Returns a non-null C string for the ZIP entry filename in options */ +static struct gmio_zip_entry_filename gmio_amf_zip_entry_filename( + const struct gmio_amf_write_options* options) +{ + static const char default_filename[] = "geometry.amf"; + const char* filename = options->zip_entry_filename; + const bool is_empty_filename = filename == NULL || *filename == '\0'; + struct gmio_zip_entry_filename zip_filename; + zip_filename.ptr = is_empty_filename ? default_filename : filename; + zip_filename.len = + is_empty_filename ? + sizeof(default_filename) - 1 : + options->zip_entry_filename_len; + return zip_filename; +} + int gmio_amf_write( struct gmio_stream* stream, const struct gmio_amf_document* doc, const struct gmio_amf_write_options* opts) { - /* Constants */ static const struct gmio_amf_write_options default_write_opts = {0}; + opts = opts != NULL ? opts : &default_write_opts; + + /* Constants */ struct gmio_memblock_helper mblock_helper = gmio_memblock_helper(opts != NULL ? &opts->stream_memblock : NULL); const struct gmio_memblock* memblock = &mblock_helper.memblock; + const struct gmio_zip_entry_filename zip_entry_filename = + gmio_amf_zip_entry_filename(opts); /* Variables */ struct gmio_amf_wcontext context = {0}; struct gmio_ostringstream sstream = gmio_ostringstream( *stream, gmio_string(memblock->ptr, 0, memblock->size)); - - opts = opts != NULL ? opts : &default_write_opts; + uintmax_t zip_write_pos = 0; /* Check validity of input parameters */ context.error = GMIO_ERROR_OK; /* TODO: check stream function pointers */ if (!gmio_check_memblock(&context.error, memblock)) goto label_end; - if (!gmio_amf_check_error(&context.error, doc)) + if (!gmio_amf_check_document(&context.error, doc)) goto label_end; /* Initialize writing context */ - { - const struct gmio_string_16 f64_stdio_format = - gmio_to_stdio_float_format( - opts->float64_format, opts->float64_prec); - context.options = opts; - context.sstream = &sstream; - context.document = doc; - context.task_iface = &opts->task_iface; - context.task_progress_current = 0; - if (context.task_iface->func_handle_progress != NULL) - context.task_progress_max += gmio_amf_task_progress_max(doc); - context.f64_format.printf_format = f64_stdio_format.array; - context.f64_format.text_format = opts->float64_format; - context.f64_format.precision = - opts->float64_prec != 0 ? opts->float64_prec : 16; - + const struct gmio_string_16 f64_stdio_format = + gmio_to_stdio_float_format(opts->float64_format, opts->float64_prec); + context.options = opts; + context.sstream = &sstream; + context.document = doc; + context.task_iface = &opts->task_iface; + context.task_progress_current = 0; + if (context.task_iface->func_handle_progress != NULL) + context.task_progress_max += gmio_amf_task_progress_max(doc); + context.f64_format.printf_format = f64_stdio_format.array; + context.f64_format.text_format = opts->float64_format; + context.f64_format.precision = + opts->float64_prec != 0 ? opts->float64_prec : 16; + if (opts->compress) { /* Initialize internal zlib stream for compression */ - if (opts->compress) { - const size_t mblock_halfsize = memblock->size / 2; - context.sstream->strbuff.capacity = mblock_halfsize; - context.z_memblock = - gmio_memblock( - (uint8_t*)memblock->ptr + mblock_halfsize, - mblock_halfsize, - NULL); - context.error = - gmio_zlib_compress_init( - &context.z_stream, &opts->z_compress_options); - if (gmio_error(context.error)) - goto label_end; - context.z_flush = Z_NO_FLUSH; - } + const size_t mblock_halfsize = memblock->size / 2; + context.sstream->strbuff.capacity = mblock_halfsize; + context.z_memblock = + gmio_memblock( + (uint8_t*)memblock->ptr + mblock_halfsize, + mblock_halfsize, + NULL); + context.z_crc32 = crc32(0, NULL, 0); + context.error = + gmio_zlib_compress_init( + &context.z_stream, &opts->z_compress_options); + if (gmio_error(context.error)) + goto label_end; + context.z_flush = Z_NO_FLUSH; } sstream.cookie = &context; sstream.func_stream_write = &gmio_amf_ostringstream_write; + /* If compression enabled, write ZIP local file header */ + if (opts->compress) { + struct gmio_zip_local_file_header info = {0}; + info.general_purpose_flags = + GMIO_ZIP_GENERAL_PURPOSE_FLAG_USE_DATA_DESCRIPTOR; + info.compress_method = GMIO_ZIP_COMPRESS_METHOD_DEFLATE; + info.filename = zip_entry_filename.ptr; + info.filename_len = zip_entry_filename.len; + zip_write_pos += + gmio_zip_write_local_file_header(stream, &info, &context.error); + if (gmio_error(context.error)) + goto label_end; + } + gmio_amf_write_amf_begin(&sstream, doc); if (!gmio_amf_write_root_metadata(&context)) goto label_end; @@ -896,6 +911,49 @@ int gmio_amf_write( gmio_ostringstream_write_chararray(&sstream, "\n"); gmio_ostringstream_flush(&sstream); + /* Write ending ZIP archive data */ + if (opts->compress && gmio_no_error(context.error)) { + zip_write_pos += context.z_compressed_size; + /* Write data descriptor */ + struct gmio_zip_data_descriptor dd = {0}; + dd.crc32 = context.z_crc32; + dd.compressed_size = context.z_compressed_size; + dd.uncompressed_size = context.z_uncompressed_size; + zip_write_pos += + gmio_zip_write_data_descriptor(stream, &dd, &context.error); + if (gmio_error(context.error)) + goto label_end; + /* Write central directory header */ + struct gmio_zip_central_directory_header cdh = {0}; + cdh.version_needed_to_extract = + GMIO_ZIP_FEATURE_VERSION_FILE_COMPRESSED_DEFLATE; + cdh.general_purpose_flags = + GMIO_ZIP_GENERAL_PURPOSE_FLAG_USE_DATA_DESCRIPTOR; + cdh.compress_method = GMIO_ZIP_COMPRESS_METHOD_DEFLATE; + cdh.crc32 = context.z_crc32; + cdh.compressed_size = (uint32_t)context.z_compressed_size; + cdh.uncompressed_size = (uint32_t)context.z_uncompressed_size; + cdh.filename = zip_entry_filename.ptr; + cdh.filename_len = zip_entry_filename.len; + const uintmax_t central_dir_startpos = zip_write_pos; + const size_t central_dir_size = + gmio_zip_write_central_directory_header( + stream, &cdh, &context.error); + zip_write_pos += central_dir_size; + if (gmio_error(context.error)) + goto label_end; + /* Write end of central directory record */ + struct gmio_zip_end_of_central_directory_record eocdr = {0}; + eocdr.total_entry_count_in_central_dir_on_disk = 1; + eocdr.total_entry_count_in_central_dir = 1; + eocdr.central_dir_size = (uint32_t)central_dir_size; + eocdr.start_offset_central_dir_from_disk_start_nb = + (uint32_t)central_dir_startpos; + zip_write_pos += + gmio_zip_write_end_of_central_directory_record( + stream, &eocdr, &context.error); + } + label_end: if (opts->compress) deflateEnd(&context.z_stream); @@ -911,6 +969,8 @@ int gmio_amf_write_file( const bool compress = opts != NULL ? opts->compress : false; FILE* file = fopen(filepath, compress ? "wb" : "w"); if (file != NULL) { + /* TODO: if opts->zip_entry_filename is empty then try to take the + * filename part of filepath */ struct gmio_stream stream = gmio_stream_stdio(file); const int error = gmio_amf_write(&stream, doc, opts); fclose(file); diff --git a/src/gmio_amf/amf_io_options.h b/src/gmio_amf/amf_io_options.h index 74cd9ad..2ab9585 100644 --- a/src/gmio_amf/amf_io_options.h +++ b/src/gmio_amf/amf_io_options.h @@ -76,10 +76,12 @@ struct gmio_amf_write_options */ uint8_t float64_prec; - /* ZIP compression */ + /* ZIP/Deflate compression */ bool compress; struct gmio_zlib_compress_options z_compress_options; + const char* zip_entry_filename; + uint16_t zip_entry_filename_len; }; #endif /* GMIO_AMF_IO_OPTIONS_H */ diff --git a/src/gmio_core/global.h b/src/gmio_core/global.h index a2fe994..c3e6623 100644 --- a/src/gmio_core/global.h +++ b/src/gmio_core/global.h @@ -139,6 +139,11 @@ typedef int32_t intmax_t; typedef uint32_t uintmax_t; # endif +# define INT16_MAX 0x7FFF +# define UINT16_MAX 0xFFFF +# define INT32_MAX 0x7FFFFFFF +# define UINT32_MAX 0xFFFFFFFF + #endif /* GMIO_HAVE_STDBOOL_H */ diff --git a/src/gmio_core/internal/zlib_utils.c b/src/gmio_core/internal/zlib_utils.c index e458ad8..3ad7376 100644 --- a/src/gmio_core/internal/zlib_utils.c +++ b/src/gmio_core/internal/zlib_utils.c @@ -30,21 +30,6 @@ #include "zlib_utils.h" #include "../error.h" -/* Converts zlib error to gmio "zlib-specific" error */ -int zlib_error_to_gmio_error(int z_error) -{ - switch (z_error) { - case Z_OK: return GMIO_ERROR_OK; - case Z_ERRNO: return GMIO_ERROR_ZLIB_ERRNO; - case Z_STREAM_ERROR: return GMIO_ERROR_ZLIB_STREAM; - case Z_DATA_ERROR: return GMIO_ERROR_ZLIB_DATA; - case Z_MEM_ERROR: return GMIO_ERROR_ZLIB_MEM; - case Z_BUF_ERROR: return GMIO_ERROR_ZLIB_BUF; - case Z_VERSION_ERROR: return GMIO_ERROR_ZLIB_VERSION; - } - return GMIO_ERROR_UNKNOWN; -} - static int gmio_to_zlib_compress_level(int gmio_compress_level) { if (gmio_compress_level == GMIO_ZLIB_COMPRESS_LEVEL_DEFAULT) @@ -61,6 +46,21 @@ static int gmio_to_zlib_compress_memusage(int gmio_compress_memusage) return gmio_compress_memusage; } +/* Converts zlib error to gmio "zlib-specific" error */ +int zlib_error_to_gmio_error(int z_error) +{ + switch (z_error) { + case Z_OK: return GMIO_ERROR_OK; + case Z_ERRNO: return GMIO_ERROR_ZLIB_ERRNO; + case Z_STREAM_ERROR: return GMIO_ERROR_ZLIB_STREAM; + case Z_DATA_ERROR: return GMIO_ERROR_ZLIB_DATA; + case Z_MEM_ERROR: return GMIO_ERROR_ZLIB_MEM; + case Z_BUF_ERROR: return GMIO_ERROR_ZLIB_BUF; + case Z_VERSION_ERROR: return GMIO_ERROR_ZLIB_VERSION; + } + return GMIO_ERROR_UNKNOWN; +} + int gmio_zlib_compress_init( struct z_stream_s* z_stream, const struct gmio_zlib_compress_options* z_opts) @@ -69,12 +69,23 @@ int gmio_zlib_compress_init( gmio_to_zlib_compress_level(z_opts->level); const int zlib_compress_memusage = gmio_to_zlib_compress_memusage(z_opts->memory_usage); + /* zlib doc: + * the windowBits parameter is the base two logarithm of the window size + * (the size of the history buffer). It should be in the range 8..15 for + * this version of the library. Larger values of this parameter result in + * better compression at the expense of memory usage. The default value is + * 15 if deflateInit is used instead. + * windowBits can also be –8..–15 for raw deflate. In this case, -windowBits + * determines the window size. deflate() will then generate raw deflate + * data with no zlib header or trailer, and will not compute an adler32 + * check value. */ + static const int z_window_bits = -15; const int z_init_error = deflateInit2_( z_stream, zlib_compress_level, Z_DEFLATED, /* Method */ - 15, /* Window bits(default value) */ + z_window_bits, zlib_compress_memusage, z_opts->strategy, ZLIB_VERSION, diff --git a/tests/test_amf_io.c b/tests/test_amf_io.c index 188daa3..c2e2c4f 100644 --- a/tests/test_amf_io.c +++ b/tests/test_amf_io.c @@ -33,12 +33,15 @@ #include "stream_buffer.h" #include "../src/gmio_core/error.h" +#include "../src/gmio_core/internal/byte_codec.h" #include "../src/gmio_core/internal/helper_stream.h" +#include "../src/gmio_core/internal/zip_utils.h" #include "../src/gmio_amf/amf_error.h" #include "../src/gmio_amf/amf_io.h" #include #include +#include #include struct __tamf__material @@ -108,10 +111,10 @@ static void __tamf__get_object_mesh( uint32_t mesh_index, struct gmio_amf_mesh* ptr_mesh) { - const struct __tamf__document* doc = - (const struct __tamf__document*)cookie; GMIO_UNUSED(object_index); GMIO_UNUSED(mesh_index); + const struct __tamf__document* doc = + (const struct __tamf__document*)cookie; ptr_mesh->vertex_count = doc->mesh.vertex_count; ptr_mesh->edge_count = 0; ptr_mesh->volume_count = 1; @@ -147,9 +150,9 @@ static void __tamf__get_object_mesh_volume_triangle( uint32_t triangle_index, struct gmio_amf_triangle* ptr_triangle) { + GMIO_UNUSED(volume_index); const struct __tamf__document* doc = (const struct __tamf__document*)cookie; const struct __tamf__triangle* tri = &doc->mesh.vec_triangle[triangle_index]; - GMIO_UNUSED(volume_index); ptr_triangle->v1 = tri->vertex[0]; ptr_triangle->v2 = tri->vertex[1]; ptr_triangle->v3 = tri->vertex[2]; @@ -162,14 +165,19 @@ static void __tamf__get_document_element_metadata( uint32_t metadata_index, struct gmio_amf_metadata* ptr_metadata) { - const struct __tamf__document* doc = (const struct __tamf__document*)cookie; GMIO_UNUSED(metadata_index); + const struct __tamf__document* doc = (const struct __tamf__document*)cookie; if (element == GMIO_AMF_DOCUMENT_ELEMENT_MATERIAL) { ptr_metadata->type = "name"; ptr_metadata->data = doc->vec_material[element_index].name; } } +static void __tamf__skip_zip_local_file_header() +{ + +} + static const char* test_amf_write() { { @@ -247,20 +255,71 @@ static const char* test_amf_write() if (gmio_error(error)) printf("\n0x%x\n", error); UTEST_COMPARE_INT(error, GMIO_ERROR_OK); - printf("%s\n", wbuff.ptr); + /* printf("%s\n", wbuff.ptr); */ } -#if 0 - /* Write compressed */ + /* Write compressed ZIP */ { - int error = GMIO_ERROR_OK; + const size_t source_len = wbuff.pos; + uint8_t* source = calloc(source_len, 1); + + memcpy(source, wbuff.ptr, source_len); wbuff.pos = 0; options.compress = true; - error = gmio_amf_write(&stream, &doc, &options); + static const char zip_entry_filename[] = "test.amf"; + options.zip_entry_filename = zip_entry_filename; + options.zip_entry_filename_len = sizeof(zip_entry_filename) - 1; + const int error = gmio_amf_write(&stream, &doc, &options); UTEST_COMPARE_INT(error, GMIO_ERROR_OK); - } +#if 0 + FILE* file = fopen("output.zip", "wb"); + fwrite(wbuff.ptr, 1, wbuff.pos, file); + fclose(file); #endif + /* Unzip and compare with source data */ + uint8_t* rbuff = wbuff.ptr; + /* -- Read local file header */ + UTEST_COMPARE_UINT(gmio_decode_uint32_le(rbuff), 0x04034b50); + rbuff += 8; + /* -- Read compression method */ + UTEST_COMPARE_UINT( + gmio_decode_uint16_le(rbuff), + GMIO_ZIP_COMPRESS_METHOD_DEFLATE); + rbuff += 18; + /* -- Read filename length */ + UTEST_COMPARE_UINT( + gmio_decode_uint16_le(rbuff), + options.zip_entry_filename_len); + rbuff += 2; + /* -- Read extrafield length */ + const uint16_t zip_extrafield_len = gmio_decode_uint16_le(rbuff); + rbuff += 2; + /* -- Read filename */ + UTEST_ASSERT(strncmp( + (const char*)rbuff, + options.zip_entry_filename, + options.zip_entry_filename_len) + == 0); + rbuff += options.zip_entry_filename_len; + /* -- Skip extrafield */ + rbuff += zip_extrafield_len; + +#if 0 /* TODO: check other ZIP records, and uncompress file */ + uint8_t* dest = calloc(wbuffsize, 1); + unsigned long dest_len = (unsigned long)wbuffsize; + const unsigned long z_len = wbuff.pos; + const int zerr = uncompress(dest, &dest_len, wbuff.ptr, z_len); + printf("\n-- Info: z_len=%i src_len=%i\n", z_len, source_len); + UTEST_COMPARE_INT(zerr, Z_OK); + UTEST_COMPARE_UINT(source_len, dest_len); + UTEST_COMPARE_INT(memcmp(dest, source, source_len), 0); + free(dest); +#endif + + free(source); + } + free(wbuff.ptr); } From 3acc51f73ca8c6ed2dda8cb471c1d2b5df28995e Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Fri, 23 Dec 2016 22:16:12 +0100 Subject: [PATCH 19/81] cmake: force POSIX with gcc --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 24e027b..7f2637e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -125,6 +125,7 @@ test_big_endian(GMIO_HOST_IS_BIG_ENDIAN) # Adapt C compiler flags to enable strict ISO C99 conformance if(CMAKE_C_COMPILER_IS_GCC_COMPATIBLE) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -pedantic-errors") + add_definitions(-D_POSIX_SOURCE) endif() set(CMAKE_REQUIRED_FLAGS "${CMAKE_C_FLAGS}") From 88655ddcdb35bb349313d81b29726b4c81ff83d3 Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Wed, 28 Dec 2016 20:13:22 +0100 Subject: [PATCH 20/81] core: fix some compilation warnings in zlib_utils.c --- src/gmio_core/internal/zlib_utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gmio_core/internal/zlib_utils.c b/src/gmio_core/internal/zlib_utils.c index 3ad7376..1799545 100644 --- a/src/gmio_core/internal/zlib_utils.c +++ b/src/gmio_core/internal/zlib_utils.c @@ -97,9 +97,9 @@ bool gmio_check_zlib_compress_options( int* error, const struct gmio_zlib_compress_options* z_opts) { if (z_opts != NULL) { - if (!(-1 <= z_opts->level && z_opts->level <= 9)) + if (z_opts->level > 9) *error = GMIO_ERROR_ZLIB_INVALID_COMPRESS_LEVEL; - if (!(0 <= z_opts->memory_usage && z_opts->memory_usage <= 9)) + if (z_opts->memory_usage > 9) *error = GMIO_ERROR_ZLIB_INVALID_COMPRESS_MEMORY_USAGE; } return gmio_no_error(*error); From 469a525fc8f515168846a87b751c7aa43eac1314 Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Fri, 30 Dec 2016 00:08:50 +0100 Subject: [PATCH 21/81] travis: verbose make --- CMakeLists.txt | 5 ++--- travis-build-script.sh | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7f2637e..7e575da 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -162,7 +162,7 @@ elseif(HAVE_GMIO_SIZEOF_LONG_LONG) set(GMIO_HAVE_LONG_LONG ${HAVE_GMIO_SIZEOF_LONG_LONG}) endif() -# Check Available C99 features +# Check available C99 features if(CMAKE_C_COMPILER_IS_GCC_COMPATIBLE) list(APPEND CMAKE_REQUIRED_LIBRARIES m) # -lm endif() @@ -185,7 +185,7 @@ if(WIN32 AND NOT GMIO_HAVE_VSNPRINTF_FUNC) check_function_exists(_vsnprintf GMIO_HAVE_WIN__VSNPRINTF_FUNC) endif() -# Check POSIX features +# Check available POSIX features if(UNIX) # See: # http://linux.die.net/man/2/fstat64 @@ -289,7 +289,6 @@ if(CMAKE_C_COMPILER_IS_GCC_COMPATIBLE) endif() # Force PIC for GCC - # See https://www.gentoo.org/proj/en/base/amd64/howtos/index.xml?part=1&chap=3 set(CMAKE_POSITION_INDEPENDENT_CODE ON) endif() diff --git a/travis-build-script.sh b/travis-build-script.sh index e506a29..a7a086d 100644 --- a/travis-build-script.sh +++ b/travis-build-script.sh @@ -42,7 +42,7 @@ cmake .. -G "Unix Makefiles" \ -DGMIO_FLOAT2STR_LIB=$TRAVIS_FLOAT2STR_LIB # Make -make -j4 +make -j4 VERBOSE=1 make install make check # Unit tests From fcdc4bf6b38dd834449fe376a2ce5471005b9125 Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Fri, 30 Dec 2016 16:41:25 +0100 Subject: [PATCH 22/81] cmake: hopefully fix relocation R_X86_64_32 errors with static builds --- CMakeLists.txt | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7e575da..d93906c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,6 +28,7 @@ ############################################################################# cmake_minimum_required(VERSION 2.8) +cmake_policy(SET CMP0018 NEW) include(CheckIncludeFiles) include(CheckFunctionExists) @@ -122,10 +123,23 @@ message(STATUS "GMIO_TARGET_ARCH_BIT_SIZE = ${GMIO_TARGET_ARCH_BIT_SIZE}") include(TestBigEndian) test_big_endian(GMIO_HOST_IS_BIG_ENDIAN) -# Adapt C compiler flags to enable strict ISO C99 conformance +# Adapt C compiler flags for GCC if(CMAKE_C_COMPILER_IS_GCC_COMPATIBLE) + # Enable strict ISO C99 conformance set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -pedantic-errors") add_definitions(-D_POSIX_SOURCE) + + # cmake < v2.8.9 does not support CMAKE_POSITION_INDEPENDENT_CODE + # For this project, gcc needs -fPIC option on x86_64 UNIX platform + if(NOT (WIN32 OR CYGWIN) + AND (CMAKE_VERSION VERSION_LESS 2.8.9) + AND (${CMAKE_SYSTEM_PROCESSOR} MATCHES "i.86") + AND (GMIO_TARGET_ARCH_BIT_SIZE EQUAL 64)) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_SHARED_LIBRARY_C_FLAGS}") + endif() + + # Force PIC + set(CMAKE_POSITION_INDEPENDENT_CODE ON) endif() set(CMAKE_REQUIRED_FLAGS "${CMAKE_C_FLAGS}") @@ -287,9 +301,6 @@ if(CMAKE_C_COMPILER_IS_GCC_COMPATIBLE) if (NOT GMIO_GCC_DOESNT_WARN_UNIVERSAL_0_INITIALIZER) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-missing-braces -Wno-missing-field-initializers") endif() - - # Force PIC for GCC - set(CMAKE_POSITION_INDEPENDENT_CODE ON) endif() # Specific flags for Clang From 33cd1d948b63b34f720054c02d8ff55f7f4e3d2c Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Fri, 30 Dec 2016 16:44:48 +0100 Subject: [PATCH 23/81] cmake: don't force CMP0018 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d93906c..d5ddf96 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,7 +28,7 @@ ############################################################################# cmake_minimum_required(VERSION 2.8) -cmake_policy(SET CMP0018 NEW) +#cmake_policy(SET CMP0018 NEW) include(CheckIncludeFiles) include(CheckFunctionExists) From b5ec0f89ac55c70ba8a182b61becf7a6cdb63273 Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Fri, 30 Dec 2016 16:52:36 +0100 Subject: [PATCH 24/81] cmake: try to debug compilation error on travis CI --- CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index d5ddf96..44ccd3a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -129,6 +129,9 @@ if(CMAKE_C_COMPILER_IS_GCC_COMPATIBLE) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -pedantic-errors") add_definitions(-D_POSIX_SOURCE) + message(STATUS "CMAKE_SHARED_LIBRARY_C_FLAGS = ${CMAKE_SHARED_LIBRARY_C_FLAGS}") + message(STATUS "CMAKE_SYSTEM_PROCESSOR = ${CMAKE_SYSTEM_PROCESSOR}") + # cmake < v2.8.9 does not support CMAKE_POSITION_INDEPENDENT_CODE # For this project, gcc needs -fPIC option on x86_64 UNIX platform if(NOT (WIN32 OR CYGWIN) From b134f809e7e98284f50fa867c139d1e3df8df08e Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Fri, 30 Dec 2016 16:57:34 +0100 Subject: [PATCH 25/81] cmake: add case to detect x86 processor family --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 44ccd3a..62a0a02 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -136,7 +136,8 @@ if(CMAKE_C_COMPILER_IS_GCC_COMPATIBLE) # For this project, gcc needs -fPIC option on x86_64 UNIX platform if(NOT (WIN32 OR CYGWIN) AND (CMAKE_VERSION VERSION_LESS 2.8.9) - AND (${CMAKE_SYSTEM_PROCESSOR} MATCHES "i.86") + AND ((${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86") + OR (${CMAKE_SYSTEM_PROCESSOR} MATCHES "i.86")) AND (GMIO_TARGET_ARCH_BIT_SIZE EQUAL 64)) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_SHARED_LIBRARY_C_FLAGS}") endif() From b236063dffe0eaf5c0ed651bc1f5515408031dac Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Sat, 31 Dec 2016 15:44:12 +0100 Subject: [PATCH 26/81] cmake: hopefully fix clang compilation errors --- CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 62a0a02..1e60de7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -127,7 +127,9 @@ test_big_endian(GMIO_HOST_IS_BIG_ENDIAN) if(CMAKE_C_COMPILER_IS_GCC_COMPATIBLE) # Enable strict ISO C99 conformance set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -pedantic-errors") - add_definitions(-D_POSIX_SOURCE) + if(CMAKE_COMPILER_IS_GNUCC) + add_definitions(-D_POSIX_SOURCE) + endif() message(STATUS "CMAKE_SHARED_LIBRARY_C_FLAGS = ${CMAKE_SHARED_LIBRARY_C_FLAGS}") message(STATUS "CMAKE_SYSTEM_PROCESSOR = ${CMAKE_SYSTEM_PROCESSOR}") From 8c22af1caeac363cc2e51c68dcdd45a51b4a14a6 Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Mon, 2 Jan 2017 11:28:53 +0100 Subject: [PATCH 27/81] Update ChangeLog file --- ChangeLog | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4973476..6e3d5e2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,16 @@ -v0.3.0 +v0.3.2 (12-10-2016) + * gmio_stl: fix ending error when reading multiple STL solids from stream + (GitHub issue #2) + +v0.3.1 (21-09-2016) + * gmio_support: fix compilation error with OpenCascade v6.8.0 + (GitHub issue #1) + + * gmio_support: OpenCascade related files no longer requires C++11 + + * gmio_stl: remove public #include of internal header + +v0.3.0 (05-07-2016) * gmio_stl: check LC_NUMERIC is C or POSIX gmio_stla_read() and gmio_stla_write() now checks LC_NUMERIC is either "C" or "POSIX", if not then GMIO_ERROR_BAD_LC_NUMERIC is returned. @@ -8,10 +20,10 @@ v0.3.0 * Relicense under BSD 2-clause -v0.2.1 +v0.2.1 (30-06-2016) * fake_support: fix compilation errors with Clang -v0.2.0 +v0.2.0 (29-06-2016) * gmio_support: fix duplicated vertices when reading STL file into StlMesh_Mesh -v0.1.0 +v0.1.0 (24-06-2016) From 31d26ebd325ca2362311a3e9f41681896d28c69c Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Mon, 2 Jan 2017 11:45:51 +0100 Subject: [PATCH 28/81] scripts: add containing folder --- .travis.yml | 4 ++-- bump-version.rb => scripts/bump-version.rb | 0 coverity_travis.yml => scripts/coverity_travis.yml | 0 travis-build-script.sh => scripts/travis-build.sh | 0 4 files changed, 2 insertions(+), 2 deletions(-) rename bump-version.rb => scripts/bump-version.rb (100%) rename coverity_travis.yml => scripts/coverity_travis.yml (100%) rename travis-build-script.sh => scripts/travis-build.sh (100%) diff --git a/.travis.yml b/.travis.yml index cccf757..6ca513d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,5 +37,5 @@ matrix: env: TRAVIS_BUILD_TYPE=Release script: - - chmod +x travis-build-script.sh - - ./travis-build-script.sh + - chmod +x travis-build.sh + - ./travis-build.sh diff --git a/bump-version.rb b/scripts/bump-version.rb similarity index 100% rename from bump-version.rb rename to scripts/bump-version.rb diff --git a/coverity_travis.yml b/scripts/coverity_travis.yml similarity index 100% rename from coverity_travis.yml rename to scripts/coverity_travis.yml diff --git a/travis-build-script.sh b/scripts/travis-build.sh similarity index 100% rename from travis-build-script.sh rename to scripts/travis-build.sh From 7f794f532a1eb4f5086913ad5676eaafd9a9a62f Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Wed, 4 Jan 2017 12:13:45 +0100 Subject: [PATCH 29/81] Fix some compilation errors for Visual C++ 2012 Unfortunately Visual C++ 2012 can't compile gmio because it does not support mixing declarations and instructions. Visual C++ 2013 at least is a prerequisite. --- CMakeLists.txt | 160 ++++++++++++----------- src/gmio_core/config.h.cmake | 10 +- src/gmio_core/global.h | 12 +- src/gmio_core/internal/c99_math_compat.h | 15 ++- src/gmio_core/internal/zip_utils.c | 3 +- src/gmio_core/stream.h | 2 +- src/gmio_stl/stla_read.c | 31 ++--- 7 files changed, 121 insertions(+), 112 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1e60de7..28ace2b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -131,9 +131,6 @@ if(CMAKE_C_COMPILER_IS_GCC_COMPATIBLE) add_definitions(-D_POSIX_SOURCE) endif() - message(STATUS "CMAKE_SHARED_LIBRARY_C_FLAGS = ${CMAKE_SHARED_LIBRARY_C_FLAGS}") - message(STATUS "CMAKE_SYSTEM_PROCESSOR = ${CMAKE_SYSTEM_PROCESSOR}") - # cmake < v2.8.9 does not support CMAKE_POSITION_INDEPENDENT_CODE # For this project, gcc needs -fPIC option on x86_64 UNIX platform if(NOT (WIN32 OR CYGWIN) @@ -148,6 +145,75 @@ if(CMAKE_C_COMPILER_IS_GCC_COMPATIBLE) set(CMAKE_POSITION_INDEPENDENT_CODE ON) endif() +# Adapt C compiler flags GCC-like compilers +if(CMAKE_C_COMPILER_IS_GCC_COMPATIBLE) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstrict-aliasing") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wstrict-aliasing") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wcast-align -Wfloat-equal") + #set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Winline") + if(CMAKE_COMPILER_IS_GNUCC) + # Undefined behavior sanitizer(ubsan), requires GCC >= v4.9 + #set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=undefined") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wlogical-op") + else() + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wlogical-op-parentheses") + endif() + + # Disable warnings -Wno-missing-braces -Wno-missing-field-initializers + # in case GCC wrongly warns about universal zero initializer {0} + # See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53119 + set(CMAKE_REQUIRED_FLAGS "${CMAKE_C_FLAGS} -Werror=missing-braces") + check_c_source_compiles( + "struct data { char array[128]; }; + int main() { + struct data d = {0}; + return d.array[0]; + }" + GMIO_GCC_DOESNT_WARN_UNIVERSAL_0_INITIALIZER) + set(CMAKE_REQUIRED_FLAGS "${CMAKE_C_FLAGS}") # Restore CMAKE_REQUIRED_FLAGS + if (NOT GMIO_GCC_DOESNT_WARN_UNIVERSAL_0_INITIALIZER) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-missing-braces -Wno-missing-field-initializers") + endif() +endif() + +# Adapt C compiler flags Clang +if(CMAKE_COMPILER_IS_CLANG) + # Clang on apple-darwin13.4.0 wrongly reports many unused functions + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-function") +endif() + +# Adapt C compiler flags for Visual C++ +if(MSVC) + # Set warning level to /W4 + string(REGEX REPLACE "/W[0-9]" "/W4" CMAKE_C_FLAGS ${CMAKE_C_FLAGS}) + + # Set warning level to /Wall + #string(REGEX REPLACE "/W[0-9]" "/Wall" CMAKE_C_FLAGS ${CMAKE_C_FLAGS}) + #set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4255 /wd4710 /wd4711 /wd4820") + + # Enable static analysis + #set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /analyze") + #set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /Oi /Qvec-report:2") + + # Treat some warnings as errors + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /we4013") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /we4024") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /we4057") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /we4090") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /we4133") + + # Enable /Zc:strictStrings when msvc_ver > 2012 and build_type != Debug + if((MSVC_VERSION GREATER 1700) AND NOT (CMAKE_BUILD_TYPE STREQUAL "Debug")) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /Zc:strictStrings") + endif() + + # Disable deprecation warnings about "non-secure" CRT functions + add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS) + + # Enable "Generate Intrinsic Functions" + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /Oi") +endif() + set(CMAKE_REQUIRED_FLAGS "${CMAKE_C_FLAGS}") # Some compilers (like GCC v4.9) don't disable when needed @@ -189,11 +255,21 @@ endif() check_function_exists(powf GMIO_HAVE_POWF_FUNC) check_function_exists(sqrtf GMIO_HAVE_SQRTF_FUNC) check_function_exists(strtof GMIO_HAVE_STRTOF_FUNC) -check_symbol_exists(isfinite math.h GMIO_HAVE_ISFINITE_MACRO) -check_symbol_exists(isnan math.h GMIO_HAVE_ISNAN_MACRO) +check_symbol_exists(isfinite math.h GMIO_HAVE_ISFINITE_SYM) +check_symbol_exists(isnan math.h GMIO_HAVE_ISNAN_SYM) +if(WIN32 AND NOT GMIO_HAVE_ISNAN_SYM) + check_symbol_exists(_finite float.h GMIO_HAVE_WIN__FINITE_SYM) +endif() +if(WIN32 AND NOT GMIO_HAVE_ISNAN_SYM) + check_symbol_exists(_isnan float.h GMIO_HAVE_WIN__ISNAN_SYM) +endif() + set(CMAKE_REQUIRED_LIBRARIES) # Pop changes -check_include_files(stdbool.h GMIO_HAVE_STDBOOL_H) +check_c_source_compiles( + "#include + int main() { const bool c = 0; return 0; }" + GMIO_HAVE_C99_BOOL) check_function_exists(snprintf GMIO_HAVE_SNPRINTF_FUNC) if(WIN32 AND NOT GMIO_HAVE_SNPRINTF_FUNC) @@ -278,78 +354,6 @@ elseif(MSVC) GMIO_HAVE_MSVC_BUILTIN_BSWAP_FUNC) endif() -# Specific flags for GCC-like compilers -if(CMAKE_C_COMPILER_IS_GCC_COMPATIBLE) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstrict-aliasing") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wstrict-aliasing") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wcast-align -Wfloat-equal") - #set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Winline") - if(CMAKE_COMPILER_IS_GNUCC) - # Undefined behavior sanitizer(ubsan), requires GCC >= v4.9 - #set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=undefined") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wlogical-op") - else() - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wlogical-op-parentheses") - endif() - - # Disable warnings -Wno-missing-braces -Wno-missing-field-initializers - # in case GCC wrongly warns about universal zero initializer {0} - # See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53119 - set(CMAKE_REQUIRED_FLAGS "${CMAKE_C_FLAGS} -Werror=missing-braces") - check_c_source_compiles( - "struct data { char array[128]; }; - int main() { - struct data d = {0}; - return d.array[0]; - }" - GMIO_GCC_DOESNT_WARN_UNIVERSAL_0_INITIALIZER) - set(CMAKE_REQUIRED_FLAGS "${CMAKE_C_FLAGS}") # Restore CMAKE_REQUIRED_FLAGS - if (NOT GMIO_GCC_DOESNT_WARN_UNIVERSAL_0_INITIALIZER) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-missing-braces -Wno-missing-field-initializers") - endif() -endif() - -# Specific flags for Clang -if(CMAKE_COMPILER_IS_CLANG) - # Clang on apple-darwin13.4.0 wrongly reports many unused functions - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-function") -endif() - -# Specific flags for Visual C++ -if(MSVC) - # Treat all files a C source files - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /TC") - - # Set warning level to /W4 - string(REGEX REPLACE "/W[0-9]" "/W4" CMAKE_C_FLAGS ${CMAKE_C_FLAGS}) - - # Set warning level to /Wall - #string(REGEX REPLACE "/W[0-9]" "/Wall" CMAKE_C_FLAGS ${CMAKE_C_FLAGS}) - #set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4255 /wd4710 /wd4711 /wd4820") - - # Enable static analysis - #set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /analyze") - #set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /Oi /Qvec-report:2") - - # Treat some warnings as errors - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /we4013") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /we4024") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /we4057") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /we4090") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /we4133") - - # Enable /Zc:strictStrings when msvc_ver > 2012 and build_type != Debug - if((MSVC_VERSION GREATER 1700) AND NOT (CMAKE_BUILD_TYPE STREQUAL "Debug")) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /Zc:strictStrings") - endif() - - # Disable deprecation warnings about "non-secure" CRT functions - add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS) - - # Enable "Generate Intrinsic Functions" - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /Oi") -endif() - #set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) # zlib diff --git a/src/gmio_core/config.h.cmake b/src/gmio_core/config.h.cmake index 0c1fb74..d87ce35 100644 --- a/src/gmio_core/config.h.cmake +++ b/src/gmio_core/config.h.cmake @@ -50,8 +50,8 @@ #cmakedefine GMIO_HAVE_STDINT_H #endif -#ifndef GMIO_HAVE_STDBOOL_H -#cmakedefine GMIO_HAVE_STDBOOL_H +#ifndef GMIO_HAVE_C99_BOOL +#cmakedefine GMIO_HAVE_C99_BOOL #endif #cmakedefine GMIO_HAVE_STRTOF_FUNC @@ -61,8 +61,10 @@ #cmakedefine GMIO_HAVE_VSNPRINTF_FUNC #cmakedefine GMIO_HAVE_WIN__VSNPRINTF_FUNC -#cmakedefine GMIO_HAVE_ISFINITE_MACRO -#cmakedefine GMIO_HAVE_ISNAN_MACRO +#cmakedefine GMIO_HAVE_ISFINITE_SYM +#cmakedefine GMIO_HAVE_WIN__FINITE_SYM +#cmakedefine GMIO_HAVE_ISNAN_SYM +#cmakedefine GMIO_HAVE_WIN__ISNAN_SYM /* POSIX */ #cmakedefine GMIO_HAVE_SYS_TYPES_H diff --git a/src/gmio_core/global.h b/src/gmio_core/global.h index c3e6623..bb32792 100644 --- a/src/gmio_core/global.h +++ b/src/gmio_core/global.h @@ -146,16 +146,20 @@ typedef uint32_t uintmax_t; #endif -/* GMIO_HAVE_STDBOOL_H */ -#ifdef GMIO_HAVE_STDBOOL_H -# include -#elif !defined(DOXYGEN) && !defined(__cplusplus) +/* GMIO_HAVE_C99_BOOL */ +#ifndef __cplusplus +# if defined(GMIO_HAVE_C99_BOOL) +# include +# endif +# if !defined(__bool_true_false_are_defined) && !defined(DOXYGEN) typedef int bool; enum gmio_bool_value { false = 0, true = 1 }; +# define __bool_true_false_are_defined 1 +# endif #endif /* GMIO_UNUSED */ diff --git a/src/gmio_core/internal/c99_math_compat.h b/src/gmio_core/internal/c99_math_compat.h index d805f93..8c071e7 100644 --- a/src/gmio_core/internal/c99_math_compat.h +++ b/src/gmio_core/internal/c99_math_compat.h @@ -29,7 +29,6 @@ #ifndef GMIO_INTERNAL_C99_MATH_COMPAT_H #define GMIO_INTERNAL_C99_MATH_COMPAT_H - #include "../global.h" #include @@ -50,17 +49,23 @@ GMIO_INLINE float gmio_sqrtf(float x) { return (float)sqrt((double)x); } #endif -#ifdef GMIO_HAVE_ISFINITE_MACRO +#if defined(GMIO_HAVE_ISFINITE_SYM) # define gmio_isfinite(x) isfinite(x) +#elif defined(GMIO_HAVE_WIN__FINITE_SYM) +# include +# define gmio_isfinite(x) _finite(x) #else -/* No isfinite() macro*/ +/* No isfinite() symbol */ # define gmio_isfinite(x) (((x) != NAN) && ((x) != INFINITY)) #endif -#ifdef GMIO_HAVE_ISNAN_MACRO +#if defined(GMIO_HAVE_ISNAN_SYM) # define gmio_isnan(x) isnan(x) +#elif defined(GMIO_HAVE_WIN__ISNAN_SYM) +# include +# define gmio_isnan(x) _isnan(x) #else -/* No isnan() macro*/ +/* No isnan() symbol */ # define gmio_isnan(x) ((x) == NAN) #endif diff --git a/src/gmio_core/internal/zip_utils.c b/src/gmio_core/internal/zip_utils.c index 22575a9..cd4c4bf 100644 --- a/src/gmio_core/internal/zip_utils.c +++ b/src/gmio_core/internal/zip_utils.c @@ -122,7 +122,8 @@ size_t gmio_zip_write_local_file_header( uint8_t* buff = fixed_data; const bool use_data_descriptor = - info->general_purpose_flags & GMIO_ZIP_GENERAL_PURPOSE_FLAG_USE_DATA_DESCRIPTOR; + info->general_purpose_flags + & GMIO_ZIP_GENERAL_PURPOSE_FLAG_USE_DATA_DESCRIPTOR; /* 4-bytes magic number 0x04034b50 */ buff = gmio_adv_encode_uint32_le(0x04034b50, buff); diff --git a/src/gmio_core/stream.h b/src/gmio_core/stream.h index 89ab0e1..3a28e25 100644 --- a/src/gmio_core/stream.h +++ b/src/gmio_core/stream.h @@ -85,7 +85,7 @@ struct gmio_stream /*! Pointer on a function that checks end-of-stream indicator * * Checks whether the end-of-stream indicator associated with stream - * pointed by \p cookie is set, returning true if is. + * pointed by \p cookie is set, returning true if it is. * * The function should behaves like C standard [feof()] * (http://pubs.opengroup.org/onlinepubs/007904975/functions/feof.html) diff --git a/src/gmio_stl/stla_read.c b/src/gmio_stl/stla_read.c index 34384a9..794b66d 100644 --- a/src/gmio_stl/stla_read.c +++ b/src/gmio_stl/stla_read.c @@ -374,8 +374,7 @@ bool stla_token_match_candidate( enum gmio_stla_token token, const enum gmio_stla_token* candidates) { bool found = false; - size_t i; - for (i = 0; !found && candidates[i] != null_token; ++i) + for (size_t i = 0; !found && candidates[i] != null_token; ++i) found = token == candidates[i]; return found; } @@ -416,10 +415,9 @@ int gmio_stla_eat_next_token( enum gmio_stla_token expected_token) { struct gmio_string* token_str = &data->token_str; - enum gmio_eat_word_error eat_error; - token_str->len = 0; - eat_error = gmio_stringstream_eat_word(&data->strstream, token_str); + const enum gmio_eat_word_error eat_error = + gmio_stringstream_eat_word(&data->strstream, token_str); if (eat_error == GMIO_EAT_WORD_ERROR_OK) { const char* expected_token_str = stla_token_to_string(expected_token); if (gmio_ascii_stricmp(token_str->ptr, expected_token_str) == 0) { @@ -443,12 +441,11 @@ int gmio_stla_eat_next_token_inplace( enum gmio_stla_token expected_token) { struct gmio_stringstream* sstream = &data->strstream; - const char* stream_char = NULL; const char* expected_token_str = stla_token_to_string(expected_token); bool error = false; data->token = unknown_token; - stream_char = gmio_stringstream_skip_ascii_spaces(sstream); + const char* stream_char = gmio_stringstream_skip_ascii_spaces(sstream); while (!error) { if (stream_char == NULL || gmio_ascii_isspace(*stream_char)) { if (*expected_token_str == 0) { @@ -472,11 +469,9 @@ int gmio_stla_eat_next_token_inplace( { size_t i = 0; /* -- Copy the matching part of the expected token */ - { - const char* it = stla_token_to_string(expected_token); - while (it != expected_token_str) - data->token_str.ptr[i++] = *(it++); - } + const char* it = stla_token_to_string(expected_token); + while (it != expected_token_str) + data->token_str.ptr[i++] = *(it++); /* -- Copy the non matching part */ while (i < data->token_str.capacity && stream_char != NULL @@ -508,15 +503,13 @@ int gmio_stla_eat_until_token( do { const size_t previous_buff_len = strbuff->len; - enum gmio_eat_word_error eat_word_err = 0; - const char* next_word = NULL; /* Pointer on next word string */ - size_t next_word_len = 0; /* Length of next word string */ - gmio_stringstream_copy_ascii_spaces(sstream, strbuff); /* Next word */ - next_word = strbuff->ptr + strbuff->len; - eat_word_err = gmio_stringstream_eat_word(sstream, strbuff); - next_word_len = (strbuff->ptr + strbuff->len) - next_word; + const char* next_word = strbuff->ptr + strbuff->len; + const enum gmio_eat_word_error eat_word_err = + gmio_stringstream_eat_word(sstream, strbuff); + const size_t next_word_len = + (strbuff->ptr + strbuff->len) - next_word; /* Qualify token */ data->token = eat_word_err == GMIO_EAT_WORD_ERROR_OK ? From 6dc41dc62bf4224dd90f34b95b4f79fdeffdf071 Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Wed, 4 Jan 2017 12:27:18 +0100 Subject: [PATCH 30/81] scripts: add local_build bat files --- scripts/local_build/build.bat | 14 ++++++ scripts/local_build/build_mingw_target.bat | 22 +++++++++ scripts/local_build/build_msvc_target.bat | 53 +++++++++++++++++++++ scripts/local_build/create_build_dirs.bat | 7 +++ scripts/local_build/userbuilds_TEMPLATE.bat | 22 +++++++++ scripts/local_build/uservars_TEMPLATE.bat | 10 ++++ 6 files changed, 128 insertions(+) create mode 100644 scripts/local_build/build.bat create mode 100644 scripts/local_build/build_mingw_target.bat create mode 100644 scripts/local_build/build_msvc_target.bat create mode 100644 scripts/local_build/create_build_dirs.bat create mode 100644 scripts/local_build/userbuilds_TEMPLATE.bat create mode 100644 scripts/local_build/uservars_TEMPLATE.bat diff --git a/scripts/local_build/build.bat b/scripts/local_build/build.bat new file mode 100644 index 0000000..418669f --- /dev/null +++ b/scripts/local_build/build.bat @@ -0,0 +1,14 @@ +set GMIO_LOCAL_CI_ROOT=%~dp0 +call %GMIO_LOCAL_CI_ROOT%\_uservars.bat +set GMIO_ROOT=%GMIO_LOCAL_CI_ROOT%\..\.. +set PATH_MSVC2010=%VS100COMNTOOLS% +set PATH_MSVC2012=%VS110COMNTOOLS% +set PATH_MSVC2013=%VS120COMNTOOLS% +set PATH_MSVC2015=%VS140COMNTOOLS% +set PATH=%PATH_CMAKE%;%PATH_DOXYGEN%;%PATH_JOM%;%PATH% +set PATH_ORIGINAL=%PATH% + +cmake --version +cd %GMIO_BUILD_ROOT% +call %GMIO_LOCAL_CI_ROOT%\_userbuilds.bat +pause diff --git a/scripts/local_build/build_mingw_target.bat b/scripts/local_build/build_mingw_target.bat new file mode 100644 index 0000000..0e467ce --- /dev/null +++ b/scripts/local_build/build_mingw_target.bat @@ -0,0 +1,22 @@ +if not defined GMIO_BUILD_ROOT ( + echo "****ERROR: Variable GMIO_BUILD_ROOT not defined" + exit 0 +) + +set BUILD_TYPE=%1 +set BUILD_OUTPUT_FILE=%GMIO_BUILD_ROOT%\%CURRENT_BUILD%_%BUILD_TYPE%.txt 2>&1 +cd %GMIO_BUILD_ROOT%\%CURRENT_BUILD%\%BUILD_TYPE% +cmake %GMIO_ROOT% -G "MinGW Makefiles" ^ + -DCMAKE_BUILD_TYPE=%BUILD_TYPE% -DCMAKE_DEBUG_POSTFIX=_d ^ + -DCMAKE_INSTALL_PREFIX=%GMIO_BUILD_ROOT%\%CURRENT_BUILD%\install ^ + -DGMIO_FLOAT2STR_LIB=google_doubleconversion ^ + -DGMIO_BUILD_EXAMPLES=ON ^ + -DGMIO_BUILD_TESTS_FAKE_SUPPORT=ON ^ + -DGMIO_BUILD_BENCHMARKS=ON ^ + -DGMIO_BUILD_BENCHMARK_ASSIMP=OFF ^ + -DGMIO_BUILD_BENCHMARK_OPENCASCADE=OFF ^ + -DGMIO_BUILD_BENCHMARK_LIB3MF=OFF ^ + > %BUILD_OUTPUT_FILE% +mingw32-make -j4 >> %BUILD_OUTPUT_FILE% +mingw32-make check >> %BUILD_OUTPUT_FILE% +mingw32-make install >> %BUILD_OUTPUT_FILE% diff --git a/scripts/local_build/build_msvc_target.bat b/scripts/local_build/build_msvc_target.bat new file mode 100644 index 0000000..e128ec8 --- /dev/null +++ b/scripts/local_build/build_msvc_target.bat @@ -0,0 +1,53 @@ +if not defined GMIO_BUILD_ROOT ( + echo "****ERROR: Variable GMIO_BUILD_ROOT not defined" + exit 0 +) + +@set BUILD_TYPE=%1 +@set VSXXXCOMNTOOLS=%~2 +@set TARGET_ARCH=%3 + +@set INCLUDE= +@set LIB= +@set LIBPATH= +@set VS80COMNTOOLS= +@set VS90COMNTOOLS= +@set VS100COMNTOOLS= +@set VS110COMNTOOLS= +@set VS120COMNTOOLS= +@set VS140COMNTOOLS= +@set VSINSTALLDIR= +@set Framework35Version= +@set FrameworkDir= +@set FrameworkVersion= +@set FrameworkDir32= +@set FrameworkVersion32= +@set FrameworkDir64= +@set FrameworkVersion64= +@set WindowsSdkDir= +call "%VSXXXCOMNTOOLS%\..\..\VC\vcvarsall.bat" %TARGET_ARCH% +@set VSXXXCOMNTOOLS= + +if "%ROOTDIR_OPENCASCADE%"=="" ( + set BUILD_BENCHMARK_OPENCASCADE=OFF +) else ( + set BUILD_BENCHMARK_OPENCASCADE=ON +) + +@set BUILD_OUTPUT_FILE=%GMIO_BUILD_ROOT%\%CURRENT_BUILD%_%BUILD_TYPE%.txt 2>&1 +cd %GMIO_BUILD_ROOT%\%CURRENT_BUILD%\%BUILD_TYPE% +cmake %GMIO_ROOT% -G "NMake Makefiles" ^ + -DCMAKE_BUILD_TYPE=%BUILD_TYPE% -DCMAKE_DEBUG_POSTFIX=_d ^ + -DCMAKE_INSTALL_PREFIX=%GMIO_BUILD_ROOT%\%CURRENT_BUILD%\install ^ + -DGMIO_FLOAT2STR_LIB=google_doubleconversion ^ + -DGMIO_BUILD_EXAMPLES=ON ^ + -DGMIO_BUILD_TESTS_FAKE_SUPPORT=ON ^ + -DGMIO_BUILD_BENCHMARKS=ON ^ + -DGMIO_BUILD_BENCHMARK_ASSIMP=ON -DROOTDIR_ASSIMP=%ROOTDIR_ASSIMP% ^ + -DGMIO_BUILD_BENCHMARK_OPENCASCADE=%BUILD_BENCHMARK_OPENCASCADE% ^ + -DROOTDIR_OPENCASCADE=%ROOTDIR_OPENCASCADE% ^ + -DGMIO_BUILD_BENCHMARK_LIB3MF=OFF ^ + > %BUILD_OUTPUT_FILE% +jom -j4 >> %BUILD_OUTPUT_FILE% +jom check >> %BUILD_OUTPUT_FILE% +jom install >> %BUILD_OUTPUT_FILE% diff --git a/scripts/local_build/create_build_dirs.bat b/scripts/local_build/create_build_dirs.bat new file mode 100644 index 0000000..10b83cc --- /dev/null +++ b/scripts/local_build/create_build_dirs.bat @@ -0,0 +1,7 @@ +if defined GMIO_BUILD_ROOT ( + cd %GMIO_BUILD_ROOT% + rmdir /S /Q %1 + mkdir %1 + cd %1 + mkdir debug release install +) diff --git a/scripts/local_build/userbuilds_TEMPLATE.bat b/scripts/local_build/userbuilds_TEMPLATE.bat new file mode 100644 index 0000000..3c36e7c --- /dev/null +++ b/scripts/local_build/userbuilds_TEMPLATE.bat @@ -0,0 +1,22 @@ +rem -- Visual C++ 2013 x64 +set %PATH%=%PATH_ORIGINAL% +set CURRENT_BUILD=msvc2013-x64 +call %GMIO_LOCAL_CI_ROOT%\create_build_dirs.bat %CURRENT_BUILD% +call %GMIO_LOCAL_CI_ROOT%\build_msvc_target.bat debug "%PATH_MSVC2013%" amd64 +call %GMIO_LOCAL_CI_ROOT%\build_msvc_target.bat release "%PATH_MSVC2013%" amd64 + +rem -- Visual C++ 2013 x86 +set %PATH%=%PATH_ORIGINAL% +set CURRENT_BUILD=msvc2013-x86 +call %GMIO_LOCAL_CI_ROOT%\create_build_dirs.bat %CURRENT_BUILD% +set ROOTDIR_OPENCASCADE= +call %GMIO_LOCAL_CI_ROOT%\build_msvc_target.bat debug "%PATH_MSVC2013%" x86 +call %GMIO_LOCAL_CI_ROOT%\build_msvc_target.bat release "%PATH_MSVC2013%" x86 + +rem -- MinGW tdm64-gcc-5.1.0 +set %PATH%=%ORIGINAL_PATH% +set CURRENT_BUILD=tdm64-gcc-5.1.0 +call C:\dev\tools\tdm64-gcc-5.1.0\mingwvars.bat +call %GMIO_LOCAL_CI_ROOT%\create_build_dirs.bat %CURRENT_BUILD% +call %GMIO_LOCAL_CI_ROOT%\build_mingw_target.bat debug +call %GMIO_LOCAL_CI_ROOT%\build_mingw_target.bat release diff --git a/scripts/local_build/uservars_TEMPLATE.bat b/scripts/local_build/uservars_TEMPLATE.bat new file mode 100644 index 0000000..ce74643 --- /dev/null +++ b/scripts/local_build/uservars_TEMPLATE.bat @@ -0,0 +1,10 @@ +rem Required user variables +set GMIO_BUILD_ROOT=C:\dev\builds\gmio\local_ci +set PATH_JOM=C:\dev\tools\jom +set PATH_CMAKE=C:\Program Files (x86)\CMake 3.2\bin + +rem Optional user variables +set ROOTDIR_ASSIMP=C:\dev\libs\assimp-3.1.1 +set ROOTDIR_OPENCASCADE_x64=C:\dev\libs\OpenCASCADE7.0.0-vc12-64\opencascade-7.0.0 +set ROOTDIR_LIB3MF= +set PATH_DOXYGEN=C:\Program Files\doxygen\bin From 998e901870ed5368d8bedaea8eb976911868f502 Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Wed, 4 Jan 2017 12:38:22 +0100 Subject: [PATCH 31/81] travis: fix path of travis-build.sh --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6ca513d..282d13c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,5 +37,5 @@ matrix: env: TRAVIS_BUILD_TYPE=Release script: - - chmod +x travis-build.sh - - ./travis-build.sh + - chmod +x scripts/travis-build.sh + - ./scripts/travis-build.sh From 778b371304e0315b709622893d5c1a4d64754f45 Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Wed, 4 Jan 2017 17:22:41 +0100 Subject: [PATCH 32/81] tests: fix test_stla_lc_numeric() in case environment's loale is already "C" --- tests/test_stl_io.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/tests/test_stl_io.c b/tests/test_stl_io.c index 845689d..185acdb 100644 --- a/tests/test_stl_io.c +++ b/tests/test_stl_io.c @@ -369,7 +369,7 @@ static const char* test_stla_lc_numeric() int error[4] = {0}; gmio_lc_numeric_save(); - setlocale(LC_NUMERIC, ""); + setlocale(LC_NUMERIC, ""); /* "" -> environment's default locale */ if (!gmio_lc_numeric_is_C()) { struct gmio_stl_read_options read_opts = {0}; struct gmio_stl_write_options write_opts = {0}; @@ -381,17 +381,14 @@ static const char* test_stla_lc_numeric() error[2] = gmio_stla_read(&null_stream, &null_meshcreator, &read_opts); error[3] = gmio_stl_write( GMIO_STL_FORMAT_ASCII, &null_stream, &null_mesh, &write_opts); - } - else { - fprintf(stderr, "\nskip: default locale is NULL or already C/POSIX"); - } - gmio_lc_numeric_restore(); - { - size_t i = 0; - for (; i < GMIO_ARRAY_SIZE(error); ++i) { + for (size_t i = 0; i < GMIO_ARRAY_SIZE(error); ++i) { UTEST_COMPARE_INT(GMIO_ERROR_BAD_LC_NUMERIC, error[i]); } } + else { + fprintf(stderr, "\nskip: default locale is NULL or already C/POSIX\n"); + } + gmio_lc_numeric_restore(); return NULL; } From 3a11906c9689a242c289320f32e0b159bac89f75 Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Wed, 4 Jan 2017 17:29:32 +0100 Subject: [PATCH 33/81] tests: refactoring about variable decls --- tests/test_stl_io.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/tests/test_stl_io.c b/tests/test_stl_io.c index 185acdb..7a6c70e 100644 --- a/tests/test_stl_io.c +++ b/tests/test_stl_io.c @@ -151,7 +151,6 @@ static const char* test_stlb_header_write() const char* filepath = "temp/solid.stlb"; struct gmio_stlb_header header = {0}; const char* header_str = "temp/solid.stlb generated with gmio library"; - int error = GMIO_ERROR_OK; { FILE* outfile = fopen(filepath, "wb"); @@ -159,7 +158,7 @@ static const char* test_stlb_header_write() memcpy(&header, header_str, GMIO_MIN(GMIO_STLB_HEADER_SIZE, strlen(header_str))); - error = gmio_stlb_header_write( + const int error = gmio_stlb_header_write( &stream, GMIO_ENDIANNESS_LITTLE, &header, 0); fclose(outfile); UTEST_COMPARE_INT(GMIO_ERROR_OK, error); @@ -168,7 +167,7 @@ static const char* test_stlb_header_write() { struct gmio_stl_data data = {0}; struct gmio_stl_mesh_creator creator = gmio_stl_data_mesh_creator(&data); - error = gmio_stl_read_file(filepath, &creator, NULL); + const int error = gmio_stl_read_file(filepath, &creator, NULL); UTEST_COMPARE_INT(GMIO_ERROR_OK, error); UTEST_ASSERT(gmio_stlb_header_equal(&header, &data.header)); UTEST_COMPARE_UINT(0, data.tri_array.count); @@ -192,12 +191,11 @@ static const char* test_stlb_write() const char* model_fpath_out = "temp/solid.le_stlb"; const char* model_fpath_out_be = "temp/solid.be_stlb"; struct gmio_stl_data data = {0}; - int error = GMIO_ERROR_OK; /* Read input model file */ { struct gmio_stl_mesh_creator creator = gmio_stl_data_mesh_creator(&data); - error = gmio_stl_read_file(model_fpath, &creator, NULL); + const int error = gmio_stl_read_file(model_fpath, &creator, NULL); UTEST_COMPARE_INT(GMIO_ERROR_OK, error); } @@ -208,13 +206,14 @@ static const char* test_stlb_write() const struct gmio_stl_mesh mesh = gmio_stl_data_mesh(&data); struct gmio_stl_write_options opts = {0}; opts.stlb_header = data.header; - error = gmio_stl_write_file( + int error = gmio_stl_write_file( GMIO_STL_FORMAT_BINARY_LE, model_fpath_out, &mesh, &opts); UTEST_COMPARE_INT(GMIO_ERROR_OK, error); /* Big-endian version */ error = gmio_stl_write_file( GMIO_STL_FORMAT_BINARY_BE, model_fpath_out_be, &mesh, &opts); + UTEST_COMPARE_INT(GMIO_ERROR_OK, error); } /* Check input and output models are equal */ @@ -251,7 +250,7 @@ static const char* test_stlb_write() { struct gmio_stl_data data_be = {0}; struct gmio_stl_mesh_creator creator = gmio_stl_data_mesh_creator(&data_be); - error = gmio_stl_read_file(model_fpath_out_be, &creator, NULL); + const int error = gmio_stl_read_file(model_fpath_out_be, &creator, NULL); UTEST_COMPARE_INT(GMIO_ERROR_OK, error); UTEST_ASSERT(gmio_stlb_header_equal(&data.header, &data_be.header)); UTEST_COMPARE_UINT(data.tri_array.count, data_be.tri_array.count); @@ -273,12 +272,11 @@ static const char* test_stla_write() const char* model_filepath_out = "temp/solid.stla"; struct gmio_stl_data data = {0}; /* TODO: fix memory leak on error */ char header_str[GMIO_STLB_HEADER_SIZE + 1] = {0}; - int error = GMIO_ERROR_OK; /* Read input model file */ { struct gmio_stl_mesh_creator creator = gmio_stl_data_mesh_creator(&data); - error = gmio_stl_read_file(model_filepath, &creator, NULL); + const int error = gmio_stl_read_file(model_filepath, &creator, NULL); UTEST_COMPARE_INT(GMIO_ERROR_OK, error); } @@ -290,7 +288,7 @@ static const char* test_stla_write() opts.stla_solid_name = header_str; opts.stla_float32_prec = 7; opts.stla_float32_format = GMIO_FLOAT_TEXT_FORMAT_SHORTEST_LOWERCASE; - error = gmio_stl_write_file( + const int error = gmio_stl_write_file( GMIO_STL_FORMAT_ASCII, model_filepath_out, &mesh, &opts); UTEST_COMPARE_INT(GMIO_ERROR_OK, error); } @@ -301,18 +299,17 @@ static const char* test_stla_write() struct gmio_stl_data data_stla = {0}; struct gmio_stl_mesh_creator creator = gmio_stl_data_mesh_creator(&data_stla); - size_t i = 0; gmio_cstr_copy( trim_header_str, sizeof(trim_header_str), header_str, sizeof(header_str)); gmio_string_trim_from_end(trim_header_str, sizeof(header_str)); - error = gmio_stl_read_file(model_filepath_out, &creator, NULL); + const int error = gmio_stl_read_file(model_filepath_out, &creator, NULL); UTEST_COMPARE_INT(GMIO_ERROR_OK, error); UTEST_COMPARE_UINT(data.tri_array.count, data_stla.tri_array.count); UTEST_COMPARE_CSTR(trim_header_str, data_stla.solid_name); - for (i = 0; i < data.tri_array.count; ++i) { + for (size_t i = 0; i < data.tri_array.count; ++i) { const struct gmio_stl_triangle* lhs = &data.tri_array.ptr[i]; const struct gmio_stl_triangle* rhs = &data_stla.tri_array.ptr[i]; const bool tri_equal = gmio_stl_triangle_equal(lhs, rhs, 5); From 8bcac9ad4713f6d8c4be3a063d011b25a12cbde3 Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Fri, 6 Jan 2017 12:24:28 +0100 Subject: [PATCH 34/81] tests: fully test ZIP archive generated by gmio_amf_write() --- src/gmio_amf/amf_io.c | 5 +- src/gmio_core/internal/zip_utils.c | 378 +++++++++++++++++++++++----- src/gmio_core/internal/zip_utils.h | 51 +++- src/gmio_core/internal/zlib_utils.c | 82 +++++- src/gmio_core/internal/zlib_utils.h | 20 ++ tests/main_test_amf.c | 3 +- tests/test_amf_io.c | 313 ++++++++++++++--------- 7 files changed, 642 insertions(+), 210 deletions(-) diff --git a/src/gmio_amf/amf_io.c b/src/gmio_amf/amf_io.c index d3f746b..034f414 100644 --- a/src/gmio_amf/amf_io.c +++ b/src/gmio_amf/amf_io.c @@ -632,7 +632,8 @@ static size_t gmio_amf_ostringstream_write_zlib( int z_retcode = Z_OK; context->z_uncompressed_size += len; - context->z_crc32 = crc32(context->z_crc32, (const Bytef*)ptr, len); + context->z_crc32 = + gmio_zlib_crc32_update(context->z_crc32, (const uint8_t*)ptr, len); z_stream->next_in = (z_const Bytef*)ptr; z_stream->avail_in = len; @@ -866,7 +867,7 @@ int gmio_amf_write( (uint8_t*)memblock->ptr + mblock_halfsize, mblock_halfsize, NULL); - context.z_crc32 = crc32(0, NULL, 0); + context.z_crc32 = gmio_zlib_crc32_initial(); context.error = gmio_zlib_compress_init( &context.z_stream, &opts->z_compress_options); diff --git a/src/gmio_core/internal/zip_utils.c b/src/gmio_core/internal/zip_utils.c index cd4c4bf..fa5f209 100644 --- a/src/gmio_core/internal/zip_utils.c +++ b/src/gmio_core/internal/zip_utils.c @@ -75,14 +75,21 @@ static const struct tm* gmio_nonnull_datetime(const struct tm* datetime) return datetime; } -#ifdef GMIO_HAVE_INT64_TYPE -/* Encodes little-endian 64b val in buffer and returns advanced buffer pos */ -static uint8_t* gmio_adv_encode_uint64_le(uint64_t val, uint8_t* bytes) +/* Reads 16b uint from memory (little-endian) and advances buffer pos */ +static uint16_t gmio_adv_decode_uint16_le(const uint8_t** bytes) { - gmio_encode_uint64_le(val, bytes); - return bytes + 8; + const uint16_t val = gmio_decode_uint16_le(*bytes); + *bytes += 2; + return val; +} + +/* Reads 32b uint from memory (little-endian) and advances buffer pos */ +static uint32_t gmio_adv_decode_uint32_le(const uint8_t** bytes) +{ + const uint32_t val = gmio_decode_uint32_le(*bytes); + *bytes += 4; + return val; } -#endif /* Encodes little-endian 32b val in buffer and returns advanced buffer pos */ static uint8_t* gmio_adv_encode_uint32_le(uint32_t val, uint8_t* bytes) @@ -98,25 +105,251 @@ static uint8_t* gmio_adv_encode_uint16_le(uint16_t val, uint8_t* bytes) return bytes + 2; } +#ifdef GMIO_HAVE_INT64_TYPE +/* Reads 64b uint from memory (little-endian) and advances buffer pos */ +static uint64_t gmio_adv_decode_uint64_le(const uint8_t** bytes) +{ + const uint64_t val = gmio_decode_uint64_le(*bytes); + *bytes += 8; + return val; +} + +/* Encodes little-endian 64b val in buffer and returns advanced buffer pos */ +static uint8_t* gmio_adv_encode_uint64_le(uint64_t val, uint8_t* bytes) +{ + gmio_encode_uint64_le(val, bytes); + return bytes + 8; +} +#endif + /* Helper to facilitate return from gmio_zip_write_xxx() API functions */ static size_t gmio_zip_write_returnhelper( - struct gmio_stream* stream, size_t written, size_t expected, int* error) + struct gmio_stream* stream, + size_t written, + size_t expected, + int* ptr_error) { - if (error != NULL) { + if (ptr_error != NULL) { const bool no_error = written == expected && !gmio_stream_error(stream); - *error = no_error ? GMIO_ERROR_OK : GMIO_ERROR_STREAM; + *ptr_error = no_error ? GMIO_ERROR_OK : GMIO_ERROR_STREAM; } return written; } +static bool gmio_zip_read_checkhelper( + struct gmio_stream* stream, size_t read, size_t expected) +{ + return read == expected && !gmio_stream_error(stream); +} + +/* Helper to facilitate return from gmio_zip_read_xxx() and gmio_zip_write_xxx() + * API functions */ +static size_t gmio_zip_io_returnerr(size_t io_len, int error, int* ptr_error) +{ + if (ptr_error != NULL) + *ptr_error = error; + return io_len; +} + /* ---------- * API functions * ---------- */ +size_t gmio_zip_read_local_file_header( + struct gmio_stream *stream, + struct gmio_zip_local_file_header *info, + int *ptr_error) +{ + uint8_t buff[GMIO_ZIP_SIZE_LOCAL_FILE_HEADER]; + uint8_t* buffit = buff; + + const size_t read_len = gmio_stream_read_bytes(stream, buff, sizeof(buff)); + if (!gmio_zip_read_checkhelper(stream, read_len, sizeof(buff))) + return gmio_zip_io_returnerr(read_len, GMIO_ERROR_STREAM, ptr_error); + + /* 4-bytes magic */ + if (gmio_adv_decode_uint32_le(&buffit) != 0x04034b50) { + return gmio_zip_io_returnerr( + read_len, GMIO_ZIP_UTILS_ERROR_BAD_MAGIC, ptr_error); + } + /* 2-bytes version needed to extract */ + info->version_needed_to_extract = gmio_adv_decode_uint16_le(&buffit); + /* 2-bytes general purpose bit flag */ + info->general_purpose_flags = gmio_adv_decode_uint16_le(&buffit); + /* 2-bytes compression method */ + info->compress_method = gmio_adv_decode_uint16_le(&buffit); + /* 2-bytes last mod file time */ + /* 2-bytes last mod file date */ + /* TODO: convert DOS datetime to struct tm */ + const uint32_t dos_datetime = gmio_adv_decode_uint32_le(&buffit); + GMIO_UNUSED(dos_datetime); + info->lastmod_datetime = NULL; + /* 4-bytes crc-32 */ + info->crc32 = gmio_adv_decode_uint32_le(&buffit); + /* 4-bytes compressed size */ + info->compressed_size = gmio_adv_decode_uint32_le(&buffit); + /* 4-bytes uncompressed size */ + info->uncompressed_size = gmio_adv_decode_uint32_le(&buffit); + /* 2-bytes file name length */ + info->filename_len = gmio_adv_decode_uint16_le(&buffit); + /* 2-bytes extra field length */ + info->extrafield_len = gmio_adv_decode_uint16_le(&buffit); + + info->filename = NULL; + info->extrafield = NULL; + + return gmio_zip_io_returnerr(read_len, GMIO_ERROR_OK, ptr_error); +} + +size_t gmio_zip_write_data_descriptor( + struct gmio_stream *stream, + const struct gmio_zip_data_descriptor *info, + int* ptr_error) +{ + const size_t fixed_data_len = + info->use_zip64 ? + GMIO_ZIP64_SIZE_DATA_DESCRIPTOR : + GMIO_ZIP_SIZE_DATA_DESCRIPTOR; + uint8_t fixed_data[GMIO_ZIP64_SIZE_DATA_DESCRIPTOR]; + uint8_t* buff = fixed_data; + + /* 4-bytes crc-32 */ + buff = gmio_adv_encode_uint32_le(info->crc32, buff); + /* Compressed size and uncompressed size (4 or 8 bytes) */ + if (info->use_zip64) { +#ifdef GMIO_HAVE_INT64_TYPE + buff = gmio_adv_encode_uint64_le(info->compressed_size, buff); + buff = gmio_adv_encode_uint64_le(info->uncompressed_size, buff); +#else + /* TODO: error code */ + return gmio_zip_io_returnerr(0, GMIO_ERROR_UNKNOWN, ptr_error); +#endif + } + else { + if (info->compressed_size <= UINT32_MAX + && info->uncompressed_size <= UINT32_MAX) + { + buff = gmio_adv_encode_uint32_le((uint32_t)info->compressed_size, buff); + buff = gmio_adv_encode_uint32_le((uint32_t)info->uncompressed_size, buff); + } + else { + /* TODO: error code */ + return gmio_zip_io_returnerr(0, GMIO_ERROR_UNKNOWN, ptr_error); + } + } + + /* Write to stream */ + const size_t written_len = + gmio_stream_write_bytes(stream, fixed_data, fixed_data_len); + return gmio_zip_write_returnhelper( + stream, written_len, fixed_data_len, ptr_error); +} + +size_t gmio_zip_read_central_directory_header( + struct gmio_stream *stream, + struct gmio_zip_central_directory_header *info, + int *ptr_error) +{ + uint8_t buff[GMIO_ZIP_SIZE_CENTRAL_DIRECTORY_HEADER]; + uint8_t* buffit = buff; + + const size_t read_len = gmio_stream_read_bytes(stream, buff, sizeof(buff)); + if (!gmio_zip_read_checkhelper(stream, read_len, sizeof(buff))) + return gmio_zip_io_returnerr(read_len, GMIO_ERROR_STREAM, ptr_error); + + /* 4-bytes magic */ + if (gmio_adv_decode_uint32_le(&buffit) != 0x02014b50) { + return gmio_zip_io_returnerr( + read_len, GMIO_ZIP_UTILS_ERROR_BAD_MAGIC, ptr_error); + } + + /* 2-bytes version made by */ + info->version_made_by = gmio_adv_decode_uint16_le(&buffit); + /* 2-bytes version needed to extract */ + info->version_needed_to_extract = gmio_adv_decode_uint16_le(&buffit); + /* 2-bytes general purpose bit flag */ + info->general_purpose_flags = gmio_adv_decode_uint16_le(&buffit); + /* 2-bytes compression method */ + info->compress_method = gmio_adv_decode_uint16_le(&buffit); + /* 2-bytes last mod file time */ + /* 2-bytes last mod file date */ + /* TODO: convert DOS datetime to struct tm */ + const uint32_t dos_datetime = gmio_adv_decode_uint32_le(&buffit); + GMIO_UNUSED(dos_datetime); + info->lastmod_datetime = NULL; + /* 4-bytes crc-32 */ + info->crc32 = gmio_adv_decode_uint32_le(&buffit); + /* 4-bytes compressed size */ + info->compressed_size = gmio_adv_decode_uint32_le(&buffit); + /* 4-bytes uncompressed size */ + info->uncompressed_size = gmio_adv_decode_uint32_le(&buffit); + /* 2-bytes file name length */ + info->filename_len = gmio_adv_decode_uint16_le(&buffit); + /* 2-bytes extra field length */ + info->extrafield_len = gmio_adv_decode_uint16_le(&buffit); + /* 2-bytes file comment length */ + info->filecomment_len = gmio_adv_decode_uint16_le(&buffit); + /* 2-bytes disk number start */ + info->disk_nb_start = gmio_adv_decode_uint16_le(&buffit); + /* 2-bytes internal file attributes */ + info->internal_file_attrs = gmio_adv_decode_uint16_le(&buffit); + /* 4-bytes external file attributes */ + info->external_file_attrs = gmio_adv_decode_uint32_le(&buffit); + /* 4-bytes relative offset of local header */ + info->relative_offset_local_header = gmio_adv_decode_uint32_le(&buffit); + + info->filename = NULL; + info->extrafield = NULL; + info->filecomment = NULL; + + return gmio_zip_io_returnerr(read_len, GMIO_ERROR_OK, ptr_error); +} + +size_t gmio_zip_read_end_of_central_directory_record( + struct gmio_stream *stream, + struct gmio_zip_end_of_central_directory_record *info, + int *ptr_error) +{ + uint8_t buff[GMIO_ZIP_SIZE_END_OF_CENTRAL_DIRECTORY_RECORD]; + uint8_t* buffit = buff; + + const size_t read_len = gmio_stream_read_bytes(stream, buff, sizeof(buff)); + if (!gmio_zip_read_checkhelper(stream, read_len, sizeof(buff))) + return gmio_zip_io_returnerr(read_len, GMIO_ERROR_STREAM, ptr_error); + + /* 4-bytes magic */ + if (gmio_adv_decode_uint32_le(&buffit) != 0x06054b50) { + return gmio_zip_io_returnerr( + read_len, GMIO_ZIP_UTILS_ERROR_BAD_MAGIC, ptr_error); + } + + /* 2-bytes number of this disk */ + info->disk_nb = gmio_adv_decode_uint16_le(&buffit); + /* 2-bytes number of the disk with the start of the central directory */ + info->disk_nb_with_start_of_central_dir = gmio_adv_decode_uint16_le(&buffit); + /* 2-bytes total number of entries in the central directory on this disk */ + info->total_entry_count_in_central_dir_on_disk = + gmio_adv_decode_uint16_le(&buffit); + /* 2-bytes total number of entries in the central directory */ + info->total_entry_count_in_central_dir = gmio_adv_decode_uint16_le(&buffit); + /* 4-bytes size of the central directory */ + info->central_dir_size = gmio_adv_decode_uint32_le(&buffit); + /* 4-bytes offset of start of central directory with respect to the starting + * disk number */ + info->start_offset_central_dir_from_disk_start_nb = + gmio_adv_decode_uint32_le(&buffit); + /* 2-bytes .ZIP file comment length */ + info->filecomment_len = gmio_adv_decode_uint16_le(&buffit); + + info->filecomment = NULL; + + return gmio_zip_io_returnerr(read_len, GMIO_ERROR_OK, ptr_error); +} + size_t gmio_zip_write_local_file_header( struct gmio_stream* stream, const struct gmio_zip_local_file_header* info, - int* error) + int* ptr_error) { uint8_t fixed_data[GMIO_ZIP_SIZE_LOCAL_FILE_HEADER]; uint8_t* buff = fixed_data; @@ -162,55 +395,62 @@ size_t gmio_zip_write_local_file_header( written_len += gmio_stream_write_bytes(stream, info->extrafield, info->extrafield_len); return gmio_zip_write_returnhelper( - stream, written_len, expected_written_len, error); + stream, written_len, expected_written_len, ptr_error); } -size_t gmio_zip_write_data_descriptor( +size_t gmio_zip_read_data_descriptor( struct gmio_stream *stream, - const struct gmio_zip_data_descriptor *info, - int* error) + struct gmio_zip_data_descriptor *info, + int* ptr_error) { - const size_t fixed_data_len = - info->use_zip64 ? - GMIO_ZIP64_SIZE_DATA_DESCRIPTOR : - GMIO_ZIP_SIZE_DATA_DESCRIPTOR; - uint8_t fixed_data[GMIO_ZIP64_SIZE_DATA_DESCRIPTOR]; - uint8_t* buff = fixed_data; + uint8_t buff[GMIO_ZIP_SIZE_DATA_DESCRIPTOR]; + uint8_t* buffit = buff; + + const size_t read_len = gmio_stream_read_bytes(stream, buff, sizeof(buff)); + if (!gmio_zip_read_checkhelper(stream, read_len, sizeof(buff))) + return gmio_zip_io_returnerr(read_len, GMIO_ERROR_STREAM, ptr_error); /* 4-bytes crc-32 */ - buff = gmio_adv_encode_uint32_le(info->crc32, buff); - /* Compressed size and uncompressed size (4 or 8 bytes) */ - if (info->use_zip64) { -#ifdef GMIO_HAVE_INT64_TYPE - buff = gmio_adv_encode_uint64_le(info->compressed_size, buff); - buff = gmio_adv_encode_uint64_le(info->uncompressed_size, buff); -#else - return GMIO_ERROR_UNKNOWN; /* TODO: error code */ -#endif - } - else { - if (info->compressed_size <= UINT32_MAX - && info->uncompressed_size <= UINT32_MAX) - { - buff = gmio_adv_encode_uint32_le((uint32_t)info->compressed_size, buff); - buff = gmio_adv_encode_uint32_le((uint32_t)info->uncompressed_size, buff); - } - else { - return GMIO_ERROR_UNKNOWN; /* TODO: error code */ - } - } + info->crc32 = gmio_adv_decode_uint32_le(&buffit); + /* 4-bytes compressed size */ + info->compressed_size = gmio_adv_decode_uint32_le(&buffit); + /* 4-bytes uncompressed size */ + info->uncompressed_size = gmio_adv_decode_uint32_le(&buffit); - /* Write to stream */ - const size_t written_len = - gmio_stream_write_bytes(stream, fixed_data, fixed_data_len); - return gmio_zip_write_returnhelper( - stream, written_len, fixed_data_len, error); + return gmio_zip_io_returnerr(read_len, GMIO_ERROR_OK, ptr_error); +} + +size_t gmio_zip64_read_data_descriptor( + struct gmio_stream* stream, + struct gmio_zip_data_descriptor* info, + int* ptr_error) +{ +#ifdef GMIO_HAVE_INT64_TYPE + uint8_t buff[GMIO_ZIP64_SIZE_DATA_DESCRIPTOR]; + uint8_t* buffit = buff; + + const size_t read_len = gmio_stream_read_bytes(stream, buff, sizeof(buff)); + if (!gmio_zip_read_checkhelper(stream, read_len, sizeof(buff))) + return gmio_zip_io_returnerr(read_len, GMIO_ERROR_STREAM, ptr_error); + + /* 4-bytes crc-32 */ + info->crc32 = gmio_adv_decode_uint32_le(&buffit); + /* 8-bytes compressed size */ + info->compressed_size = gmio_adv_decode_uint64_le(&buffit); + /* 8-bytes uncompressed size */ + info->uncompressed_size = gmio_adv_decode_uint64_le(&buffit); + + return gmio_zip_io_returnerr(read_len, GMIO_ERROR_OK, ptr_error); +#else + /* TODO: error code */ + return gmio_zip_io_returnerr(0, GMIO_ERROR_UNKNOWN, ptr_error); +#endif } size_t gmio_zip_write_central_directory_header( struct gmio_stream *stream, const struct gmio_zip_central_directory_header *info, - int* error) + int* ptr_error) { uint8_t fixed_data[GMIO_ZIP_SIZE_CENTRAL_DIRECTORY_HEADER]; uint8_t* buff = fixed_data; @@ -270,18 +510,18 @@ size_t gmio_zip_write_central_directory_header( written_len += gmio_stream_write_bytes(stream, info->filecomment, info->filecomment_len); return gmio_zip_write_returnhelper( - stream, written_len, expected_written_len, error); + stream, written_len, expected_written_len, ptr_error); } size_t gmio_zip64_write_extrafield_extended_info( uint8_t *buff, size_t buff_capacity, const struct gmio_zip64_extrablock_extended_info *info, - int* error) + int* ptr_error) { if (buff_capacity < GMIO_ZIP64_SIZE_EXTRAFIELD_EXTENDED_INFO) { - *error = GMIO_ERROR_INVALID_MEMBLOCK_SIZE; - return 0; + return gmio_zip_io_returnerr( + 0, GMIO_ERROR_INVALID_MEMBLOCK_SIZE, ptr_error); } #ifdef GMIO_HAVE_INT64_TYPE /* Tag */ @@ -297,18 +537,20 @@ size_t gmio_zip64_write_extrafield_extended_info( buff = gmio_adv_encode_uint64_le(info->relative_offset_local_header, buff); /* Number of the disk on which this file starts */ buff = gmio_adv_encode_uint32_le(info->disk_nb_start, buff); - *error = GMIO_ERROR_OK; - return GMIO_ZIP64_SIZE_EXTRAFIELD_EXTENDED_INFO; + return gmio_zip_io_returnerr( + GMIO_ZIP64_SIZE_EXTRAFIELD_EXTENDED_INFO, + GMIO_ERROR_OK, + ptr_error); #else - *error = GMIO_ERROR_UNKNOWN; /* TODO: error code */ - return 0; + /* TODO: error code */ + return gmio_zip_io_returnerr(0, GMIO_ERROR_UNKNOWN, error); #endif } size_t gmio_zip_write_end_of_central_directory_record( struct gmio_stream *stream, const struct gmio_zip_end_of_central_directory_record *info, - int* error) + int* ptr_error) { uint8_t fixed_data[GMIO_ZIP_SIZE_END_OF_CENTRAL_DIRECTORY_RECORD]; uint8_t* buff = fixed_data; @@ -322,17 +564,24 @@ size_t gmio_zip_write_end_of_central_directory_record( /* 2-bytes number of the disk with the start of the central directory */ const uint16_t disk_nb_with_start_of_central_dir = - info->use_zip64 ? UINT16_MAX : info->disk_nb_with_start_of_central_dir; + info->use_zip64 ? + UINT16_MAX : + info->disk_nb_with_start_of_central_dir; buff = gmio_adv_encode_uint16_le(disk_nb_with_start_of_central_dir, buff); /* 2-bytes total number of entries in the central directory on this disk */ const uint16_t total_entry_count_in_central_dir_on_disk = - info->use_zip64 ? UINT16_MAX : info->total_entry_count_in_central_dir_on_disk; - buff = gmio_adv_encode_uint16_le(total_entry_count_in_central_dir_on_disk, buff); + info->use_zip64 ? + UINT16_MAX : + info->total_entry_count_in_central_dir_on_disk; + buff = gmio_adv_encode_uint16_le( + total_entry_count_in_central_dir_on_disk, buff); /* 2-bytes total number of entries in the central directory */ const uint16_t total_entry_count_in_central_dir = - info->use_zip64 ? UINT16_MAX : info->total_entry_count_in_central_dir; + info->use_zip64 ? + UINT16_MAX : + info->total_entry_count_in_central_dir; buff = gmio_adv_encode_uint16_le(total_entry_count_in_central_dir, buff); /* 4-bytes size of the central directory */ @@ -343,8 +592,11 @@ size_t gmio_zip_write_end_of_central_directory_record( /* 4-bytes offset of start of central directory with respect to the starting * disk number */ const uint32_t start_offset_central_dir_from_disk_start_nb = - info->use_zip64 ? UINT32_MAX : info->start_offset_central_dir_from_disk_start_nb; - buff = gmio_adv_encode_uint32_le(start_offset_central_dir_from_disk_start_nb, buff); + info->use_zip64 ? + UINT32_MAX : + info->start_offset_central_dir_from_disk_start_nb; + buff = gmio_adv_encode_uint32_le( + start_offset_central_dir_from_disk_start_nb, buff); /* 2-bytes .ZIP file comment length */ buff = gmio_adv_encode_uint16_le(info->filecomment_len, buff); @@ -358,5 +610,5 @@ size_t gmio_zip_write_end_of_central_directory_record( written_len += gmio_stream_write_bytes(stream, info->filecomment, info->filecomment_len); return gmio_zip_write_returnhelper( - stream, written_len, expected_written_len, error); + stream, written_len, expected_written_len, ptr_error); } diff --git a/src/gmio_core/internal/zip_utils.h b/src/gmio_core/internal/zip_utils.h index 85eccf9..1adbb2d 100644 --- a/src/gmio_core/internal/zip_utils.h +++ b/src/gmio_core/internal/zip_utils.h @@ -165,10 +165,10 @@ struct gmio_zip_local_file_header { uint32_t crc32; uint32_t compressed_size; uint32_t uncompressed_size; - const char* filename; - const uint8_t* extrafield; uint16_t filename_len; uint16_t extrafield_len; + const char* filename; + const uint8_t* extrafield; }; /*! Zip data descriptor */ @@ -246,23 +246,58 @@ struct gmio_zip_write_result { size_t written_len; }; +enum { GMIO_ZIP_UTILS_ERROR_TAG = 0xAA000000 }; +enum gmio_zip_utils_error { + GMIO_ZIP_UTILS_ERROR_BAD_MAGIC = GMIO_ZIP_UTILS_ERROR_TAG + 0x01 +}; + +/*! Reads ZIP local file header from \p stream */ +size_t gmio_zip_read_local_file_header( + struct gmio_stream* stream, + struct gmio_zip_local_file_header* info, + int* ptr_error); + +/*! Reads ZIP data descriptor from \p stream */ +size_t gmio_zip_read_data_descriptor( + struct gmio_stream* stream, + struct gmio_zip_data_descriptor* info, + int* ptr_error); + +/*! Reads Zip64 data descriptor from \p stream */ +size_t gmio_zip64_read_data_descriptor( + struct gmio_stream* stream, + struct gmio_zip_data_descriptor* info, + int* ptr_error); + +/*! Reads ZIP central directory header from \p stream */ +size_t gmio_zip_read_central_directory_header( + struct gmio_stream* stream, + struct gmio_zip_central_directory_header* info, + int* ptr_error); + +/*! Reads ZIP end of central directory record from \p stream */ +size_t gmio_zip_read_end_of_central_directory_record( + struct gmio_stream* stream, + struct gmio_zip_end_of_central_directory_record* info, + int* ptr_error); + /*! Writes ZIP local file header to \p stream */ size_t gmio_zip_write_local_file_header( struct gmio_stream* stream, const struct gmio_zip_local_file_header* info, - int* error); + int* ptr_error); /*! Writes ZIP data descriptor to \p stream */ size_t gmio_zip_write_data_descriptor( struct gmio_stream* stream, const struct gmio_zip_data_descriptor* info, - int* error); + int* ptr_error); /*! Writes ZIP central directory header to \p stream */ size_t gmio_zip_write_central_directory_header( struct gmio_stream* stream, const struct gmio_zip_central_directory_header* info, - int* error); + int* ptr_error); /*! Writes ZIP local file header to \p buff * @@ -273,12 +308,12 @@ size_t gmio_zip64_write_extrafield_extended_info( uint8_t* buff, size_t buff_capacity, const struct gmio_zip64_extrablock_extended_info* info, - int* error); + int* ptr_error); -/*! Writes ZIP end of central directory record \p stream */ +/*! Writes ZIP end of central directory record to \p stream */ size_t gmio_zip_write_end_of_central_directory_record( struct gmio_stream* stream, const struct gmio_zip_end_of_central_directory_record* info, - int* error); + int* ptr_error); #endif /* GMIO_INTERNAL_ZIP_UTILS_H */ diff --git a/src/gmio_core/internal/zlib_utils.c b/src/gmio_core/internal/zlib_utils.c index 1799545..b7c24e7 100644 --- a/src/gmio_core/internal/zlib_utils.c +++ b/src/gmio_core/internal/zlib_utils.c @@ -30,6 +30,18 @@ #include "zlib_utils.h" #include "../error.h" +/* zlib doc: + * the windowBits parameter is the base two logarithm of the window size + * (the size of the history buffer). It should be in the range 8..15 for + * this version of the library. Larger values of this parameter result in + * better compression at the expense of memory usage. The default value is + * 15 if deflateInit is used instead. + * windowBits can also be –8..–15 for raw deflate. In this case, -windowBits + * determines the window size. deflate() will then generate raw deflate + * data with no zlib header or trailer, and will not compute an adler32 + * check value. */ +static const int z_window_bits_for_no_zlib_wrapper = -15; + static int gmio_to_zlib_compress_level(int gmio_compress_level) { if (gmio_compress_level == GMIO_ZLIB_COMPRESS_LEVEL_DEFAULT) @@ -69,23 +81,12 @@ int gmio_zlib_compress_init( gmio_to_zlib_compress_level(z_opts->level); const int zlib_compress_memusage = gmio_to_zlib_compress_memusage(z_opts->memory_usage); - /* zlib doc: - * the windowBits parameter is the base two logarithm of the window size - * (the size of the history buffer). It should be in the range 8..15 for - * this version of the library. Larger values of this parameter result in - * better compression at the expense of memory usage. The default value is - * 15 if deflateInit is used instead. - * windowBits can also be –8..–15 for raw deflate. In this case, -windowBits - * determines the window size. deflate() will then generate raw deflate - * data with no zlib header or trailer, and will not compute an adler32 - * check value. */ - static const int z_window_bits = -15; const int z_init_error = deflateInit2_( z_stream, zlib_compress_level, Z_DEFLATED, /* Method */ - z_window_bits, + z_window_bits_for_no_zlib_wrapper, zlib_compress_memusage, z_opts->strategy, ZLIB_VERSION, @@ -104,3 +105,60 @@ bool gmio_check_zlib_compress_options( } return gmio_no_error(*error); } + +int gmio_zlib_uncompress_buffer( + uint8_t* dest, size_t* dest_len, const uint8_t* src, size_t src_len) +{ + z_stream stream; + int err; + + stream.next_in = (z_const Bytef *)src; + stream.avail_in = (uInt)src_len; + /* Check for source > 64K on 16-bit machine: */ + if ((uLong)stream.avail_in != src_len) + return GMIO_ERROR_ZLIB_BUF; + + stream.next_out = dest; + stream.avail_out = (uInt)*dest_len; + if ((uLong)stream.avail_out != *dest_len) + return GMIO_ERROR_ZLIB_BUF; + + stream.zalloc = (alloc_func)NULL; + stream.zfree = (free_func)NULL; + + err = inflateInit2_( + &stream, + z_window_bits_for_no_zlib_wrapper, + ZLIB_VERSION, + sizeof(z_stream)); + if (err != Z_OK) + return err; + + err = inflate(&stream, Z_FINISH); + if (err != Z_STREAM_END) { + inflateEnd(&stream); + if (err == Z_NEED_DICT || (err == Z_BUF_ERROR && stream.avail_in == 0)) + return GMIO_ERROR_ZLIB_DATA; + return err; + } + *dest_len = stream.total_out; + + err = inflateEnd(&stream); + return zlib_error_to_gmio_error(err); +} + +uint32_t gmio_zlib_crc32(const uint8_t *buff, size_t buff_len) +{ + return gmio_zlib_crc32_update(gmio_zlib_crc32_initial(), buff, buff_len); +} + +uint32_t gmio_zlib_crc32_update( + uint32_t crc, const uint8_t *buff, size_t buff_len) +{ + return crc32(crc, (const Bytef*)buff, (uInt)buff_len); +} + +uint32_t gmio_zlib_crc32_initial() +{ + return crc32(0, NULL, 0); +} diff --git a/src/gmio_core/internal/zlib_utils.h b/src/gmio_core/internal/zlib_utils.h index 6957ede..bb4c805 100644 --- a/src/gmio_core/internal/zlib_utils.h +++ b/src/gmio_core/internal/zlib_utils.h @@ -46,4 +46,24 @@ int gmio_zlib_compress_init( bool gmio_check_zlib_compress_options( int* error, const struct gmio_zlib_compress_options* z_opts); +/* Decompresses the source buffer into the destination buffer. + * + * \p sourceLen is the byte length of the source buffer. Upon entry, \p destLen + * is the total size of the destination buffer, which must be large enough to + * hold the entire uncompressed data. + * Upon exit, destLen is the actual size of the compressed buffer. + */ +int gmio_zlib_uncompress_buffer( + uint8_t* dest, size_t* dest_len, const uint8_t* src, size_t src_len); + +/* Computes the CRC-32 value with the bytes buff[0..buff_len-1] */ +uint32_t gmio_zlib_crc32(const uint8_t* buff, size_t buff_len); + +/* Returns the required initial value for the gmio_zlib_crc32_update() */ +uint32_t gmio_zlib_crc32_initial(); + +/* Updates a running CRC-32 with the bytes buff[0..buff_len-1] */ +uint32_t gmio_zlib_crc32_update( + uint32_t crc, const uint8_t* buff, size_t buff_len); + #endif /* GMIO_INTERNAL_ZLIB_UTILS_H */ diff --git a/tests/main_test_amf.c b/tests/main_test_amf.c index 71eae47..be30e46 100644 --- a/tests/main_test_amf.c +++ b/tests/main_test_amf.c @@ -48,7 +48,8 @@ const char* all_tests() gmio_memblock_set_default_constructor(gmio_memblock_for_tests); - UTEST_RUN(test_amf_write); + UTEST_RUN(test_amf_write_doc_null); + UTEST_RUN(test_amf_write_doc_1); return NULL; } diff --git a/tests/test_amf_io.c b/tests/test_amf_io.c index c2e2c4f..7b34f88 100644 --- a/tests/test_amf_io.c +++ b/tests/test_amf_io.c @@ -36,6 +36,7 @@ #include "../src/gmio_core/internal/byte_codec.h" #include "../src/gmio_core/internal/helper_stream.h" #include "../src/gmio_core/internal/zip_utils.h" +#include "../src/gmio_core/internal/zlib_utils.h" #include "../src/gmio_amf/amf_error.h" #include "../src/gmio_amf/amf_io.h" @@ -178,97 +179,105 @@ static void __tamf__skip_zip_local_file_header() } -static const char* test_amf_write() +static const char* test_amf_write_doc_null() { + struct gmio_stream stream = {0}; + struct gmio_amf_document doc = {0}; + const int error = gmio_amf_write(&stream, &doc, NULL); + UTEST_ASSERT(gmio_error(error)); + return NULL; +} + +static const char* test_amf_write_doc_1() +{ + static const size_t wbuffsize = 8192; + struct gmio_rw_buffer wbuff = {0}; + struct gmio_amf_document doc = {0}; + + const struct __tamf__material testmaterials[] = { + { { 1., 0., 0. }, "red" }, + { { 0., 1., 0. }, "green" }, + { { 0., 0., 1. }, "blue" }, + { { 1., 1., 1. }, "white" } + }; + + const struct gmio_vec3d testvertices[] = { + { 0., 0., 0.}, + { 1., 0., 0.}, + { 1., -1., 0.}, + { 0., -1., 0.}, + { 1., 0., 1.}, + { 1., -1., 1.}, + { 0., 0., 1.}, + { 0., -1., 1.} + }; + const struct __tamf__triangle testtriangles[] = { + { 0, 1, 2}, + { 0, 2, 3}, + { 1, 5, 2}, + { 1, 4, 5}, + { 6, 5, 7}, + { 6, 4, 5}, + { 0, 6, 7}, + { 0, 7, 3}, + { 0, 6, 4}, + { 0, 4, 1}, + { 3, 7, 5}, + { 3, 5, 2} + }; + struct __tamf__document testdoc = {0}; + + wbuff.ptr = calloc(wbuffsize, 1); + wbuff.len = wbuffsize; + + testdoc.vec_material = testmaterials; + testdoc.mesh.vec_vertex = testvertices; + testdoc.mesh.vertex_count = GMIO_ARRAY_SIZE(testvertices); + testdoc.mesh.vec_triangle = testtriangles; + testdoc.mesh.triangle_count = GMIO_ARRAY_SIZE(testtriangles); + + doc.cookie = &testdoc; + doc.unit = GMIO_AMF_UNIT_MILLIMETER; + doc.func_get_document_element = &__tamf__get_document_element; + doc.func_get_object_mesh = &__tamf__get_object_mesh; + doc.func_get_object_mesh_element = &__tamf__get_object_mesh_element; + doc.func_get_object_mesh_volume_triangle = + &__tamf__get_object_mesh_volume_triangle; + doc.func_get_document_element_metadata = + &__tamf__get_document_element_metadata; + doc.object_count = 1; + doc.material_count = GMIO_ARRAY_SIZE(testmaterials); + + /* Write as raw contents(uncompressed) */ { - struct gmio_stream stream = {0}; - struct gmio_amf_document doc = {0}; - const int error = gmio_amf_write(&stream, &doc, NULL); - UTEST_ASSERT(gmio_error(error)); + struct gmio_stream stream = gmio_stream_buffer(&wbuff); + struct gmio_amf_write_options options = {0}; + options.float64_prec = 9; + const int error = gmio_amf_write(&stream, &doc, &options); + if (gmio_error(error)) + printf("\n0x%x\n", error); + UTEST_COMPARE_INT(error, GMIO_ERROR_OK); + /* printf("%s\n", wbuff.ptr); */ } + /* Write compressed ZIP */ { - static const size_t wbuffsize = 8192; - struct gmio_rw_buffer wbuff = {0}; - struct gmio_stream stream = gmio_stream_buffer(&wbuff); - struct gmio_amf_document doc = {0}; - struct gmio_amf_write_options options = {0}; + const size_t source_len = wbuff.pos; + const uint32_t crc32_amf_data = gmio_zlib_crc32(wbuff.ptr, source_len); + uint8_t* source = calloc(source_len, 1); + memcpy(source, wbuff.ptr, source_len); - const struct __tamf__material testmaterials[] = { - { { 1., 0., 0. }, "red" }, - { { 0., 1., 0. }, "green" }, - { { 0., 0., 1. }, "blue" }, - { { 1., 1., 1. }, "white" } - }; - const struct gmio_vec3d testvertices[] = { - { 0., 0., 0.}, - { 1., 0., 0.}, - { 1., -1., 0.}, - { 0., -1., 0.}, - { 1., 0., 1.}, - { 1., -1., 1.}, - { 0., 0., 1.}, - { 0., -1., 1.} - }; - const struct __tamf__triangle testtriangles[] = { - { 0, 1, 2}, - { 0, 2, 3}, - { 1, 5, 2}, - { 1, 4, 5}, - { 6, 5, 7}, - { 6, 4, 5}, - { 0, 6, 7}, - { 0, 7, 3}, - { 0, 6, 4}, - { 0, 4, 1}, - { 3, 7, 5}, - { 3, 5, 2} - }; - struct __tamf__document testdoc = {0}; - - wbuff.ptr = calloc(wbuffsize, 1); - wbuff.len = wbuffsize; - - testdoc.vec_material = testmaterials; - testdoc.mesh.vec_vertex = testvertices; - testdoc.mesh.vertex_count = GMIO_ARRAY_SIZE(testvertices); - testdoc.mesh.vec_triangle = testtriangles; - testdoc.mesh.triangle_count = GMIO_ARRAY_SIZE(testtriangles); - - doc.cookie = &testdoc; - doc.unit = GMIO_AMF_UNIT_MILLIMETER; - doc.func_get_document_element = &__tamf__get_document_element; - doc.func_get_object_mesh = &__tamf__get_object_mesh; - doc.func_get_object_mesh_element = &__tamf__get_object_mesh_element; - doc.func_get_object_mesh_volume_triangle = - &__tamf__get_object_mesh_volume_triangle; - doc.func_get_document_element_metadata = - &__tamf__get_document_element_metadata; - doc.object_count = 1; - doc.material_count = GMIO_ARRAY_SIZE(testmaterials); - - options.float64_prec = 9; - - /* Write as raw contents(uncompressed) */ + static const char zip_entry_filename[] = "test.amf"; + static const uint16_t zip_entry_filename_len = + sizeof(zip_entry_filename) - 1; { - const int error = gmio_amf_write(&stream, &doc, &options); - if (gmio_error(error)) - printf("\n0x%x\n", error); - UTEST_COMPARE_INT(error, GMIO_ERROR_OK); - /* printf("%s\n", wbuff.ptr); */ - } - - /* Write compressed ZIP */ - { - const size_t source_len = wbuff.pos; - uint8_t* source = calloc(source_len, 1); - - memcpy(source, wbuff.ptr, source_len); wbuff.pos = 0; + struct gmio_stream stream = gmio_stream_buffer(&wbuff); + struct gmio_amf_write_options options = {0}; + options.float64_prec = 9; options.compress = true; - static const char zip_entry_filename[] = "test.amf"; options.zip_entry_filename = zip_entry_filename; - options.zip_entry_filename_len = sizeof(zip_entry_filename) - 1; + options.zip_entry_filename_len = zip_entry_filename_len; const int error = gmio_amf_write(&stream, &doc, &options); UTEST_COMPARE_INT(error, GMIO_ERROR_OK); #if 0 @@ -276,52 +285,108 @@ static const char* test_amf_write() fwrite(wbuff.ptr, 1, wbuff.pos, file); fclose(file); #endif - - /* Unzip and compare with source data */ - uint8_t* rbuff = wbuff.ptr; - /* -- Read local file header */ - UTEST_COMPARE_UINT(gmio_decode_uint32_le(rbuff), 0x04034b50); - rbuff += 8; - /* -- Read compression method */ - UTEST_COMPARE_UINT( - gmio_decode_uint16_le(rbuff), - GMIO_ZIP_COMPRESS_METHOD_DEFLATE); - rbuff += 18; - /* -- Read filename length */ - UTEST_COMPARE_UINT( - gmio_decode_uint16_le(rbuff), - options.zip_entry_filename_len); - rbuff += 2; - /* -- Read extrafield length */ - const uint16_t zip_extrafield_len = gmio_decode_uint16_le(rbuff); - rbuff += 2; - /* -- Read filename */ - UTEST_ASSERT(strncmp( - (const char*)rbuff, - options.zip_entry_filename, - options.zip_entry_filename_len) - == 0); - rbuff += options.zip_entry_filename_len; - /* -- Skip extrafield */ - rbuff += zip_extrafield_len; - -#if 0 /* TODO: check other ZIP records, and uncompress file */ - uint8_t* dest = calloc(wbuffsize, 1); - unsigned long dest_len = (unsigned long)wbuffsize; - const unsigned long z_len = wbuff.pos; - const int zerr = uncompress(dest, &dest_len, wbuff.ptr, z_len); - printf("\n-- Info: z_len=%i src_len=%i\n", z_len, source_len); - UTEST_COMPARE_INT(zerr, Z_OK); - UTEST_COMPARE_UINT(source_len, dest_len); - UTEST_COMPARE_INT(memcmp(dest, source, source_len), 0); - free(dest); -#endif - - free(source); } - free(wbuff.ptr); + /* Unzip and compare with source data */ + { + /* Total size in bytes of the ZIP archive */ + const uintmax_t zip_archive_len = wbuff.pos; + wbuff.pos = 0; + struct gmio_stream stream = gmio_stream_buffer(&wbuff); + int error = GMIO_ERROR_OK; + /* -- Read ZIP local file header */ + struct gmio_zip_local_file_header zip_lfh = {0}; + const size_t lfh_read_len = + gmio_zip_read_local_file_header(&stream, &zip_lfh, &error); + UTEST_COMPARE_INT(error, GMIO_ERROR_OK); + UTEST_COMPARE_UINT( + zip_lfh.compress_method, + GMIO_ZIP_COMPRESS_METHOD_DEFLATE); + UTEST_ASSERT( + (zip_lfh.general_purpose_flags & + GMIO_ZIP_GENERAL_PURPOSE_FLAG_USE_DATA_DESCRIPTOR) + != 0); + UTEST_COMPARE_UINT( + zip_lfh.filename_len, + sizeof(zip_entry_filename) - 1); + UTEST_ASSERT(strncmp( + (const char*)wbuff.ptr + wbuff.pos, + zip_entry_filename, + zip_entry_filename_len) + == 0); + /* -- Read ZIP end of central directory record */ + static const size_t end_of_central_dir_record_len = 22; + wbuff.pos = zip_archive_len - end_of_central_dir_record_len;; + struct gmio_zip_end_of_central_directory_record zip_eocdr = {0}; + gmio_zip_read_end_of_central_directory_record( + &stream, &zip_eocdr, &error); + UTEST_COMPARE_INT(error, GMIO_ERROR_OK); + UTEST_COMPARE_UINT(zip_eocdr.disk_nb, 0); + UTEST_COMPARE_UINT( + zip_eocdr.disk_nb_with_start_of_central_dir, 0); + UTEST_COMPARE_UINT( + zip_eocdr.total_entry_count_in_central_dir_on_disk, 1); + UTEST_COMPARE_UINT( + zip_eocdr.total_entry_count_in_central_dir, 1); + /* -- Read ZIP central directory */ + wbuff.pos = zip_eocdr.start_offset_central_dir_from_disk_start_nb; + struct gmio_zip_central_directory_header zip_cdh = {0}; + gmio_zip_read_central_directory_header(&stream, &zip_cdh, &error); + UTEST_COMPARE_INT(error, GMIO_ERROR_OK); + UTEST_COMPARE_UINT( + zip_cdh.compress_method, + GMIO_ZIP_COMPRESS_METHOD_DEFLATE); + UTEST_ASSERT( + (zip_cdh.general_purpose_flags & + GMIO_ZIP_GENERAL_PURPOSE_FLAG_USE_DATA_DESCRIPTOR) + != 0); + UTEST_COMPARE_UINT(crc32_amf_data, zip_cdh.crc32); + UTEST_COMPARE_UINT( + zip_cdh.filename_len, zip_entry_filename_len); + UTEST_ASSERT(strncmp( + (const char*)wbuff.ptr + wbuff.pos, + zip_entry_filename, + zip_entry_filename_len) + == 0); + /* -- Read compressed AMF data */ + const size_t pos_start_amf_data = + lfh_read_len + zip_lfh.filename_len + zip_lfh.extrafield_len; + wbuff.pos = pos_start_amf_data; + { + uint8_t* dest = calloc(zip_cdh.uncompressed_size, 1); + size_t dest_len = zip_cdh.uncompressed_size; + const int error = + gmio_zlib_uncompress_buffer( + dest, + &dest_len, + (const uint8_t*)wbuff.ptr + wbuff.pos, + zip_cdh.compressed_size); + printf("\n-- Info: z_len=%i src_len=%i\n", + zip_cdh.compressed_size, source_len); + UTEST_COMPARE_INT(error, GMIO_ERROR_OK); + UTEST_COMPARE_UINT(source_len, dest_len); + UTEST_COMPARE_UINT(dest_len, zip_cdh.uncompressed_size); + UTEST_COMPARE_INT(memcmp(dest, source, source_len), 0); + const uint32_t crc32_uncomp = gmio_zlib_crc32(dest, dest_len); + UTEST_COMPARE_UINT(crc32_amf_data, crc32_uncomp); + free(dest); + } + /* -- Read ZIP data descriptor */ + wbuff.pos = pos_start_amf_data + zip_cdh.compressed_size; + struct gmio_zip_data_descriptor zip_dd = {0}; + gmio_zip_read_data_descriptor(&stream, &zip_dd, &error); + UTEST_COMPARE_INT(error, GMIO_ERROR_OK); + UTEST_COMPARE_UINT(zip_dd.crc32, crc32_amf_data); + UTEST_COMPARE_UINT( + zip_dd.compressed_size, zip_cdh.compressed_size); + UTEST_COMPARE_UINT( + zip_dd.uncompressed_size, zip_cdh.uncompressed_size); + } + + free(source); } + free(wbuff.ptr); + return NULL; } From bf8e01d237a75eabd13a086e58083c2d7701968c Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Fri, 6 Jan 2017 18:29:46 +0100 Subject: [PATCH 35/81] gmio_core: fix GCC compilation errors --- src/gmio_core/internal/zip_utils.c | 10 +++++----- src/gmio_core/internal/zip_utils.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/gmio_core/internal/zip_utils.c b/src/gmio_core/internal/zip_utils.c index fa5f209..686d327 100644 --- a/src/gmio_core/internal/zip_utils.c +++ b/src/gmio_core/internal/zip_utils.c @@ -161,7 +161,7 @@ size_t gmio_zip_read_local_file_header( int *ptr_error) { uint8_t buff[GMIO_ZIP_SIZE_LOCAL_FILE_HEADER]; - uint8_t* buffit = buff; + const uint8_t* buffit = buff; const size_t read_len = gmio_stream_read_bytes(stream, buff, sizeof(buff)); if (!gmio_zip_read_checkhelper(stream, read_len, sizeof(buff))) @@ -251,7 +251,7 @@ size_t gmio_zip_read_central_directory_header( int *ptr_error) { uint8_t buff[GMIO_ZIP_SIZE_CENTRAL_DIRECTORY_HEADER]; - uint8_t* buffit = buff; + const uint8_t* buffit = buff; const size_t read_len = gmio_stream_read_bytes(stream, buff, sizeof(buff)); if (!gmio_zip_read_checkhelper(stream, read_len, sizeof(buff))) @@ -311,7 +311,7 @@ size_t gmio_zip_read_end_of_central_directory_record( int *ptr_error) { uint8_t buff[GMIO_ZIP_SIZE_END_OF_CENTRAL_DIRECTORY_RECORD]; - uint8_t* buffit = buff; + const uint8_t* buffit = buff; const size_t read_len = gmio_stream_read_bytes(stream, buff, sizeof(buff)); if (!gmio_zip_read_checkhelper(stream, read_len, sizeof(buff))) @@ -404,7 +404,7 @@ size_t gmio_zip_read_data_descriptor( int* ptr_error) { uint8_t buff[GMIO_ZIP_SIZE_DATA_DESCRIPTOR]; - uint8_t* buffit = buff; + const uint8_t* buffit = buff; const size_t read_len = gmio_stream_read_bytes(stream, buff, sizeof(buff)); if (!gmio_zip_read_checkhelper(stream, read_len, sizeof(buff))) @@ -427,7 +427,7 @@ size_t gmio_zip64_read_data_descriptor( { #ifdef GMIO_HAVE_INT64_TYPE uint8_t buff[GMIO_ZIP64_SIZE_DATA_DESCRIPTOR]; - uint8_t* buffit = buff; + const uint8_t* buffit = buff; const size_t read_len = gmio_stream_read_bytes(stream, buff, sizeof(buff)); if (!gmio_zip_read_checkhelper(stream, read_len, sizeof(buff))) diff --git a/src/gmio_core/internal/zip_utils.h b/src/gmio_core/internal/zip_utils.h index 1adbb2d..b085f07 100644 --- a/src/gmio_core/internal/zip_utils.h +++ b/src/gmio_core/internal/zip_utils.h @@ -246,7 +246,7 @@ struct gmio_zip_write_result { size_t written_len; }; -enum { GMIO_ZIP_UTILS_ERROR_TAG = 0xAA000000 }; +enum { GMIO_ZIP_UTILS_ERROR_TAG = 0x00AA0000 }; enum gmio_zip_utils_error { GMIO_ZIP_UTILS_ERROR_BAD_MAGIC = GMIO_ZIP_UTILS_ERROR_TAG + 0x01 }; From b8ad964edcbd3c98b2541b0a44921eb9f5be7298 Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Mon, 9 Jan 2017 10:52:06 +0100 Subject: [PATCH 36/81] Minor fixes/improvements on the doxygen doc --- src/gmio_amf/amf_document.h | 1 + src/gmio_amf/amf_error.h | 3 +- src/gmio_amf/amf_io_options.h | 1 + src/gmio_core/const_string.h | 1 + src/gmio_core/endian.h | 11 ++++--- src/gmio_core/error.h | 10 +++---- src/gmio_core/internal/byte_swap.h | 3 +- src/gmio_core/internal/ostringstream.h | 8 +++--- src/gmio_core/internal/string.h | 12 +++----- src/gmio_core/internal/string_ascii_utils.h | 32 +++++++-------------- src/gmio_core/internal/stringstream.h | 11 +++---- src/gmio_core/internal/zlib_utils.h | 22 +++++++------- src/gmio_core/memblock.h | 30 +++++++++---------- src/gmio_core/text_format.h | 3 +- src/gmio_core/zlib_compress.h | 1 + src/gmio_stl/stl_error.h | 3 +- src/gmio_stl/stl_format.h | 2 +- src/gmio_stl/stl_infos.h | 19 ++++-------- 18 files changed, 71 insertions(+), 102 deletions(-) diff --git a/src/gmio_amf/amf_document.h b/src/gmio_amf/amf_document.h index d08116e..2841e03 100644 --- a/src/gmio_amf/amf_document.h +++ b/src/gmio_amf/amf_document.h @@ -377,3 +377,4 @@ struct gmio_amf_document }; #endif /* GMIO_AMF_DOCUMENT_H */ +/*! @} */ diff --git a/src/gmio_amf/amf_error.h b/src/gmio_amf/amf_error.h index b1c8d76..2e50854 100644 --- a/src/gmio_amf/amf_error.h +++ b/src/gmio_amf/amf_error.h @@ -41,8 +41,7 @@ * Byte-mask to tag(identify) AMF-specific error codes */ enum { GMIO_AMF_ERROR_TAG = 0x12000000 }; -/*! This enum defines the specific error codes reported by AMF read/write - * functions */ +/*! Specific error codes reported by AMF read/write functions */ enum gmio_amf_error { /*! The input gmio_amf_document is \c NULL */ diff --git a/src/gmio_amf/amf_io_options.h b/src/gmio_amf/amf_io_options.h index 2ab9585..46872c4 100644 --- a/src/gmio_amf/amf_io_options.h +++ b/src/gmio_amf/amf_io_options.h @@ -85,3 +85,4 @@ struct gmio_amf_write_options }; #endif /* GMIO_AMF_IO_OPTIONS_H */ +/*! @} */ diff --git a/src/gmio_core/const_string.h b/src/gmio_core/const_string.h index 5096044..ab1967d 100644 --- a/src/gmio_core/const_string.h +++ b/src/gmio_core/const_string.h @@ -85,3 +85,4 @@ bool gmio_const_string_is_empty(const struct gmio_const_string* str) } #endif /* GMIO_CONST_STRING_H */ +/*! @} */ diff --git a/src/gmio_core/endian.h b/src/gmio_core/endian.h index 3c7c4f2..125cea9 100644 --- a/src/gmio_core/endian.h +++ b/src/gmio_core/endian.h @@ -39,7 +39,7 @@ #include "global.h" -/*! This enum identifies common endianness (byte order) of computer memory */ +/*! Common endianness (byte order) of computer memory */ enum gmio_endianness { /*! Other (unknown) byte-order */ @@ -56,12 +56,11 @@ enum gmio_endianness #ifdef GMIO_HOST_IS_BIG_ENDIAN GMIO_ENDIANNESS_HOST = GMIO_ENDIANNESS_BIG #else - /*! Defines the endianness(byte order) used by the host computer for - * storing data in memory. + /*! Endianness(byte order) used by the host computer for storing data in + * memory. * - * It is set at configure-time to either GMIO_ENDIANNESS_LITTLE or - * GMIO_ENDIANNESS_BIG - */ + * Set at configure-time to either GMIO_ENDIANNESS_LITTLE or + * GMIO_ENDIANNESS_BIG */ GMIO_ENDIANNESS_HOST = GMIO_ENDIANNESS_LITTLE #endif }; diff --git a/src/gmio_core/error.h b/src/gmio_core/error.h index 4783c77..41d5edf 100644 --- a/src/gmio_core/error.h +++ b/src/gmio_core/error.h @@ -43,7 +43,7 @@ * Byte-mask to tag(identify) zlib-specific error codes */ enum { GMIO_ZLIB_ERROR_TAG = 0x1000000 }; -/*! This enum defines common errors */ +/*! Common errors */ enum gmio_error { /*! No error occurred, success */ @@ -52,7 +52,7 @@ enum gmio_error /*! Unknown error */ GMIO_ERROR_UNKNOWN, - /*! Pointer on argument memory block is NULL */ + /*! Pointer on argument memory block is \c NULL */ GMIO_ERROR_NULL_MEMBLOCK, /*! Argument size for the memory block is too small */ @@ -65,10 +65,8 @@ enum gmio_error * gmio_task_iface::func_is_stop_requested() returned true */ GMIO_ERROR_TASK_STOPPED, - /*! An error occured after a call to a function - * - * The caller can check errno to get the real error number - */ + /*! An error occured after a call to a \c function. + * The caller can check \c errno to get the real error number */ GMIO_ERROR_STDIO, /*! Checking of \c LC_NUMERIC failed(should be "C" or "POSIX") */ diff --git a/src/gmio_core/internal/byte_swap.h b/src/gmio_core/internal/byte_swap.h index 47f8c40..7618266 100644 --- a/src/gmio_core/internal/byte_swap.h +++ b/src/gmio_core/internal/byte_swap.h @@ -58,8 +58,7 @@ GMIO_INLINE uint32_t gmio_uint32_bswap(uint32_t val) #elif defined(GMIO_HAVE_MSVC_BUILTIN_BSWAP_FUNC) return _byteswap_ulong(val); #else - return - ((val & 0x000000FF) << 24) + return ((val & 0x000000FF) << 24) | ((val & 0x0000FF00) << 8) | ((val >> 8) & 0x0000FF00) | ((val >> 24) & 0x000000FF); diff --git a/src/gmio_core/internal/ostringstream.h b/src/gmio_core/internal/ostringstream.h index 144be21..4865c6a 100644 --- a/src/gmio_core/internal/ostringstream.h +++ b/src/gmio_core/internal/ostringstream.h @@ -37,7 +37,7 @@ /*! Output stream that operates on a string * - * To be used with API below. + * To be used with API below */ struct gmio_ostringstream { @@ -56,7 +56,7 @@ struct gmio_ostringstream void* cookie, struct gmio_stream* stream, const char* ptr, size_t len); }; -/*! Returns an initialized gmio_ostringstream object */ +/*! Returns an initialized ostringstream */ struct gmio_ostringstream gmio_ostringstream( const struct gmio_stream stream, const struct gmio_string strbuff); @@ -124,13 +124,13 @@ GMIO_INLINE void gmio_ostringstream_flush(struct gmio_ostringstream* sstream); /* XML */ -/*! Write XML attribute of name \p attr and value \p val */ +/*! Writes XML attribute of name \p attr and value \p val */ void gmio_ostringstream_write_xmlattr_str( struct gmio_ostringstream* sstream, const char* attr, const char* val); void gmio_ostringstream_write_xmlattr_u32( struct gmio_ostringstream* sstream, const char* attr, uint32_t val); -/*! Write XML element containing \p val : val */ +/*! Writes XML element containing \p val : val */ void gmio_ostringstream_write_xmlelt_f64( struct gmio_ostringstream* sstream, const char* elt, double val); diff --git a/src/gmio_core/internal/string.h b/src/gmio_core/internal/string.h index f496bc7..fddc567 100644 --- a/src/gmio_core/internal/string.h +++ b/src/gmio_core/internal/string.h @@ -46,16 +46,12 @@ struct gmio_string size_t capacity; /*!< Maximum contents size */ }; -/*! Returns an initialized struct gmio_string object - * - * gmio_string::capacity is set to max(len,capacity) - */ +/*! Returns an initialized struct string. + * gmio_string::capacity is set to max(len,capacity) */ GMIO_INLINE struct gmio_string gmio_string(char* ptr, size_t len, size_t capacity); -/*! Clears the contents of the string \p str and makes it null - * - * \warning Memory pointed to by gmio_string::ptr is not freed in any way - */ +/*! Clears the contents of the string \p str and makes it null. + * \warning Memory pointed to by gmio_string::ptr is not freed in any way */ GMIO_INLINE void gmio_string_clear(struct gmio_string* str); /*! Returns a pointer after the last character of \p str */ diff --git a/src/gmio_core/internal/string_ascii_utils.h b/src/gmio_core/internal/string_ascii_utils.h index b68a371..3c7daf6 100644 --- a/src/gmio_core/internal/string_ascii_utils.h +++ b/src/gmio_core/internal/string_ascii_utils.h @@ -52,37 +52,27 @@ GMIO_INLINE char gmio_ascii_toupper(char c); /*! Returns the uppercase letter converted to lowercase */ GMIO_INLINE char gmio_ascii_tolower(char c); -/*! Returns 0 if \p c1 compare equals to \p c2, non-zero otherwise - * - * Comparison is case-insensitive - */ +/*! Returns 0 if \p c1 compare equals to \p c2, non-zero otherwise. + * \note Comparison is case-insensitive */ GMIO_INLINE bool gmio_ascii_char_iequals(char c1, char c2); -/*! Returns 0 if \p str1 and \p str2 compare equal, non-zero otherwise - * - * Comparison is case-insensitive - */ +/*! Returns 0 if \p str1 and \p str2 compare equal, non-zero otherwise. + * \note Comparison is case-insensitive */ GMIO_INLINE int gmio_ascii_stricmp(const char* str1, const char* str2); -/*! Returns 0 if the first \p n characreters of \p str1 and \p str2 compare - * equal, non-zero otherwise - * - * Comparison is case-insensitive - */ +/*! Returns 0 if the first \p n characters of \p str1 and \p str2 compare equal, + * non-zero otherwise. + * \note Comparison is case-insensitive */ GMIO_INLINE int gmio_ascii_strincmp( const char* str1, const char* str2, size_t n); -/*! Returns true if \p str starts with string \p begin - * - * Comparison is case-insensitive - */ +/*! Returns true if \p str starts with string \p begin. + * \note Comparison is case-insensitive */ GMIO_INLINE bool gmio_ascii_istarts_with( const char* str, const char* begin); -/*! Locate substring (insensitive case string matching) - * - * Behaves the same as strstr() - */ +/*! Locate substring (insensitive case string matching). + * Behaves the same as strstr() */ const char* gmio_ascii_istrstr(const char *str1, const char *str2); diff --git a/src/gmio_core/internal/stringstream.h b/src/gmio_core/internal/stringstream.h index dd9b8d4..0bbe7c7 100644 --- a/src/gmio_core/internal/stringstream.h +++ b/src/gmio_core/internal/stringstream.h @@ -58,13 +58,12 @@ struct gmio_stringstream /*! Data to be passed to callback func_stream_read */ void* cookie; - /*! Pointer on a function called each time next contents chunk has to be - * read */ + /*! Pointer on a function called each time next contents chunk has to be read */ size_t (*func_stream_read)( void* cookie, struct gmio_stream* stream, char* ptr, size_t len); }; -/*! Returns an initialized gmio_stringstream object */ +/*! Returns an initialized stringstream */ struct gmio_stringstream gmio_stringstream( const struct gmio_stream stream, const struct gmio_string strbuff); @@ -110,10 +109,8 @@ enum gmio_eat_word_error gmio_stringstream_eat_word( struct gmio_stringstream* sstream, struct gmio_string* str); #if 0 -/*! Iterate over stream while it matches input string \p str - * - * Returns true if \p str was fully matched - */ +/*! Iterate over stream while it matches input string \p str. + * Returns true if \p str was fully matched */ bool gmio_stringstream_checked_next_chars( struct gmio_stringstream* sstream, const char* str); #endif diff --git a/src/gmio_core/internal/zlib_utils.h b/src/gmio_core/internal/zlib_utils.h index bb4c805..41bb15d 100644 --- a/src/gmio_core/internal/zlib_utils.h +++ b/src/gmio_core/internal/zlib_utils.h @@ -34,35 +34,35 @@ #include "../zlib_compress.h" #include -/* Converts zlib error to gmio "zlib-specific" error */ +/*! Converts zlib error to gmio "zlib-specific" error */ int zlib_error_to_gmio_error(int z_error); -/* Wrapper around deflateInit2(), returns a converted gmio error code */ +/*! Wrapper around deflateInit2(), returns a converted gmio error code */ int gmio_zlib_compress_init( struct z_stream_s* z_stream, const struct gmio_zlib_compress_options* z_opts); -/* Checks zlib compression options */ +/*! Checks zlib compression options */ bool gmio_check_zlib_compress_options( int* error, const struct gmio_zlib_compress_options* z_opts); -/* Decompresses the source buffer into the destination buffer. +/*! Decompresses the source buffer into the destination buffer. * - * \p sourceLen is the byte length of the source buffer. Upon entry, \p destLen - * is the total size of the destination buffer, which must be large enough to - * hold the entire uncompressed data. - * Upon exit, destLen is the actual size of the compressed buffer. + * \p sourceLen is the byte length of the source buffer. Upon entry, \p destLen + * is the total size of the destination buffer, which must be large enough to + * hold the entire uncompressed data. + * Upon exit, destLen is the actual size of the compressed buffer. */ int gmio_zlib_uncompress_buffer( uint8_t* dest, size_t* dest_len, const uint8_t* src, size_t src_len); -/* Computes the CRC-32 value with the bytes buff[0..buff_len-1] */ +/*! Computes the CRC-32 value with the bytes buff[0..buff_len-1] */ uint32_t gmio_zlib_crc32(const uint8_t* buff, size_t buff_len); -/* Returns the required initial value for the gmio_zlib_crc32_update() */ +/*! Returns the required initial value for the gmio_zlib_crc32_update() */ uint32_t gmio_zlib_crc32_initial(); -/* Updates a running CRC-32 with the bytes buff[0..buff_len-1] */ +/*! Updates a running CRC-32 with the bytes buff[0..buff_len-1] */ uint32_t gmio_zlib_crc32_update( uint32_t crc, const uint8_t* buff, size_t buff_len); diff --git a/src/gmio_core/memblock.h b/src/gmio_core/memblock.h index a66056f..e05bbf5 100644 --- a/src/gmio_core/memblock.h +++ b/src/gmio_core/memblock.h @@ -46,7 +46,7 @@ * gmio_memblock comes with convenient constructors that binds to * allocation functions, like gmio_memblock_malloc(), ... * - * Binding gmio_memblock to some statically-allocated memory is done through + * Binding a memblock to some statically-allocated memory is done through * gmio_memblock() : * \code{.c} * char buff[512] = {0}; @@ -54,7 +54,7 @@ * gmio_memblock(buff, GMIO_ARRAY_SIZE(buff), NULL); * \endcode * - * Any gmio_memblock object can be safely freed with gmio_memblock_deallocate() + * Any memblock can be safely freed with gmio_memblock_deallocate() */ struct gmio_memblock { @@ -77,27 +77,23 @@ GMIO_C_LINKAGE_BEGIN /*! Returns true if \p mblock is NULL or points to null/void memory */ GMIO_API bool gmio_memblock_isnull(const struct gmio_memblock* mblock); -/*! Returns an initialized gmio_memblock object - * +/*! Returns an initialized memblock object. * If \p ptr is NULL then gmio_memblock::size is forced to \c 0 */ GMIO_API struct gmio_memblock gmio_memblock( void* ptr, size_t size, void (*func_deallocate)(void*)); -/*! Returns a gmio_memblock object allocated with standard \c malloc() - * +/*! Returns a memblock allocated with standard \c malloc(). * gmio_memblock::func_deallocate is set to standard \c free() */ GMIO_API struct gmio_memblock gmio_memblock_malloc(size_t size); -/*! Returns a gmio_memblock object allocated with standard \c calloc() - * +/*! Returns a memblock allocated with standard \c calloc(). * gmio_memblock::func_deallocate is set to standard \c free() */ GMIO_API struct gmio_memblock gmio_memblock_calloc(size_t num, size_t size); -/*! Returns a gmio_memblock object allocated with standard \c realloc() - * +/*! Returns a memblock allocated with standard \c realloc(). * gmio_memblock::func_deallocate is set to standard \c free() */ GMIO_API struct gmio_memblock gmio_memblock_realloc(void* ptr, size_t size); @@ -105,7 +101,7 @@ GMIO_API struct gmio_memblock gmio_memblock_realloc(void* ptr, size_t size); /*! Safe and convenient call to gmio_memblock::func_deallocate() */ GMIO_API void gmio_memblock_deallocate(struct gmio_memblock* mblock); -/*! Typedef for a pointer to a function that creates an allocated mblock +/*! Typedef for a pointer to a function that creates an allocated memblock * * Signature: * \code{.c} struct gmio_memblock mblock_ctor(); \endcode @@ -114,22 +110,22 @@ typedef struct gmio_memblock (*gmio_memblock_constructor_func_t)(); /*! Installs a global function to construct gmio_memblock objects * - * The constructor function allocates a gmio_memblock object on demand, to be - * used when a temporary memblock is needed. + * The constructor function allocates a memblock on demand, to be used when a + * temporary memblock is needed. * * This function is not thread-safe. */ GMIO_API void gmio_memblock_set_default_constructor( gmio_memblock_constructor_func_t ctor); -/*! Returns the currently installed function to construct gmio_memblock objects - * +/*! Returns the currently installed function to construct memblock objects. * It is initialized to gmio_memblock_malloc(128KB) */ GMIO_API gmio_memblock_constructor_func_t gmio_memblock_default_constructor(); -/*! Returns a gmio_memblock object created using the function - * gmio_memblock_default_constructor() */ +/*! Returns a memblock created with the function + * gmio_memblock_default_constructor() + */ GMIO_API struct gmio_memblock gmio_memblock_default(); GMIO_C_LINKAGE_END diff --git a/src/gmio_core/text_format.h b/src/gmio_core/text_format.h index 98c99d7..9ff0421 100644 --- a/src/gmio_core/text_format.h +++ b/src/gmio_core/text_format.h @@ -39,8 +39,7 @@ #include "global.h" -/*! This enum defines the various formats to textually represent a float(single - * or double precision) */ +/*! Various formats to textually represent a float(single/double precision) */ enum gmio_float_text_format { /*! Decimal floating point, lowercase (ex: 392.65) */ diff --git a/src/gmio_core/zlib_compress.h b/src/gmio_core/zlib_compress.h index 2bdcf90..ad937c1 100644 --- a/src/gmio_core/zlib_compress.h +++ b/src/gmio_core/zlib_compress.h @@ -94,3 +94,4 @@ struct gmio_zlib_compress_options }; #endif /* GMIO_ZLIB_COMPRESS_H */ +/*! @} */ diff --git a/src/gmio_stl/stl_error.h b/src/gmio_stl/stl_error.h index b8c38cc..7c4ff03 100644 --- a/src/gmio_stl/stl_error.h +++ b/src/gmio_stl/stl_error.h @@ -41,8 +41,7 @@ * Byte-mask to tag(identify) STL-specific error codes */ enum { GMIO_STL_ERROR_TAG = 0x11000000 }; -/*! This enum defines the various error codes reported by STL read/write - * functions */ +/*! Specific error codes reported by STL read/write functions */ enum gmio_stl_error { /*! STL format could not be guessed in read function */ diff --git a/src/gmio_stl/stl_format.h b/src/gmio_stl/stl_format.h index f258de3..63b6500 100644 --- a/src/gmio_stl/stl_format.h +++ b/src/gmio_stl/stl_format.h @@ -44,7 +44,7 @@ * Byte-mask to tag(identify) STL binary formats */ enum { GMIO_STL_FORMAT_TAG_BINARY = 0x10 }; -/*! This enums defines the various STL formats */ +/*! Various STL formats */ enum gmio_stl_format { /*! Unknown STL format */ diff --git a/src/gmio_stl/stl_infos.h b/src/gmio_stl/stl_infos.h index 5f6d9bb..ecd7d78 100644 --- a/src/gmio_stl/stl_infos.h +++ b/src/gmio_stl/stl_infos.h @@ -51,23 +51,18 @@ struct gmio_stl_infos /*! Count of facets(triangles) */ uint32_t facet_count; - /*! Size of the STL data in bytes - * + /*! Size of the STL data in bytes. * For STL ascii it includes the "endsolid" tag */ gmio_streamsize_t size; - /*! STL ascii only: name of the solid - * + /*! STL ascii only: name of the solid. * The pointer has to be set before calling gmio_stl_infos_probe() - * \sa stla_solidname_maxlen - */ + * \sa stla_solidname_maxlen */ char* stla_solidname; - /*! STL ascii only: maximum length(capacity) of stla_solidname - * + /*! STL ascii only: maximum length(capacity) of stla_solidname. * The value has to be set before calling gmio_stl_infos_probe() - * \sa stla_solidname - */ + * \sa stla_solidname */ size_t stla_solidname_maxlen; /*! STL binary only: header(80-bytes) of STL data */ @@ -111,9 +106,7 @@ struct gmio_stl_infos_probe_options enum gmio_stl_format format_hint; /*! Restrict gmio_stl_infos_probe() to not read further this limit(in bytes) - * - * \warning Not yet supported - */ + * \warning Not yet supported */ gmio_streamsize_t size_limit; }; From 5951d7be701e6b8b27cdaa70e53fac859d6a00f9 Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Mon, 9 Jan 2017 12:58:19 +0100 Subject: [PATCH 37/81] gmio_core: add gmio_adv_[de,en]code_xxx() functions in byte_codec.h --- src/gmio_core/internal/byte_codec.h | 124 ++++++++++++++++++++++++++-- src/gmio_core/internal/zip_utils.c | 50 +---------- 2 files changed, 120 insertions(+), 54 deletions(-) diff --git a/src/gmio_core/internal/byte_codec.h b/src/gmio_core/internal/byte_codec.h index 82543bd..47ddf07 100644 --- a/src/gmio_core/internal/byte_codec.h +++ b/src/gmio_core/internal/byte_codec.h @@ -39,19 +39,18 @@ * uintNN_t gmio_decode_uintNN_be(const uint8_t* bytes) * * Functions that writes NNbit uint to memory in little-endian - * uintNN_t gmio_encode_uintNN_le(uintNN_t val, uint8_t* bytes); + * void gmio_encode_uintNN_le(uintNN_t val, uint8_t* bytes); * * Functions that writes NNbit uint to memory in big-endian - * uintNN_t gmio_encode_uintNN_be(uintNN_t val, uint8_t* bytes); + * void gmio_encode_uintNN_be(uintNN_t val, uint8_t* bytes); */ GMIO_INLINE uint16_t gmio_decode_uint16_le(const uint8_t* bytes); GMIO_INLINE uint16_t gmio_decode_uint16_be(const uint8_t* bytes); -GMIO_INLINE void gmio_encode_uint16_le(uint16_t val, uint8_t* bytes); -GMIO_INLINE void gmio_encode_uint16_be(uint16_t val, uint8_t* bytes); - GMIO_INLINE uint32_t gmio_decode_uint32_le(const uint8_t* bytes); GMIO_INLINE uint32_t gmio_decode_uint32_be(const uint8_t* bytes); +GMIO_INLINE void gmio_encode_uint16_le(uint16_t val, uint8_t* bytes); +GMIO_INLINE void gmio_encode_uint16_be(uint16_t val, uint8_t* bytes); GMIO_INLINE void gmio_encode_uint32_le(uint32_t val, uint8_t* bytes); GMIO_INLINE void gmio_encode_uint32_be(uint32_t val, uint8_t* bytes); @@ -62,6 +61,39 @@ GMIO_INLINE void gmio_encode_uint64_le(uint64_t val, uint8_t* bytes); GMIO_INLINE void gmio_encode_uint64_be(uint64_t val, uint8_t* bytes); #endif /* GMIO_HAVE_INT64_TYPE */ +/* Functions that reads NNbit uint from memory (little-endian) and advances + * buffer pos + * uintNN_t gmio_adv_decode_uintNN_le(const uint8_t** bytes) + * + * Functions that reads NNbit uint from memory (big-endian) and advances + * buffer pos + * uintNN_t gmio_adv_decode_uintNN_be(const uint8_t** bytes) + * + * Functions that writes NNbit uint to memory in little-endian and returns + * advanced buffer pos + * uint8_t* gmio_adv_encode_uintNN_le(uintNN_t val, uint8_t* bytes) + * + * Functions that writes NNbit uint to memory in big-endian and returns + * advanced buffer pos + * uint8_t* gmio_adv_encode_uintNN_be(uintNN_t val, uint8_t* bytes) + */ + +GMIO_INLINE uint16_t gmio_adv_decode_uint16_le(const uint8_t** bytes); +GMIO_INLINE uint16_t gmio_adv_decode_uint16_be(const uint8_t** bytes); +GMIO_INLINE uint32_t gmio_adv_decode_uint32_le(const uint8_t** bytes); +GMIO_INLINE uint32_t gmio_adv_decode_uint32_be(const uint8_t** bytes); +GMIO_INLINE uint8_t* gmio_adv_encode_uint16_le(uint16_t val, uint8_t* bytes); +GMIO_INLINE uint8_t* gmio_adv_encode_uint16_be(uint16_t val, uint8_t* bytes); +GMIO_INLINE uint8_t* gmio_adv_encode_uint32_le(uint32_t val, uint8_t* bytes); +GMIO_INLINE uint8_t* gmio_adv_encode_uint32_be(uint32_t val, uint8_t* bytes); + +#ifdef GMIO_HAVE_INT64_TYPE +GMIO_INLINE uint64_t gmio_adv_decode_uint64_le(const uint8_t** bytes); +GMIO_INLINE uint64_t gmio_adv_decode_uint64_be(const uint8_t** bytes); +GMIO_INLINE uint8_t* gmio_adv_encode_uint64_le(uint64_t val, uint8_t* bytes); +GMIO_INLINE uint8_t* gmio_adv_encode_uint64_be(uint64_t val, uint8_t* bytes); +#endif /* GMIO_HAVE_INT64_TYPE */ + /* @@ -162,4 +194,86 @@ void gmio_encode_uint64_be(uint64_t val, uint8_t* bytes) #endif /* GMIO_HAVE_INT64_TYPE */ +uint16_t gmio_adv_decode_uint16_le(const uint8_t** bytes) +{ + const uint16_t val = gmio_decode_uint16_le(*bytes); + *bytes += 2; + return val; +} + +uint16_t gmio_adv_decode_uint16_be(const uint8_t** bytes) +{ + const uint16_t val = gmio_decode_uint16_be(*bytes); + *bytes += 2; + return val; +} + +uint32_t gmio_adv_decode_uint32_le(const uint8_t** bytes) +{ + const uint32_t val = gmio_decode_uint32_le(*bytes); + *bytes += 4; + return val; +} + +uint32_t gmio_adv_decode_uint32_be(const uint8_t** bytes) +{ + const uint32_t val = gmio_decode_uint32_be(*bytes); + *bytes += 4; + return val; +} + +uint8_t* gmio_adv_encode_uint16_le(uint16_t val, uint8_t* bytes) +{ + gmio_encode_uint16_le(val, bytes); + return bytes + 2; +} + +uint8_t* gmio_adv_encode_uint16_be(uint16_t val, uint8_t* bytes) +{ + gmio_encode_uint16_be(val, bytes); + return bytes + 2; +} + +uint8_t* gmio_adv_encode_uint32_le(uint32_t val, uint8_t* bytes) +{ + gmio_encode_uint32_le(val, bytes); + return bytes + 4; +} + +uint8_t* gmio_adv_encode_uint32_be(uint32_t val, uint8_t* bytes) +{ + gmio_encode_uint32_be(val, bytes); + return bytes + 4; +} + +#ifdef GMIO_HAVE_INT64_TYPE + +uint64_t gmio_adv_decode_uint64_le(const uint8_t** bytes) +{ + const uint64_t val = gmio_decode_uint64_le(*bytes); + *bytes += 8; + return val; +} + +uint64_t gmio_adv_decode_uint64_be(const uint8_t** bytes) +{ + const uint64_t val = gmio_decode_uint64_be(*bytes); + *bytes += 8; + return val; +} + +uint8_t* gmio_adv_encode_uint64_le(uint64_t val, uint8_t* bytes) +{ + gmio_encode_uint64_le(val, bytes); + return bytes + 8; +} + +uint8_t* gmio_adv_encode_uint64_be(uint64_t val, uint8_t* bytes) +{ + gmio_encode_uint64_be(val, bytes); + return bytes + 8; +} + +#endif /* GMIO_HAVE_INT64_TYPE */ + #endif /* GMIO_INTERNAL_BYTE_CODEC_H */ diff --git a/src/gmio_core/internal/zip_utils.c b/src/gmio_core/internal/zip_utils.c index 686d327..26c5c76 100644 --- a/src/gmio_core/internal/zip_utils.c +++ b/src/gmio_core/internal/zip_utils.c @@ -75,53 +75,6 @@ static const struct tm* gmio_nonnull_datetime(const struct tm* datetime) return datetime; } -/* Reads 16b uint from memory (little-endian) and advances buffer pos */ -static uint16_t gmio_adv_decode_uint16_le(const uint8_t** bytes) -{ - const uint16_t val = gmio_decode_uint16_le(*bytes); - *bytes += 2; - return val; -} - -/* Reads 32b uint from memory (little-endian) and advances buffer pos */ -static uint32_t gmio_adv_decode_uint32_le(const uint8_t** bytes) -{ - const uint32_t val = gmio_decode_uint32_le(*bytes); - *bytes += 4; - return val; -} - -/* Encodes little-endian 32b val in buffer and returns advanced buffer pos */ -static uint8_t* gmio_adv_encode_uint32_le(uint32_t val, uint8_t* bytes) -{ - gmio_encode_uint32_le(val, bytes); - return bytes + 4; -} - -/* Encodes little-endian 16b val in buffer and returns advanced buffer pos */ -static uint8_t* gmio_adv_encode_uint16_le(uint16_t val, uint8_t* bytes) -{ - gmio_encode_uint16_le(val, bytes); - return bytes + 2; -} - -#ifdef GMIO_HAVE_INT64_TYPE -/* Reads 64b uint from memory (little-endian) and advances buffer pos */ -static uint64_t gmio_adv_decode_uint64_le(const uint8_t** bytes) -{ - const uint64_t val = gmio_decode_uint64_le(*bytes); - *bytes += 8; - return val; -} - -/* Encodes little-endian 64b val in buffer and returns advanced buffer pos */ -static uint8_t* gmio_adv_encode_uint64_le(uint64_t val, uint8_t* bytes) -{ - gmio_encode_uint64_le(val, bytes); - return bytes + 8; -} -#endif - /* Helper to facilitate return from gmio_zip_write_xxx() API functions */ static size_t gmio_zip_write_returnhelper( struct gmio_stream* stream, @@ -142,8 +95,7 @@ static bool gmio_zip_read_checkhelper( return read == expected && !gmio_stream_error(stream); } -/* Helper to facilitate return from gmio_zip_read_xxx() and gmio_zip_write_xxx() - * API functions */ +/* Helper to facilitate return from gmio_zip_[read,write]_xxx() API functions */ static size_t gmio_zip_io_returnerr(size_t io_len, int error, int* ptr_error) { if (ptr_error != NULL) From 6f944d5efcd5456b77137b0f2fe6b0b5e610dfd6 Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Mon, 9 Jan 2017 14:27:13 +0100 Subject: [PATCH 38/81] zip_utils.c: remove needless comments --- src/gmio_core/internal/zip_utils.c | 68 ++---------------------------- 1 file changed, 4 insertions(+), 64 deletions(-) diff --git a/src/gmio_core/internal/zip_utils.c b/src/gmio_core/internal/zip_utils.c index 686d327..5ee3562 100644 --- a/src/gmio_core/internal/zip_utils.c +++ b/src/gmio_core/internal/zip_utils.c @@ -263,39 +263,24 @@ size_t gmio_zip_read_central_directory_header( read_len, GMIO_ZIP_UTILS_ERROR_BAD_MAGIC, ptr_error); } - /* 2-bytes version made by */ info->version_made_by = gmio_adv_decode_uint16_le(&buffit); - /* 2-bytes version needed to extract */ info->version_needed_to_extract = gmio_adv_decode_uint16_le(&buffit); - /* 2-bytes general purpose bit flag */ info->general_purpose_flags = gmio_adv_decode_uint16_le(&buffit); - /* 2-bytes compression method */ info->compress_method = gmio_adv_decode_uint16_le(&buffit); - /* 2-bytes last mod file time */ - /* 2-bytes last mod file date */ + /* 2-bytes last mod file time + 2-bytes last mod file date */ /* TODO: convert DOS datetime to struct tm */ const uint32_t dos_datetime = gmio_adv_decode_uint32_le(&buffit); GMIO_UNUSED(dos_datetime); info->lastmod_datetime = NULL; - /* 4-bytes crc-32 */ info->crc32 = gmio_adv_decode_uint32_le(&buffit); - /* 4-bytes compressed size */ info->compressed_size = gmio_adv_decode_uint32_le(&buffit); - /* 4-bytes uncompressed size */ info->uncompressed_size = gmio_adv_decode_uint32_le(&buffit); - /* 2-bytes file name length */ info->filename_len = gmio_adv_decode_uint16_le(&buffit); - /* 2-bytes extra field length */ info->extrafield_len = gmio_adv_decode_uint16_le(&buffit); - /* 2-bytes file comment length */ info->filecomment_len = gmio_adv_decode_uint16_le(&buffit); - /* 2-bytes disk number start */ info->disk_nb_start = gmio_adv_decode_uint16_le(&buffit); - /* 2-bytes internal file attributes */ info->internal_file_attrs = gmio_adv_decode_uint16_le(&buffit); - /* 4-bytes external file attributes */ info->external_file_attrs = gmio_adv_decode_uint32_le(&buffit); - /* 4-bytes relative offset of local header */ info->relative_offset_local_header = gmio_adv_decode_uint32_le(&buffit); info->filename = NULL; @@ -323,24 +308,15 @@ size_t gmio_zip_read_end_of_central_directory_record( read_len, GMIO_ZIP_UTILS_ERROR_BAD_MAGIC, ptr_error); } - /* 2-bytes number of this disk */ info->disk_nb = gmio_adv_decode_uint16_le(&buffit); - /* 2-bytes number of the disk with the start of the central directory */ info->disk_nb_with_start_of_central_dir = gmio_adv_decode_uint16_le(&buffit); - /* 2-bytes total number of entries in the central directory on this disk */ info->total_entry_count_in_central_dir_on_disk = gmio_adv_decode_uint16_le(&buffit); - /* 2-bytes total number of entries in the central directory */ info->total_entry_count_in_central_dir = gmio_adv_decode_uint16_le(&buffit); - /* 4-bytes size of the central directory */ info->central_dir_size = gmio_adv_decode_uint32_le(&buffit); - /* 4-bytes offset of start of central directory with respect to the starting - * disk number */ info->start_offset_central_dir_from_disk_start_nb = gmio_adv_decode_uint32_le(&buffit); - /* 2-bytes .ZIP file comment length */ info->filecomment_len = gmio_adv_decode_uint16_le(&buffit); - info->filecomment = NULL; return gmio_zip_io_returnerr(read_len, GMIO_ERROR_OK, ptr_error); @@ -358,30 +334,20 @@ size_t gmio_zip_write_local_file_header( info->general_purpose_flags & GMIO_ZIP_GENERAL_PURPOSE_FLAG_USE_DATA_DESCRIPTOR; - /* 4-bytes magic number 0x04034b50 */ buff = gmio_adv_encode_uint32_le(0x04034b50, buff); - /* 2-bytes version needed to extract */ buff = gmio_adv_encode_uint16_le(info->version_needed_to_extract, buff); - /* 2-bytes general purpose bit flag */ buff = gmio_adv_encode_uint16_le(info->general_purpose_flags, buff); - /* 2-bytes compression method */ buff = gmio_adv_encode_uint16_le(info->compress_method, buff); - /* 2-bytes last mod file time */ - /* 2-bytes last mod file date */ + /* 2-bytes last mod file time + 2-bytes last mod file date */ const struct tm* lastmod = gmio_nonnull_datetime(info->lastmod_datetime); buff = gmio_adv_encode_uint32_le(gmio_to_msdos_datetime(lastmod), buff); - /* 4-bytes crc-32 */ buff = gmio_adv_encode_uint32_le( use_data_descriptor ? 0 : info->crc32, buff); - /* 4-bytes compressed size */ buff = gmio_adv_encode_uint32_le( use_data_descriptor ? 0 : info->compressed_size, buff); - /* 4-bytes uncompressed size */ buff = gmio_adv_encode_uint32_le( use_data_descriptor ? 0 : info->uncompressed_size, buff); - /* 2-bytes file name length */ buff = gmio_adv_encode_uint16_le(info->filename_len, buff); - /* 2-bytes extra field length */ buff = gmio_adv_encode_uint16_le(info->extrafield_len, buff); /* Write to stream */ @@ -410,11 +376,8 @@ size_t gmio_zip_read_data_descriptor( if (!gmio_zip_read_checkhelper(stream, read_len, sizeof(buff))) return gmio_zip_io_returnerr(read_len, GMIO_ERROR_STREAM, ptr_error); - /* 4-bytes crc-32 */ info->crc32 = gmio_adv_decode_uint32_le(&buffit); - /* 4-bytes compressed size */ info->compressed_size = gmio_adv_decode_uint32_le(&buffit); - /* 4-bytes uncompressed size */ info->uncompressed_size = gmio_adv_decode_uint32_le(&buffit); return gmio_zip_io_returnerr(read_len, GMIO_ERROR_OK, ptr_error); @@ -433,11 +396,8 @@ size_t gmio_zip64_read_data_descriptor( if (!gmio_zip_read_checkhelper(stream, read_len, sizeof(buff))) return gmio_zip_io_returnerr(read_len, GMIO_ERROR_STREAM, ptr_error); - /* 4-bytes crc-32 */ info->crc32 = gmio_adv_decode_uint32_le(&buffit); - /* 8-bytes compressed size */ info->compressed_size = gmio_adv_decode_uint64_le(&buffit); - /* 8-bytes uncompressed size */ info->uncompressed_size = gmio_adv_decode_uint64_le(&buffit); return gmio_zip_io_returnerr(read_len, GMIO_ERROR_OK, ptr_error); @@ -455,43 +415,27 @@ size_t gmio_zip_write_central_directory_header( uint8_t fixed_data[GMIO_ZIP_SIZE_CENTRAL_DIRECTORY_HEADER]; uint8_t* buff = fixed_data; - /* 4-bytes magic number 0x02014b50 */ buff = gmio_adv_encode_uint32_le(0x02014b50, buff); - /* 2-bytes version made by */ buff = gmio_adv_encode_uint16_le(info->version_made_by, buff); - /* 2-bytes version needed to extract */ buff = gmio_adv_encode_uint16_le(info->version_needed_to_extract, buff); - /* 2-bytes general purpose bit flag */ buff = gmio_adv_encode_uint16_le(info->general_purpose_flags, buff); - /* 2-bytes compression method */ buff = gmio_adv_encode_uint16_le(info->compress_method, buff); - /* 2-bytes last mod file time */ - /* 2-bytes last mod file date */ + /* 2-bytes last mod file time + 2-bytes last mod file date */ const struct tm* lastmod = gmio_nonnull_datetime(info->lastmod_datetime); buff = gmio_adv_encode_uint32_le(gmio_to_msdos_datetime(lastmod), buff); - /* 4-bytes crc-32 */ buff = gmio_adv_encode_uint32_le(info->crc32, buff); - /* 4-bytes compressed size */ const uint32_t compressed_size = info->use_zip64 ? UINT32_MAX : info->compressed_size; - buff = gmio_adv_encode_uint32_le(compressed_size, buff); - /* 4-bytes uncompressed size */ const uint32_t uncompressed_size = info->use_zip64 ? UINT32_MAX : info->uncompressed_size; + buff = gmio_adv_encode_uint32_le(compressed_size, buff); buff = gmio_adv_encode_uint32_le(uncompressed_size, buff); - /* 2-bytes file name length */ buff = gmio_adv_encode_uint16_le(info->filename_len, buff); - /* 2-bytes extra field length */ buff = gmio_adv_encode_uint16_le(info->extrafield_len, buff); - /* 2-bytes file comment length */ buff = gmio_adv_encode_uint16_le(info->filecomment_len, buff); - /* 2-bytes disk number start */ buff = gmio_adv_encode_uint16_le(info->disk_nb_start, buff); - /* 2-bytes internal file attributes */ buff = gmio_adv_encode_uint16_le(info->internal_file_attrs, buff); - /* 4-bytes external file attributes */ buff = gmio_adv_encode_uint32_le(info->external_file_attrs, buff); - /* 4-bytes relative offset of local header */ const uint32_t relative_offset_local_header = info->use_zip64 ? UINT32_MAX : info->relative_offset_local_header; buff = gmio_adv_encode_uint32_le(relative_offset_local_header, buff); @@ -529,13 +473,9 @@ size_t gmio_zip64_write_extrafield_extended_info( /* Size of the "extra" block */ buff = gmio_adv_encode_uint16_le( GMIO_ZIP64_SIZE_EXTRAFIELD_EXTENDED_INFO - 2, buff); - /* Original uncompressed file size */ buff = gmio_adv_encode_uint64_le(info->uncompressed_size, buff); - /* Size of compressed data */ buff = gmio_adv_encode_uint64_le(info->compressed_size, buff); - /* Offset of local header record */ buff = gmio_adv_encode_uint64_le(info->relative_offset_local_header, buff); - /* Number of the disk on which this file starts */ buff = gmio_adv_encode_uint32_le(info->disk_nb_start, buff); return gmio_zip_io_returnerr( GMIO_ZIP64_SIZE_EXTRAFIELD_EXTENDED_INFO, From f1a6bf764ca9fea05e538c9a190075af31f4f76c Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Mon, 9 Jan 2017 14:43:55 +0100 Subject: [PATCH 39/81] Harmonize gmio_adv_encode_xxx() API functions --- src/gmio_core/internal/byte_codec.h | 48 ++--- src/gmio_core/internal/zip_utils.c | 265 +++++++++++++--------------- 2 files changed, 149 insertions(+), 164 deletions(-) diff --git a/src/gmio_core/internal/byte_codec.h b/src/gmio_core/internal/byte_codec.h index 47ddf07..f9261d4 100644 --- a/src/gmio_core/internal/byte_codec.h +++ b/src/gmio_core/internal/byte_codec.h @@ -82,16 +82,16 @@ GMIO_INLINE uint16_t gmio_adv_decode_uint16_le(const uint8_t** bytes); GMIO_INLINE uint16_t gmio_adv_decode_uint16_be(const uint8_t** bytes); GMIO_INLINE uint32_t gmio_adv_decode_uint32_le(const uint8_t** bytes); GMIO_INLINE uint32_t gmio_adv_decode_uint32_be(const uint8_t** bytes); -GMIO_INLINE uint8_t* gmio_adv_encode_uint16_le(uint16_t val, uint8_t* bytes); -GMIO_INLINE uint8_t* gmio_adv_encode_uint16_be(uint16_t val, uint8_t* bytes); -GMIO_INLINE uint8_t* gmio_adv_encode_uint32_le(uint32_t val, uint8_t* bytes); -GMIO_INLINE uint8_t* gmio_adv_encode_uint32_be(uint32_t val, uint8_t* bytes); +GMIO_INLINE void gmio_adv_encode_uint16_le(uint16_t val, uint8_t** bytes); +GMIO_INLINE void gmio_adv_encode_uint16_be(uint16_t val, uint8_t** bytes); +GMIO_INLINE void gmio_adv_encode_uint32_le(uint32_t val, uint8_t** bytes); +GMIO_INLINE void gmio_adv_encode_uint32_be(uint32_t val, uint8_t** bytes); #ifdef GMIO_HAVE_INT64_TYPE GMIO_INLINE uint64_t gmio_adv_decode_uint64_le(const uint8_t** bytes); GMIO_INLINE uint64_t gmio_adv_decode_uint64_be(const uint8_t** bytes); -GMIO_INLINE uint8_t* gmio_adv_encode_uint64_le(uint64_t val, uint8_t* bytes); -GMIO_INLINE uint8_t* gmio_adv_encode_uint64_be(uint64_t val, uint8_t* bytes); +GMIO_INLINE void gmio_adv_encode_uint64_le(uint64_t val, uint8_t** bytes); +GMIO_INLINE void gmio_adv_encode_uint64_be(uint64_t val, uint8_t** bytes); #endif /* GMIO_HAVE_INT64_TYPE */ @@ -222,28 +222,28 @@ uint32_t gmio_adv_decode_uint32_be(const uint8_t** bytes) return val; } -uint8_t* gmio_adv_encode_uint16_le(uint16_t val, uint8_t* bytes) +void gmio_adv_encode_uint16_le(uint16_t val, uint8_t** bytes) { - gmio_encode_uint16_le(val, bytes); - return bytes + 2; + gmio_encode_uint16_le(val, *bytes); + *bytes += 2; } -uint8_t* gmio_adv_encode_uint16_be(uint16_t val, uint8_t* bytes) +void gmio_adv_encode_uint16_be(uint16_t val, uint8_t** bytes) { - gmio_encode_uint16_be(val, bytes); - return bytes + 2; + gmio_encode_uint16_be(val, *bytes); + *bytes += 2; } -uint8_t* gmio_adv_encode_uint32_le(uint32_t val, uint8_t* bytes) +void gmio_adv_encode_uint32_le(uint32_t val, uint8_t** bytes) { - gmio_encode_uint32_le(val, bytes); - return bytes + 4; + gmio_encode_uint32_le(val, *bytes); + *bytes += 4; } -uint8_t* gmio_adv_encode_uint32_be(uint32_t val, uint8_t* bytes) +void gmio_adv_encode_uint32_be(uint32_t val, uint8_t** bytes) { - gmio_encode_uint32_be(val, bytes); - return bytes + 4; + gmio_encode_uint32_be(val, *bytes); + *bytes += 4; } #ifdef GMIO_HAVE_INT64_TYPE @@ -262,16 +262,16 @@ uint64_t gmio_adv_decode_uint64_be(const uint8_t** bytes) return val; } -uint8_t* gmio_adv_encode_uint64_le(uint64_t val, uint8_t* bytes) +void gmio_adv_encode_uint64_le(uint64_t val, uint8_t** bytes) { - gmio_encode_uint64_le(val, bytes); - return bytes + 8; + gmio_encode_uint64_le(val, *bytes); + *bytes += 8; } -uint8_t* gmio_adv_encode_uint64_be(uint64_t val, uint8_t* bytes) +void gmio_adv_encode_uint64_be(uint64_t val, uint8_t** bytes) { - gmio_encode_uint64_be(val, bytes); - return bytes + 8; + gmio_encode_uint64_be(val, *bytes); + *bytes += 8; } #endif /* GMIO_HAVE_INT64_TYPE */ diff --git a/src/gmio_core/internal/zip_utils.c b/src/gmio_core/internal/zip_utils.c index ec070cf..107b443 100644 --- a/src/gmio_core/internal/zip_utils.c +++ b/src/gmio_core/internal/zip_utils.c @@ -112,40 +112,30 @@ size_t gmio_zip_read_local_file_header( struct gmio_zip_local_file_header *info, int *ptr_error) { - uint8_t buff[GMIO_ZIP_SIZE_LOCAL_FILE_HEADER]; - const uint8_t* buffit = buff; + uint8_t bytes[GMIO_ZIP_SIZE_LOCAL_FILE_HEADER]; + const uint8_t* buff = bytes; - const size_t read_len = gmio_stream_read_bytes(stream, buff, sizeof(buff)); - if (!gmio_zip_read_checkhelper(stream, read_len, sizeof(buff))) + const size_t read_len = gmio_stream_read_bytes(stream, bytes, sizeof(bytes)); + if (!gmio_zip_read_checkhelper(stream, read_len, sizeof(bytes))) return gmio_zip_io_returnerr(read_len, GMIO_ERROR_STREAM, ptr_error); - /* 4-bytes magic */ - if (gmio_adv_decode_uint32_le(&buffit) != 0x04034b50) { + if (gmio_adv_decode_uint32_le(&buff) != 0x04034b50) { return gmio_zip_io_returnerr( read_len, GMIO_ZIP_UTILS_ERROR_BAD_MAGIC, ptr_error); } - /* 2-bytes version needed to extract */ - info->version_needed_to_extract = gmio_adv_decode_uint16_le(&buffit); - /* 2-bytes general purpose bit flag */ - info->general_purpose_flags = gmio_adv_decode_uint16_le(&buffit); - /* 2-bytes compression method */ - info->compress_method = gmio_adv_decode_uint16_le(&buffit); - /* 2-bytes last mod file time */ - /* 2-bytes last mod file date */ + info->version_needed_to_extract = gmio_adv_decode_uint16_le(&buff); + info->general_purpose_flags = gmio_adv_decode_uint16_le(&buff); + info->compress_method = gmio_adv_decode_uint16_le(&buff); + /* 2-bytes last mod file time + 2-bytes last mod file date */ /* TODO: convert DOS datetime to struct tm */ - const uint32_t dos_datetime = gmio_adv_decode_uint32_le(&buffit); + const uint32_t dos_datetime = gmio_adv_decode_uint32_le(&buff); GMIO_UNUSED(dos_datetime); info->lastmod_datetime = NULL; - /* 4-bytes crc-32 */ - info->crc32 = gmio_adv_decode_uint32_le(&buffit); - /* 4-bytes compressed size */ - info->compressed_size = gmio_adv_decode_uint32_le(&buffit); - /* 4-bytes uncompressed size */ - info->uncompressed_size = gmio_adv_decode_uint32_le(&buffit); - /* 2-bytes file name length */ - info->filename_len = gmio_adv_decode_uint16_le(&buffit); - /* 2-bytes extra field length */ - info->extrafield_len = gmio_adv_decode_uint16_le(&buffit); + info->crc32 = gmio_adv_decode_uint32_le(&buff); + info->compressed_size = gmio_adv_decode_uint32_le(&buff); + info->uncompressed_size = gmio_adv_decode_uint32_le(&buff); + info->filename_len = gmio_adv_decode_uint16_le(&buff); + info->extrafield_len = gmio_adv_decode_uint16_le(&buff); info->filename = NULL; info->extrafield = NULL; @@ -158,20 +148,20 @@ size_t gmio_zip_write_data_descriptor( const struct gmio_zip_data_descriptor *info, int* ptr_error) { - const size_t fixed_data_len = + const size_t bytes_len = info->use_zip64 ? GMIO_ZIP64_SIZE_DATA_DESCRIPTOR : GMIO_ZIP_SIZE_DATA_DESCRIPTOR; - uint8_t fixed_data[GMIO_ZIP64_SIZE_DATA_DESCRIPTOR]; - uint8_t* buff = fixed_data; + uint8_t bytes[GMIO_ZIP64_SIZE_DATA_DESCRIPTOR]; + uint8_t* buff = bytes; /* 4-bytes crc-32 */ - buff = gmio_adv_encode_uint32_le(info->crc32, buff); + gmio_adv_encode_uint32_le(info->crc32, &buff); /* Compressed size and uncompressed size (4 or 8 bytes) */ if (info->use_zip64) { #ifdef GMIO_HAVE_INT64_TYPE - buff = gmio_adv_encode_uint64_le(info->compressed_size, buff); - buff = gmio_adv_encode_uint64_le(info->uncompressed_size, buff); + gmio_adv_encode_uint64_le(info->compressed_size, &buff); + gmio_adv_encode_uint64_le(info->uncompressed_size, &buff); #else /* TODO: error code */ return gmio_zip_io_returnerr(0, GMIO_ERROR_UNKNOWN, ptr_error); @@ -181,8 +171,8 @@ size_t gmio_zip_write_data_descriptor( if (info->compressed_size <= UINT32_MAX && info->uncompressed_size <= UINT32_MAX) { - buff = gmio_adv_encode_uint32_le((uint32_t)info->compressed_size, buff); - buff = gmio_adv_encode_uint32_le((uint32_t)info->uncompressed_size, buff); + gmio_adv_encode_uint32_le((uint32_t)info->compressed_size, &buff); + gmio_adv_encode_uint32_le((uint32_t)info->uncompressed_size, &buff); } else { /* TODO: error code */ @@ -192,9 +182,9 @@ size_t gmio_zip_write_data_descriptor( /* Write to stream */ const size_t written_len = - gmio_stream_write_bytes(stream, fixed_data, fixed_data_len); + gmio_stream_write_bytes(stream, bytes, bytes_len); return gmio_zip_write_returnhelper( - stream, written_len, fixed_data_len, ptr_error); + stream, written_len, bytes_len, ptr_error); } size_t gmio_zip_read_central_directory_header( @@ -202,38 +192,37 @@ size_t gmio_zip_read_central_directory_header( struct gmio_zip_central_directory_header *info, int *ptr_error) { - uint8_t buff[GMIO_ZIP_SIZE_CENTRAL_DIRECTORY_HEADER]; - const uint8_t* buffit = buff; + uint8_t bytes[GMIO_ZIP_SIZE_CENTRAL_DIRECTORY_HEADER]; + const uint8_t* buff = bytes; - const size_t read_len = gmio_stream_read_bytes(stream, buff, sizeof(buff)); - if (!gmio_zip_read_checkhelper(stream, read_len, sizeof(buff))) + const size_t read_len = gmio_stream_read_bytes(stream, bytes, sizeof(bytes)); + if (!gmio_zip_read_checkhelper(stream, read_len, sizeof(bytes))) return gmio_zip_io_returnerr(read_len, GMIO_ERROR_STREAM, ptr_error); - /* 4-bytes magic */ - if (gmio_adv_decode_uint32_le(&buffit) != 0x02014b50) { + if (gmio_adv_decode_uint32_le(&buff) != 0x02014b50) { return gmio_zip_io_returnerr( read_len, GMIO_ZIP_UTILS_ERROR_BAD_MAGIC, ptr_error); } - info->version_made_by = gmio_adv_decode_uint16_le(&buffit); - info->version_needed_to_extract = gmio_adv_decode_uint16_le(&buffit); - info->general_purpose_flags = gmio_adv_decode_uint16_le(&buffit); - info->compress_method = gmio_adv_decode_uint16_le(&buffit); + info->version_made_by = gmio_adv_decode_uint16_le(&buff); + info->version_needed_to_extract = gmio_adv_decode_uint16_le(&buff); + info->general_purpose_flags = gmio_adv_decode_uint16_le(&buff); + info->compress_method = gmio_adv_decode_uint16_le(&buff); /* 2-bytes last mod file time + 2-bytes last mod file date */ /* TODO: convert DOS datetime to struct tm */ - const uint32_t dos_datetime = gmio_adv_decode_uint32_le(&buffit); + const uint32_t dos_datetime = gmio_adv_decode_uint32_le(&buff); GMIO_UNUSED(dos_datetime); info->lastmod_datetime = NULL; - info->crc32 = gmio_adv_decode_uint32_le(&buffit); - info->compressed_size = gmio_adv_decode_uint32_le(&buffit); - info->uncompressed_size = gmio_adv_decode_uint32_le(&buffit); - info->filename_len = gmio_adv_decode_uint16_le(&buffit); - info->extrafield_len = gmio_adv_decode_uint16_le(&buffit); - info->filecomment_len = gmio_adv_decode_uint16_le(&buffit); - info->disk_nb_start = gmio_adv_decode_uint16_le(&buffit); - info->internal_file_attrs = gmio_adv_decode_uint16_le(&buffit); - info->external_file_attrs = gmio_adv_decode_uint32_le(&buffit); - info->relative_offset_local_header = gmio_adv_decode_uint32_le(&buffit); + info->crc32 = gmio_adv_decode_uint32_le(&buff); + info->compressed_size = gmio_adv_decode_uint32_le(&buff); + info->uncompressed_size = gmio_adv_decode_uint32_le(&buff); + info->filename_len = gmio_adv_decode_uint16_le(&buff); + info->extrafield_len = gmio_adv_decode_uint16_le(&buff); + info->filecomment_len = gmio_adv_decode_uint16_le(&buff); + info->disk_nb_start = gmio_adv_decode_uint16_le(&buff); + info->internal_file_attrs = gmio_adv_decode_uint16_le(&buff); + info->external_file_attrs = gmio_adv_decode_uint32_le(&buff); + info->relative_offset_local_header = gmio_adv_decode_uint32_le(&buff); info->filename = NULL; info->extrafield = NULL; @@ -247,28 +236,28 @@ size_t gmio_zip_read_end_of_central_directory_record( struct gmio_zip_end_of_central_directory_record *info, int *ptr_error) { - uint8_t buff[GMIO_ZIP_SIZE_END_OF_CENTRAL_DIRECTORY_RECORD]; - const uint8_t* buffit = buff; + uint8_t bytes[GMIO_ZIP_SIZE_END_OF_CENTRAL_DIRECTORY_RECORD]; + const uint8_t* buff = bytes; - const size_t read_len = gmio_stream_read_bytes(stream, buff, sizeof(buff)); - if (!gmio_zip_read_checkhelper(stream, read_len, sizeof(buff))) + const size_t read_len = gmio_stream_read_bytes(stream, bytes, sizeof(bytes)); + if (!gmio_zip_read_checkhelper(stream, read_len, sizeof(bytes))) return gmio_zip_io_returnerr(read_len, GMIO_ERROR_STREAM, ptr_error); /* 4-bytes magic */ - if (gmio_adv_decode_uint32_le(&buffit) != 0x06054b50) { + if (gmio_adv_decode_uint32_le(&buff) != 0x06054b50) { return gmio_zip_io_returnerr( read_len, GMIO_ZIP_UTILS_ERROR_BAD_MAGIC, ptr_error); } - info->disk_nb = gmio_adv_decode_uint16_le(&buffit); - info->disk_nb_with_start_of_central_dir = gmio_adv_decode_uint16_le(&buffit); + info->disk_nb = gmio_adv_decode_uint16_le(&buff); + info->disk_nb_with_start_of_central_dir = gmio_adv_decode_uint16_le(&buff); info->total_entry_count_in_central_dir_on_disk = - gmio_adv_decode_uint16_le(&buffit); - info->total_entry_count_in_central_dir = gmio_adv_decode_uint16_le(&buffit); - info->central_dir_size = gmio_adv_decode_uint32_le(&buffit); + gmio_adv_decode_uint16_le(&buff); + info->total_entry_count_in_central_dir = gmio_adv_decode_uint16_le(&buff); + info->central_dir_size = gmio_adv_decode_uint32_le(&buff); info->start_offset_central_dir_from_disk_start_nb = - gmio_adv_decode_uint32_le(&buffit); - info->filecomment_len = gmio_adv_decode_uint16_le(&buffit); + gmio_adv_decode_uint32_le(&buff); + info->filecomment_len = gmio_adv_decode_uint16_le(&buff); info->filecomment = NULL; return gmio_zip_io_returnerr(read_len, GMIO_ERROR_OK, ptr_error); @@ -279,35 +268,34 @@ size_t gmio_zip_write_local_file_header( const struct gmio_zip_local_file_header* info, int* ptr_error) { - uint8_t fixed_data[GMIO_ZIP_SIZE_LOCAL_FILE_HEADER]; - uint8_t* buff = fixed_data; + uint8_t bytes[GMIO_ZIP_SIZE_LOCAL_FILE_HEADER]; + uint8_t* buff = bytes; const bool use_data_descriptor = info->general_purpose_flags & GMIO_ZIP_GENERAL_PURPOSE_FLAG_USE_DATA_DESCRIPTOR; - buff = gmio_adv_encode_uint32_le(0x04034b50, buff); - buff = gmio_adv_encode_uint16_le(info->version_needed_to_extract, buff); - buff = gmio_adv_encode_uint16_le(info->general_purpose_flags, buff); - buff = gmio_adv_encode_uint16_le(info->compress_method, buff); + gmio_adv_encode_uint32_le(0x04034b50, &buff); + gmio_adv_encode_uint16_le(info->version_needed_to_extract, &buff); + gmio_adv_encode_uint16_le(info->general_purpose_flags, &buff); + gmio_adv_encode_uint16_le(info->compress_method, &buff); /* 2-bytes last mod file time + 2-bytes last mod file date */ const struct tm* lastmod = gmio_nonnull_datetime(info->lastmod_datetime); - buff = gmio_adv_encode_uint32_le(gmio_to_msdos_datetime(lastmod), buff); - buff = gmio_adv_encode_uint32_le( - use_data_descriptor ? 0 : info->crc32, buff); - buff = gmio_adv_encode_uint32_le( - use_data_descriptor ? 0 : info->compressed_size, buff); - buff = gmio_adv_encode_uint32_le( - use_data_descriptor ? 0 : info->uncompressed_size, buff); - buff = gmio_adv_encode_uint16_le(info->filename_len, buff); - buff = gmio_adv_encode_uint16_le(info->extrafield_len, buff); + gmio_adv_encode_uint32_le(gmio_to_msdos_datetime(lastmod), &buff); + gmio_adv_encode_uint32_le(use_data_descriptor ? 0 : info->crc32, &buff); + gmio_adv_encode_uint32_le( + use_data_descriptor ? 0 : info->compressed_size, &buff); + gmio_adv_encode_uint32_le( + use_data_descriptor ? 0 : info->uncompressed_size, &buff); + gmio_adv_encode_uint16_le(info->filename_len, &buff); + gmio_adv_encode_uint16_le(info->extrafield_len, &buff); /* Write to stream */ const size_t expected_written_len = - sizeof(fixed_data) + info->filename_len + info->extrafield_len; + sizeof(bytes) + info->filename_len + info->extrafield_len; size_t written_len = 0; written_len += - gmio_stream_write_bytes(stream, fixed_data, sizeof(fixed_data)); + gmio_stream_write_bytes(stream, bytes, sizeof(bytes)); written_len += gmio_stream_write_bytes(stream, info->filename, info->filename_len); written_len += @@ -321,16 +309,16 @@ size_t gmio_zip_read_data_descriptor( struct gmio_zip_data_descriptor *info, int* ptr_error) { - uint8_t buff[GMIO_ZIP_SIZE_DATA_DESCRIPTOR]; - const uint8_t* buffit = buff; + uint8_t bytes[GMIO_ZIP_SIZE_DATA_DESCRIPTOR]; + const uint8_t* buff = bytes; - const size_t read_len = gmio_stream_read_bytes(stream, buff, sizeof(buff)); - if (!gmio_zip_read_checkhelper(stream, read_len, sizeof(buff))) + const size_t read_len = gmio_stream_read_bytes(stream, bytes, sizeof(bytes)); + if (!gmio_zip_read_checkhelper(stream, read_len, sizeof(bytes))) return gmio_zip_io_returnerr(read_len, GMIO_ERROR_STREAM, ptr_error); - info->crc32 = gmio_adv_decode_uint32_le(&buffit); - info->compressed_size = gmio_adv_decode_uint32_le(&buffit); - info->uncompressed_size = gmio_adv_decode_uint32_le(&buffit); + info->crc32 = gmio_adv_decode_uint32_le(&buff); + info->compressed_size = gmio_adv_decode_uint32_le(&buff); + info->uncompressed_size = gmio_adv_decode_uint32_le(&buff); return gmio_zip_io_returnerr(read_len, GMIO_ERROR_OK, ptr_error); } @@ -341,16 +329,16 @@ size_t gmio_zip64_read_data_descriptor( int* ptr_error) { #ifdef GMIO_HAVE_INT64_TYPE - uint8_t buff[GMIO_ZIP64_SIZE_DATA_DESCRIPTOR]; - const uint8_t* buffit = buff; + uint8_t bytes[GMIO_ZIP64_SIZE_DATA_DESCRIPTOR]; + const uint8_t* buff = bytes; - const size_t read_len = gmio_stream_read_bytes(stream, buff, sizeof(buff)); - if (!gmio_zip_read_checkhelper(stream, read_len, sizeof(buff))) + const size_t read_len = gmio_stream_read_bytes(stream, bytes, sizeof(bytes)); + if (!gmio_zip_read_checkhelper(stream, read_len, sizeof(bytes))) return gmio_zip_io_returnerr(read_len, GMIO_ERROR_STREAM, ptr_error); - info->crc32 = gmio_adv_decode_uint32_le(&buffit); - info->compressed_size = gmio_adv_decode_uint64_le(&buffit); - info->uncompressed_size = gmio_adv_decode_uint64_le(&buffit); + info->crc32 = gmio_adv_decode_uint32_le(&buff); + info->compressed_size = gmio_adv_decode_uint64_le(&buff); + info->uncompressed_size = gmio_adv_decode_uint64_le(&buff); return gmio_zip_io_returnerr(read_len, GMIO_ERROR_OK, ptr_error); #else @@ -364,41 +352,41 @@ size_t gmio_zip_write_central_directory_header( const struct gmio_zip_central_directory_header *info, int* ptr_error) { - uint8_t fixed_data[GMIO_ZIP_SIZE_CENTRAL_DIRECTORY_HEADER]; - uint8_t* buff = fixed_data; + uint8_t bytes[GMIO_ZIP_SIZE_CENTRAL_DIRECTORY_HEADER]; + uint8_t* buff = bytes; - buff = gmio_adv_encode_uint32_le(0x02014b50, buff); - buff = gmio_adv_encode_uint16_le(info->version_made_by, buff); - buff = gmio_adv_encode_uint16_le(info->version_needed_to_extract, buff); - buff = gmio_adv_encode_uint16_le(info->general_purpose_flags, buff); - buff = gmio_adv_encode_uint16_le(info->compress_method, buff); + gmio_adv_encode_uint32_le(0x02014b50, &buff); + gmio_adv_encode_uint16_le(info->version_made_by, &buff); + gmio_adv_encode_uint16_le(info->version_needed_to_extract, &buff); + gmio_adv_encode_uint16_le(info->general_purpose_flags, &buff); + gmio_adv_encode_uint16_le(info->compress_method, &buff); /* 2-bytes last mod file time + 2-bytes last mod file date */ const struct tm* lastmod = gmio_nonnull_datetime(info->lastmod_datetime); - buff = gmio_adv_encode_uint32_le(gmio_to_msdos_datetime(lastmod), buff); - buff = gmio_adv_encode_uint32_le(info->crc32, buff); + gmio_adv_encode_uint32_le(gmio_to_msdos_datetime(lastmod), &buff); + gmio_adv_encode_uint32_le(info->crc32, &buff); const uint32_t compressed_size = info->use_zip64 ? UINT32_MAX : info->compressed_size; const uint32_t uncompressed_size = info->use_zip64 ? UINT32_MAX : info->uncompressed_size; - buff = gmio_adv_encode_uint32_le(compressed_size, buff); - buff = gmio_adv_encode_uint32_le(uncompressed_size, buff); - buff = gmio_adv_encode_uint16_le(info->filename_len, buff); - buff = gmio_adv_encode_uint16_le(info->extrafield_len, buff); - buff = gmio_adv_encode_uint16_le(info->filecomment_len, buff); - buff = gmio_adv_encode_uint16_le(info->disk_nb_start, buff); - buff = gmio_adv_encode_uint16_le(info->internal_file_attrs, buff); - buff = gmio_adv_encode_uint32_le(info->external_file_attrs, buff); + gmio_adv_encode_uint32_le(compressed_size, &buff); + gmio_adv_encode_uint32_le(uncompressed_size, &buff); + gmio_adv_encode_uint16_le(info->filename_len, &buff); + gmio_adv_encode_uint16_le(info->extrafield_len, &buff); + gmio_adv_encode_uint16_le(info->filecomment_len, &buff); + gmio_adv_encode_uint16_le(info->disk_nb_start, &buff); + gmio_adv_encode_uint16_le(info->internal_file_attrs, &buff); + gmio_adv_encode_uint32_le(info->external_file_attrs, &buff); const uint32_t relative_offset_local_header = info->use_zip64 ? UINT32_MAX : info->relative_offset_local_header; - buff = gmio_adv_encode_uint32_le(relative_offset_local_header, buff); + gmio_adv_encode_uint32_le(relative_offset_local_header, &buff); /* Write to stream */ const size_t expected_written_len = - sizeof(fixed_data) + sizeof(bytes) + info->filename_len + info->extrafield_len + info->filecomment_len; size_t written_len = 0; written_len += - gmio_stream_write_bytes(stream, fixed_data, sizeof(fixed_data)); + gmio_stream_write_bytes(stream, bytes, sizeof(bytes)); written_len += gmio_stream_write_bytes(stream, info->filename, info->filename_len); written_len += @@ -421,14 +409,13 @@ size_t gmio_zip64_write_extrafield_extended_info( } #ifdef GMIO_HAVE_INT64_TYPE /* Tag */ - buff = gmio_adv_encode_uint16_le(0x0001, buff); + gmio_adv_encode_uint16_le(0x0001, &buff); /* Size of the "extra" block */ - buff = gmio_adv_encode_uint16_le( - GMIO_ZIP64_SIZE_EXTRAFIELD_EXTENDED_INFO - 2, buff); - buff = gmio_adv_encode_uint64_le(info->uncompressed_size, buff); - buff = gmio_adv_encode_uint64_le(info->compressed_size, buff); - buff = gmio_adv_encode_uint64_le(info->relative_offset_local_header, buff); - buff = gmio_adv_encode_uint32_le(info->disk_nb_start, buff); + gmio_adv_encode_uint16_le(GMIO_ZIP64_SIZE_EXTRAFIELD_EXTENDED_INFO - 2, &buff); + gmio_adv_encode_uint64_le(info->uncompressed_size, &buff); + gmio_adv_encode_uint64_le(info->compressed_size, &buff); + gmio_adv_encode_uint64_le(info->relative_offset_local_header, &buff); + gmio_adv_encode_uint32_le(info->disk_nb_start, &buff); return gmio_zip_io_returnerr( GMIO_ZIP64_SIZE_EXTRAFIELD_EXTENDED_INFO, GMIO_ERROR_OK, @@ -444,42 +431,41 @@ size_t gmio_zip_write_end_of_central_directory_record( const struct gmio_zip_end_of_central_directory_record *info, int* ptr_error) { - uint8_t fixed_data[GMIO_ZIP_SIZE_END_OF_CENTRAL_DIRECTORY_RECORD]; - uint8_t* buff = fixed_data; + uint8_t bytes[GMIO_ZIP_SIZE_END_OF_CENTRAL_DIRECTORY_RECORD]; + uint8_t* buff = bytes; /* 4-bytes magic number 0x06054b50 */ - buff = gmio_adv_encode_uint32_le(0x06054b50, buff); + gmio_adv_encode_uint32_le(0x06054b50, &buff); /* 2-bytes number of this disk */ const uint16_t disk_nb = info->use_zip64 ? UINT16_MAX : info->disk_nb; - buff = gmio_adv_encode_uint16_le(disk_nb, buff); + gmio_adv_encode_uint16_le(disk_nb, &buff); /* 2-bytes number of the disk with the start of the central directory */ const uint16_t disk_nb_with_start_of_central_dir = info->use_zip64 ? UINT16_MAX : info->disk_nb_with_start_of_central_dir; - buff = gmio_adv_encode_uint16_le(disk_nb_with_start_of_central_dir, buff); + gmio_adv_encode_uint16_le(disk_nb_with_start_of_central_dir, &buff); /* 2-bytes total number of entries in the central directory on this disk */ const uint16_t total_entry_count_in_central_dir_on_disk = info->use_zip64 ? UINT16_MAX : info->total_entry_count_in_central_dir_on_disk; - buff = gmio_adv_encode_uint16_le( - total_entry_count_in_central_dir_on_disk, buff); + gmio_adv_encode_uint16_le(total_entry_count_in_central_dir_on_disk, &buff); /* 2-bytes total number of entries in the central directory */ const uint16_t total_entry_count_in_central_dir = info->use_zip64 ? UINT16_MAX : info->total_entry_count_in_central_dir; - buff = gmio_adv_encode_uint16_le(total_entry_count_in_central_dir, buff); + gmio_adv_encode_uint16_le(total_entry_count_in_central_dir, &buff); /* 4-bytes size of the central directory */ const uint32_t central_dir_size = info->use_zip64 ? UINT32_MAX : info->central_dir_size; - buff = gmio_adv_encode_uint32_le(central_dir_size, buff); + gmio_adv_encode_uint32_le(central_dir_size, &buff); /* 4-bytes offset of start of central directory with respect to the starting * disk number */ @@ -487,18 +473,17 @@ size_t gmio_zip_write_end_of_central_directory_record( info->use_zip64 ? UINT32_MAX : info->start_offset_central_dir_from_disk_start_nb; - buff = gmio_adv_encode_uint32_le( - start_offset_central_dir_from_disk_start_nb, buff); + gmio_adv_encode_uint32_le(start_offset_central_dir_from_disk_start_nb, &buff); /* 2-bytes .ZIP file comment length */ - buff = gmio_adv_encode_uint16_le(info->filecomment_len, buff); + gmio_adv_encode_uint16_le(info->filecomment_len, &buff); /* Write to stream */ const size_t expected_written_len = - sizeof(fixed_data) + info->filecomment_len; + sizeof(bytes) + info->filecomment_len; size_t written_len = 0; written_len += - gmio_stream_write_bytes(stream, fixed_data, sizeof(fixed_data)); + gmio_stream_write_bytes(stream, bytes, sizeof(bytes)); written_len += gmio_stream_write_bytes(stream, info->filecomment, info->filecomment_len); return gmio_zip_write_returnhelper( From 3914e51863ee5978963f639fdb4fa16e386bee7b Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Mon, 9 Jan 2017 15:27:14 +0100 Subject: [PATCH 40/81] zip_utils.c: factorize initial bytes and magic read+check --- src/gmio_core/internal/zip_utils.c | 100 +++++++++++++++-------------- src/gmio_core/internal/zip_utils.h | 2 +- 2 files changed, 53 insertions(+), 49 deletions(-) diff --git a/src/gmio_core/internal/zip_utils.c b/src/gmio_core/internal/zip_utils.c index 107b443..2ff4199 100644 --- a/src/gmio_core/internal/zip_utils.c +++ b/src/gmio_core/internal/zip_utils.c @@ -89,12 +89,6 @@ static size_t gmio_zip_write_returnhelper( return written; } -static bool gmio_zip_read_checkhelper( - struct gmio_stream* stream, size_t read, size_t expected) -{ - return read == expected && !gmio_stream_error(stream); -} - /* Helper to facilitate return from gmio_zip_[read,write]_xxx() API functions */ static size_t gmio_zip_io_returnerr(size_t io_len, int error, int* ptr_error) { @@ -103,6 +97,36 @@ static size_t gmio_zip_io_returnerr(size_t io_len, int error, int* ptr_error) return io_len; } +/* Helper to read and check a 32b uint from buffer */ +static bool gmio_zip_readcheckmagic( + const uint8_t** ptr_buff, uint32_t expected_magic, int* ptr_error) +{ + if (gmio_adv_decode_uint32_le(ptr_buff) != expected_magic) { + if (ptr_error != NULL) + *ptr_error = GMIO_ZIP_UTILS_ERROR_BAD_MAGIC; + return false; + } + return true; +} + +/* Helper to read and check some bytes from buffer */ +static bool gmio_zip_readcheckbytes( + struct gmio_stream* stream, + uint8_t* buff, + size_t expected_len, + size_t* ptr_read_len, + int* ptr_error) +{ + *ptr_read_len = gmio_stream_read_bytes(stream, buff, expected_len); + const int error = + (*ptr_read_len == expected_len && !gmio_stream_error(stream)) ? + GMIO_ERROR_OK : + GMIO_ERROR_STREAM; + if (ptr_error != NULL) + *ptr_error = error; + return gmio_no_error(error); +} + /* ---------- * API functions * ---------- */ @@ -113,16 +137,13 @@ size_t gmio_zip_read_local_file_header( int *ptr_error) { uint8_t bytes[GMIO_ZIP_SIZE_LOCAL_FILE_HEADER]; + size_t read_len = 0; + if (!gmio_zip_readcheckbytes(stream, bytes, sizeof(bytes), &read_len, ptr_error)) + return read_len; + const uint8_t* buff = bytes; - - const size_t read_len = gmio_stream_read_bytes(stream, bytes, sizeof(bytes)); - if (!gmio_zip_read_checkhelper(stream, read_len, sizeof(bytes))) - return gmio_zip_io_returnerr(read_len, GMIO_ERROR_STREAM, ptr_error); - - if (gmio_adv_decode_uint32_le(&buff) != 0x04034b50) { - return gmio_zip_io_returnerr( - read_len, GMIO_ZIP_UTILS_ERROR_BAD_MAGIC, ptr_error); - } + if (!gmio_zip_readcheckmagic(&buff, 0x04034b50, ptr_error)) + return read_len; info->version_needed_to_extract = gmio_adv_decode_uint16_le(&buff); info->general_purpose_flags = gmio_adv_decode_uint16_le(&buff); info->compress_method = gmio_adv_decode_uint16_le(&buff); @@ -194,16 +215,11 @@ size_t gmio_zip_read_central_directory_header( { uint8_t bytes[GMIO_ZIP_SIZE_CENTRAL_DIRECTORY_HEADER]; const uint8_t* buff = bytes; - - const size_t read_len = gmio_stream_read_bytes(stream, bytes, sizeof(bytes)); - if (!gmio_zip_read_checkhelper(stream, read_len, sizeof(bytes))) - return gmio_zip_io_returnerr(read_len, GMIO_ERROR_STREAM, ptr_error); - - if (gmio_adv_decode_uint32_le(&buff) != 0x02014b50) { - return gmio_zip_io_returnerr( - read_len, GMIO_ZIP_UTILS_ERROR_BAD_MAGIC, ptr_error); - } - + size_t read_len = 0; + if (!gmio_zip_readcheckbytes(stream, bytes, sizeof(bytes), &read_len, ptr_error)) + return read_len; + if (!gmio_zip_readcheckmagic(&buff, 0x02014b50, ptr_error)) + return read_len; info->version_made_by = gmio_adv_decode_uint16_le(&buff); info->version_needed_to_extract = gmio_adv_decode_uint16_le(&buff); info->general_purpose_flags = gmio_adv_decode_uint16_le(&buff); @@ -238,17 +254,11 @@ size_t gmio_zip_read_end_of_central_directory_record( { uint8_t bytes[GMIO_ZIP_SIZE_END_OF_CENTRAL_DIRECTORY_RECORD]; const uint8_t* buff = bytes; - - const size_t read_len = gmio_stream_read_bytes(stream, bytes, sizeof(bytes)); - if (!gmio_zip_read_checkhelper(stream, read_len, sizeof(bytes))) - return gmio_zip_io_returnerr(read_len, GMIO_ERROR_STREAM, ptr_error); - - /* 4-bytes magic */ - if (gmio_adv_decode_uint32_le(&buff) != 0x06054b50) { - return gmio_zip_io_returnerr( - read_len, GMIO_ZIP_UTILS_ERROR_BAD_MAGIC, ptr_error); - } - + size_t read_len = 0; + if (!gmio_zip_readcheckbytes(stream, bytes, sizeof(bytes), &read_len, ptr_error)) + return read_len; + if (!gmio_zip_readcheckmagic(&buff, 0x06054b50, ptr_error)) + return read_len; info->disk_nb = gmio_adv_decode_uint16_le(&buff); info->disk_nb_with_start_of_central_dir = gmio_adv_decode_uint16_le(&buff); info->total_entry_count_in_central_dir_on_disk = @@ -311,15 +321,12 @@ size_t gmio_zip_read_data_descriptor( { uint8_t bytes[GMIO_ZIP_SIZE_DATA_DESCRIPTOR]; const uint8_t* buff = bytes; - - const size_t read_len = gmio_stream_read_bytes(stream, bytes, sizeof(bytes)); - if (!gmio_zip_read_checkhelper(stream, read_len, sizeof(bytes))) - return gmio_zip_io_returnerr(read_len, GMIO_ERROR_STREAM, ptr_error); - + size_t read_len = 0; + if (!gmio_zip_readcheckbytes(stream, bytes, sizeof(bytes), &read_len, ptr_error)) + return read_len; info->crc32 = gmio_adv_decode_uint32_le(&buff); info->compressed_size = gmio_adv_decode_uint32_le(&buff); info->uncompressed_size = gmio_adv_decode_uint32_le(&buff); - return gmio_zip_io_returnerr(read_len, GMIO_ERROR_OK, ptr_error); } @@ -331,15 +338,12 @@ size_t gmio_zip64_read_data_descriptor( #ifdef GMIO_HAVE_INT64_TYPE uint8_t bytes[GMIO_ZIP64_SIZE_DATA_DESCRIPTOR]; const uint8_t* buff = bytes; - - const size_t read_len = gmio_stream_read_bytes(stream, bytes, sizeof(bytes)); - if (!gmio_zip_read_checkhelper(stream, read_len, sizeof(bytes))) - return gmio_zip_io_returnerr(read_len, GMIO_ERROR_STREAM, ptr_error); - + size_t read_len = 0; + if (!gmio_zip_readcheckbytes(stream, bytes, sizeof(bytes), &read_len, ptr_error)) + return read_len; info->crc32 = gmio_adv_decode_uint32_le(&buff); info->compressed_size = gmio_adv_decode_uint64_le(&buff); info->uncompressed_size = gmio_adv_decode_uint64_le(&buff); - return gmio_zip_io_returnerr(read_len, GMIO_ERROR_OK, ptr_error); #else /* TODO: error code */ diff --git a/src/gmio_core/internal/zip_utils.h b/src/gmio_core/internal/zip_utils.h index b085f07..1adbb2d 100644 --- a/src/gmio_core/internal/zip_utils.h +++ b/src/gmio_core/internal/zip_utils.h @@ -246,7 +246,7 @@ struct gmio_zip_write_result { size_t written_len; }; -enum { GMIO_ZIP_UTILS_ERROR_TAG = 0x00AA0000 }; +enum { GMIO_ZIP_UTILS_ERROR_TAG = 0xAA000000 }; enum gmio_zip_utils_error { GMIO_ZIP_UTILS_ERROR_BAD_MAGIC = GMIO_ZIP_UTILS_ERROR_TAG + 0x01 }; From cad0804c17517e287d8d04701ea94d903e791cdc Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Mon, 9 Jan 2017 15:45:22 +0100 Subject: [PATCH 41/81] Move back const_string.h in gmio_core/internal --- src/gmio_core/{ => internal}/const_string.h | 19 +++++-------------- src/gmio_stl/stla_read.c | 2 +- 2 files changed, 6 insertions(+), 15 deletions(-) rename src/gmio_core/{ => internal}/const_string.h (90%) diff --git a/src/gmio_core/const_string.h b/src/gmio_core/internal/const_string.h similarity index 90% rename from src/gmio_core/const_string.h rename to src/gmio_core/internal/const_string.h index ab1967d..85014c1 100644 --- a/src/gmio_core/const_string.h +++ b/src/gmio_core/internal/const_string.h @@ -27,22 +27,14 @@ ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ****************************************************************************/ -/*! \file const_string.h - * Declaration of gmio_const_string and utility functions - * - * \addtogroup gmio_core - * @{ - */ +#ifndef GMIO_INTERNAL_CONST_STRING_H +#define GMIO_INTERNAL_CONST_STRING_H -#ifndef GMIO_CONST_STRING_H -#define GMIO_CONST_STRING_H - -#include "global.h" +#include "../global.h" #include -/*! Stores a read-only string of 8-bit chars - * +/*! Stores a read-only string of 8-bit chars. * For faster lookups, it knowns the length of its contents. */ struct gmio_const_string @@ -84,5 +76,4 @@ bool gmio_const_string_is_empty(const struct gmio_const_string* str) return str->ptr == NULL || str->len == 0; } -#endif /* GMIO_CONST_STRING_H */ -/*! @} */ +#endif /* GMIO_INTERNAL_CONST_STRING_H */ diff --git a/src/gmio_stl/stla_read.c b/src/gmio_stl/stla_read.c index 794b66d..c6ed424 100644 --- a/src/gmio_stl/stla_read.c +++ b/src/gmio_stl/stla_read.c @@ -35,9 +35,9 @@ #include "internal/stl_error_check.h" #include "internal/stla_parsing.h" -#include "../gmio_core/const_string.h" #include "../gmio_core/error.h" #include "../gmio_core/internal/c99_stdio_compat.h" +#include "../gmio_core/internal/const_string.h" #include "../gmio_core/internal/error_check.h" #include "../gmio_core/internal/helper_memblock.h" #include "../gmio_core/internal/helper_stream.h" From 0481df6e6192f2be1f5571958b428394eb6572e7 Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Tue, 10 Jan 2017 10:47:46 +0100 Subject: [PATCH 42/81] gmio_amf: add Zip64 support --- src/gmio_amf/amf_io.c | 167 ++++----- src/gmio_amf/amf_io_options.h | 1 + src/gmio_core/error.h | 21 +- src/gmio_core/internal/string.h | 3 +- src/gmio_core/internal/zip_utils.c | 307 ++++++++++++++-- src/gmio_core/internal/zip_utils.h | 67 +++- tests/main_test_amf.c | 4 +- tests/test_amf_io.c | 565 +++++++++++++++++++---------- 8 files changed, 793 insertions(+), 342 deletions(-) diff --git a/src/gmio_amf/amf_io.c b/src/gmio_amf/amf_io.c index 034f414..54188d4 100644 --- a/src/gmio_amf/amf_io.c +++ b/src/gmio_amf/amf_io.c @@ -46,8 +46,8 @@ /* Writing(output) context */ struct gmio_amf_wcontext { + struct gmio_ostringstream sstream; const struct gmio_amf_write_options* options; - struct gmio_ostringstream* sstream; const struct gmio_amf_document* document; const struct gmio_task_iface* task_iface; intmax_t task_progress_current; @@ -85,7 +85,7 @@ static void gmio_amf_write_double( double value, const char* value_formula) { - struct gmio_ostringstream* sstream = context->sstream; + struct gmio_ostringstream* sstream = &context->sstream; if (value_formula == NULL || *value_formula == '\0') gmio_ostringstream_write_f64(sstream, value, &context->f64_format); else @@ -98,7 +98,7 @@ static void gmio_amf_write_color_component( double value, const char* value_formula) { - struct gmio_ostringstream* sstream = context->sstream; + struct gmio_ostringstream* sstream = &context->sstream; if (value_formula == NULL || *value_formula == '\0') { gmio_ostringstream_write_f64(sstream, value, &context->f64_format); } @@ -114,7 +114,7 @@ static void gmio_amf_write_color( struct gmio_amf_wcontext* context, const struct gmio_amf_color* color) { - struct gmio_ostringstream* sstream = context->sstream; + struct gmio_ostringstream* sstream = &context->sstream; gmio_ostringstream_write_chararray(sstream, ""); gmio_amf_write_color_component(context, color->r, color->r_formula); gmio_ostringstream_write_chararray(sstream, ""); @@ -177,7 +177,7 @@ static bool gmio_amf_write_root_metadata(struct gmio_amf_wcontext* context) doc->func_get_document_element( doc->cookie, GMIO_AMF_DOCUMENT_ELEMENT_METADATA, imeta, &metadata); - gmio_amf_write_metadata(context->sstream, &metadata); + gmio_amf_write_metadata(&context->sstream, &metadata); gmio_amf_wcontext_incr_task_progress(context); } return gmio_no_error(context->error); @@ -187,7 +187,7 @@ static bool gmio_amf_write_root_metadata(struct gmio_amf_wcontext* context) static bool gmio_amf_write_root_materials(struct gmio_amf_wcontext* context) { const struct gmio_amf_document* doc = context->document; - struct gmio_ostringstream* sstream = context->sstream; + struct gmio_ostringstream* sstream = &context->sstream; struct gmio_amf_material material = {0}; for (uint32_t imat = 0; imat < doc->material_count; ++imat) { doc->func_get_document_element( @@ -280,7 +280,7 @@ static bool gmio_amf_write_mesh( const struct gmio_amf_object_mesh_element_index* base_mesh_element_index) { const struct gmio_amf_document* doc = context->document; - struct gmio_ostringstream* sstream = context->sstream; + struct gmio_ostringstream* sstream = &context->sstream; struct gmio_amf_object_mesh_element_index mesh_elt_index = *base_mesh_element_index; const struct gmio_ostringstream_format_float* f64_format = @@ -441,7 +441,7 @@ static bool gmio_amf_write_mesh( static bool gmio_amf_write_root_objects(struct gmio_amf_wcontext* context) { const struct gmio_amf_document* doc = context->document; - struct gmio_ostringstream* sstream = context->sstream; + struct gmio_ostringstream* sstream = &context->sstream; struct gmio_amf_object object = {0}; for (uint32_t iobj = 0; iobj < doc->object_count; ++iobj) { doc->func_get_document_element( @@ -496,7 +496,7 @@ static bool gmio_amf_write_root_objects(struct gmio_amf_wcontext* context) static bool gmio_amf_write_root_textures(struct gmio_amf_wcontext* context) { const struct gmio_amf_document* doc = context->document; - struct gmio_ostringstream* sstream = context->sstream; + struct gmio_ostringstream* sstream = &context->sstream; struct gmio_amf_texture texture = {0}; for (uint32_t itex = 0; itex < doc->texture_count; ++itex) { doc->func_get_document_element( @@ -532,7 +532,7 @@ static bool gmio_amf_write_root_textures(struct gmio_amf_wcontext* context) static bool gmio_amf_write_root_constellations(struct gmio_amf_wcontext* context) { const struct gmio_amf_document* doc = context->document; - struct gmio_ostringstream* sstream = context->sstream; + struct gmio_ostringstream* sstream = &context->sstream; struct gmio_amf_constellation constellation = {0}; for (uint32_t icons = 0; icons < doc->constellation_count; ++icons) { doc->func_get_document_element( @@ -814,6 +814,39 @@ static struct gmio_zip_entry_filename gmio_amf_zip_entry_filename( return zip_filename; } +/* Writes AMF file data, plain text or compressed(ZIP) + * This function satisfies the signature required by gmio_zip_write_single_file() + */ +static int gmio_amf_write_file_data( + void* cookie, struct gmio_zip_data_descriptor* dd) +{ + struct gmio_amf_wcontext* context = (struct gmio_amf_wcontext*)cookie; + struct gmio_ostringstream* sstream = &context->sstream; + gmio_amf_write_amf_begin(sstream, context->document); + if (!gmio_amf_write_root_metadata(context)) + return context->error; + if (!gmio_amf_write_root_materials(context)) + return context->error; + if (!gmio_amf_write_root_objects(context)) + return context->error; + if (!gmio_amf_write_root_textures(context)) + return context->error; + if (!gmio_amf_write_root_constellations(context)) + return context->error; + if (context->options->compress) { + gmio_ostringstream_flush(sstream); + context->z_flush = Z_FINISH; + } + gmio_ostringstream_write_chararray(sstream, "\n"); + gmio_ostringstream_flush(sstream); + if (context->options->compress && dd != NULL) { + dd->crc32 = context->z_crc32; + dd->uncompressed_size = context->z_uncompressed_size; + dd->compressed_size = context->z_compressed_size; + } + return context->error; +} + int gmio_amf_write( struct gmio_stream* stream, const struct gmio_amf_document* doc, @@ -822,19 +855,10 @@ int gmio_amf_write( static const struct gmio_amf_write_options default_write_opts = {0}; opts = opts != NULL ? opts : &default_write_opts; - /* Constants */ + struct gmio_amf_wcontext context = {0}; struct gmio_memblock_helper mblock_helper = gmio_memblock_helper(opts != NULL ? &opts->stream_memblock : NULL); const struct gmio_memblock* memblock = &mblock_helper.memblock; - const struct gmio_zip_entry_filename zip_entry_filename = - gmio_amf_zip_entry_filename(opts); - - /* Variables */ - struct gmio_amf_wcontext context = {0}; - struct gmio_ostringstream sstream = - gmio_ostringstream( - *stream, gmio_string(memblock->ptr, 0, memblock->size)); - uintmax_t zip_write_pos = 0; /* Check validity of input parameters */ context.error = GMIO_ERROR_OK; @@ -847,8 +871,12 @@ int gmio_amf_write( /* Initialize writing context */ const struct gmio_string_16 f64_stdio_format = gmio_to_stdio_float_format(opts->float64_format, opts->float64_prec); + context.sstream = + gmio_ostringstream( + *stream, gmio_string(memblock->ptr, 0, memblock->size)); + context.sstream.cookie = &context; + context.sstream.func_stream_write = &gmio_amf_ostringstream_write; context.options = opts; - context.sstream = &sstream; context.document = doc; context.task_iface = &opts->task_iface; context.task_progress_current = 0; @@ -858,10 +886,11 @@ int gmio_amf_write( context.f64_format.text_format = opts->float64_format; context.f64_format.precision = opts->float64_prec != 0 ? opts->float64_prec : 16; + if (opts->compress) { /* Initialize internal zlib stream for compression */ const size_t mblock_halfsize = memblock->size / 2; - context.sstream->strbuff.capacity = mblock_halfsize; + context.sstream.strbuff.capacity = mblock_halfsize; context.z_memblock = gmio_memblock( (uint8_t*)memblock->ptr + mblock_halfsize, @@ -874,85 +903,23 @@ int gmio_amf_write( if (gmio_error(context.error)) goto label_end; context.z_flush = Z_NO_FLUSH; + /* Write ZIP file */ + struct gmio_zip_file_entry file_entry = {0}; + file_entry.compress_method = GMIO_ZIP_COMPRESS_METHOD_DEFLATE; + file_entry.feature_version = + opts->force_zip64_format ? + GMIO_ZIP_FEATURE_VERSION_FILE_ZIP64_FORMAT_EXTENSIONS : + GMIO_ZIP_FEATURE_VERSION_FILE_COMPRESSED_DEFLATE; + const struct gmio_zip_entry_filename zip_entry_filename = + gmio_amf_zip_entry_filename(opts); + file_entry.filename = zip_entry_filename.ptr; + file_entry.filename_len = zip_entry_filename.len; + file_entry.cookie_func_write_file_data = &context; + file_entry.func_write_file_data = gmio_amf_write_file_data; + gmio_zip_write_single_file(stream, &file_entry, &context.error); } - - sstream.cookie = &context; - sstream.func_stream_write = &gmio_amf_ostringstream_write; - - /* If compression enabled, write ZIP local file header */ - if (opts->compress) { - struct gmio_zip_local_file_header info = {0}; - info.general_purpose_flags = - GMIO_ZIP_GENERAL_PURPOSE_FLAG_USE_DATA_DESCRIPTOR; - info.compress_method = GMIO_ZIP_COMPRESS_METHOD_DEFLATE; - info.filename = zip_entry_filename.ptr; - info.filename_len = zip_entry_filename.len; - zip_write_pos += - gmio_zip_write_local_file_header(stream, &info, &context.error); - if (gmio_error(context.error)) - goto label_end; - } - - gmio_amf_write_amf_begin(&sstream, doc); - if (!gmio_amf_write_root_metadata(&context)) - goto label_end; - if (!gmio_amf_write_root_materials(&context)) - goto label_end; - if (!gmio_amf_write_root_objects(&context)) - goto label_end; - if (!gmio_amf_write_root_textures(&context)) - goto label_end; - if (!gmio_amf_write_root_constellations(&context)) - goto label_end; - - if (opts->compress) { - gmio_ostringstream_flush(&sstream); - context.z_flush = Z_FINISH; - } - gmio_ostringstream_write_chararray(&sstream, "\n"); - gmio_ostringstream_flush(&sstream); - - /* Write ending ZIP archive data */ - if (opts->compress && gmio_no_error(context.error)) { - zip_write_pos += context.z_compressed_size; - /* Write data descriptor */ - struct gmio_zip_data_descriptor dd = {0}; - dd.crc32 = context.z_crc32; - dd.compressed_size = context.z_compressed_size; - dd.uncompressed_size = context.z_uncompressed_size; - zip_write_pos += - gmio_zip_write_data_descriptor(stream, &dd, &context.error); - if (gmio_error(context.error)) - goto label_end; - /* Write central directory header */ - struct gmio_zip_central_directory_header cdh = {0}; - cdh.version_needed_to_extract = - GMIO_ZIP_FEATURE_VERSION_FILE_COMPRESSED_DEFLATE; - cdh.general_purpose_flags = - GMIO_ZIP_GENERAL_PURPOSE_FLAG_USE_DATA_DESCRIPTOR; - cdh.compress_method = GMIO_ZIP_COMPRESS_METHOD_DEFLATE; - cdh.crc32 = context.z_crc32; - cdh.compressed_size = (uint32_t)context.z_compressed_size; - cdh.uncompressed_size = (uint32_t)context.z_uncompressed_size; - cdh.filename = zip_entry_filename.ptr; - cdh.filename_len = zip_entry_filename.len; - const uintmax_t central_dir_startpos = zip_write_pos; - const size_t central_dir_size = - gmio_zip_write_central_directory_header( - stream, &cdh, &context.error); - zip_write_pos += central_dir_size; - if (gmio_error(context.error)) - goto label_end; - /* Write end of central directory record */ - struct gmio_zip_end_of_central_directory_record eocdr = {0}; - eocdr.total_entry_count_in_central_dir_on_disk = 1; - eocdr.total_entry_count_in_central_dir = 1; - eocdr.central_dir_size = (uint32_t)central_dir_size; - eocdr.start_offset_central_dir_from_disk_start_nb = - (uint32_t)central_dir_startpos; - zip_write_pos += - gmio_zip_write_end_of_central_directory_record( - stream, &eocdr, &context.error); + else { + context.error = gmio_amf_write_file_data(&context, NULL); } label_end: diff --git a/src/gmio_amf/amf_io_options.h b/src/gmio_amf/amf_io_options.h index 46872c4..15146bf 100644 --- a/src/gmio_amf/amf_io_options.h +++ b/src/gmio_amf/amf_io_options.h @@ -82,6 +82,7 @@ struct gmio_amf_write_options struct gmio_zlib_compress_options z_compress_options; const char* zip_entry_filename; uint16_t zip_entry_filename_len; + bool force_zip64_format; }; #endif /* GMIO_AMF_IO_OPTIONS_H */ diff --git a/src/gmio_core/error.h b/src/gmio_core/error.h index 41d5edf..45d5f58 100644 --- a/src/gmio_core/error.h +++ b/src/gmio_core/error.h @@ -39,9 +39,15 @@ #include "global.h" -/*! \c GMIO_ZLIB_ERROR_TAG - * Byte-mask to tag(identify) zlib-specific error codes */ -enum { GMIO_ZLIB_ERROR_TAG = 0x1000000 }; +enum { + /*! \c GMIO_ZLIB_ERROR_TAG + * Byte-mask to tag(identify) zlib-specific error codes */ + GMIO_ZLIB_ERROR_TAG = 0x01000000, + + /*! \c GMIO_ZIP_ERROR_TAG + * Byte-mask to tag(identify) ZIP-specific error codes */ + GMIO_ZIP_ERROR_TAG = 0x02000000 +}; /*! Common errors */ enum gmio_error @@ -97,7 +103,14 @@ enum gmio_error /*! Invalid compression memory usage, see * gmio_zlib_compress_options::memory_usage */ - GMIO_ERROR_ZLIB_INVALID_COMPRESS_MEMORY_USAGE + GMIO_ERROR_ZLIB_INVALID_COMPRESS_MEMORY_USAGE, + + /*! Zip64 format requires the compiler to provide a 64b integer type */ + GMIO_ERROR_ZIP_INT64_TYPE_REQUIRED = GMIO_ZIP_ERROR_TAG + 0x01, + + /*! The size of some ZIP file entry exceeds 32b limit and so requires Zip64 + * format */ + GMIO_ERROR_ZIP64_FORMAT_REQUIRED = GMIO_ZIP_ERROR_TAG + 0x02 }; /*! Returns true if code == GMIO_NO_ERROR */ diff --git a/src/gmio_core/internal/string.h b/src/gmio_core/internal/string.h index fddc567..105956f 100644 --- a/src/gmio_core/internal/string.h +++ b/src/gmio_core/internal/string.h @@ -34,8 +34,7 @@ #include -/*! Stores a mutable string of 8-bit chars - * +/*! Stores a mutable string of 8-bit chars. * For faster lookups, it knowns the length of its contents. Length must not * exceeds the maximum size(capacity). */ diff --git a/src/gmio_core/internal/zip_utils.c b/src/gmio_core/internal/zip_utils.c index 2ff4199..e356c5f 100644 --- a/src/gmio_core/internal/zip_utils.c +++ b/src/gmio_core/internal/zip_utils.c @@ -41,8 +41,10 @@ enum { GMIO_ZIP_SIZE_LOCAL_FILE_HEADER = 4 + 5*2 + 3*4 + 2*2, GMIO_ZIP_SIZE_CENTRAL_DIRECTORY_HEADER = 4 + 6*2 + 3*4 + 5*2 +2*4, - GMIO_ZIP64_SIZE_DATA_DESCRIPTOR = 4 + 2*8, - GMIO_ZIP_SIZE_DATA_DESCRIPTOR = 4 + 2*4, + GMIO_ZIP_SIZE_DATA_DESCRIPTOR = 4 + 4 + 4 + 4, + GMIO_ZIP64_SIZE_DATA_DESCRIPTOR = 4 + 4 + 2*8, + GMIO_ZIP64_SIZE_END_OF_CENTRAL_DIRECTORY_RECORD = 4 + 8 + 2*2 + 2*4 + 4*8, + GMIO_ZIP64_SIZE_END_OF_CENTRAL_DIRECTORY_LOCATOR = 4 + 4 + 8 + 4, GMIO_ZIP_SIZE_END_OF_CENTRAL_DIRECTORY_RECORD = 4 + 4*2 + 2*4 + 2 }; @@ -176,7 +178,7 @@ size_t gmio_zip_write_data_descriptor( uint8_t bytes[GMIO_ZIP64_SIZE_DATA_DESCRIPTOR]; uint8_t* buff = bytes; - /* 4-bytes crc-32 */ + gmio_adv_encode_uint32_le(0x08074b50, &buff); gmio_adv_encode_uint32_le(info->crc32, &buff); /* Compressed size and uncompressed size (4 or 8 bytes) */ if (info->use_zip64) { @@ -184,21 +186,19 @@ size_t gmio_zip_write_data_descriptor( gmio_adv_encode_uint64_le(info->compressed_size, &buff); gmio_adv_encode_uint64_le(info->uncompressed_size, &buff); #else - /* TODO: error code */ - return gmio_zip_io_returnerr(0, GMIO_ERROR_UNKNOWN, ptr_error); + return gmio_zip_io_returnerr( + 0, GMIO_ERROR_ZIP_INT64_TYPE_REQUIRED, ptr_error); #endif } + else if (!gmio_zip64_required( + info->uncompressed_size, info->compressed_size)) + { + gmio_adv_encode_uint32_le((uint32_t)info->compressed_size, &buff); + gmio_adv_encode_uint32_le((uint32_t)info->uncompressed_size, &buff); + } else { - if (info->compressed_size <= UINT32_MAX - && info->uncompressed_size <= UINT32_MAX) - { - gmio_adv_encode_uint32_le((uint32_t)info->compressed_size, &buff); - gmio_adv_encode_uint32_le((uint32_t)info->uncompressed_size, &buff); - } - else { - /* TODO: error code */ - return gmio_zip_io_returnerr(0, GMIO_ERROR_UNKNOWN, ptr_error); - } + return gmio_zip_io_returnerr( + 0, GMIO_ERROR_ZIP64_FORMAT_REQUIRED, ptr_error); } /* Write to stream */ @@ -247,6 +247,59 @@ size_t gmio_zip_read_central_directory_header( return gmio_zip_io_returnerr(read_len, GMIO_ERROR_OK, ptr_error); } +size_t gmio_zip64_read_end_of_central_directory_record( + struct gmio_stream *stream, + struct gmio_zip64_end_of_central_directory_record *info, + int *ptr_error) +{ +#ifdef GMIO_HAVE_INT64_TYPE + uint8_t bytes[GMIO_ZIP64_SIZE_END_OF_CENTRAL_DIRECTORY_RECORD]; + const uint8_t* buff = bytes; + size_t read_len = 0; + if (!gmio_zip_readcheckbytes(stream, bytes, sizeof(bytes), &read_len, ptr_error)) + return read_len; + if (!gmio_zip_readcheckmagic(&buff, 0x06064b50, ptr_error)) + return read_len; + gmio_adv_decode_uint64_le(&buff); + info->version_made_by = gmio_adv_decode_uint16_le(&buff); + info->version_needed_to_extract = gmio_adv_decode_uint16_le(&buff); + info->disk_nb = gmio_adv_decode_uint32_le(&buff); + info->disk_nb_with_start_of_central_dir = gmio_adv_decode_uint32_le(&buff); + info->total_entry_count_in_central_dir_on_disk = + gmio_adv_decode_uint64_le(&buff); + info->central_dir_size = gmio_adv_decode_uint64_le(&buff); + info->start_offset_central_dir_from_disk_start_nb = + gmio_adv_decode_uint64_le(&buff); + return gmio_zip_io_returnerr(read_len, GMIO_ERROR_OK, ptr_error); +#else + return gmio_zip_io_returnerr( + 0, GMIO_ERROR_ZIP_INT64_TYPE_REQUIRED, ptr_error); +#endif +} + +size_t gmio_zip64_read_end_of_central_directory_locator( + struct gmio_stream *stream, + struct gmio_zip64_end_of_central_directory_locator *info, + int *ptr_error) +{ +#ifdef GMIO_HAVE_INT64_TYPE + uint8_t bytes[GMIO_ZIP64_SIZE_END_OF_CENTRAL_DIRECTORY_LOCATOR]; + const uint8_t* buff = bytes; + size_t read_len = 0; + if (!gmio_zip_readcheckbytes(stream, bytes, sizeof(bytes), &read_len, ptr_error)) + return read_len; + if (!gmio_zip_readcheckmagic(&buff, 0x07064b50, ptr_error)) + return read_len; + info->disk_nb_with_start_of_central_dir = gmio_adv_decode_uint32_le(&buff); + info->relative_offset = gmio_adv_decode_uint64_le(&buff); + info->total_disk_count = gmio_adv_decode_uint32_le(&buff); + return gmio_zip_io_returnerr(read_len, GMIO_ERROR_OK, ptr_error); +#else + return gmio_zip_io_returnerr( + 0, GMIO_ERROR_ZIP_INT64_TYPE_REQUIRED, ptr_error); +#endif +} + size_t gmio_zip_read_end_of_central_directory_record( struct gmio_stream *stream, struct gmio_zip_end_of_central_directory_record *info, @@ -269,7 +322,6 @@ size_t gmio_zip_read_end_of_central_directory_record( gmio_adv_decode_uint32_le(&buff); info->filecomment_len = gmio_adv_decode_uint16_le(&buff); info->filecomment = NULL; - return gmio_zip_io_returnerr(read_len, GMIO_ERROR_OK, ptr_error); } @@ -324,6 +376,8 @@ size_t gmio_zip_read_data_descriptor( size_t read_len = 0; if (!gmio_zip_readcheckbytes(stream, bytes, sizeof(bytes), &read_len, ptr_error)) return read_len; + if (!gmio_zip_readcheckmagic(&buff, 0x08074b50, ptr_error)) + return read_len; info->crc32 = gmio_adv_decode_uint32_le(&buff); info->compressed_size = gmio_adv_decode_uint32_le(&buff); info->uncompressed_size = gmio_adv_decode_uint32_le(&buff); @@ -341,13 +395,15 @@ size_t gmio_zip64_read_data_descriptor( size_t read_len = 0; if (!gmio_zip_readcheckbytes(stream, bytes, sizeof(bytes), &read_len, ptr_error)) return read_len; + if (!gmio_zip_readcheckmagic(&buff, 0x08074b50, ptr_error)) + return read_len; info->crc32 = gmio_adv_decode_uint32_le(&buff); info->compressed_size = gmio_adv_decode_uint64_le(&buff); info->uncompressed_size = gmio_adv_decode_uint64_le(&buff); return gmio_zip_io_returnerr(read_len, GMIO_ERROR_OK, ptr_error); #else - /* TODO: error code */ - return gmio_zip_io_returnerr(0, GMIO_ERROR_UNKNOWN, ptr_error); + return gmio_zip_io_returnerr( + 0, GMIO_ERROR_ZIP_INT64_TYPE_REQUIRED, ptr_error); #endif } @@ -401,32 +457,86 @@ size_t gmio_zip_write_central_directory_header( stream, written_len, expected_written_len, ptr_error); } -size_t gmio_zip64_write_extrafield_extended_info( +size_t gmio_zip64_write_extrafield( uint8_t *buff, size_t buff_capacity, - const struct gmio_zip64_extrablock_extended_info *info, + const struct gmio_zip64_extrafield *info, int* ptr_error) { - if (buff_capacity < GMIO_ZIP64_SIZE_EXTRAFIELD_EXTENDED_INFO) { + if (buff_capacity < GMIO_ZIP64_SIZE_EXTRAFIELD) { return gmio_zip_io_returnerr( 0, GMIO_ERROR_INVALID_MEMBLOCK_SIZE, ptr_error); } #ifdef GMIO_HAVE_INT64_TYPE - /* Tag */ - gmio_adv_encode_uint16_le(0x0001, &buff); - /* Size of the "extra" block */ - gmio_adv_encode_uint16_le(GMIO_ZIP64_SIZE_EXTRAFIELD_EXTENDED_INFO - 2, &buff); + static const uint16_t extrablock_tag = 0x0001; + static const uint16_t extrablock_size = 3*8 + 4; + gmio_adv_encode_uint16_le(extrablock_tag, &buff); + gmio_adv_encode_uint16_le(extrablock_size, &buff); gmio_adv_encode_uint64_le(info->uncompressed_size, &buff); gmio_adv_encode_uint64_le(info->compressed_size, &buff); gmio_adv_encode_uint64_le(info->relative_offset_local_header, &buff); gmio_adv_encode_uint32_le(info->disk_nb_start, &buff); return gmio_zip_io_returnerr( - GMIO_ZIP64_SIZE_EXTRAFIELD_EXTENDED_INFO, - GMIO_ERROR_OK, - ptr_error); + GMIO_ZIP64_SIZE_EXTRAFIELD, GMIO_ERROR_OK, ptr_error); #else - /* TODO: error code */ - return gmio_zip_io_returnerr(0, GMIO_ERROR_UNKNOWN, error); + return gmio_zip_io_returnerr( + 0, GMIO_ERROR_ZIP_INT64_TYPE_REQUIRED, ptr_error); +#endif +} + +size_t gmio_zip64_write_end_of_central_directory_record( + struct gmio_stream *stream, + const struct gmio_zip64_end_of_central_directory_record *info, + int *ptr_error) +{ +#ifdef GMIO_HAVE_INT64_TYPE + uint8_t bytes[GMIO_ZIP64_SIZE_END_OF_CENTRAL_DIRECTORY_RECORD]; + uint8_t* buff = bytes; + gmio_adv_encode_uint32_le(0x06064b50, &buff); + gmio_adv_encode_uint64_le(sizeof(bytes) - 12, &buff); + gmio_adv_encode_uint16_le(info->version_made_by, &buff); + gmio_adv_encode_uint16_le(info->version_needed_to_extract, &buff); + gmio_adv_encode_uint32_le(info->disk_nb, &buff); + gmio_adv_encode_uint32_le(info->disk_nb_with_start_of_central_dir, &buff); + gmio_adv_encode_uint64_le( + info->total_entry_count_in_central_dir_on_disk, &buff); + gmio_adv_encode_uint64_le(info->total_entry_count_in_central_dir, &buff); + gmio_adv_encode_uint64_le(info->central_dir_size, &buff); + gmio_adv_encode_uint64_le( + info->start_offset_central_dir_from_disk_start_nb, &buff); + /* Write to stream */ + const size_t expected_written_len = sizeof(bytes); + const size_t written_len = + gmio_stream_write_bytes(stream, bytes, sizeof(bytes)); + return gmio_zip_write_returnhelper( + stream, written_len, expected_written_len, ptr_error); +#else + return gmio_zip_io_returnerr( + 0, GMIO_ERROR_ZIP_INT64_TYPE_REQUIRED, ptr_error); +#endif +} + +size_t gmio_zip64_write_end_of_central_directory_locator( + struct gmio_stream *stream, + const struct gmio_zip64_end_of_central_directory_locator *info, + int *ptr_error) +{ +#ifdef GMIO_HAVE_INT64_TYPE + uint8_t bytes[GMIO_ZIP64_SIZE_END_OF_CENTRAL_DIRECTORY_LOCATOR]; + uint8_t* buff = bytes; + gmio_adv_encode_uint32_le(0x07064b50, &buff); + gmio_adv_encode_uint32_le(info->disk_nb_with_start_of_central_dir, &buff); + gmio_adv_encode_uint64_le(info->relative_offset, &buff); + gmio_adv_encode_uint32_le(info->total_disk_count, &buff); + /* Write to stream */ + const size_t expected_written_len = sizeof(bytes); + const size_t written_len = + gmio_stream_write_bytes(stream, bytes, sizeof(bytes)); + return gmio_zip_write_returnhelper( + stream, written_len, expected_written_len, ptr_error); +#else + return gmio_zip_io_returnerr( + 0, GMIO_ERROR_ZIP_INT64_TYPE_REQUIRED, ptr_error); #endif } @@ -493,3 +603,140 @@ size_t gmio_zip_write_end_of_central_directory_record( return gmio_zip_write_returnhelper( stream, written_len, expected_written_len, ptr_error); } + +bool gmio_zip64_required( + uintmax_t uncompressed_size, uintmax_t compressed_size) +{ + return uncompressed_size > UINT32_MAX || compressed_size > UINT32_MAX; +} + +bool gmio_zip_write_single_file( + struct gmio_stream *stream, + const struct gmio_zip_file_entry *file_entry, + int *ptr_error) +{ + const bool use_zip64_format_extensions = + file_entry->feature_version + >= GMIO_ZIP_FEATURE_VERSION_FILE_ZIP64_FORMAT_EXTENSIONS; + uint8_t extrafield[GMIO_ZIP64_SIZE_EXTRAFIELD]; + size_t zip_write_pos = 0; + + /* Write local file header */ + struct gmio_zip_local_file_header lfh = {0}; + lfh.general_purpose_flags = GMIO_ZIP_GENERAL_PURPOSE_FLAG_USE_DATA_DESCRIPTOR; + lfh.compress_method = file_entry->compress_method; + lfh.filename = file_entry->filename; + lfh.filename_len = file_entry->filename_len; + if (use_zip64_format_extensions) { + const struct gmio_zip64_extrafield zip64extra = {0}; + zip_write_pos += + gmio_zip64_write_extrafield( + extrafield, sizeof(extrafield), &zip64extra, ptr_error); + if (gmio_error(*ptr_error)) + return false; + lfh.extrafield = extrafield; + lfh.extrafield_len = sizeof(extrafield); + } + zip_write_pos += gmio_zip_write_local_file_header(stream, &lfh, ptr_error); + if (gmio_error(*ptr_error)) + return false; + + /* Write file data */ + struct gmio_zip_data_descriptor dd = {0}; + *ptr_error = + file_entry->func_write_file_data( + file_entry->cookie_func_write_file_data, &dd); + zip_write_pos += dd.compressed_size; + if (gmio_error(*ptr_error)) + return false; + + /* Guess version needed */ + const bool needs_zip64 = + use_zip64_format_extensions + || gmio_zip64_required(dd.uncompressed_size, dd.compressed_size); + const enum gmio_zip_feature_version version_needed = + needs_zip64 && !use_zip64_format_extensions ? + GMIO_ZIP_FEATURE_VERSION_FILE_ZIP64_FORMAT_EXTENSIONS : + file_entry->feature_version; + + /* Write data descriptor */ + dd.use_zip64 = needs_zip64; + zip_write_pos += gmio_zip_write_data_descriptor(stream, &dd, ptr_error); + if (gmio_error(*ptr_error)) + return false; + + /* Write central directory header */ + const uintmax_t pos_start_central_dir = zip_write_pos; + struct gmio_zip_central_directory_header cdh = {0}; + cdh.use_zip64 = needs_zip64; + cdh.version_needed_to_extract = version_needed; + cdh.general_purpose_flags = + GMIO_ZIP_GENERAL_PURPOSE_FLAG_USE_DATA_DESCRIPTOR; + cdh.compress_method = file_entry->compress_method; + cdh.crc32 = dd.crc32; + cdh.compressed_size = (uint32_t)dd.compressed_size; + cdh.uncompressed_size = (uint32_t)dd.uncompressed_size; + cdh.filename = file_entry->filename; + cdh.filename_len = file_entry->filename_len; + if (needs_zip64) { + struct gmio_zip64_extrafield zip64extra = {0}; + zip64extra.compressed_size = dd.compressed_size; + zip64extra.uncompressed_size = dd.uncompressed_size; + zip64extra.relative_offset_local_header = 0; + zip_write_pos += + gmio_zip64_write_extrafield( + extrafield, sizeof(extrafield), &zip64extra, ptr_error); + if (gmio_error(*ptr_error)) + return false; + cdh.extrafield = extrafield; + cdh.extrafield_len = sizeof(extrafield); + } + const uintmax_t central_dir_startpos = zip_write_pos; + const size_t central_dir_size = + gmio_zip_write_central_directory_header(stream, &cdh, ptr_error); + zip_write_pos += central_dir_size; + if (gmio_error(*ptr_error)) + return false; + const uintmax_t pos_end_central_dir = zip_write_pos; + + if (needs_zip64) { + /* Write Zip64 end of central directory record */ + struct gmio_zip64_end_of_central_directory_record eocdr64 = {0}; + eocdr64.version_needed_to_extract = version_needed; + eocdr64.total_entry_count_in_central_dir_on_disk = 1; + eocdr64.total_entry_count_in_central_dir = 1; + eocdr64.central_dir_size = + pos_end_central_dir - pos_start_central_dir; + eocdr64.start_offset_central_dir_from_disk_start_nb = + pos_start_central_dir; + zip_write_pos += + gmio_zip64_write_end_of_central_directory_record( + stream, &eocdr64, ptr_error); + if (gmio_error(*ptr_error)) + return false; + + /* Write Zip64 end of central directory locator */ + struct gmio_zip64_end_of_central_directory_locator eocdl64 = {0}; + eocdl64.relative_offset = pos_end_central_dir; + eocdl64.total_disk_count = 1; + zip_write_pos += + gmio_zip64_write_end_of_central_directory_locator( + stream, &eocdl64, ptr_error); + if (gmio_error(*ptr_error)) + return false; + } + + /* Write end of central directory record */ + struct gmio_zip_end_of_central_directory_record eocdr = {0}; + eocdr.use_zip64 = needs_zip64; + eocdr.total_entry_count_in_central_dir_on_disk = 1; + eocdr.total_entry_count_in_central_dir = 1; + eocdr.central_dir_size = (uint32_t)central_dir_size; + eocdr.start_offset_central_dir_from_disk_start_nb = + (uint32_t)central_dir_startpos; + zip_write_pos += + gmio_zip_write_end_of_central_directory_record( + stream, &eocdr, ptr_error); + + return gmio_no_error(*ptr_error); +} diff --git a/src/gmio_core/internal/zip_utils.h b/src/gmio_core/internal/zip_utils.h index 1adbb2d..29a1b7c 100644 --- a/src/gmio_core/internal/zip_utils.h +++ b/src/gmio_core/internal/zip_utils.h @@ -203,11 +203,11 @@ struct gmio_zip_central_directory_header { }; enum { - GMIO_ZIP64_SIZE_EXTRAFIELD_EXTENDED_INFO = 2*2 + 3*8 + 4 + GMIO_ZIP64_SIZE_EXTRAFIELD = 2*2 + 3*8 + 4 }; /*! Zip64 extended info (extra field) */ -struct gmio_zip64_extrablock_extended_info { +struct gmio_zip64_extrafield { uintmax_t compressed_size; uintmax_t uncompressed_size; uintmax_t relative_offset_local_header; @@ -229,7 +229,6 @@ struct gmio_zip_end_of_central_directory_record { /*! Zip64 end of central directory record */ struct gmio_zip64_end_of_central_directory_record { - uintmax_t remaining_record_size; /* should be 64b */ uint16_t version_made_by; enum gmio_zip_feature_version version_needed_to_extract; uint32_t disk_nb; @@ -241,6 +240,13 @@ struct gmio_zip64_end_of_central_directory_record { const uint8_t* extensible_data_sector; /* Reserved for use by PKWARE */ }; +/*! Zip64 end of central directory locator */ +struct gmio_zip64_end_of_central_directory_locator { + uint32_t disk_nb_with_start_of_central_dir; + uintmax_t relative_offset; /* should be 64b */ + uint32_t total_disk_count; +}; + struct gmio_zip_write_result { int error; size_t written_len; @@ -275,6 +281,18 @@ size_t gmio_zip_read_central_directory_header( struct gmio_zip_central_directory_header* info, int* ptr_error); +/*! Reads Zip64 end of central directory record from \p stream */ +size_t gmio_zip64_read_end_of_central_directory_record( + struct gmio_stream* stream, + struct gmio_zip64_end_of_central_directory_record* info, + int* ptr_error); + +/*! Reads Zip64 end of central directory locator from \p stream */ +size_t gmio_zip64_read_end_of_central_directory_locator( + struct gmio_stream* stream, + struct gmio_zip64_end_of_central_directory_locator* info, + int* ptr_error); + /*! Reads ZIP end of central directory record from \p stream */ size_t gmio_zip_read_end_of_central_directory_record( struct gmio_stream* stream, @@ -299,15 +317,25 @@ size_t gmio_zip_write_central_directory_header( const struct gmio_zip_central_directory_header* info, int* ptr_error); -/*! Writes ZIP local file header to \p buff - * +/*! Writes Zip64 extra field to \p buff. * Returns \c GMIO_ERROR_INVALID_MEMBLOCK_SIZE if \p buff_capacity is less than - * \c GMIO_ZIP64_SIZE_EXTRAFIELD_EXTENDED_INFO - */ -size_t gmio_zip64_write_extrafield_extended_info( + * \c GMIO_ZIP64_SIZE_EXTRAFIELD */ +size_t gmio_zip64_write_extrafield( uint8_t* buff, size_t buff_capacity, - const struct gmio_zip64_extrablock_extended_info* info, + const struct gmio_zip64_extrafield* info, + int* ptr_error); + +/*! Writes Zip64 end of central directory record to \p stream */ +size_t gmio_zip64_write_end_of_central_directory_record( + struct gmio_stream* stream, + const struct gmio_zip64_end_of_central_directory_record* info, + int* ptr_error); + +/*! Writes Zip64 end of central directory locator to \p stream */ +size_t gmio_zip64_write_end_of_central_directory_locator( + struct gmio_stream* stream, + const struct gmio_zip64_end_of_central_directory_locator* info, int* ptr_error); /*! Writes ZIP end of central directory record to \p stream */ @@ -316,4 +344,25 @@ size_t gmio_zip_write_end_of_central_directory_record( const struct gmio_zip_end_of_central_directory_record* info, int* ptr_error); +/*! Is Zip64 format required for this file uncompress/compress sizes ? */ +bool gmio_zip64_required( + uintmax_t uncompressed_size, uintmax_t compressed_size); + +/*! Defines a file entry in a ZIP archive */ +struct gmio_zip_file_entry { + enum gmio_zip_compress_method compress_method; + enum gmio_zip_feature_version feature_version; + const char* filename; + uint16_t filename_len; + void* cookie_func_write_file_data; + int (*func_write_file_data)( + void* cookie, struct gmio_zip_data_descriptor* dd); +}; + +/*! Writes a ZIP archive containing a single file */ +bool gmio_zip_write_single_file( + struct gmio_stream* stream, + const struct gmio_zip_file_entry* file_entry, + int* ptr_error); + #endif /* GMIO_INTERNAL_ZIP_UTILS_H */ diff --git a/tests/main_test_amf.c b/tests/main_test_amf.c index be30e46..3693789 100644 --- a/tests/main_test_amf.c +++ b/tests/main_test_amf.c @@ -49,7 +49,9 @@ const char* all_tests() gmio_memblock_set_default_constructor(gmio_memblock_for_tests); UTEST_RUN(test_amf_write_doc_null); - UTEST_RUN(test_amf_write_doc_1); + UTEST_RUN(test_amf_write_doc_1_plaintext); + UTEST_RUN(test_amf_write_doc_1_zip); + UTEST_RUN(test_amf_write_doc_1_zip64); return NULL; } diff --git a/tests/test_amf_io.c b/tests/test_amf_io.c index 7b34f88..8743b42 100644 --- a/tests/test_amf_io.c +++ b/tests/test_amf_io.c @@ -67,6 +67,7 @@ struct __tamf__mesh struct __tamf__document { const struct __tamf__material* vec_material; + uint32_t material_count; struct __tamf__mesh mesh; }; @@ -174,11 +175,6 @@ static void __tamf__get_document_element_metadata( } } -static void __tamf__skip_zip_local_file_header() -{ - -} - static const char* test_amf_write_doc_null() { struct gmio_stream stream = {0}; @@ -188,205 +184,382 @@ static const char* test_amf_write_doc_null() return NULL; } -static const char* test_amf_write_doc_1() +const struct __tamf__material __tamf__doc_1_materials[] = { + { { 1., 0., 0. }, "red" }, + { { 0., 1., 0. }, "green" }, + { { 0., 0., 1. }, "blue" }, + { { 1., 1., 1. }, "white" } +}; + +const struct gmio_vec3d __tamf__doc_1_vertices[] = { + { 0., 0., 0.}, + { 1., 0., 0.}, + { 1., -1., 0.}, + { 0., -1., 0.}, + { 1., 0., 1.}, + { 1., -1., 1.}, + { 0., 0., 1.}, + { 0., -1., 1.} +}; + +const struct __tamf__triangle __tamf__doc_1_triangles[] = { + { 0, 1, 2}, + { 0, 2, 3}, + { 1, 5, 2}, + { 1, 4, 5}, + { 6, 5, 7}, + { 6, 4, 5}, + { 0, 6, 7}, + { 0, 7, 3}, + { 0, 6, 4}, + { 0, 4, 1}, + { 3, 7, 5}, + { 3, 5, 2} +}; + +struct __tamf__document __tamf__create_doc_1() +{ + struct __tamf__document doc = {0}; + doc.vec_material = __tamf__doc_1_materials; + doc.material_count = GMIO_ARRAY_SIZE(__tamf__doc_1_materials); + doc.mesh.vec_vertex = __tamf__doc_1_vertices; + doc.mesh.vertex_count = GMIO_ARRAY_SIZE(__tamf__doc_1_vertices); + doc.mesh.vec_triangle = __tamf__doc_1_triangles; + doc.mesh.triangle_count = GMIO_ARRAY_SIZE(__tamf__doc_1_triangles); + return doc; +} + +struct gmio_amf_document __tamf_create_doc( + const struct __tamf__document* testdoc) +{ + struct gmio_amf_document doc = {0}; + doc.cookie = testdoc; + doc.unit = GMIO_AMF_UNIT_MILLIMETER; + doc.func_get_document_element = __tamf__get_document_element; + doc.func_get_object_mesh = __tamf__get_object_mesh; + doc.func_get_object_mesh_element = __tamf__get_object_mesh_element; + doc.func_get_object_mesh_volume_triangle = + __tamf__get_object_mesh_volume_triangle; + doc.func_get_document_element_metadata = + __tamf__get_document_element_metadata; + doc.object_count = 1; + doc.material_count = testdoc->material_count; + return doc; +} + +static int __tamf__write_amf( + struct gmio_rw_buffer* wbuff, + const struct gmio_amf_document* doc, + const struct gmio_amf_write_options* opts) +{ + struct gmio_stream stream = gmio_stream_buffer(wbuff); + return gmio_amf_write(&stream, doc, opts); +} + + +static const char* test_amf_write_doc_1_plaintext() { static const size_t wbuffsize = 8192; struct gmio_rw_buffer wbuff = {0}; - struct gmio_amf_document doc = {0}; - - const struct __tamf__material testmaterials[] = { - { { 1., 0., 0. }, "red" }, - { { 0., 1., 0. }, "green" }, - { { 0., 0., 1. }, "blue" }, - { { 1., 1., 1. }, "white" } - }; - - const struct gmio_vec3d testvertices[] = { - { 0., 0., 0.}, - { 1., 0., 0.}, - { 1., -1., 0.}, - { 0., -1., 0.}, - { 1., 0., 1.}, - { 1., -1., 1.}, - { 0., 0., 1.}, - { 0., -1., 1.} - }; - const struct __tamf__triangle testtriangles[] = { - { 0, 1, 2}, - { 0, 2, 3}, - { 1, 5, 2}, - { 1, 4, 5}, - { 6, 5, 7}, - { 6, 4, 5}, - { 0, 6, 7}, - { 0, 7, 3}, - { 0, 6, 4}, - { 0, 4, 1}, - { 3, 7, 5}, - { 3, 5, 2} - }; - struct __tamf__document testdoc = {0}; - wbuff.ptr = calloc(wbuffsize, 1); wbuff.len = wbuffsize; - testdoc.vec_material = testmaterials; - testdoc.mesh.vec_vertex = testvertices; - testdoc.mesh.vertex_count = GMIO_ARRAY_SIZE(testvertices); - testdoc.mesh.vec_triangle = testtriangles; - testdoc.mesh.triangle_count = GMIO_ARRAY_SIZE(testtriangles); - - doc.cookie = &testdoc; - doc.unit = GMIO_AMF_UNIT_MILLIMETER; - doc.func_get_document_element = &__tamf__get_document_element; - doc.func_get_object_mesh = &__tamf__get_object_mesh; - doc.func_get_object_mesh_element = &__tamf__get_object_mesh_element; - doc.func_get_object_mesh_volume_triangle = - &__tamf__get_object_mesh_volume_triangle; - doc.func_get_document_element_metadata = - &__tamf__get_document_element_metadata; - doc.object_count = 1; - doc.material_count = GMIO_ARRAY_SIZE(testmaterials); - - /* Write as raw contents(uncompressed) */ - { - struct gmio_stream stream = gmio_stream_buffer(&wbuff); - struct gmio_amf_write_options options = {0}; - options.float64_prec = 9; - const int error = gmio_amf_write(&stream, &doc, &options); - if (gmio_error(error)) - printf("\n0x%x\n", error); - UTEST_COMPARE_INT(error, GMIO_ERROR_OK); - /* printf("%s\n", wbuff.ptr); */ - } - - /* Write compressed ZIP */ - { - const size_t source_len = wbuff.pos; - const uint32_t crc32_amf_data = gmio_zlib_crc32(wbuff.ptr, source_len); - uint8_t* source = calloc(source_len, 1); - memcpy(source, wbuff.ptr, source_len); - - static const char zip_entry_filename[] = "test.amf"; - static const uint16_t zip_entry_filename_len = - sizeof(zip_entry_filename) - 1; - { - wbuff.pos = 0; - struct gmio_stream stream = gmio_stream_buffer(&wbuff); - struct gmio_amf_write_options options = {0}; - options.float64_prec = 9; - options.compress = true; - options.zip_entry_filename = zip_entry_filename; - options.zip_entry_filename_len = zip_entry_filename_len; - const int error = gmio_amf_write(&stream, &doc, &options); - UTEST_COMPARE_INT(error, GMIO_ERROR_OK); + const struct __tamf__document testdoc = __tamf__create_doc_1(); + const struct gmio_amf_document doc = __tamf_create_doc(&testdoc); + struct gmio_amf_write_options options = {0}; + options.float64_prec = 9; + const int error = __tamf__write_amf(&wbuff, &doc, &options); #if 0 - FILE* file = fopen("output.zip", "wb"); - fwrite(wbuff.ptr, 1, wbuff.pos, file); - fclose(file); + if (gmio_error(error)) + printf("\n0x%x\n", error); #endif - } - - /* Unzip and compare with source data */ - { - /* Total size in bytes of the ZIP archive */ - const uintmax_t zip_archive_len = wbuff.pos; - wbuff.pos = 0; - struct gmio_stream stream = gmio_stream_buffer(&wbuff); - int error = GMIO_ERROR_OK; - /* -- Read ZIP local file header */ - struct gmio_zip_local_file_header zip_lfh = {0}; - const size_t lfh_read_len = - gmio_zip_read_local_file_header(&stream, &zip_lfh, &error); - UTEST_COMPARE_INT(error, GMIO_ERROR_OK); - UTEST_COMPARE_UINT( - zip_lfh.compress_method, - GMIO_ZIP_COMPRESS_METHOD_DEFLATE); - UTEST_ASSERT( - (zip_lfh.general_purpose_flags & - GMIO_ZIP_GENERAL_PURPOSE_FLAG_USE_DATA_DESCRIPTOR) - != 0); - UTEST_COMPARE_UINT( - zip_lfh.filename_len, - sizeof(zip_entry_filename) - 1); - UTEST_ASSERT(strncmp( - (const char*)wbuff.ptr + wbuff.pos, - zip_entry_filename, - zip_entry_filename_len) - == 0); - /* -- Read ZIP end of central directory record */ - static const size_t end_of_central_dir_record_len = 22; - wbuff.pos = zip_archive_len - end_of_central_dir_record_len;; - struct gmio_zip_end_of_central_directory_record zip_eocdr = {0}; - gmio_zip_read_end_of_central_directory_record( - &stream, &zip_eocdr, &error); - UTEST_COMPARE_INT(error, GMIO_ERROR_OK); - UTEST_COMPARE_UINT(zip_eocdr.disk_nb, 0); - UTEST_COMPARE_UINT( - zip_eocdr.disk_nb_with_start_of_central_dir, 0); - UTEST_COMPARE_UINT( - zip_eocdr.total_entry_count_in_central_dir_on_disk, 1); - UTEST_COMPARE_UINT( - zip_eocdr.total_entry_count_in_central_dir, 1); - /* -- Read ZIP central directory */ - wbuff.pos = zip_eocdr.start_offset_central_dir_from_disk_start_nb; - struct gmio_zip_central_directory_header zip_cdh = {0}; - gmio_zip_read_central_directory_header(&stream, &zip_cdh, &error); - UTEST_COMPARE_INT(error, GMIO_ERROR_OK); - UTEST_COMPARE_UINT( - zip_cdh.compress_method, - GMIO_ZIP_COMPRESS_METHOD_DEFLATE); - UTEST_ASSERT( - (zip_cdh.general_purpose_flags & - GMIO_ZIP_GENERAL_PURPOSE_FLAG_USE_DATA_DESCRIPTOR) - != 0); - UTEST_COMPARE_UINT(crc32_amf_data, zip_cdh.crc32); - UTEST_COMPARE_UINT( - zip_cdh.filename_len, zip_entry_filename_len); - UTEST_ASSERT(strncmp( - (const char*)wbuff.ptr + wbuff.pos, - zip_entry_filename, - zip_entry_filename_len) - == 0); - /* -- Read compressed AMF data */ - const size_t pos_start_amf_data = - lfh_read_len + zip_lfh.filename_len + zip_lfh.extrafield_len; - wbuff.pos = pos_start_amf_data; - { - uint8_t* dest = calloc(zip_cdh.uncompressed_size, 1); - size_t dest_len = zip_cdh.uncompressed_size; - const int error = - gmio_zlib_uncompress_buffer( - dest, - &dest_len, - (const uint8_t*)wbuff.ptr + wbuff.pos, - zip_cdh.compressed_size); - printf("\n-- Info: z_len=%i src_len=%i\n", - zip_cdh.compressed_size, source_len); - UTEST_COMPARE_INT(error, GMIO_ERROR_OK); - UTEST_COMPARE_UINT(source_len, dest_len); - UTEST_COMPARE_UINT(dest_len, zip_cdh.uncompressed_size); - UTEST_COMPARE_INT(memcmp(dest, source, source_len), 0); - const uint32_t crc32_uncomp = gmio_zlib_crc32(dest, dest_len); - UTEST_COMPARE_UINT(crc32_amf_data, crc32_uncomp); - free(dest); - } - /* -- Read ZIP data descriptor */ - wbuff.pos = pos_start_amf_data + zip_cdh.compressed_size; - struct gmio_zip_data_descriptor zip_dd = {0}; - gmio_zip_read_data_descriptor(&stream, &zip_dd, &error); - UTEST_COMPARE_INT(error, GMIO_ERROR_OK); - UTEST_COMPARE_UINT(zip_dd.crc32, crc32_amf_data); - UTEST_COMPARE_UINT( - zip_dd.compressed_size, zip_cdh.compressed_size); - UTEST_COMPARE_UINT( - zip_dd.uncompressed_size, zip_cdh.uncompressed_size); - } - - free(source); - } - + UTEST_COMPARE_INT(error, GMIO_ERROR_OK); + /* printf("%s\n", wbuff.ptr); */ + free(wbuff.ptr); + return NULL; +} + +static const char zip_entry_filename[] = "test.amf"; +static const uint16_t zip_entry_filename_len = sizeof(zip_entry_filename) - 1; + +static const char* __tamf__check_zip_local_file_header( + const struct gmio_zip_local_file_header* zip_lfh) +{ + UTEST_COMPARE_UINT( + zip_lfh->compress_method, + GMIO_ZIP_COMPRESS_METHOD_DEFLATE); + UTEST_ASSERT( + (zip_lfh->general_purpose_flags & + GMIO_ZIP_GENERAL_PURPOSE_FLAG_USE_DATA_DESCRIPTOR) + != 0); + UTEST_COMPARE_UINT( + zip_lfh->filename_len, + zip_entry_filename_len); + UTEST_ASSERT(strncmp( + zip_lfh->filename, + zip_entry_filename, + zip_entry_filename_len) + == 0); + return NULL; +} + +static const char* test_amf_write_doc_1_zip() +{ + static const size_t wbuffsize = 8192; + struct gmio_rw_buffer wbuff = {0}; + wbuff.ptr = calloc(wbuffsize, 1); + wbuff.len = wbuffsize; + + const struct __tamf__document testdoc = __tamf__create_doc_1(); + const struct gmio_amf_document doc = __tamf_create_doc(&testdoc); + { /* Write uncompressed */ + struct gmio_amf_write_options options = {0}; + options.float64_prec = 9; + const int error = __tamf__write_amf(&wbuff, &doc, &options); + UTEST_COMPARE_INT(error, GMIO_ERROR_OK); + } + + const size_t source_len = wbuff.pos; + const uint32_t crc32_amf_data = gmio_zlib_crc32(wbuff.ptr, source_len); + uint8_t* source = calloc(source_len, 1); + memcpy(source, wbuff.ptr, source_len); + + { /* Write compressed(ZIP) */ + wbuff.pos = 0; + struct gmio_amf_write_options options = {0}; + options.float64_prec = 9; + options.compress = true; + options.zip_entry_filename = zip_entry_filename; + options.zip_entry_filename_len = zip_entry_filename_len; + const int error = __tamf__write_amf(&wbuff, &doc, &options); + UTEST_COMPARE_INT(error, GMIO_ERROR_OK); +#if 1 + FILE* file = fopen("output.zip", "wb"); + fwrite(wbuff.ptr, 1, wbuff.pos, file); + fclose(file); +#endif + } + + /* Unzip and compare with source data */ + { + /* Total size in bytes of the ZIP archive */ + const uintmax_t zip_archive_len = wbuff.pos; + wbuff.pos = 0; + struct gmio_stream stream = gmio_stream_buffer(&wbuff); + int error = GMIO_ERROR_OK; + /* -- Read ZIP local file header */ + struct gmio_zip_local_file_header zip_lfh = {0}; + const size_t lfh_read_len = + gmio_zip_read_local_file_header(&stream, &zip_lfh, &error); + UTEST_COMPARE_INT(error, GMIO_ERROR_OK); + zip_lfh.filename = (const char*)wbuff.ptr + wbuff.pos; + const char* check_str = __tamf__check_zip_local_file_header(&zip_lfh); + if (check_str != NULL) + return check_str; + /* -- Read ZIP end of central directory record */ + static const size_t end_of_central_dir_record_len = 22; + wbuff.pos = zip_archive_len - end_of_central_dir_record_len;; + struct gmio_zip_end_of_central_directory_record zip_eocdr = {0}; + gmio_zip_read_end_of_central_directory_record( + &stream, &zip_eocdr, &error); + UTEST_COMPARE_INT(error, GMIO_ERROR_OK); + UTEST_COMPARE_UINT(zip_eocdr.disk_nb, 0); + UTEST_COMPARE_UINT( + zip_eocdr.disk_nb_with_start_of_central_dir, 0); + UTEST_COMPARE_UINT( + zip_eocdr.total_entry_count_in_central_dir_on_disk, 1); + UTEST_COMPARE_UINT( + zip_eocdr.total_entry_count_in_central_dir, 1); + /* -- Read ZIP central directory */ + wbuff.pos = zip_eocdr.start_offset_central_dir_from_disk_start_nb; + struct gmio_zip_central_directory_header zip_cdh = {0}; + gmio_zip_read_central_directory_header(&stream, &zip_cdh, &error); + UTEST_COMPARE_INT(error, GMIO_ERROR_OK); + UTEST_COMPARE_UINT( + zip_cdh.compress_method, + GMIO_ZIP_COMPRESS_METHOD_DEFLATE); + UTEST_ASSERT( + (zip_cdh.general_purpose_flags & + GMIO_ZIP_GENERAL_PURPOSE_FLAG_USE_DATA_DESCRIPTOR) + != 0); + UTEST_COMPARE_UINT(crc32_amf_data, zip_cdh.crc32); + UTEST_COMPARE_UINT( + zip_cdh.filename_len, zip_entry_filename_len); + UTEST_ASSERT(strncmp( + (const char*)wbuff.ptr + wbuff.pos, + zip_entry_filename, + zip_entry_filename_len) + == 0); + /* -- Read compressed AMF data */ + const size_t pos_start_amf_data = + lfh_read_len + zip_lfh.filename_len + zip_lfh.extrafield_len; + wbuff.pos = pos_start_amf_data; + { + uint8_t* dest = calloc(zip_cdh.uncompressed_size, 1); + size_t dest_len = zip_cdh.uncompressed_size; + const int error = + gmio_zlib_uncompress_buffer( + dest, + &dest_len, + (const uint8_t*)wbuff.ptr + wbuff.pos, + zip_cdh.compressed_size); + printf("\n-- Info: z_len=%i src_len=%i\n", + zip_cdh.compressed_size, source_len); + UTEST_COMPARE_INT(error, GMIO_ERROR_OK); + UTEST_COMPARE_UINT(source_len, dest_len); + UTEST_COMPARE_UINT(dest_len, zip_cdh.uncompressed_size); + UTEST_COMPARE_INT(memcmp(dest, source, source_len), 0); + const uint32_t crc32_uncomp = gmio_zlib_crc32(dest, dest_len); + UTEST_COMPARE_UINT(crc32_amf_data, crc32_uncomp); + free(dest); + } + /* -- Read ZIP data descriptor */ + wbuff.pos = pos_start_amf_data + zip_cdh.compressed_size; + struct gmio_zip_data_descriptor zip_dd = {0}; + gmio_zip_read_data_descriptor(&stream, &zip_dd, &error); + UTEST_COMPARE_INT(error, GMIO_ERROR_OK); + UTEST_COMPARE_UINT(zip_dd.crc32, crc32_amf_data); + UTEST_COMPARE_UINT( + zip_dd.compressed_size, zip_cdh.compressed_size); + UTEST_COMPARE_UINT( + zip_dd.uncompressed_size, zip_cdh.uncompressed_size); + } + + free(source); + free(wbuff.ptr); + return NULL; +} + +static const char* test_amf_write_doc_1_zip64() +{ + static const size_t wbuffsize = 8192; + struct gmio_rw_buffer wbuff = {0}; + wbuff.ptr = calloc(wbuffsize, 1); + wbuff.len = wbuffsize; + + const struct __tamf__document testdoc = __tamf__create_doc_1(); + const struct gmio_amf_document doc = __tamf_create_doc(&testdoc); + { /* Write uncompressed */ + struct gmio_amf_write_options options = {0}; + options.float64_prec = 9; + const int error = __tamf__write_amf(&wbuff, &doc, &options); + UTEST_COMPARE_INT(error, GMIO_ERROR_OK); + } + + const size_t source_len = wbuff.pos; + const uint32_t crc32_amf_data = gmio_zlib_crc32(wbuff.ptr, source_len); + uint8_t* source = calloc(source_len, 1); + memcpy(source, wbuff.ptr, source_len); + + static const char zip_entry_filename[] = "test.amf"; + static const uint16_t zip_entry_filename_len = sizeof(zip_entry_filename) - 1; + { /* Write compressed(Zip64) */ + wbuff.pos = 0; + struct gmio_amf_write_options options = {0}; + options.float64_prec = 9; + options.compress = true; + options.zip_entry_filename = zip_entry_filename; + options.zip_entry_filename_len = zip_entry_filename_len; + options.force_zip64_format = true; + const int error = __tamf__write_amf(&wbuff, &doc, &options); + UTEST_COMPARE_INT(error, GMIO_ERROR_OK); +#if 1 + FILE* file = fopen("output_64.zip", "wb"); + fwrite(wbuff.ptr, 1, wbuff.pos, file); + fclose(file); +#endif + } + + /* Unzip and compare with source data */ + { + /* Total size in bytes of the ZIP archive */ + const uintmax_t zip_archive_len = wbuff.pos; + wbuff.pos = 0; + struct gmio_stream stream = gmio_stream_buffer(&wbuff); + int error = GMIO_ERROR_OK; + /* -- Read ZIP local file header */ + struct gmio_zip_local_file_header zip_lfh = {0}; + const size_t lfh_read_len = + gmio_zip_read_local_file_header(&stream, &zip_lfh, &error); + UTEST_COMPARE_INT(error, GMIO_ERROR_OK); + zip_lfh.filename = (const char*)wbuff.ptr + wbuff.pos; + const char* check_str = __tamf__check_zip_local_file_header(&zip_lfh); + if (check_str != NULL) + return check_str; + /* -- Read ZIP end of central directory record */ + static const size_t end_of_central_dir_record_len = 22; + wbuff.pos = zip_archive_len - end_of_central_dir_record_len;; + struct gmio_zip_end_of_central_directory_record zip_eocdr = {0}; + gmio_zip_read_end_of_central_directory_record( + &stream, &zip_eocdr, &error); + UTEST_COMPARE_INT(error, GMIO_ERROR_OK); + UTEST_COMPARE_UINT(zip_eocdr.disk_nb, 0xFFFF); + UTEST_COMPARE_UINT(zip_eocdr.disk_nb_with_start_of_central_dir, 0xFFFF); + UTEST_COMPARE_UINT( + zip_eocdr.total_entry_count_in_central_dir_on_disk, 0xFFFF); + UTEST_COMPARE_UINT(zip_eocdr.total_entry_count_in_central_dir, 0xFFFF); + UTEST_COMPARE_UINT(zip_eocdr.central_dir_size, 0xFFFFFFFF); + UTEST_COMPARE_UINT( + zip_eocdr.start_offset_central_dir_from_disk_start_nb, + 0xFFFFFFFF); +#if 0 + /* -- Read ZIP central directory */ + wbuff.pos = zip_eocdr.start_offset_central_dir_from_disk_start_nb; + struct gmio_zip_central_directory_header zip_cdh = {0}; + gmio_zip_read_central_directory_header(&stream, &zip_cdh, &error); + UTEST_COMPARE_INT(error, GMIO_ERROR_OK); + UTEST_COMPARE_UINT( + zip_cdh.compress_method, + GMIO_ZIP_COMPRESS_METHOD_DEFLATE); + UTEST_ASSERT( + (zip_cdh.general_purpose_flags & + GMIO_ZIP_GENERAL_PURPOSE_FLAG_USE_DATA_DESCRIPTOR) + != 0); + UTEST_COMPARE_UINT(crc32_amf_data, zip_cdh.crc32); + UTEST_COMPARE_UINT( + zip_cdh.filename_len, zip_entry_filename_len); + UTEST_ASSERT(strncmp( + (const char*)wbuff.ptr + wbuff.pos, + zip_entry_filename, + zip_entry_filename_len) + == 0); + /* -- Read compressed AMF data */ + const size_t pos_start_amf_data = + lfh_read_len + zip_lfh.filename_len + zip_lfh.extrafield_len; + wbuff.pos = pos_start_amf_data; + { + uint8_t* dest = calloc(zip_cdh.uncompressed_size, 1); + size_t dest_len = zip_cdh.uncompressed_size; + const int error = + gmio_zlib_uncompress_buffer( + dest, + &dest_len, + (const uint8_t*)wbuff.ptr + wbuff.pos, + zip_cdh.compressed_size); + printf("\n-- Info: z_len=%i src_len=%i\n", + zip_cdh.compressed_size, source_len); + UTEST_COMPARE_INT(error, GMIO_ERROR_OK); + UTEST_COMPARE_UINT(source_len, dest_len); + UTEST_COMPARE_UINT(dest_len, zip_cdh.uncompressed_size); + UTEST_COMPARE_INT(memcmp(dest, source, source_len), 0); + const uint32_t crc32_uncomp = gmio_zlib_crc32(dest, dest_len); + UTEST_COMPARE_UINT(crc32_amf_data, crc32_uncomp); + free(dest); + } + /* -- Read ZIP data descriptor */ + wbuff.pos = pos_start_amf_data + zip_cdh.compressed_size; + struct gmio_zip_data_descriptor zip_dd = {0}; + gmio_zip64_read_data_descriptor(&stream, &zip_dd, &error); + UTEST_COMPARE_INT(error, GMIO_ERROR_OK); + UTEST_COMPARE_UINT(zip_dd.crc32, crc32_amf_data); + UTEST_COMPARE_UINT( + zip_dd.compressed_size, zip_cdh.compressed_size); + UTEST_COMPARE_UINT( + zip_dd.uncompressed_size, zip_cdh.uncompressed_size); +#endif + } + + free(source); free(wbuff.ptr); - return NULL; } From 929f54e13c65d9120d6902b02ad1c9a3f9108218 Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Thu, 12 Jan 2017 10:25:30 +0100 Subject: [PATCH 43/81] Clarify format of error codes --- src/gmio_amf/amf_error.h | 2 +- src/gmio_core/error.h | 36 ++++++++++++++++++------------ src/gmio_core/internal/zip_utils.h | 4 ++-- src/gmio_stl/stl_error.h | 2 +- 4 files changed, 26 insertions(+), 18 deletions(-) diff --git a/src/gmio_amf/amf_error.h b/src/gmio_amf/amf_error.h index 2e50854..de56522 100644 --- a/src/gmio_amf/amf_error.h +++ b/src/gmio_amf/amf_error.h @@ -39,7 +39,7 @@ /*! \c GMIO_AMF_ERROR_TAG * Byte-mask to tag(identify) AMF-specific error codes */ -enum { GMIO_AMF_ERROR_TAG = 0x12000000 }; +enum { GMIO_AMF_ERROR_TAG = 0x02000000 }; /*! Specific error codes reported by AMF read/write functions */ enum gmio_amf_error diff --git a/src/gmio_core/error.h b/src/gmio_core/error.h index 45d5f58..a329997 100644 --- a/src/gmio_core/error.h +++ b/src/gmio_core/error.h @@ -39,17 +39,20 @@ #include "global.h" -enum { - /*! \c GMIO_ZLIB_ERROR_TAG - * Byte-mask to tag(identify) zlib-specific error codes */ - GMIO_ZLIB_ERROR_TAG = 0x01000000, - - /*! \c GMIO_ZIP_ERROR_TAG - * Byte-mask to tag(identify) ZIP-specific error codes */ - GMIO_ZIP_ERROR_TAG = 0x02000000 -}; - -/*! Common errors */ +/*! Common errors + * + * Format: + * + * 4-bytes signed integer (ISO C restricts enumerator value to 'int') + * max value: 0x7FFFFFFF + * bits 0x00FFFFFF..0x7FFFFFFF: tag identifying the error category + * bits 0x001FFFFF..0x00FFFFFF: tag identifying an error sub-category + * bits 0x00000000..0x000FFFFF: error value in the (sub)category + * Max count of categories : 128 (2^7) + * Max count of sub-categories : 15 (2^4 - 1) + * Max count of error values : 1048576 (2^20) + * + */ enum gmio_error { /*! No error occurred, success */ @@ -80,7 +83,7 @@ enum gmio_error /* zlib */ /*! See \c Z_ERRNO (file operation error) */ - GMIO_ERROR_ZLIB_ERRNO = GMIO_ZLIB_ERROR_TAG + 0x01, + GMIO_ERROR_ZLIB_ERRNO, /*! See \c Z_STREAM_ERROR */ GMIO_ERROR_ZLIB_STREAM, @@ -105,14 +108,19 @@ enum gmio_error * gmio_zlib_compress_options::memory_usage */ GMIO_ERROR_ZLIB_INVALID_COMPRESS_MEMORY_USAGE, + /* ZIP */ /*! Zip64 format requires the compiler to provide a 64b integer type */ - GMIO_ERROR_ZIP_INT64_TYPE_REQUIRED = GMIO_ZIP_ERROR_TAG + 0x01, + GMIO_ERROR_ZIP_INT64_TYPE_REQUIRED, /*! The size of some ZIP file entry exceeds 32b limit and so requires Zip64 * format */ - GMIO_ERROR_ZIP64_FORMAT_REQUIRED = GMIO_ZIP_ERROR_TAG + 0x02 + GMIO_ERROR_ZIP64_FORMAT_REQUIRED }; +/*! \c GMIO_CORE_ERROR_TAG + * Byte-mask to tag(identify) gmio_core error codes */ +enum { GMIO_CORE_ERROR_TAG = 0x00 }; + /*! Returns true if code == GMIO_NO_ERROR */ GMIO_INLINE bool gmio_no_error(int code) { return code == GMIO_ERROR_OK ? true : false; } diff --git a/src/gmio_core/internal/zip_utils.h b/src/gmio_core/internal/zip_utils.h index 29a1b7c..48217e7 100644 --- a/src/gmio_core/internal/zip_utils.h +++ b/src/gmio_core/internal/zip_utils.h @@ -252,9 +252,9 @@ struct gmio_zip_write_result { size_t written_len; }; -enum { GMIO_ZIP_UTILS_ERROR_TAG = 0xAA000000 }; +enum { GMIO_ZIP_UTILS_ERROR_TAG = 0x00100000 }; enum gmio_zip_utils_error { - GMIO_ZIP_UTILS_ERROR_BAD_MAGIC = GMIO_ZIP_UTILS_ERROR_TAG + 0x01 + GMIO_ZIP_UTILS_ERROR_BAD_MAGIC = GMIO_ZIP_UTILS_ERROR_TAG + 1 }; /*! Reads ZIP local file header from \p stream */ diff --git a/src/gmio_stl/stl_error.h b/src/gmio_stl/stl_error.h index 7c4ff03..6af020b 100644 --- a/src/gmio_stl/stl_error.h +++ b/src/gmio_stl/stl_error.h @@ -39,7 +39,7 @@ /*! \c GMIO_STL_ERROR_TAG * Byte-mask to tag(identify) STL-specific error codes */ -enum { GMIO_STL_ERROR_TAG = 0x11000000 }; +enum { GMIO_STL_ERROR_TAG = 0x01000000 }; /*! Specific error codes reported by STL read/write functions */ enum gmio_stl_error From 89994729124d3bb10ee89b3954c60d4041e51494 Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Fri, 13 Jan 2017 10:49:15 +0100 Subject: [PATCH 44/81] gmio_core: drop support of obsolete ZIP disk --- src/gmio_core/internal/zip_utils.c | 124 ++++++++++++----------------- src/gmio_core/internal/zip_utils.h | 49 ++---------- tests/test_amf_io.c | 20 +---- 3 files changed, 62 insertions(+), 131 deletions(-) diff --git a/src/gmio_core/internal/zip_utils.c b/src/gmio_core/internal/zip_utils.c index e356c5f..47b17be 100644 --- a/src/gmio_core/internal/zip_utils.c +++ b/src/gmio_core/internal/zip_utils.c @@ -235,7 +235,7 @@ size_t gmio_zip_read_central_directory_header( info->filename_len = gmio_adv_decode_uint16_le(&buff); info->extrafield_len = gmio_adv_decode_uint16_le(&buff); info->filecomment_len = gmio_adv_decode_uint16_le(&buff); - info->disk_nb_start = gmio_adv_decode_uint16_le(&buff); + gmio_adv_decode_uint16_le(&buff); /* disk_nb_start */ info->internal_file_attrs = gmio_adv_decode_uint16_le(&buff); info->external_file_attrs = gmio_adv_decode_uint32_le(&buff); info->relative_offset_local_header = gmio_adv_decode_uint32_le(&buff); @@ -260,16 +260,16 @@ size_t gmio_zip64_read_end_of_central_directory_record( return read_len; if (!gmio_zip_readcheckmagic(&buff, 0x06064b50, ptr_error)) return read_len; + /* Size of zip64 end of central directory record */ gmio_adv_decode_uint64_le(&buff); info->version_made_by = gmio_adv_decode_uint16_le(&buff); info->version_needed_to_extract = gmio_adv_decode_uint16_le(&buff); - info->disk_nb = gmio_adv_decode_uint32_le(&buff); - info->disk_nb_with_start_of_central_dir = gmio_adv_decode_uint32_le(&buff); - info->total_entry_count_in_central_dir_on_disk = - gmio_adv_decode_uint64_le(&buff); + gmio_adv_decode_uint32_le(&buff); /* disk_nb */ + gmio_adv_decode_uint32_le(&buff); /* disk_nb_with_start_of_central_dir */ + gmio_adv_decode_uint64_le(&buff); /* total_entry_count_in_central_dir_on_disk */ + info->entry_count = gmio_adv_decode_uint64_le(&buff); info->central_dir_size = gmio_adv_decode_uint64_le(&buff); - info->start_offset_central_dir_from_disk_start_nb = - gmio_adv_decode_uint64_le(&buff); + info->start_offset = gmio_adv_decode_uint64_le(&buff); return gmio_zip_io_returnerr(read_len, GMIO_ERROR_OK, ptr_error); #else return gmio_zip_io_returnerr( @@ -290,9 +290,12 @@ size_t gmio_zip64_read_end_of_central_directory_locator( return read_len; if (!gmio_zip_readcheckmagic(&buff, 0x07064b50, ptr_error)) return read_len; - info->disk_nb_with_start_of_central_dir = gmio_adv_decode_uint32_le(&buff); + /* Number of the disk with the start of the zip64 end of central directory */ + gmio_adv_decode_uint32_le(&buff); + /* Relative offset of the zip64 end of central directory record */ info->relative_offset = gmio_adv_decode_uint64_le(&buff); - info->total_disk_count = gmio_adv_decode_uint32_le(&buff); + /* Total number of disks */ + gmio_adv_decode_uint32_le(&buff); return gmio_zip_io_returnerr(read_len, GMIO_ERROR_OK, ptr_error); #else return gmio_zip_io_returnerr( @@ -312,14 +315,12 @@ size_t gmio_zip_read_end_of_central_directory_record( return read_len; if (!gmio_zip_readcheckmagic(&buff, 0x06054b50, ptr_error)) return read_len; - info->disk_nb = gmio_adv_decode_uint16_le(&buff); - info->disk_nb_with_start_of_central_dir = gmio_adv_decode_uint16_le(&buff); - info->total_entry_count_in_central_dir_on_disk = - gmio_adv_decode_uint16_le(&buff); - info->total_entry_count_in_central_dir = gmio_adv_decode_uint16_le(&buff); + gmio_adv_decode_uint16_le(&buff); /* disk_nb */ + gmio_adv_decode_uint16_le(&buff); /* disk_nb_with_start_of_central_dir */ + gmio_adv_decode_uint16_le(&buff); /* total_entry_count_in_central_dir_on_disk */ + info->entry_count = gmio_adv_decode_uint16_le(&buff); info->central_dir_size = gmio_adv_decode_uint32_le(&buff); - info->start_offset_central_dir_from_disk_start_nb = - gmio_adv_decode_uint32_le(&buff); + info->start_offset = gmio_adv_decode_uint32_le(&buff); info->filecomment_len = gmio_adv_decode_uint16_le(&buff); info->filecomment = NULL; return gmio_zip_io_returnerr(read_len, GMIO_ERROR_OK, ptr_error); @@ -433,7 +434,7 @@ size_t gmio_zip_write_central_directory_header( gmio_adv_encode_uint16_le(info->filename_len, &buff); gmio_adv_encode_uint16_le(info->extrafield_len, &buff); gmio_adv_encode_uint16_le(info->filecomment_len, &buff); - gmio_adv_encode_uint16_le(info->disk_nb_start, &buff); + gmio_adv_encode_uint16_le(0, &buff); /* Disk number start */ gmio_adv_encode_uint16_le(info->internal_file_attrs, &buff); gmio_adv_encode_uint32_le(info->external_file_attrs, &buff); const uint32_t relative_offset_local_header = @@ -475,7 +476,7 @@ size_t gmio_zip64_write_extrafield( gmio_adv_encode_uint64_le(info->uncompressed_size, &buff); gmio_adv_encode_uint64_le(info->compressed_size, &buff); gmio_adv_encode_uint64_le(info->relative_offset_local_header, &buff); - gmio_adv_encode_uint32_le(info->disk_nb_start, &buff); + gmio_adv_encode_uint32_le(0, &buff); /* Disk start number */ return gmio_zip_io_returnerr( GMIO_ZIP64_SIZE_EXTRAFIELD, GMIO_ERROR_OK, ptr_error); #else @@ -492,18 +493,20 @@ size_t gmio_zip64_write_end_of_central_directory_record( #ifdef GMIO_HAVE_INT64_TYPE uint8_t bytes[GMIO_ZIP64_SIZE_END_OF_CENTRAL_DIRECTORY_RECORD]; uint8_t* buff = bytes; + const uint32_t disk_nb = 0; + const uint32_t disk_nb_start = 0; + const uint64_t disk_entry_count = info->entry_count; gmio_adv_encode_uint32_le(0x06064b50, &buff); gmio_adv_encode_uint64_le(sizeof(bytes) - 12, &buff); gmio_adv_encode_uint16_le(info->version_made_by, &buff); gmio_adv_encode_uint16_le(info->version_needed_to_extract, &buff); - gmio_adv_encode_uint32_le(info->disk_nb, &buff); - gmio_adv_encode_uint32_le(info->disk_nb_with_start_of_central_dir, &buff); - gmio_adv_encode_uint64_le( - info->total_entry_count_in_central_dir_on_disk, &buff); - gmio_adv_encode_uint64_le(info->total_entry_count_in_central_dir, &buff); + gmio_adv_encode_uint32_le(disk_nb, &buff); + gmio_adv_encode_uint32_le(disk_nb_start, &buff); + gmio_adv_encode_uint64_le(disk_entry_count, &buff); + gmio_adv_encode_uint64_le(info->entry_count, &buff); gmio_adv_encode_uint64_le(info->central_dir_size, &buff); - gmio_adv_encode_uint64_le( - info->start_offset_central_dir_from_disk_start_nb, &buff); + gmio_adv_encode_uint64_le(info->start_offset, &buff); + /* Note: don't write any PKWARE reserved "zip64 extensible data sector" /* Write to stream */ const size_t expected_written_len = sizeof(bytes); const size_t written_len = @@ -524,10 +527,12 @@ size_t gmio_zip64_write_end_of_central_directory_locator( #ifdef GMIO_HAVE_INT64_TYPE uint8_t bytes[GMIO_ZIP64_SIZE_END_OF_CENTRAL_DIRECTORY_LOCATOR]; uint8_t* buff = bytes; + const uint32_t disk_nb = 0; + const uint32_t disk_count = 1; gmio_adv_encode_uint32_le(0x07064b50, &buff); - gmio_adv_encode_uint32_le(info->disk_nb_with_start_of_central_dir, &buff); + gmio_adv_encode_uint32_le(disk_nb, &buff); gmio_adv_encode_uint64_le(info->relative_offset, &buff); - gmio_adv_encode_uint32_le(info->total_disk_count, &buff); + gmio_adv_encode_uint32_le(disk_count, &buff); /* Write to stream */ const size_t expected_written_len = sizeof(bytes); const size_t written_len = @@ -541,55 +546,37 @@ size_t gmio_zip64_write_end_of_central_directory_locator( } size_t gmio_zip_write_end_of_central_directory_record( - struct gmio_stream *stream, - const struct gmio_zip_end_of_central_directory_record *info, + struct gmio_stream* stream, + const struct gmio_zip_end_of_central_directory_record* info, int* ptr_error) { uint8_t bytes[GMIO_ZIP_SIZE_END_OF_CENTRAL_DIRECTORY_RECORD]; uint8_t* buff = bytes; - /* 4-bytes magic number 0x06054b50 */ gmio_adv_encode_uint32_le(0x06054b50, &buff); - /* 2-bytes number of this disk */ - const uint16_t disk_nb = info->use_zip64 ? UINT16_MAX : info->disk_nb; + const uint16_t disk_nb = info->use_zip64 ? UINT16_MAX : 0; gmio_adv_encode_uint16_le(disk_nb, &buff); - /* 2-bytes number of the disk with the start of the central directory */ - const uint16_t disk_nb_with_start_of_central_dir = - info->use_zip64 ? - UINT16_MAX : - info->disk_nb_with_start_of_central_dir; - gmio_adv_encode_uint16_le(disk_nb_with_start_of_central_dir, &buff); + const uint16_t disk_nb_start = info->use_zip64 ? UINT16_MAX : 0; + gmio_adv_encode_uint16_le(disk_nb_start, &buff); - /* 2-bytes total number of entries in the central directory on this disk */ - const uint16_t total_entry_count_in_central_dir_on_disk = - info->use_zip64 ? - UINT16_MAX : - info->total_entry_count_in_central_dir_on_disk; - gmio_adv_encode_uint16_le(total_entry_count_in_central_dir_on_disk, &buff); + const uint16_t disk_entry_count = + info->use_zip64 ? UINT16_MAX : info->entry_count; + gmio_adv_encode_uint16_le(disk_entry_count, &buff); - /* 2-bytes total number of entries in the central directory */ - const uint16_t total_entry_count_in_central_dir = - info->use_zip64 ? - UINT16_MAX : - info->total_entry_count_in_central_dir; - gmio_adv_encode_uint16_le(total_entry_count_in_central_dir, &buff); + const uint16_t entry_count = + info->use_zip64 ? UINT16_MAX : info->entry_count; + gmio_adv_encode_uint16_le(entry_count, &buff); - /* 4-bytes size of the central directory */ const uint32_t central_dir_size = info->use_zip64 ? UINT32_MAX : info->central_dir_size; gmio_adv_encode_uint32_le(central_dir_size, &buff); - /* 4-bytes offset of start of central directory with respect to the starting - * disk number */ - const uint32_t start_offset_central_dir_from_disk_start_nb = - info->use_zip64 ? - UINT32_MAX : - info->start_offset_central_dir_from_disk_start_nb; - gmio_adv_encode_uint32_le(start_offset_central_dir_from_disk_start_nb, &buff); + const uint32_t start_offset = + info->use_zip64 ? UINT32_MAX : info->start_offset; + gmio_adv_encode_uint32_le(start_offset, &buff); - /* 2-bytes .ZIP file comment length */ gmio_adv_encode_uint16_le(info->filecomment_len, &buff); /* Write to stream */ @@ -670,8 +657,7 @@ bool gmio_zip_write_single_file( struct gmio_zip_central_directory_header cdh = {0}; cdh.use_zip64 = needs_zip64; cdh.version_needed_to_extract = version_needed; - cdh.general_purpose_flags = - GMIO_ZIP_GENERAL_PURPOSE_FLAG_USE_DATA_DESCRIPTOR; + cdh.general_purpose_flags = lfh.general_purpose_flags; cdh.compress_method = file_entry->compress_method; cdh.crc32 = dd.crc32; cdh.compressed_size = (uint32_t)dd.compressed_size; @@ -703,12 +689,9 @@ bool gmio_zip_write_single_file( /* Write Zip64 end of central directory record */ struct gmio_zip64_end_of_central_directory_record eocdr64 = {0}; eocdr64.version_needed_to_extract = version_needed; - eocdr64.total_entry_count_in_central_dir_on_disk = 1; - eocdr64.total_entry_count_in_central_dir = 1; - eocdr64.central_dir_size = - pos_end_central_dir - pos_start_central_dir; - eocdr64.start_offset_central_dir_from_disk_start_nb = - pos_start_central_dir; + eocdr64.entry_count = 1; + eocdr64.central_dir_size = pos_end_central_dir - pos_start_central_dir; + eocdr64.start_offset = pos_start_central_dir; zip_write_pos += gmio_zip64_write_end_of_central_directory_record( stream, &eocdr64, ptr_error); @@ -718,7 +701,6 @@ bool gmio_zip_write_single_file( /* Write Zip64 end of central directory locator */ struct gmio_zip64_end_of_central_directory_locator eocdl64 = {0}; eocdl64.relative_offset = pos_end_central_dir; - eocdl64.total_disk_count = 1; zip_write_pos += gmio_zip64_write_end_of_central_directory_locator( stream, &eocdl64, ptr_error); @@ -729,11 +711,9 @@ bool gmio_zip_write_single_file( /* Write end of central directory record */ struct gmio_zip_end_of_central_directory_record eocdr = {0}; eocdr.use_zip64 = needs_zip64; - eocdr.total_entry_count_in_central_dir_on_disk = 1; - eocdr.total_entry_count_in_central_dir = 1; + eocdr.entry_count = 1; eocdr.central_dir_size = (uint32_t)central_dir_size; - eocdr.start_offset_central_dir_from_disk_start_nb = - (uint32_t)central_dir_startpos; + eocdr.start_offset = (uint32_t)central_dir_startpos; zip_write_pos += gmio_zip_write_end_of_central_directory_record( stream, &eocdr, ptr_error); diff --git a/src/gmio_core/internal/zip_utils.h b/src/gmio_core/internal/zip_utils.h index 48217e7..aaa1525 100644 --- a/src/gmio_core/internal/zip_utils.h +++ b/src/gmio_core/internal/zip_utils.h @@ -156,7 +156,6 @@ enum gmio_zip_feature_version { GMIO_ZIP_FEATURE_VERSION_FILE_ENCRYPTED_TWOFISH = 63 }; -/*! Zip local file header */ struct gmio_zip_local_file_header { enum gmio_zip_feature_version version_needed_to_extract; uint16_t general_purpose_flags; @@ -171,7 +170,6 @@ struct gmio_zip_local_file_header { const uint8_t* extrafield; }; -/*! Zip data descriptor */ struct gmio_zip_data_descriptor { bool use_zip64; uint32_t crc32; @@ -179,7 +177,6 @@ struct gmio_zip_data_descriptor { uintmax_t uncompressed_size; }; -/*! Zip central directory header */ struct gmio_zip_central_directory_header { bool use_zip64; uint16_t version_made_by; @@ -193,7 +190,6 @@ struct gmio_zip_central_directory_header { uint16_t filename_len; uint16_t extrafield_len; uint16_t filecomment_len; - uint16_t disk_nb_start; uint16_t internal_file_attrs; uint32_t external_file_attrs; uint32_t relative_offset_local_header; @@ -202,54 +198,34 @@ struct gmio_zip_central_directory_header { const char* filecomment; }; -enum { - GMIO_ZIP64_SIZE_EXTRAFIELD = 2*2 + 3*8 + 4 -}; +enum { GMIO_ZIP64_SIZE_EXTRAFIELD = 2*2 + 3*8 + 4 }; /*! Zip64 extended info (extra field) */ struct gmio_zip64_extrafield { uintmax_t compressed_size; uintmax_t uncompressed_size; uintmax_t relative_offset_local_header; - uint32_t disk_nb_start; }; -/*! Zip end of central directory record */ struct gmio_zip_end_of_central_directory_record { bool use_zip64; - uint16_t disk_nb; - uint16_t disk_nb_with_start_of_central_dir; - uint16_t total_entry_count_in_central_dir_on_disk; - uint16_t total_entry_count_in_central_dir; + uint16_t entry_count; uint32_t central_dir_size; - uint32_t start_offset_central_dir_from_disk_start_nb; + uint32_t start_offset; uint16_t filecomment_len; const char* filecomment; }; -/*! Zip64 end of central directory record */ struct gmio_zip64_end_of_central_directory_record { uint16_t version_made_by; enum gmio_zip_feature_version version_needed_to_extract; - uint32_t disk_nb; - uint32_t disk_nb_with_start_of_central_dir; - uintmax_t total_entry_count_in_central_dir_on_disk; /* should be 64b */ - uintmax_t total_entry_count_in_central_dir; /* should be 64b */ - uintmax_t central_dir_size; /* should be 64b */ - uintmax_t start_offset_central_dir_from_disk_start_nb; /* should be 64b */ - const uint8_t* extensible_data_sector; /* Reserved for use by PKWARE */ + uintmax_t entry_count; /* should be 64b */ + uintmax_t central_dir_size; /* should be 64b */ + uintmax_t start_offset; /* should be 64b */ }; -/*! Zip64 end of central directory locator */ struct gmio_zip64_end_of_central_directory_locator { - uint32_t disk_nb_with_start_of_central_dir; uintmax_t relative_offset; /* should be 64b */ - uint32_t total_disk_count; -}; - -struct gmio_zip_write_result { - int error; - size_t written_len; }; enum { GMIO_ZIP_UTILS_ERROR_TAG = 0x00100000 }; @@ -257,61 +233,51 @@ enum gmio_zip_utils_error { GMIO_ZIP_UTILS_ERROR_BAD_MAGIC = GMIO_ZIP_UTILS_ERROR_TAG + 1 }; -/*! Reads ZIP local file header from \p stream */ size_t gmio_zip_read_local_file_header( struct gmio_stream* stream, struct gmio_zip_local_file_header* info, int* ptr_error); -/*! Reads ZIP data descriptor from \p stream */ size_t gmio_zip_read_data_descriptor( struct gmio_stream* stream, struct gmio_zip_data_descriptor* info, int* ptr_error); -/*! Reads Zip64 data descriptor from \p stream */ size_t gmio_zip64_read_data_descriptor( struct gmio_stream* stream, struct gmio_zip_data_descriptor* info, int* ptr_error); -/*! Reads ZIP central directory header from \p stream */ size_t gmio_zip_read_central_directory_header( struct gmio_stream* stream, struct gmio_zip_central_directory_header* info, int* ptr_error); -/*! Reads Zip64 end of central directory record from \p stream */ size_t gmio_zip64_read_end_of_central_directory_record( struct gmio_stream* stream, struct gmio_zip64_end_of_central_directory_record* info, int* ptr_error); -/*! Reads Zip64 end of central directory locator from \p stream */ size_t gmio_zip64_read_end_of_central_directory_locator( struct gmio_stream* stream, struct gmio_zip64_end_of_central_directory_locator* info, int* ptr_error); -/*! Reads ZIP end of central directory record from \p stream */ size_t gmio_zip_read_end_of_central_directory_record( struct gmio_stream* stream, struct gmio_zip_end_of_central_directory_record* info, int* ptr_error); -/*! Writes ZIP local file header to \p stream */ size_t gmio_zip_write_local_file_header( struct gmio_stream* stream, const struct gmio_zip_local_file_header* info, int* ptr_error); -/*! Writes ZIP data descriptor to \p stream */ size_t gmio_zip_write_data_descriptor( struct gmio_stream* stream, const struct gmio_zip_data_descriptor* info, int* ptr_error); -/*! Writes ZIP central directory header to \p stream */ size_t gmio_zip_write_central_directory_header( struct gmio_stream* stream, const struct gmio_zip_central_directory_header* info, @@ -326,19 +292,16 @@ size_t gmio_zip64_write_extrafield( const struct gmio_zip64_extrafield* info, int* ptr_error); -/*! Writes Zip64 end of central directory record to \p stream */ size_t gmio_zip64_write_end_of_central_directory_record( struct gmio_stream* stream, const struct gmio_zip64_end_of_central_directory_record* info, int* ptr_error); -/*! Writes Zip64 end of central directory locator to \p stream */ size_t gmio_zip64_write_end_of_central_directory_locator( struct gmio_stream* stream, const struct gmio_zip64_end_of_central_directory_locator* info, int* ptr_error); -/*! Writes ZIP end of central directory record to \p stream */ size_t gmio_zip_write_end_of_central_directory_record( struct gmio_stream* stream, const struct gmio_zip_end_of_central_directory_record* info, diff --git a/tests/test_amf_io.c b/tests/test_amf_io.c index 8743b42..cf7122b 100644 --- a/tests/test_amf_io.c +++ b/tests/test_amf_io.c @@ -363,15 +363,9 @@ static const char* test_amf_write_doc_1_zip() gmio_zip_read_end_of_central_directory_record( &stream, &zip_eocdr, &error); UTEST_COMPARE_INT(error, GMIO_ERROR_OK); - UTEST_COMPARE_UINT(zip_eocdr.disk_nb, 0); - UTEST_COMPARE_UINT( - zip_eocdr.disk_nb_with_start_of_central_dir, 0); - UTEST_COMPARE_UINT( - zip_eocdr.total_entry_count_in_central_dir_on_disk, 1); - UTEST_COMPARE_UINT( - zip_eocdr.total_entry_count_in_central_dir, 1); + UTEST_COMPARE_UINT(zip_eocdr.entry_count, 1); /* -- Read ZIP central directory */ - wbuff.pos = zip_eocdr.start_offset_central_dir_from_disk_start_nb; + wbuff.pos = zip_eocdr.start_offset; struct gmio_zip_central_directory_header zip_cdh = {0}; gmio_zip_read_central_directory_header(&stream, &zip_cdh, &error); UTEST_COMPARE_INT(error, GMIO_ERROR_OK); @@ -493,15 +487,9 @@ static const char* test_amf_write_doc_1_zip64() gmio_zip_read_end_of_central_directory_record( &stream, &zip_eocdr, &error); UTEST_COMPARE_INT(error, GMIO_ERROR_OK); - UTEST_COMPARE_UINT(zip_eocdr.disk_nb, 0xFFFF); - UTEST_COMPARE_UINT(zip_eocdr.disk_nb_with_start_of_central_dir, 0xFFFF); - UTEST_COMPARE_UINT( - zip_eocdr.total_entry_count_in_central_dir_on_disk, 0xFFFF); - UTEST_COMPARE_UINT(zip_eocdr.total_entry_count_in_central_dir, 0xFFFF); + UTEST_COMPARE_UINT(zip_eocdr.entry_count, 0xFFFF); UTEST_COMPARE_UINT(zip_eocdr.central_dir_size, 0xFFFFFFFF); - UTEST_COMPARE_UINT( - zip_eocdr.start_offset_central_dir_from_disk_start_nb, - 0xFFFFFFFF); + UTEST_COMPARE_UINT(zip_eocdr.start_offset, 0xFFFFFFFF); #if 0 /* -- Read ZIP central directory */ wbuff.pos = zip_eocdr.start_offset_central_dir_from_disk_start_nb; From b008445fc8fb52e5f5fec3a8552de09cac3f52e3 Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Tue, 17 Jan 2017 18:42:36 +0100 Subject: [PATCH 45/81] gmio_core: fix zip64 corrupted output --- src/gmio_core/internal/zip_utils.c | 99 ++++++---- src/gmio_core/internal/zip_utils.h | 42 ++++- tests/main_test_core.c | 1 + tests/test_amf_io.c | 124 +++---------- tests/test_core_internal.c | 280 +++++++++++++++++++++++++++++ 5 files changed, 398 insertions(+), 148 deletions(-) diff --git a/src/gmio_core/internal/zip_utils.c b/src/gmio_core/internal/zip_utils.c index 47b17be..87c0f63 100644 --- a/src/gmio_core/internal/zip_utils.c +++ b/src/gmio_core/internal/zip_utils.c @@ -38,15 +38,8 @@ * Constants * ---------- */ -enum { - GMIO_ZIP_SIZE_LOCAL_FILE_HEADER = 4 + 5*2 + 3*4 + 2*2, - GMIO_ZIP_SIZE_CENTRAL_DIRECTORY_HEADER = 4 + 6*2 + 3*4 + 5*2 +2*4, - GMIO_ZIP_SIZE_DATA_DESCRIPTOR = 4 + 4 + 4 + 4, - GMIO_ZIP64_SIZE_DATA_DESCRIPTOR = 4 + 4 + 2*8, - GMIO_ZIP64_SIZE_END_OF_CENTRAL_DIRECTORY_RECORD = 4 + 8 + 2*2 + 2*4 + 4*8, - GMIO_ZIP64_SIZE_END_OF_CENTRAL_DIRECTORY_LOCATOR = 4 + 4 + 8 + 4, - GMIO_ZIP_SIZE_END_OF_CENTRAL_DIRECTORY_RECORD = 4 + 4*2 + 2*4 + 2 -}; +static const uint16_t zip64_extrablock_tag = 0x0001; +static const uint16_t zip64_extrablock_size = 3*8 + 4; /* ---------- * Internal functions @@ -238,7 +231,7 @@ size_t gmio_zip_read_central_directory_header( gmio_adv_decode_uint16_le(&buff); /* disk_nb_start */ info->internal_file_attrs = gmio_adv_decode_uint16_le(&buff); info->external_file_attrs = gmio_adv_decode_uint32_le(&buff); - info->relative_offset_local_header = gmio_adv_decode_uint32_le(&buff); + info->local_header_offset = gmio_adv_decode_uint32_le(&buff); info->filename = NULL; info->extrafield = NULL; @@ -247,6 +240,36 @@ size_t gmio_zip_read_central_directory_header( return gmio_zip_io_returnerr(read_len, GMIO_ERROR_OK, ptr_error); } +size_t gmio_zip64_read_extrafield( + struct gmio_stream *stream, + struct gmio_zip64_extrafield *info, + int *ptr_error) +{ +#ifdef GMIO_HAVE_INT64_TYPE + uint8_t bytes[GMIO_ZIP64_SIZE_EXTRAFIELD]; + const uint8_t* buff = bytes; + size_t read_len = 0; + if (!gmio_zip_readcheckbytes(stream, bytes, sizeof(bytes), &read_len, ptr_error)) + return read_len; + if (gmio_adv_decode_uint16_le(&buff) != zip64_extrablock_tag) { + return gmio_zip_io_returnerr( + read_len, GMIO_ZIP_UTILS_ERROR_BAD_EXTRAFIELD_TAG, ptr_error); + } + if (gmio_adv_decode_uint16_le(&buff) != zip64_extrablock_size) { + return gmio_zip_io_returnerr( + read_len, GMIO_ZIP_UTILS_ERROR_BAD_EXTRAFIELD_SIZE, ptr_error); + } + info->uncompressed_size = gmio_adv_decode_uint64_le(&buff); + info->compressed_size = gmio_adv_decode_uint64_le(&buff); + info->local_header_offset = gmio_adv_decode_uint64_le(&buff); + gmio_adv_decode_uint32_le(&buff); /* Disk start number */ + return gmio_zip_io_returnerr(read_len, GMIO_ERROR_OK, ptr_error); +#else + return gmio_zip_io_returnerr( + 0, GMIO_ERROR_ZIP_INT64_TYPE_REQUIRED, ptr_error); +#endif +} + size_t gmio_zip64_read_end_of_central_directory_record( struct gmio_stream *stream, struct gmio_zip64_end_of_central_directory_record *info, @@ -269,7 +292,7 @@ size_t gmio_zip64_read_end_of_central_directory_record( gmio_adv_decode_uint64_le(&buff); /* total_entry_count_in_central_dir_on_disk */ info->entry_count = gmio_adv_decode_uint64_le(&buff); info->central_dir_size = gmio_adv_decode_uint64_le(&buff); - info->start_offset = gmio_adv_decode_uint64_le(&buff); + info->central_dir_offset = gmio_adv_decode_uint64_le(&buff); return gmio_zip_io_returnerr(read_len, GMIO_ERROR_OK, ptr_error); #else return gmio_zip_io_returnerr( @@ -293,7 +316,7 @@ size_t gmio_zip64_read_end_of_central_directory_locator( /* Number of the disk with the start of the zip64 end of central directory */ gmio_adv_decode_uint32_le(&buff); /* Relative offset of the zip64 end of central directory record */ - info->relative_offset = gmio_adv_decode_uint64_le(&buff); + info->zip64_end_of_central_dir_offset = gmio_adv_decode_uint64_le(&buff); /* Total number of disks */ gmio_adv_decode_uint32_le(&buff); return gmio_zip_io_returnerr(read_len, GMIO_ERROR_OK, ptr_error); @@ -320,7 +343,7 @@ size_t gmio_zip_read_end_of_central_directory_record( gmio_adv_decode_uint16_le(&buff); /* total_entry_count_in_central_dir_on_disk */ info->entry_count = gmio_adv_decode_uint16_le(&buff); info->central_dir_size = gmio_adv_decode_uint32_le(&buff); - info->start_offset = gmio_adv_decode_uint32_le(&buff); + info->central_dir_offset = gmio_adv_decode_uint32_le(&buff); info->filecomment_len = gmio_adv_decode_uint16_le(&buff); info->filecomment = NULL; return gmio_zip_io_returnerr(read_len, GMIO_ERROR_OK, ptr_error); @@ -437,9 +460,9 @@ size_t gmio_zip_write_central_directory_header( gmio_adv_encode_uint16_le(0, &buff); /* Disk number start */ gmio_adv_encode_uint16_le(info->internal_file_attrs, &buff); gmio_adv_encode_uint32_le(info->external_file_attrs, &buff); - const uint32_t relative_offset_local_header = - info->use_zip64 ? UINT32_MAX : info->relative_offset_local_header; - gmio_adv_encode_uint32_le(relative_offset_local_header, &buff); + const uint32_t local_header_offset = + info->use_zip64 ? UINT32_MAX : info->local_header_offset; + gmio_adv_encode_uint32_le(local_header_offset, &buff); /* Write to stream */ const size_t expected_written_len = @@ -469,13 +492,11 @@ size_t gmio_zip64_write_extrafield( 0, GMIO_ERROR_INVALID_MEMBLOCK_SIZE, ptr_error); } #ifdef GMIO_HAVE_INT64_TYPE - static const uint16_t extrablock_tag = 0x0001; - static const uint16_t extrablock_size = 3*8 + 4; - gmio_adv_encode_uint16_le(extrablock_tag, &buff); - gmio_adv_encode_uint16_le(extrablock_size, &buff); + gmio_adv_encode_uint16_le(zip64_extrablock_tag, &buff); + gmio_adv_encode_uint16_le(zip64_extrablock_size, &buff); gmio_adv_encode_uint64_le(info->uncompressed_size, &buff); gmio_adv_encode_uint64_le(info->compressed_size, &buff); - gmio_adv_encode_uint64_le(info->relative_offset_local_header, &buff); + gmio_adv_encode_uint64_le(info->local_header_offset, &buff); gmio_adv_encode_uint32_le(0, &buff); /* Disk start number */ return gmio_zip_io_returnerr( GMIO_ZIP64_SIZE_EXTRAFIELD, GMIO_ERROR_OK, ptr_error); @@ -505,7 +526,7 @@ size_t gmio_zip64_write_end_of_central_directory_record( gmio_adv_encode_uint64_le(disk_entry_count, &buff); gmio_adv_encode_uint64_le(info->entry_count, &buff); gmio_adv_encode_uint64_le(info->central_dir_size, &buff); - gmio_adv_encode_uint64_le(info->start_offset, &buff); + gmio_adv_encode_uint64_le(info->central_dir_offset, &buff); /* Note: don't write any PKWARE reserved "zip64 extensible data sector" /* Write to stream */ const size_t expected_written_len = sizeof(bytes); @@ -531,7 +552,7 @@ size_t gmio_zip64_write_end_of_central_directory_locator( const uint32_t disk_count = 1; gmio_adv_encode_uint32_le(0x07064b50, &buff); gmio_adv_encode_uint32_le(disk_nb, &buff); - gmio_adv_encode_uint64_le(info->relative_offset, &buff); + gmio_adv_encode_uint64_le(info->zip64_end_of_central_dir_offset, &buff); gmio_adv_encode_uint32_le(disk_count, &buff); /* Write to stream */ const size_t expected_written_len = sizeof(bytes); @@ -573,9 +594,9 @@ size_t gmio_zip_write_end_of_central_directory_record( info->use_zip64 ? UINT32_MAX : info->central_dir_size; gmio_adv_encode_uint32_le(central_dir_size, &buff); - const uint32_t start_offset = - info->use_zip64 ? UINT32_MAX : info->start_offset; - gmio_adv_encode_uint32_le(start_offset, &buff); + const uint32_t central_dir_offset = + info->use_zip64 ? UINT32_MAX : info->central_dir_offset; + gmio_adv_encode_uint32_le(central_dir_offset, &buff); gmio_adv_encode_uint16_le(info->filecomment_len, &buff); @@ -606,18 +627,20 @@ bool gmio_zip_write_single_file( file_entry->feature_version >= GMIO_ZIP_FEATURE_VERSION_FILE_ZIP64_FORMAT_EXTENSIONS; uint8_t extrafield[GMIO_ZIP64_SIZE_EXTRAFIELD]; - size_t zip_write_pos = 0; + uintmax_t zip_write_pos = 0; /* Write local file header */ struct gmio_zip_local_file_header lfh = {0}; + lfh.version_needed_to_extract = file_entry->feature_version; lfh.general_purpose_flags = GMIO_ZIP_GENERAL_PURPOSE_FLAG_USE_DATA_DESCRIPTOR; lfh.compress_method = file_entry->compress_method; lfh.filename = file_entry->filename; lfh.filename_len = file_entry->filename_len; if (use_zip64_format_extensions) { + lfh.compressed_size = UINT32_MAX; + lfh.uncompressed_size = UINT32_MAX; const struct gmio_zip64_extrafield zip64extra = {0}; - zip_write_pos += - gmio_zip64_write_extrafield( + gmio_zip64_write_extrafield( extrafield, sizeof(extrafield), &zip64extra, ptr_error); if (gmio_error(*ptr_error)) return false; @@ -653,7 +676,7 @@ bool gmio_zip_write_single_file( return false; /* Write central directory header */ - const uintmax_t pos_start_central_dir = zip_write_pos; + const uintmax_t pos_central_dir = zip_write_pos; struct gmio_zip_central_directory_header cdh = {0}; cdh.use_zip64 = needs_zip64; cdh.version_needed_to_extract = version_needed; @@ -668,30 +691,28 @@ bool gmio_zip_write_single_file( struct gmio_zip64_extrafield zip64extra = {0}; zip64extra.compressed_size = dd.compressed_size; zip64extra.uncompressed_size = dd.uncompressed_size; - zip64extra.relative_offset_local_header = 0; - zip_write_pos += - gmio_zip64_write_extrafield( + gmio_zip64_write_extrafield( extrafield, sizeof(extrafield), &zip64extra, ptr_error); if (gmio_error(*ptr_error)) return false; cdh.extrafield = extrafield; cdh.extrafield_len = sizeof(extrafield); } - const uintmax_t central_dir_startpos = zip_write_pos; + const uintmax_t central_dir_pos = zip_write_pos; const size_t central_dir_size = gmio_zip_write_central_directory_header(stream, &cdh, ptr_error); zip_write_pos += central_dir_size; if (gmio_error(*ptr_error)) return false; - const uintmax_t pos_end_central_dir = zip_write_pos; if (needs_zip64) { /* Write Zip64 end of central directory record */ + const uintmax_t pos_zip64_end_of_central_dir = zip_write_pos; struct gmio_zip64_end_of_central_directory_record eocdr64 = {0}; eocdr64.version_needed_to_extract = version_needed; eocdr64.entry_count = 1; - eocdr64.central_dir_size = pos_end_central_dir - pos_start_central_dir; - eocdr64.start_offset = pos_start_central_dir; + eocdr64.central_dir_size = central_dir_size; + eocdr64.central_dir_offset = pos_central_dir; zip_write_pos += gmio_zip64_write_end_of_central_directory_record( stream, &eocdr64, ptr_error); @@ -700,7 +721,7 @@ bool gmio_zip_write_single_file( /* Write Zip64 end of central directory locator */ struct gmio_zip64_end_of_central_directory_locator eocdl64 = {0}; - eocdl64.relative_offset = pos_end_central_dir; + eocdl64.zip64_end_of_central_dir_offset = pos_zip64_end_of_central_dir; zip_write_pos += gmio_zip64_write_end_of_central_directory_locator( stream, &eocdl64, ptr_error); @@ -713,7 +734,7 @@ bool gmio_zip_write_single_file( eocdr.use_zip64 = needs_zip64; eocdr.entry_count = 1; eocdr.central_dir_size = (uint32_t)central_dir_size; - eocdr.start_offset = (uint32_t)central_dir_startpos; + eocdr.central_dir_offset = (uint32_t)central_dir_pos; zip_write_pos += gmio_zip_write_end_of_central_directory_record( stream, &eocdr, ptr_error); diff --git a/src/gmio_core/internal/zip_utils.h b/src/gmio_core/internal/zip_utils.h index aaa1525..27e2ba0 100644 --- a/src/gmio_core/internal/zip_utils.h +++ b/src/gmio_core/internal/zip_utils.h @@ -192,26 +192,35 @@ struct gmio_zip_central_directory_header { uint16_t filecomment_len; uint16_t internal_file_attrs; uint32_t external_file_attrs; - uint32_t relative_offset_local_header; + uint32_t local_header_offset; const char* filename; const uint8_t* extrafield; const char* filecomment; }; -enum { GMIO_ZIP64_SIZE_EXTRAFIELD = 2*2 + 3*8 + 4 }; +enum { + GMIO_ZIP_SIZE_LOCAL_FILE_HEADER = 4 + 5*2 + 3*4 + 2*2, + GMIO_ZIP_SIZE_CENTRAL_DIRECTORY_HEADER = 4 + 6*2 + 3*4 + 5*2 +2*4, + GMIO_ZIP_SIZE_DATA_DESCRIPTOR = 4 + 4 + 4 + 4, + GMIO_ZIP64_SIZE_EXTRAFIELD = 2*2 + 3*8 + 4, + GMIO_ZIP64_SIZE_DATA_DESCRIPTOR = 4 + 4 + 2*8, + GMIO_ZIP64_SIZE_END_OF_CENTRAL_DIRECTORY_RECORD = 4 + 8 + 2*2 + 2*4 + 4*8, + GMIO_ZIP64_SIZE_END_OF_CENTRAL_DIRECTORY_LOCATOR = 4 + 4 + 8 + 4, + GMIO_ZIP_SIZE_END_OF_CENTRAL_DIRECTORY_RECORD = 4 + 4*2 + 2*4 + 2 +}; /*! Zip64 extended info (extra field) */ struct gmio_zip64_extrafield { uintmax_t compressed_size; uintmax_t uncompressed_size; - uintmax_t relative_offset_local_header; + uintmax_t local_header_offset; }; struct gmio_zip_end_of_central_directory_record { bool use_zip64; uint16_t entry_count; uint32_t central_dir_size; - uint32_t start_offset; + uint32_t central_dir_offset; uint16_t filecomment_len; const char* filecomment; }; @@ -219,20 +228,26 @@ struct gmio_zip_end_of_central_directory_record { struct gmio_zip64_end_of_central_directory_record { uint16_t version_made_by; enum gmio_zip_feature_version version_needed_to_extract; - uintmax_t entry_count; /* should be 64b */ - uintmax_t central_dir_size; /* should be 64b */ - uintmax_t start_offset; /* should be 64b */ + uintmax_t entry_count; /* should be 64b */ + uintmax_t central_dir_size; /* should be 64b */ + uintmax_t central_dir_offset; /* should be 64b */ }; struct gmio_zip64_end_of_central_directory_locator { - uintmax_t relative_offset; /* should be 64b */ + uintmax_t zip64_end_of_central_dir_offset; /* should be 64b */ }; enum { GMIO_ZIP_UTILS_ERROR_TAG = 0x00100000 }; enum gmio_zip_utils_error { - GMIO_ZIP_UTILS_ERROR_BAD_MAGIC = GMIO_ZIP_UTILS_ERROR_TAG + 1 + GMIO_ZIP_UTILS_ERROR_BAD_MAGIC = GMIO_ZIP_UTILS_ERROR_TAG + 1, + GMIO_ZIP_UTILS_ERROR_BAD_EXTRAFIELD_TAG, + GMIO_ZIP_UTILS_ERROR_BAD_EXTRAFIELD_SIZE }; +/* + * ZIP read functions + */ + size_t gmio_zip_read_local_file_header( struct gmio_stream* stream, struct gmio_zip_local_file_header* info, @@ -253,6 +268,11 @@ size_t gmio_zip_read_central_directory_header( struct gmio_zip_central_directory_header* info, int* ptr_error); +size_t gmio_zip64_read_extrafield( + struct gmio_stream* stream, + struct gmio_zip64_extrafield* info, + int* ptr_error); + size_t gmio_zip64_read_end_of_central_directory_record( struct gmio_stream* stream, struct gmio_zip64_end_of_central_directory_record* info, @@ -268,6 +288,10 @@ size_t gmio_zip_read_end_of_central_directory_record( struct gmio_zip_end_of_central_directory_record* info, int* ptr_error); +/* + * ZIP write functions + */ + size_t gmio_zip_write_local_file_header( struct gmio_stream* stream, const struct gmio_zip_local_file_header* info, diff --git a/tests/main_test_core.c b/tests/main_test_core.c index aa6bb30..31f3a0d 100644 --- a/tests/main_test_core.c +++ b/tests/main_test_core.c @@ -56,6 +56,7 @@ const char* all_tests() UTEST_RUN(test_internal__stringstream); UTEST_RUN(test_internal__string_ascii_utils); UTEST_RUN(test_internal__benchmark_gmio_fast_atof); + UTEST_RUN(test_internal__zip_utils); return NULL; } diff --git a/tests/test_amf_io.c b/tests/test_amf_io.c index cf7122b..e86410a 100644 --- a/tests/test_amf_io.c +++ b/tests/test_amf_io.c @@ -256,7 +256,6 @@ static int __tamf__write_amf( return gmio_amf_write(&stream, doc, opts); } - static const char* test_amf_write_doc_1_plaintext() { static const size_t wbuffsize = 8192; @@ -282,27 +281,6 @@ static const char* test_amf_write_doc_1_plaintext() static const char zip_entry_filename[] = "test.amf"; static const uint16_t zip_entry_filename_len = sizeof(zip_entry_filename) - 1; -static const char* __tamf__check_zip_local_file_header( - const struct gmio_zip_local_file_header* zip_lfh) -{ - UTEST_COMPARE_UINT( - zip_lfh->compress_method, - GMIO_ZIP_COMPRESS_METHOD_DEFLATE); - UTEST_ASSERT( - (zip_lfh->general_purpose_flags & - GMIO_ZIP_GENERAL_PURPOSE_FLAG_USE_DATA_DESCRIPTOR) - != 0); - UTEST_COMPARE_UINT( - zip_lfh->filename_len, - zip_entry_filename_len); - UTEST_ASSERT(strncmp( - zip_lfh->filename, - zip_entry_filename, - zip_entry_filename_len) - == 0); - return NULL; -} - static const char* test_amf_write_doc_1_zip() { static const size_t wbuffsize = 8192; @@ -319,10 +297,10 @@ static const char* test_amf_write_doc_1_zip() UTEST_COMPARE_INT(error, GMIO_ERROR_OK); } - const size_t source_len = wbuff.pos; - const uint32_t crc32_amf_data = gmio_zlib_crc32(wbuff.ptr, source_len); - uint8_t* source = calloc(source_len, 1); - memcpy(source, wbuff.ptr, source_len); + const size_t amf_data_len = wbuff.pos; + const uint32_t crc32_amf_data = gmio_zlib_crc32(wbuff.ptr, amf_data_len); + uint8_t* amf_data = calloc(amf_data_len, 1); + memcpy(amf_data, wbuff.ptr, amf_data_len); { /* Write compressed(ZIP) */ wbuff.pos = 0; @@ -347,79 +325,49 @@ static const char* test_amf_write_doc_1_zip() wbuff.pos = 0; struct gmio_stream stream = gmio_stream_buffer(&wbuff); int error = GMIO_ERROR_OK; - /* -- Read ZIP local file header */ - struct gmio_zip_local_file_header zip_lfh = {0}; - const size_t lfh_read_len = - gmio_zip_read_local_file_header(&stream, &zip_lfh, &error); - UTEST_COMPARE_INT(error, GMIO_ERROR_OK); - zip_lfh.filename = (const char*)wbuff.ptr + wbuff.pos; - const char* check_str = __tamf__check_zip_local_file_header(&zip_lfh); - if (check_str != NULL) - return check_str; /* -- Read ZIP end of central directory record */ - static const size_t end_of_central_dir_record_len = 22; - wbuff.pos = zip_archive_len - end_of_central_dir_record_len;; + wbuff.pos = + zip_archive_len - GMIO_ZIP_SIZE_END_OF_CENTRAL_DIRECTORY_RECORD; struct gmio_zip_end_of_central_directory_record zip_eocdr = {0}; gmio_zip_read_end_of_central_directory_record( &stream, &zip_eocdr, &error); UTEST_COMPARE_INT(error, GMIO_ERROR_OK); - UTEST_COMPARE_UINT(zip_eocdr.entry_count, 1); /* -- Read ZIP central directory */ - wbuff.pos = zip_eocdr.start_offset; + wbuff.pos = zip_eocdr.central_dir_offset; struct gmio_zip_central_directory_header zip_cdh = {0}; gmio_zip_read_central_directory_header(&stream, &zip_cdh, &error); UTEST_COMPARE_INT(error, GMIO_ERROR_OK); - UTEST_COMPARE_UINT( - zip_cdh.compress_method, - GMIO_ZIP_COMPRESS_METHOD_DEFLATE); - UTEST_ASSERT( - (zip_cdh.general_purpose_flags & - GMIO_ZIP_GENERAL_PURPOSE_FLAG_USE_DATA_DESCRIPTOR) - != 0); - UTEST_COMPARE_UINT(crc32_amf_data, zip_cdh.crc32); - UTEST_COMPARE_UINT( - zip_cdh.filename_len, zip_entry_filename_len); - UTEST_ASSERT(strncmp( - (const char*)wbuff.ptr + wbuff.pos, - zip_entry_filename, - zip_entry_filename_len) - == 0); - /* -- Read compressed AMF data */ - const size_t pos_start_amf_data = - lfh_read_len + zip_lfh.filename_len + zip_lfh.extrafield_len; - wbuff.pos = pos_start_amf_data; + UTEST_COMPARE_UINT(zip_cdh.uncompressed_size, amf_data_len); + const uint32_t amf_data_compressed_len = zip_cdh.uncompressed_size; + /* -- Read(skip) ZIP local file header */ + wbuff.pos = 0; + struct gmio_zip_local_file_header zip_lfh = {0}; + const size_t lfh_read_len = + gmio_zip_read_local_file_header(&stream, &zip_lfh, &error); + UTEST_COMPARE_INT(error, GMIO_ERROR_OK); + /* -- Read and check compressed AMF data */ + wbuff.pos = lfh_read_len + zip_lfh.filename_len + zip_lfh.extrafield_len; { - uint8_t* dest = calloc(zip_cdh.uncompressed_size, 1); - size_t dest_len = zip_cdh.uncompressed_size; + uint8_t* dest = calloc(amf_data_len, 1); + size_t dest_len = amf_data_len; const int error = gmio_zlib_uncompress_buffer( dest, &dest_len, (const uint8_t*)wbuff.ptr + wbuff.pos, - zip_cdh.compressed_size); + amf_data_compressed_len); printf("\n-- Info: z_len=%i src_len=%i\n", - zip_cdh.compressed_size, source_len); + amf_data_compressed_len, amf_data_len); UTEST_COMPARE_INT(error, GMIO_ERROR_OK); - UTEST_COMPARE_UINT(source_len, dest_len); - UTEST_COMPARE_UINT(dest_len, zip_cdh.uncompressed_size); - UTEST_COMPARE_INT(memcmp(dest, source, source_len), 0); + UTEST_COMPARE_UINT(dest_len, amf_data_len); + UTEST_COMPARE_INT(memcmp(dest, amf_data, amf_data_len), 0); const uint32_t crc32_uncomp = gmio_zlib_crc32(dest, dest_len); UTEST_COMPARE_UINT(crc32_amf_data, crc32_uncomp); free(dest); } - /* -- Read ZIP data descriptor */ - wbuff.pos = pos_start_amf_data + zip_cdh.compressed_size; - struct gmio_zip_data_descriptor zip_dd = {0}; - gmio_zip_read_data_descriptor(&stream, &zip_dd, &error); - UTEST_COMPARE_INT(error, GMIO_ERROR_OK); - UTEST_COMPARE_UINT(zip_dd.crc32, crc32_amf_data); - UTEST_COMPARE_UINT( - zip_dd.compressed_size, zip_cdh.compressed_size); - UTEST_COMPARE_UINT( - zip_dd.uncompressed_size, zip_cdh.uncompressed_size); } - free(source); + free(amf_data); free(wbuff.ptr); return NULL; } @@ -466,30 +414,6 @@ static const char* test_amf_write_doc_1_zip64() /* Unzip and compare with source data */ { - /* Total size in bytes of the ZIP archive */ - const uintmax_t zip_archive_len = wbuff.pos; - wbuff.pos = 0; - struct gmio_stream stream = gmio_stream_buffer(&wbuff); - int error = GMIO_ERROR_OK; - /* -- Read ZIP local file header */ - struct gmio_zip_local_file_header zip_lfh = {0}; - const size_t lfh_read_len = - gmio_zip_read_local_file_header(&stream, &zip_lfh, &error); - UTEST_COMPARE_INT(error, GMIO_ERROR_OK); - zip_lfh.filename = (const char*)wbuff.ptr + wbuff.pos; - const char* check_str = __tamf__check_zip_local_file_header(&zip_lfh); - if (check_str != NULL) - return check_str; - /* -- Read ZIP end of central directory record */ - static const size_t end_of_central_dir_record_len = 22; - wbuff.pos = zip_archive_len - end_of_central_dir_record_len;; - struct gmio_zip_end_of_central_directory_record zip_eocdr = {0}; - gmio_zip_read_end_of_central_directory_record( - &stream, &zip_eocdr, &error); - UTEST_COMPARE_INT(error, GMIO_ERROR_OK); - UTEST_COMPARE_UINT(zip_eocdr.entry_count, 0xFFFF); - UTEST_COMPARE_UINT(zip_eocdr.central_dir_size, 0xFFFFFFFF); - UTEST_COMPARE_UINT(zip_eocdr.start_offset, 0xFFFFFFFF); #if 0 /* -- Read ZIP central directory */ wbuff.pos = zip_eocdr.start_offset_central_dir_from_disk_start_nb; diff --git a/tests/test_core_internal.c b/tests/test_core_internal.c index 28d5c20..1f7b5db 100644 --- a/tests/test_core_internal.c +++ b/tests/test_core_internal.c @@ -37,6 +37,7 @@ #include "../src/gmio_core/internal/convert.h" #include "../src/gmio_core/internal/error_check.h" #include "../src/gmio_core/internal/fast_atof.h" +#include "../src/gmio_core/internal/helper_stream.h" #include "../src/gmio_core/internal/locale_utils.h" #include "../src/gmio_core/internal/numeric_utils.h" #include "../src/gmio_core/internal/ostringstream.h" @@ -44,6 +45,8 @@ #include "../src/gmio_core/internal/stringstream.h" #include "../src/gmio_core/internal/stringstream_fast_atof.h" #include "../src/gmio_core/internal/string_ascii_utils.h" +#include "../src/gmio_core/internal/zip_utils.h" +#include "../src/gmio_core/internal/zlib_utils.h" #include #include @@ -531,3 +534,280 @@ static const char* test_internal__error_check() return NULL; } + +static void __tc__write_file(const char* filepath, uint8_t* bytes, size_t len) +{ + FILE* file = fopen(filepath, "wb"); + fwrite(bytes, 1, len, file); + fclose(file); +} + +struct __tc__func_write_file_data_cookie { + struct gmio_stream* stream; + const uint8_t* data; + size_t data_len; + uint32_t data_crc32; +}; + +static int __tc__write_zip_uncompressed_file_data( + void* cookie, struct gmio_zip_data_descriptor* dd) +{ + struct __tc__func_write_file_data_cookie* fcookie = + (struct __tc__func_write_file_data_cookie*)cookie; + gmio_stream_write_bytes(fcookie->stream, fcookie->data, fcookie->data_len); + dd->crc32 = fcookie->data_crc32; + dd->uncompressed_size = fcookie->data_len; + dd->compressed_size = fcookie->data_len; + return GMIO_ERROR_OK; +} + +static const char* __tc__zip_compare_entry( + const struct gmio_zip_file_entry* lhs, + const struct gmio_zip_file_entry* rhs) +{ + UTEST_COMPARE_UINT(lhs->compress_method, rhs->compress_method); + UTEST_COMPARE_UINT(lhs->feature_version, rhs->feature_version); + UTEST_COMPARE_UINT(lhs->filename_len, rhs->filename_len); + UTEST_ASSERT(strncmp(lhs->filename, rhs->filename, lhs->filename_len) == 0); + return NULL; +} + +static const char* test_internal__zip_utils() +{ + static const unsigned bytes_size = 1024; + uint8_t* bytes = calloc(bytes_size, 1); + struct gmio_rw_buffer wbuff = gmio_rw_buffer(bytes, bytes_size, 0); + struct gmio_stream stream = gmio_stream_buffer(&wbuff); + int error; + + /* Write empty ZIP file */ + { + struct gmio_zip_end_of_central_directory_record eocdr = {0}; + gmio_zip_write_end_of_central_directory_record(&stream, &eocdr, &error); + UTEST_COMPARE_INT(error, GMIO_ERROR_OK); +#if 1 + __tc__write_file("test_output_empty.zip", wbuff.ptr, wbuff.pos); +#endif + } + + /* Write empty Zip64 file */ + wbuff.pos = 0; + { + struct gmio_zip64_end_of_central_directory_record eocdr64 = {0}; + eocdr64.version_needed_to_extract = + GMIO_ZIP_FEATURE_VERSION_FILE_ZIP64_FORMAT_EXTENSIONS; + gmio_zip64_write_end_of_central_directory_record( + &stream, &eocdr64, &error); + UTEST_COMPARE_INT(error, GMIO_ERROR_OK); + + struct gmio_zip64_end_of_central_directory_locator eocdl64 = {0}; + gmio_zip64_write_end_of_central_directory_locator( + &stream, &eocdl64, &error); + UTEST_COMPARE_INT(error, GMIO_ERROR_OK); + + struct gmio_zip_end_of_central_directory_record eocdr = {0}; + gmio_zip_write_end_of_central_directory_record(&stream, &eocdr, &error); + UTEST_COMPARE_INT(error, GMIO_ERROR_OK); +#if 1 + __tc__write_file("test_output_empty_64.zip", wbuff.ptr, wbuff.pos); +#endif + } + + /* Common constants */ + static const char zip_entry_filedata[] = + "On ne fait bien que ce qu'on fait soi-même"; + struct __tc__func_write_file_data_cookie fcookie = {0}; + fcookie.stream = &stream; + fcookie.data = (const uint8_t*)zip_entry_filedata; + fcookie.data_len = GMIO_ARRAY_SIZE(zip_entry_filedata) - 1; + fcookie.data_crc32 = gmio_zlib_crc32(fcookie.data, fcookie.data_len); + static const char zip_entry_filename[] = "file.txt"; + static const uint16_t zip_entry_filename_len = + GMIO_ARRAY_SIZE(zip_entry_filename) - 1; + + /* Common variables */ + struct gmio_zip_file_entry entry = {0}; + entry.compress_method = GMIO_ZIP_COMPRESS_METHOD_NO_COMPRESSION; + entry.feature_version = GMIO_ZIP_FEATURE_VERSION_DEFAULT; + entry.filename = zip_entry_filename; + entry.filename_len = zip_entry_filename_len; + entry.cookie_func_write_file_data = &fcookie; + entry.func_write_file_data = __tc__write_zip_uncompressed_file_data; + + /* + * Write one-entry ZIP file + */ + { + wbuff.pos = 0; + entry.feature_version = GMIO_ZIP_FEATURE_VERSION_DEFAULT; + UTEST_ASSERT(gmio_zip_write_single_file(&stream, &entry, &error)); + UTEST_COMPARE_UINT(error, GMIO_ERROR_OK); +#if 1 + __tc__write_file("test_output_one_file.zip", wbuff.ptr, wbuff.pos); +#endif + + const uintmax_t zip_archive_len = wbuff.pos; + wbuff.pos = 0; + /* -- Read ZIP local file header */ + struct gmio_zip_local_file_header zip_lfh = {0}; + const size_t lfh_read_len = + gmio_zip_read_local_file_header(&stream, &zip_lfh, &error); + UTEST_COMPARE_INT(error, GMIO_ERROR_OK); + struct gmio_zip_file_entry lfh_entry = {0}; + lfh_entry.compress_method = zip_lfh.compress_method; + lfh_entry.feature_version = zip_lfh.version_needed_to_extract; + lfh_entry.filename = (const char*)wbuff.ptr + wbuff.pos; + lfh_entry.filename_len = zip_lfh.filename_len; + const char* check_str = __tc__zip_compare_entry(&entry, &lfh_entry); + if (check_str != NULL) return check_str; + /* -- Read ZIP end of central directory record */ + wbuff.pos = + zip_archive_len - GMIO_ZIP_SIZE_END_OF_CENTRAL_DIRECTORY_RECORD; + struct gmio_zip_end_of_central_directory_record zip_eocdr = {0}; + gmio_zip_read_end_of_central_directory_record( + &stream, &zip_eocdr, &error); + UTEST_COMPARE_INT(error, GMIO_ERROR_OK); + UTEST_COMPARE_UINT(zip_eocdr.entry_count, 1); + /* -- Read ZIP central directory */ + wbuff.pos = zip_eocdr.central_dir_offset; + struct gmio_zip_central_directory_header zip_cdh = {0}; + gmio_zip_read_central_directory_header(&stream, &zip_cdh, &error); + struct gmio_zip_file_entry cdh_entry = {0}; + cdh_entry.compress_method = zip_cdh.compress_method; + cdh_entry.feature_version = zip_cdh.version_needed_to_extract; + cdh_entry.filename = (const char*)wbuff.ptr + wbuff.pos; + cdh_entry.filename_len = zip_lfh.filename_len; + UTEST_COMPARE_INT(error, GMIO_ERROR_OK); + UTEST_ASSERT((zip_cdh.general_purpose_flags & + GMIO_ZIP_GENERAL_PURPOSE_FLAG_USE_DATA_DESCRIPTOR) + != 0); + UTEST_COMPARE_UINT(fcookie.data_crc32, zip_cdh.crc32); + UTEST_COMPARE_UINT(fcookie.data_len, zip_cdh.uncompressed_size); + UTEST_COMPARE_UINT(fcookie.data_len, zip_cdh.compressed_size); + UTEST_COMPARE_UINT(zip_cdh.local_header_offset, 0); + check_str = __tc__zip_compare_entry(&entry, &cdh_entry); + if (check_str != NULL) return check_str; + /* -- Read file data */ + const size_t pos_file_data = + lfh_read_len + zip_lfh.filename_len + zip_lfh.extrafield_len; + UTEST_ASSERT(strncmp((const char*)wbuff.ptr + pos_file_data, + (const char*)fcookie.data, + fcookie.data_len) + == 0); + /* -- Read ZIP data descriptor */ + wbuff.pos = pos_file_data + zip_cdh.compressed_size; + struct gmio_zip_data_descriptor zip_dd = {0}; + gmio_zip_read_data_descriptor(&stream, &zip_dd, &error); + UTEST_COMPARE_INT(error, GMIO_ERROR_OK); + UTEST_COMPARE_UINT(zip_dd.crc32, zip_cdh.crc32); + UTEST_COMPARE_UINT(zip_dd.compressed_size, zip_cdh.compressed_size); + UTEST_COMPARE_UINT(zip_dd.uncompressed_size, zip_cdh.uncompressed_size); + } + + /* + * Write one-entry Zip64 file + */ + { + wbuff.pos = 0; + entry.feature_version = + GMIO_ZIP_FEATURE_VERSION_FILE_ZIP64_FORMAT_EXTENSIONS; + UTEST_ASSERT(gmio_zip_write_single_file(&stream, &entry, &error)); + UTEST_COMPARE_UINT(error, GMIO_ERROR_OK); +#if 1 + __tc__write_file("test_output_one_file_64.zip", wbuff.ptr, wbuff.pos); +#endif + + const uintmax_t zip_archive_len = wbuff.pos; + /* -- Read ZIP end of central directory record */ + wbuff.pos = + zip_archive_len - GMIO_ZIP_SIZE_END_OF_CENTRAL_DIRECTORY_RECORD; + struct gmio_zip_end_of_central_directory_record zip_eocdr = {0}; + gmio_zip_read_end_of_central_directory_record( + &stream, &zip_eocdr, &error); + UTEST_COMPARE_INT(GMIO_ERROR_OK, error); + UTEST_COMPARE_UINT(UINT16_MAX, zip_eocdr.entry_count); + UTEST_COMPARE_UINT(UINT32_MAX, zip_eocdr.central_dir_size); + UTEST_COMPARE_UINT(UINT32_MAX, zip_eocdr.central_dir_offset); + /* -- Read Zip64 end of central directory locator */ + wbuff.pos = + zip_archive_len + - GMIO_ZIP_SIZE_END_OF_CENTRAL_DIRECTORY_RECORD + - GMIO_ZIP64_SIZE_END_OF_CENTRAL_DIRECTORY_LOCATOR; + struct gmio_zip64_end_of_central_directory_locator zip64_eocdl = {0}; + gmio_zip64_read_end_of_central_directory_locator( + &stream, &zip64_eocdl, &error); + UTEST_COMPARE_INT(GMIO_ERROR_OK, error); + /* -- Read Zip64 end of central directory record */ + wbuff.pos = zip64_eocdl.zip64_end_of_central_dir_offset; + struct gmio_zip64_end_of_central_directory_record zip64_eocdr = {0}; + gmio_zip64_read_end_of_central_directory_record( + &stream, &zip64_eocdr, &error); + UTEST_COMPARE_INT(GMIO_ERROR_OK, error); + UTEST_COMPARE_UINT( + GMIO_ZIP_FEATURE_VERSION_FILE_ZIP64_FORMAT_EXTENSIONS, + zip64_eocdr.version_needed_to_extract); + UTEST_COMPARE_UINT(1, zip64_eocdr.entry_count); + /* -- Read ZIP central directory header */ + wbuff.pos = zip64_eocdr.central_dir_offset; + struct gmio_zip_central_directory_header zip_cdh = {0}; + size_t zip_cdh_len = + gmio_zip_read_central_directory_header(&stream, &zip_cdh, &error); + zip_cdh_len += + zip_cdh.filename_len + + zip_cdh.extrafield_len + + zip_cdh.filecomment_len; + UTEST_COMPARE_INT(GMIO_ERROR_OK, error); + UTEST_COMPARE_UINT(zip64_eocdr.central_dir_size, zip_cdh_len); + UTEST_ASSERT((zip_cdh.general_purpose_flags & + GMIO_ZIP_GENERAL_PURPOSE_FLAG_USE_DATA_DESCRIPTOR) + != 0); + UTEST_COMPARE_UINT(fcookie.data_crc32, zip_cdh.crc32); + UTEST_COMPARE_UINT(UINT32_MAX, zip_cdh.uncompressed_size); + UTEST_COMPARE_UINT(UINT32_MAX, zip_cdh.compressed_size); + UTEST_COMPARE_UINT(UINT32_MAX, zip_cdh.local_header_offset); + struct gmio_zip_file_entry cdh_entry = {0}; + cdh_entry.compress_method = zip_cdh.compress_method; + cdh_entry.feature_version = zip_cdh.version_needed_to_extract; + cdh_entry.filename = (const char*)wbuff.ptr + wbuff.pos; + cdh_entry.filename_len = zip_cdh.filename_len; + const char* check_str = __tc__zip_compare_entry(&entry, &cdh_entry); + if (check_str != NULL) return check_str; + /* Read Zip64 extra field */ + wbuff.pos = + zip64_eocdr.central_dir_offset + + GMIO_ZIP_SIZE_CENTRAL_DIRECTORY_HEADER + + zip_cdh.filename_len; + struct gmio_zip64_extrafield zip64_extra = {0}; + gmio_zip64_read_extrafield(&stream, &zip64_extra, &error); + UTEST_COMPARE_INT(GMIO_ERROR_OK, error); + UTEST_COMPARE_UINT(fcookie.data_len, zip64_extra.uncompressed_size); + UTEST_COMPARE_UINT(fcookie.data_len, zip64_extra.compressed_size); + UTEST_COMPARE_UINT(0, zip64_extra.local_header_offset); + /* Read ZIP local file header */ + wbuff.pos = 0; + struct gmio_zip_local_file_header zip_lfh = {0}; + gmio_zip_read_local_file_header(&stream, &zip_lfh, &error); + UTEST_COMPARE_INT(GMIO_ERROR_OK, error); + UTEST_COMPARE_INT(0, zip_lfh.crc32); + UTEST_COMPARE_INT(0, zip_lfh.compressed_size); + UTEST_COMPARE_INT(0, zip_lfh.uncompressed_size); + /* Read ZIP local file header extrafield */ + wbuff.pos = GMIO_ZIP_SIZE_LOCAL_FILE_HEADER + zip_lfh.filename_len; + gmio_zip64_read_extrafield(&stream, &zip64_extra, &error); + UTEST_COMPARE_INT(GMIO_ERROR_OK, error); + UTEST_COMPARE_UINT(0, zip64_extra.uncompressed_size); + UTEST_COMPARE_UINT(0, zip64_extra.compressed_size); + UTEST_COMPARE_UINT(0, zip64_extra.local_header_offset); + /* Read Zip64 data descriptor */ + wbuff.pos += fcookie.data_len; + struct gmio_zip_data_descriptor zip_dd = {0}; + gmio_zip64_read_data_descriptor(&stream, &zip_dd, &error); + UTEST_COMPARE_INT(GMIO_ERROR_OK, error); + UTEST_COMPARE_UINT(fcookie.data_crc32, zip_dd.crc32); + UTEST_COMPARE_UINT(fcookie.data_len, zip_dd.uncompressed_size); + UTEST_COMPARE_UINT(fcookie.data_len, zip_dd.compressed_size); + } + + free(bytes); + return NULL; +} From abb7bafc4af036cc7727d057700bb4334e719b52 Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Tue, 17 Jan 2017 18:42:36 +0100 Subject: [PATCH 46/81] gmio_core: fix zip64 corrupted output --- src/gmio_core/internal/zip_utils.c | 99 ++++++---- src/gmio_core/internal/zip_utils.h | 42 ++++- tests/main_test_core.c | 1 + tests/test_amf_io.c | 220 ++++++---------------- tests/test_core_internal.c | 284 +++++++++++++++++++++++++++++ 5 files changed, 432 insertions(+), 214 deletions(-) diff --git a/src/gmio_core/internal/zip_utils.c b/src/gmio_core/internal/zip_utils.c index 47b17be..87c0f63 100644 --- a/src/gmio_core/internal/zip_utils.c +++ b/src/gmio_core/internal/zip_utils.c @@ -38,15 +38,8 @@ * Constants * ---------- */ -enum { - GMIO_ZIP_SIZE_LOCAL_FILE_HEADER = 4 + 5*2 + 3*4 + 2*2, - GMIO_ZIP_SIZE_CENTRAL_DIRECTORY_HEADER = 4 + 6*2 + 3*4 + 5*2 +2*4, - GMIO_ZIP_SIZE_DATA_DESCRIPTOR = 4 + 4 + 4 + 4, - GMIO_ZIP64_SIZE_DATA_DESCRIPTOR = 4 + 4 + 2*8, - GMIO_ZIP64_SIZE_END_OF_CENTRAL_DIRECTORY_RECORD = 4 + 8 + 2*2 + 2*4 + 4*8, - GMIO_ZIP64_SIZE_END_OF_CENTRAL_DIRECTORY_LOCATOR = 4 + 4 + 8 + 4, - GMIO_ZIP_SIZE_END_OF_CENTRAL_DIRECTORY_RECORD = 4 + 4*2 + 2*4 + 2 -}; +static const uint16_t zip64_extrablock_tag = 0x0001; +static const uint16_t zip64_extrablock_size = 3*8 + 4; /* ---------- * Internal functions @@ -238,7 +231,7 @@ size_t gmio_zip_read_central_directory_header( gmio_adv_decode_uint16_le(&buff); /* disk_nb_start */ info->internal_file_attrs = gmio_adv_decode_uint16_le(&buff); info->external_file_attrs = gmio_adv_decode_uint32_le(&buff); - info->relative_offset_local_header = gmio_adv_decode_uint32_le(&buff); + info->local_header_offset = gmio_adv_decode_uint32_le(&buff); info->filename = NULL; info->extrafield = NULL; @@ -247,6 +240,36 @@ size_t gmio_zip_read_central_directory_header( return gmio_zip_io_returnerr(read_len, GMIO_ERROR_OK, ptr_error); } +size_t gmio_zip64_read_extrafield( + struct gmio_stream *stream, + struct gmio_zip64_extrafield *info, + int *ptr_error) +{ +#ifdef GMIO_HAVE_INT64_TYPE + uint8_t bytes[GMIO_ZIP64_SIZE_EXTRAFIELD]; + const uint8_t* buff = bytes; + size_t read_len = 0; + if (!gmio_zip_readcheckbytes(stream, bytes, sizeof(bytes), &read_len, ptr_error)) + return read_len; + if (gmio_adv_decode_uint16_le(&buff) != zip64_extrablock_tag) { + return gmio_zip_io_returnerr( + read_len, GMIO_ZIP_UTILS_ERROR_BAD_EXTRAFIELD_TAG, ptr_error); + } + if (gmio_adv_decode_uint16_le(&buff) != zip64_extrablock_size) { + return gmio_zip_io_returnerr( + read_len, GMIO_ZIP_UTILS_ERROR_BAD_EXTRAFIELD_SIZE, ptr_error); + } + info->uncompressed_size = gmio_adv_decode_uint64_le(&buff); + info->compressed_size = gmio_adv_decode_uint64_le(&buff); + info->local_header_offset = gmio_adv_decode_uint64_le(&buff); + gmio_adv_decode_uint32_le(&buff); /* Disk start number */ + return gmio_zip_io_returnerr(read_len, GMIO_ERROR_OK, ptr_error); +#else + return gmio_zip_io_returnerr( + 0, GMIO_ERROR_ZIP_INT64_TYPE_REQUIRED, ptr_error); +#endif +} + size_t gmio_zip64_read_end_of_central_directory_record( struct gmio_stream *stream, struct gmio_zip64_end_of_central_directory_record *info, @@ -269,7 +292,7 @@ size_t gmio_zip64_read_end_of_central_directory_record( gmio_adv_decode_uint64_le(&buff); /* total_entry_count_in_central_dir_on_disk */ info->entry_count = gmio_adv_decode_uint64_le(&buff); info->central_dir_size = gmio_adv_decode_uint64_le(&buff); - info->start_offset = gmio_adv_decode_uint64_le(&buff); + info->central_dir_offset = gmio_adv_decode_uint64_le(&buff); return gmio_zip_io_returnerr(read_len, GMIO_ERROR_OK, ptr_error); #else return gmio_zip_io_returnerr( @@ -293,7 +316,7 @@ size_t gmio_zip64_read_end_of_central_directory_locator( /* Number of the disk with the start of the zip64 end of central directory */ gmio_adv_decode_uint32_le(&buff); /* Relative offset of the zip64 end of central directory record */ - info->relative_offset = gmio_adv_decode_uint64_le(&buff); + info->zip64_end_of_central_dir_offset = gmio_adv_decode_uint64_le(&buff); /* Total number of disks */ gmio_adv_decode_uint32_le(&buff); return gmio_zip_io_returnerr(read_len, GMIO_ERROR_OK, ptr_error); @@ -320,7 +343,7 @@ size_t gmio_zip_read_end_of_central_directory_record( gmio_adv_decode_uint16_le(&buff); /* total_entry_count_in_central_dir_on_disk */ info->entry_count = gmio_adv_decode_uint16_le(&buff); info->central_dir_size = gmio_adv_decode_uint32_le(&buff); - info->start_offset = gmio_adv_decode_uint32_le(&buff); + info->central_dir_offset = gmio_adv_decode_uint32_le(&buff); info->filecomment_len = gmio_adv_decode_uint16_le(&buff); info->filecomment = NULL; return gmio_zip_io_returnerr(read_len, GMIO_ERROR_OK, ptr_error); @@ -437,9 +460,9 @@ size_t gmio_zip_write_central_directory_header( gmio_adv_encode_uint16_le(0, &buff); /* Disk number start */ gmio_adv_encode_uint16_le(info->internal_file_attrs, &buff); gmio_adv_encode_uint32_le(info->external_file_attrs, &buff); - const uint32_t relative_offset_local_header = - info->use_zip64 ? UINT32_MAX : info->relative_offset_local_header; - gmio_adv_encode_uint32_le(relative_offset_local_header, &buff); + const uint32_t local_header_offset = + info->use_zip64 ? UINT32_MAX : info->local_header_offset; + gmio_adv_encode_uint32_le(local_header_offset, &buff); /* Write to stream */ const size_t expected_written_len = @@ -469,13 +492,11 @@ size_t gmio_zip64_write_extrafield( 0, GMIO_ERROR_INVALID_MEMBLOCK_SIZE, ptr_error); } #ifdef GMIO_HAVE_INT64_TYPE - static const uint16_t extrablock_tag = 0x0001; - static const uint16_t extrablock_size = 3*8 + 4; - gmio_adv_encode_uint16_le(extrablock_tag, &buff); - gmio_adv_encode_uint16_le(extrablock_size, &buff); + gmio_adv_encode_uint16_le(zip64_extrablock_tag, &buff); + gmio_adv_encode_uint16_le(zip64_extrablock_size, &buff); gmio_adv_encode_uint64_le(info->uncompressed_size, &buff); gmio_adv_encode_uint64_le(info->compressed_size, &buff); - gmio_adv_encode_uint64_le(info->relative_offset_local_header, &buff); + gmio_adv_encode_uint64_le(info->local_header_offset, &buff); gmio_adv_encode_uint32_le(0, &buff); /* Disk start number */ return gmio_zip_io_returnerr( GMIO_ZIP64_SIZE_EXTRAFIELD, GMIO_ERROR_OK, ptr_error); @@ -505,7 +526,7 @@ size_t gmio_zip64_write_end_of_central_directory_record( gmio_adv_encode_uint64_le(disk_entry_count, &buff); gmio_adv_encode_uint64_le(info->entry_count, &buff); gmio_adv_encode_uint64_le(info->central_dir_size, &buff); - gmio_adv_encode_uint64_le(info->start_offset, &buff); + gmio_adv_encode_uint64_le(info->central_dir_offset, &buff); /* Note: don't write any PKWARE reserved "zip64 extensible data sector" /* Write to stream */ const size_t expected_written_len = sizeof(bytes); @@ -531,7 +552,7 @@ size_t gmio_zip64_write_end_of_central_directory_locator( const uint32_t disk_count = 1; gmio_adv_encode_uint32_le(0x07064b50, &buff); gmio_adv_encode_uint32_le(disk_nb, &buff); - gmio_adv_encode_uint64_le(info->relative_offset, &buff); + gmio_adv_encode_uint64_le(info->zip64_end_of_central_dir_offset, &buff); gmio_adv_encode_uint32_le(disk_count, &buff); /* Write to stream */ const size_t expected_written_len = sizeof(bytes); @@ -573,9 +594,9 @@ size_t gmio_zip_write_end_of_central_directory_record( info->use_zip64 ? UINT32_MAX : info->central_dir_size; gmio_adv_encode_uint32_le(central_dir_size, &buff); - const uint32_t start_offset = - info->use_zip64 ? UINT32_MAX : info->start_offset; - gmio_adv_encode_uint32_le(start_offset, &buff); + const uint32_t central_dir_offset = + info->use_zip64 ? UINT32_MAX : info->central_dir_offset; + gmio_adv_encode_uint32_le(central_dir_offset, &buff); gmio_adv_encode_uint16_le(info->filecomment_len, &buff); @@ -606,18 +627,20 @@ bool gmio_zip_write_single_file( file_entry->feature_version >= GMIO_ZIP_FEATURE_VERSION_FILE_ZIP64_FORMAT_EXTENSIONS; uint8_t extrafield[GMIO_ZIP64_SIZE_EXTRAFIELD]; - size_t zip_write_pos = 0; + uintmax_t zip_write_pos = 0; /* Write local file header */ struct gmio_zip_local_file_header lfh = {0}; + lfh.version_needed_to_extract = file_entry->feature_version; lfh.general_purpose_flags = GMIO_ZIP_GENERAL_PURPOSE_FLAG_USE_DATA_DESCRIPTOR; lfh.compress_method = file_entry->compress_method; lfh.filename = file_entry->filename; lfh.filename_len = file_entry->filename_len; if (use_zip64_format_extensions) { + lfh.compressed_size = UINT32_MAX; + lfh.uncompressed_size = UINT32_MAX; const struct gmio_zip64_extrafield zip64extra = {0}; - zip_write_pos += - gmio_zip64_write_extrafield( + gmio_zip64_write_extrafield( extrafield, sizeof(extrafield), &zip64extra, ptr_error); if (gmio_error(*ptr_error)) return false; @@ -653,7 +676,7 @@ bool gmio_zip_write_single_file( return false; /* Write central directory header */ - const uintmax_t pos_start_central_dir = zip_write_pos; + const uintmax_t pos_central_dir = zip_write_pos; struct gmio_zip_central_directory_header cdh = {0}; cdh.use_zip64 = needs_zip64; cdh.version_needed_to_extract = version_needed; @@ -668,30 +691,28 @@ bool gmio_zip_write_single_file( struct gmio_zip64_extrafield zip64extra = {0}; zip64extra.compressed_size = dd.compressed_size; zip64extra.uncompressed_size = dd.uncompressed_size; - zip64extra.relative_offset_local_header = 0; - zip_write_pos += - gmio_zip64_write_extrafield( + gmio_zip64_write_extrafield( extrafield, sizeof(extrafield), &zip64extra, ptr_error); if (gmio_error(*ptr_error)) return false; cdh.extrafield = extrafield; cdh.extrafield_len = sizeof(extrafield); } - const uintmax_t central_dir_startpos = zip_write_pos; + const uintmax_t central_dir_pos = zip_write_pos; const size_t central_dir_size = gmio_zip_write_central_directory_header(stream, &cdh, ptr_error); zip_write_pos += central_dir_size; if (gmio_error(*ptr_error)) return false; - const uintmax_t pos_end_central_dir = zip_write_pos; if (needs_zip64) { /* Write Zip64 end of central directory record */ + const uintmax_t pos_zip64_end_of_central_dir = zip_write_pos; struct gmio_zip64_end_of_central_directory_record eocdr64 = {0}; eocdr64.version_needed_to_extract = version_needed; eocdr64.entry_count = 1; - eocdr64.central_dir_size = pos_end_central_dir - pos_start_central_dir; - eocdr64.start_offset = pos_start_central_dir; + eocdr64.central_dir_size = central_dir_size; + eocdr64.central_dir_offset = pos_central_dir; zip_write_pos += gmio_zip64_write_end_of_central_directory_record( stream, &eocdr64, ptr_error); @@ -700,7 +721,7 @@ bool gmio_zip_write_single_file( /* Write Zip64 end of central directory locator */ struct gmio_zip64_end_of_central_directory_locator eocdl64 = {0}; - eocdl64.relative_offset = pos_end_central_dir; + eocdl64.zip64_end_of_central_dir_offset = pos_zip64_end_of_central_dir; zip_write_pos += gmio_zip64_write_end_of_central_directory_locator( stream, &eocdl64, ptr_error); @@ -713,7 +734,7 @@ bool gmio_zip_write_single_file( eocdr.use_zip64 = needs_zip64; eocdr.entry_count = 1; eocdr.central_dir_size = (uint32_t)central_dir_size; - eocdr.start_offset = (uint32_t)central_dir_startpos; + eocdr.central_dir_offset = (uint32_t)central_dir_pos; zip_write_pos += gmio_zip_write_end_of_central_directory_record( stream, &eocdr, ptr_error); diff --git a/src/gmio_core/internal/zip_utils.h b/src/gmio_core/internal/zip_utils.h index aaa1525..27e2ba0 100644 --- a/src/gmio_core/internal/zip_utils.h +++ b/src/gmio_core/internal/zip_utils.h @@ -192,26 +192,35 @@ struct gmio_zip_central_directory_header { uint16_t filecomment_len; uint16_t internal_file_attrs; uint32_t external_file_attrs; - uint32_t relative_offset_local_header; + uint32_t local_header_offset; const char* filename; const uint8_t* extrafield; const char* filecomment; }; -enum { GMIO_ZIP64_SIZE_EXTRAFIELD = 2*2 + 3*8 + 4 }; +enum { + GMIO_ZIP_SIZE_LOCAL_FILE_HEADER = 4 + 5*2 + 3*4 + 2*2, + GMIO_ZIP_SIZE_CENTRAL_DIRECTORY_HEADER = 4 + 6*2 + 3*4 + 5*2 +2*4, + GMIO_ZIP_SIZE_DATA_DESCRIPTOR = 4 + 4 + 4 + 4, + GMIO_ZIP64_SIZE_EXTRAFIELD = 2*2 + 3*8 + 4, + GMIO_ZIP64_SIZE_DATA_DESCRIPTOR = 4 + 4 + 2*8, + GMIO_ZIP64_SIZE_END_OF_CENTRAL_DIRECTORY_RECORD = 4 + 8 + 2*2 + 2*4 + 4*8, + GMIO_ZIP64_SIZE_END_OF_CENTRAL_DIRECTORY_LOCATOR = 4 + 4 + 8 + 4, + GMIO_ZIP_SIZE_END_OF_CENTRAL_DIRECTORY_RECORD = 4 + 4*2 + 2*4 + 2 +}; /*! Zip64 extended info (extra field) */ struct gmio_zip64_extrafield { uintmax_t compressed_size; uintmax_t uncompressed_size; - uintmax_t relative_offset_local_header; + uintmax_t local_header_offset; }; struct gmio_zip_end_of_central_directory_record { bool use_zip64; uint16_t entry_count; uint32_t central_dir_size; - uint32_t start_offset; + uint32_t central_dir_offset; uint16_t filecomment_len; const char* filecomment; }; @@ -219,20 +228,26 @@ struct gmio_zip_end_of_central_directory_record { struct gmio_zip64_end_of_central_directory_record { uint16_t version_made_by; enum gmio_zip_feature_version version_needed_to_extract; - uintmax_t entry_count; /* should be 64b */ - uintmax_t central_dir_size; /* should be 64b */ - uintmax_t start_offset; /* should be 64b */ + uintmax_t entry_count; /* should be 64b */ + uintmax_t central_dir_size; /* should be 64b */ + uintmax_t central_dir_offset; /* should be 64b */ }; struct gmio_zip64_end_of_central_directory_locator { - uintmax_t relative_offset; /* should be 64b */ + uintmax_t zip64_end_of_central_dir_offset; /* should be 64b */ }; enum { GMIO_ZIP_UTILS_ERROR_TAG = 0x00100000 }; enum gmio_zip_utils_error { - GMIO_ZIP_UTILS_ERROR_BAD_MAGIC = GMIO_ZIP_UTILS_ERROR_TAG + 1 + GMIO_ZIP_UTILS_ERROR_BAD_MAGIC = GMIO_ZIP_UTILS_ERROR_TAG + 1, + GMIO_ZIP_UTILS_ERROR_BAD_EXTRAFIELD_TAG, + GMIO_ZIP_UTILS_ERROR_BAD_EXTRAFIELD_SIZE }; +/* + * ZIP read functions + */ + size_t gmio_zip_read_local_file_header( struct gmio_stream* stream, struct gmio_zip_local_file_header* info, @@ -253,6 +268,11 @@ size_t gmio_zip_read_central_directory_header( struct gmio_zip_central_directory_header* info, int* ptr_error); +size_t gmio_zip64_read_extrafield( + struct gmio_stream* stream, + struct gmio_zip64_extrafield* info, + int* ptr_error); + size_t gmio_zip64_read_end_of_central_directory_record( struct gmio_stream* stream, struct gmio_zip64_end_of_central_directory_record* info, @@ -268,6 +288,10 @@ size_t gmio_zip_read_end_of_central_directory_record( struct gmio_zip_end_of_central_directory_record* info, int* ptr_error); +/* + * ZIP write functions + */ + size_t gmio_zip_write_local_file_header( struct gmio_stream* stream, const struct gmio_zip_local_file_header* info, diff --git a/tests/main_test_core.c b/tests/main_test_core.c index aa6bb30..31f3a0d 100644 --- a/tests/main_test_core.c +++ b/tests/main_test_core.c @@ -56,6 +56,7 @@ const char* all_tests() UTEST_RUN(test_internal__stringstream); UTEST_RUN(test_internal__string_ascii_utils); UTEST_RUN(test_internal__benchmark_gmio_fast_atof); + UTEST_RUN(test_internal__zip_utils); return NULL; } diff --git a/tests/test_amf_io.c b/tests/test_amf_io.c index cf7122b..7da98e4 100644 --- a/tests/test_amf_io.c +++ b/tests/test_amf_io.c @@ -256,7 +256,6 @@ static int __tamf__write_amf( return gmio_amf_write(&stream, doc, opts); } - static const char* test_amf_write_doc_1_plaintext() { static const size_t wbuffsize = 8192; @@ -282,27 +281,6 @@ static const char* test_amf_write_doc_1_plaintext() static const char zip_entry_filename[] = "test.amf"; static const uint16_t zip_entry_filename_len = sizeof(zip_entry_filename) - 1; -static const char* __tamf__check_zip_local_file_header( - const struct gmio_zip_local_file_header* zip_lfh) -{ - UTEST_COMPARE_UINT( - zip_lfh->compress_method, - GMIO_ZIP_COMPRESS_METHOD_DEFLATE); - UTEST_ASSERT( - (zip_lfh->general_purpose_flags & - GMIO_ZIP_GENERAL_PURPOSE_FLAG_USE_DATA_DESCRIPTOR) - != 0); - UTEST_COMPARE_UINT( - zip_lfh->filename_len, - zip_entry_filename_len); - UTEST_ASSERT(strncmp( - zip_lfh->filename, - zip_entry_filename, - zip_entry_filename_len) - == 0); - return NULL; -} - static const char* test_amf_write_doc_1_zip() { static const size_t wbuffsize = 8192; @@ -319,10 +297,10 @@ static const char* test_amf_write_doc_1_zip() UTEST_COMPARE_INT(error, GMIO_ERROR_OK); } - const size_t source_len = wbuff.pos; - const uint32_t crc32_amf_data = gmio_zlib_crc32(wbuff.ptr, source_len); - uint8_t* source = calloc(source_len, 1); - memcpy(source, wbuff.ptr, source_len); + const size_t amf_data_len = wbuff.pos; + const uint32_t crc32_amf_data = gmio_zlib_crc32(wbuff.ptr, amf_data_len); + uint8_t* amf_data = calloc(amf_data_len, 1); + memcpy(amf_data, wbuff.ptr, amf_data_len); { /* Write compressed(ZIP) */ wbuff.pos = 0; @@ -347,79 +325,45 @@ static const char* test_amf_write_doc_1_zip() wbuff.pos = 0; struct gmio_stream stream = gmio_stream_buffer(&wbuff); int error = GMIO_ERROR_OK; - /* -- Read ZIP local file header */ + /* -- Read ZIP end of central directory record */ + wbuff.pos = + zip_archive_len - GMIO_ZIP_SIZE_END_OF_CENTRAL_DIRECTORY_RECORD; + struct gmio_zip_end_of_central_directory_record zip_eocdr = {0}; + gmio_zip_read_end_of_central_directory_record(&stream, &zip_eocdr, &error); + UTEST_COMPARE_INT(GMIO_ERROR_OK, error); + /* -- Read ZIP central directory */ + wbuff.pos = zip_eocdr.central_dir_offset; + struct gmio_zip_central_directory_header zip_cdh = {0}; + gmio_zip_read_central_directory_header(&stream, &zip_cdh, &error); + UTEST_COMPARE_INT(GMIO_ERROR_OK, error); + UTEST_COMPARE_UINT(amf_data_len, zip_cdh.uncompressed_size); + const uint32_t amf_zdata_len = zip_cdh.compressed_size; + /* -- Read(skip) ZIP local file header */ + wbuff.pos = 0; struct gmio_zip_local_file_header zip_lfh = {0}; const size_t lfh_read_len = gmio_zip_read_local_file_header(&stream, &zip_lfh, &error); - UTEST_COMPARE_INT(error, GMIO_ERROR_OK); - zip_lfh.filename = (const char*)wbuff.ptr + wbuff.pos; - const char* check_str = __tamf__check_zip_local_file_header(&zip_lfh); - if (check_str != NULL) - return check_str; - /* -- Read ZIP end of central directory record */ - static const size_t end_of_central_dir_record_len = 22; - wbuff.pos = zip_archive_len - end_of_central_dir_record_len;; - struct gmio_zip_end_of_central_directory_record zip_eocdr = {0}; - gmio_zip_read_end_of_central_directory_record( - &stream, &zip_eocdr, &error); - UTEST_COMPARE_INT(error, GMIO_ERROR_OK); - UTEST_COMPARE_UINT(zip_eocdr.entry_count, 1); - /* -- Read ZIP central directory */ - wbuff.pos = zip_eocdr.start_offset; - struct gmio_zip_central_directory_header zip_cdh = {0}; - gmio_zip_read_central_directory_header(&stream, &zip_cdh, &error); - UTEST_COMPARE_INT(error, GMIO_ERROR_OK); - UTEST_COMPARE_UINT( - zip_cdh.compress_method, - GMIO_ZIP_COMPRESS_METHOD_DEFLATE); - UTEST_ASSERT( - (zip_cdh.general_purpose_flags & - GMIO_ZIP_GENERAL_PURPOSE_FLAG_USE_DATA_DESCRIPTOR) - != 0); - UTEST_COMPARE_UINT(crc32_amf_data, zip_cdh.crc32); - UTEST_COMPARE_UINT( - zip_cdh.filename_len, zip_entry_filename_len); - UTEST_ASSERT(strncmp( - (const char*)wbuff.ptr + wbuff.pos, - zip_entry_filename, - zip_entry_filename_len) - == 0); - /* -- Read compressed AMF data */ - const size_t pos_start_amf_data = - lfh_read_len + zip_lfh.filename_len + zip_lfh.extrafield_len; - wbuff.pos = pos_start_amf_data; + UTEST_COMPARE_INT(GMIO_ERROR_OK, error); + /* -- Read and check compressed AMF data */ + wbuff.pos = lfh_read_len + zip_lfh.filename_len + zip_lfh.extrafield_len; { - uint8_t* dest = calloc(zip_cdh.uncompressed_size, 1); - size_t dest_len = zip_cdh.uncompressed_size; - const int error = - gmio_zlib_uncompress_buffer( - dest, - &dest_len, - (const uint8_t*)wbuff.ptr + wbuff.pos, - zip_cdh.compressed_size); + uint8_t* dest = calloc(amf_data_len, 1); + size_t dest_len = amf_data_len; + const uint8_t* amf_zdata = (const uint8_t*)wbuff.ptr + wbuff.pos; + const int error = gmio_zlib_uncompress_buffer( + dest, &dest_len, amf_zdata, amf_zdata_len); printf("\n-- Info: z_len=%i src_len=%i\n", - zip_cdh.compressed_size, source_len); - UTEST_COMPARE_INT(error, GMIO_ERROR_OK); - UTEST_COMPARE_UINT(source_len, dest_len); - UTEST_COMPARE_UINT(dest_len, zip_cdh.uncompressed_size); - UTEST_COMPARE_INT(memcmp(dest, source, source_len), 0); + amf_zdata_len, amf_data_len); + UTEST_COMPARE_INT(GMIO_ERROR_OK, error); + UTEST_COMPARE_UINT(dest_len, amf_data_len); + UTEST_COMPARE_INT(memcmp(dest, amf_data, amf_data_len), 0); const uint32_t crc32_uncomp = gmio_zlib_crc32(dest, dest_len); UTEST_COMPARE_UINT(crc32_amf_data, crc32_uncomp); free(dest); } - /* -- Read ZIP data descriptor */ - wbuff.pos = pos_start_amf_data + zip_cdh.compressed_size; - struct gmio_zip_data_descriptor zip_dd = {0}; - gmio_zip_read_data_descriptor(&stream, &zip_dd, &error); - UTEST_COMPARE_INT(error, GMIO_ERROR_OK); - UTEST_COMPARE_UINT(zip_dd.crc32, crc32_amf_data); - UTEST_COMPARE_UINT( - zip_dd.compressed_size, zip_cdh.compressed_size); - UTEST_COMPARE_UINT( - zip_dd.uncompressed_size, zip_cdh.uncompressed_size); } - free(source); + free(amf_data); free(wbuff.ptr); return NULL; } @@ -440,13 +384,8 @@ static const char* test_amf_write_doc_1_zip64() UTEST_COMPARE_INT(error, GMIO_ERROR_OK); } - const size_t source_len = wbuff.pos; - const uint32_t crc32_amf_data = gmio_zlib_crc32(wbuff.ptr, source_len); - uint8_t* source = calloc(source_len, 1); - memcpy(source, wbuff.ptr, source_len); + const uintmax_t amf_data_len = wbuff.pos; - static const char zip_entry_filename[] = "test.amf"; - static const uint16_t zip_entry_filename_len = sizeof(zip_entry_filename) - 1; { /* Write compressed(Zip64) */ wbuff.pos = 0; struct gmio_amf_write_options options = {0}; @@ -471,83 +410,32 @@ static const char* test_amf_write_doc_1_zip64() wbuff.pos = 0; struct gmio_stream stream = gmio_stream_buffer(&wbuff); int error = GMIO_ERROR_OK; - /* -- Read ZIP local file header */ - struct gmio_zip_local_file_header zip_lfh = {0}; - const size_t lfh_read_len = - gmio_zip_read_local_file_header(&stream, &zip_lfh, &error); - UTEST_COMPARE_INT(error, GMIO_ERROR_OK); - zip_lfh.filename = (const char*)wbuff.ptr + wbuff.pos; - const char* check_str = __tamf__check_zip_local_file_header(&zip_lfh); - if (check_str != NULL) - return check_str; - /* -- Read ZIP end of central directory record */ - static const size_t end_of_central_dir_record_len = 22; - wbuff.pos = zip_archive_len - end_of_central_dir_record_len;; - struct gmio_zip_end_of_central_directory_record zip_eocdr = {0}; - gmio_zip_read_end_of_central_directory_record( - &stream, &zip_eocdr, &error); - UTEST_COMPARE_INT(error, GMIO_ERROR_OK); - UTEST_COMPARE_UINT(zip_eocdr.entry_count, 0xFFFF); - UTEST_COMPARE_UINT(zip_eocdr.central_dir_size, 0xFFFFFFFF); - UTEST_COMPARE_UINT(zip_eocdr.start_offset, 0xFFFFFFFF); -#if 0 + /* -- Read Zip64 end of central directory record */ + wbuff.pos = + zip_archive_len + - GMIO_ZIP_SIZE_END_OF_CENTRAL_DIRECTORY_RECORD + - GMIO_ZIP64_SIZE_END_OF_CENTRAL_DIRECTORY_LOCATOR + - GMIO_ZIP64_SIZE_END_OF_CENTRAL_DIRECTORY_RECORD; + struct gmio_zip64_end_of_central_directory_record zip64_eocdr = {0}; + gmio_zip64_read_end_of_central_directory_record( + &stream, &zip64_eocdr, &error); + UTEST_COMPARE_INT(GMIO_ERROR_OK, error); /* -- Read ZIP central directory */ - wbuff.pos = zip_eocdr.start_offset_central_dir_from_disk_start_nb; + wbuff.pos = zip64_eocdr.central_dir_offset; struct gmio_zip_central_directory_header zip_cdh = {0}; gmio_zip_read_central_directory_header(&stream, &zip_cdh, &error); - UTEST_COMPARE_INT(error, GMIO_ERROR_OK); - UTEST_COMPARE_UINT( - zip_cdh.compress_method, - GMIO_ZIP_COMPRESS_METHOD_DEFLATE); - UTEST_ASSERT( - (zip_cdh.general_purpose_flags & - GMIO_ZIP_GENERAL_PURPOSE_FLAG_USE_DATA_DESCRIPTOR) - != 0); - UTEST_COMPARE_UINT(crc32_amf_data, zip_cdh.crc32); - UTEST_COMPARE_UINT( - zip_cdh.filename_len, zip_entry_filename_len); - UTEST_ASSERT(strncmp( - (const char*)wbuff.ptr + wbuff.pos, - zip_entry_filename, - zip_entry_filename_len) - == 0); - /* -- Read compressed AMF data */ - const size_t pos_start_amf_data = - lfh_read_len + zip_lfh.filename_len + zip_lfh.extrafield_len; - wbuff.pos = pos_start_amf_data; - { - uint8_t* dest = calloc(zip_cdh.uncompressed_size, 1); - size_t dest_len = zip_cdh.uncompressed_size; - const int error = - gmio_zlib_uncompress_buffer( - dest, - &dest_len, - (const uint8_t*)wbuff.ptr + wbuff.pos, - zip_cdh.compressed_size); - printf("\n-- Info: z_len=%i src_len=%i\n", - zip_cdh.compressed_size, source_len); - UTEST_COMPARE_INT(error, GMIO_ERROR_OK); - UTEST_COMPARE_UINT(source_len, dest_len); - UTEST_COMPARE_UINT(dest_len, zip_cdh.uncompressed_size); - UTEST_COMPARE_INT(memcmp(dest, source, source_len), 0); - const uint32_t crc32_uncomp = gmio_zlib_crc32(dest, dest_len); - UTEST_COMPARE_UINT(crc32_amf_data, crc32_uncomp); - free(dest); - } - /* -- Read ZIP data descriptor */ - wbuff.pos = pos_start_amf_data + zip_cdh.compressed_size; - struct gmio_zip_data_descriptor zip_dd = {0}; - gmio_zip64_read_data_descriptor(&stream, &zip_dd, &error); - UTEST_COMPARE_INT(error, GMIO_ERROR_OK); - UTEST_COMPARE_UINT(zip_dd.crc32, crc32_amf_data); - UTEST_COMPARE_UINT( - zip_dd.compressed_size, zip_cdh.compressed_size); - UTEST_COMPARE_UINT( - zip_dd.uncompressed_size, zip_cdh.uncompressed_size); -#endif + UTEST_COMPARE_INT(GMIO_ERROR_OK, error); + /* -- Read ZIP central directory Zip64 extrafield*/ + wbuff.pos = + zip64_eocdr.central_dir_offset + + GMIO_ZIP_SIZE_CENTRAL_DIRECTORY_HEADER + + zip_cdh.filename_len; + struct gmio_zip64_extrafield zip64_extra = {0}; + gmio_zip64_read_extrafield(&stream, &zip64_extra, &error); + UTEST_COMPARE_INT(GMIO_ERROR_OK, error); + UTEST_COMPARE_UINT(amf_data_len, zip64_extra.uncompressed_size); } - free(source); free(wbuff.ptr); return NULL; } diff --git a/tests/test_core_internal.c b/tests/test_core_internal.c index 28d5c20..2c2b5a1 100644 --- a/tests/test_core_internal.c +++ b/tests/test_core_internal.c @@ -37,6 +37,7 @@ #include "../src/gmio_core/internal/convert.h" #include "../src/gmio_core/internal/error_check.h" #include "../src/gmio_core/internal/fast_atof.h" +#include "../src/gmio_core/internal/helper_stream.h" #include "../src/gmio_core/internal/locale_utils.h" #include "../src/gmio_core/internal/numeric_utils.h" #include "../src/gmio_core/internal/ostringstream.h" @@ -44,6 +45,8 @@ #include "../src/gmio_core/internal/stringstream.h" #include "../src/gmio_core/internal/stringstream_fast_atof.h" #include "../src/gmio_core/internal/string_ascii_utils.h" +#include "../src/gmio_core/internal/zip_utils.h" +#include "../src/gmio_core/internal/zlib_utils.h" #include #include @@ -531,3 +534,284 @@ static const char* test_internal__error_check() return NULL; } + +static void __tc__write_file(const char* filepath, uint8_t* bytes, size_t len) +{ + FILE* file = fopen(filepath, "wb"); + fwrite(bytes, 1, len, file); + fclose(file); +} + +struct __tc__func_write_file_data_cookie { + struct gmio_stream* stream; + const uint8_t* data; + const uint8_t* zdata; + uint32_t data_crc32; + size_t data_len; + size_t zdata_len; +}; + +static int __tc__write_zip_file_data( + void* cookie, struct gmio_zip_data_descriptor* dd) +{ + struct __tc__func_write_file_data_cookie* fcookie = + (struct __tc__func_write_file_data_cookie*)cookie; + gmio_stream_write_bytes(fcookie->stream, fcookie->zdata, fcookie->zdata_len); + dd->crc32 = fcookie->data_crc32; + dd->uncompressed_size = fcookie->data_len; + dd->compressed_size = fcookie->zdata_len; + return GMIO_ERROR_OK; +} + +static const char* __tc__zip_compare_entry( + const struct gmio_zip_file_entry* lhs, + const struct gmio_zip_file_entry* rhs) +{ + UTEST_COMPARE_UINT(lhs->compress_method, rhs->compress_method); + UTEST_COMPARE_UINT(lhs->feature_version, rhs->feature_version); + UTEST_COMPARE_UINT(lhs->filename_len, rhs->filename_len); + UTEST_ASSERT(strncmp(lhs->filename, rhs->filename, lhs->filename_len) == 0); + return NULL; +} + +static const char* test_internal__zip_utils() +{ + static const unsigned bytes_size = 1024; + uint8_t* bytes = calloc(bytes_size, 1); + struct gmio_rw_buffer wbuff = gmio_rw_buffer(bytes, bytes_size, 0); + struct gmio_stream stream = gmio_stream_buffer(&wbuff); + int error; + + /* Write empty ZIP file */ + { + struct gmio_zip_end_of_central_directory_record eocdr = {0}; + gmio_zip_write_end_of_central_directory_record(&stream, &eocdr, &error); + UTEST_COMPARE_INT(error, GMIO_ERROR_OK); +#if 1 + __tc__write_file("test_output_empty.zip", wbuff.ptr, wbuff.pos); +#endif + } + + /* Write empty Zip64 file */ + wbuff.pos = 0; + { + struct gmio_zip64_end_of_central_directory_record eocdr64 = {0}; + eocdr64.version_needed_to_extract = + GMIO_ZIP_FEATURE_VERSION_FILE_ZIP64_FORMAT_EXTENSIONS; + gmio_zip64_write_end_of_central_directory_record( + &stream, &eocdr64, &error); + UTEST_COMPARE_INT(error, GMIO_ERROR_OK); + + struct gmio_zip64_end_of_central_directory_locator eocdl64 = {0}; + gmio_zip64_write_end_of_central_directory_locator( + &stream, &eocdl64, &error); + UTEST_COMPARE_INT(error, GMIO_ERROR_OK); + + struct gmio_zip_end_of_central_directory_record eocdr = {0}; + gmio_zip_write_end_of_central_directory_record(&stream, &eocdr, &error); + UTEST_COMPARE_INT(error, GMIO_ERROR_OK); +#if 1 + __tc__write_file("test_output_empty_64.zip", wbuff.ptr, wbuff.pos); +#endif + } + + /* Common constants */ + static const char zip_entry_filedata[] = + "On ne fait bien que ce qu'on fait soi-même"; + struct __tc__func_write_file_data_cookie fcookie = {0}; + fcookie.stream = &stream; + fcookie.data = (const uint8_t*)zip_entry_filedata; + fcookie.zdata = fcookie.data; /* No compression */ + fcookie.data_len = GMIO_ARRAY_SIZE(zip_entry_filedata) - 1; + fcookie.zdata_len = fcookie.data_len; /* No compression */ + fcookie.data_crc32 = gmio_zlib_crc32(fcookie.data, fcookie.data_len); + static const char zip_entry_filename[] = "file.txt"; + static const uint16_t zip_entry_filename_len = + GMIO_ARRAY_SIZE(zip_entry_filename) - 1; + + /* Common variables */ + struct gmio_zip_file_entry entry = {0}; + entry.compress_method = GMIO_ZIP_COMPRESS_METHOD_NO_COMPRESSION; + entry.feature_version = GMIO_ZIP_FEATURE_VERSION_DEFAULT; + entry.filename = zip_entry_filename; + entry.filename_len = zip_entry_filename_len; + entry.cookie_func_write_file_data = &fcookie; + entry.func_write_file_data = __tc__write_zip_file_data; + + /* + * Write one-entry ZIP file + */ + { + wbuff.pos = 0; + entry.feature_version = GMIO_ZIP_FEATURE_VERSION_DEFAULT; + UTEST_ASSERT(gmio_zip_write_single_file(&stream, &entry, &error)); + UTEST_COMPARE_UINT(error, GMIO_ERROR_OK); +#if 1 + __tc__write_file("test_output_one_file.zip", wbuff.ptr, wbuff.pos); +#endif + + const uintmax_t zip_archive_len = wbuff.pos; + wbuff.pos = 0; + /* -- Read ZIP local file header */ + struct gmio_zip_local_file_header zip_lfh = {0}; + const size_t lfh_read_len = + gmio_zip_read_local_file_header(&stream, &zip_lfh, &error); + UTEST_COMPARE_INT(error, GMIO_ERROR_OK); + struct gmio_zip_file_entry lfh_entry = {0}; + lfh_entry.compress_method = zip_lfh.compress_method; + lfh_entry.feature_version = zip_lfh.version_needed_to_extract; + lfh_entry.filename = (const char*)wbuff.ptr + wbuff.pos; + lfh_entry.filename_len = zip_lfh.filename_len; + const char* check_str = __tc__zip_compare_entry(&entry, &lfh_entry); + if (check_str != NULL) return check_str; + /* -- Read ZIP end of central directory record */ + wbuff.pos = + zip_archive_len - GMIO_ZIP_SIZE_END_OF_CENTRAL_DIRECTORY_RECORD; + struct gmio_zip_end_of_central_directory_record zip_eocdr = {0}; + gmio_zip_read_end_of_central_directory_record( + &stream, &zip_eocdr, &error); + UTEST_COMPARE_INT(error, GMIO_ERROR_OK); + UTEST_COMPARE_UINT(zip_eocdr.entry_count, 1); + /* -- Read ZIP central directory */ + wbuff.pos = zip_eocdr.central_dir_offset; + struct gmio_zip_central_directory_header zip_cdh = {0}; + gmio_zip_read_central_directory_header(&stream, &zip_cdh, &error); + struct gmio_zip_file_entry cdh_entry = {0}; + cdh_entry.compress_method = zip_cdh.compress_method; + cdh_entry.feature_version = zip_cdh.version_needed_to_extract; + cdh_entry.filename = (const char*)wbuff.ptr + wbuff.pos; + cdh_entry.filename_len = zip_lfh.filename_len; + UTEST_COMPARE_INT(error, GMIO_ERROR_OK); + UTEST_ASSERT((zip_cdh.general_purpose_flags & + GMIO_ZIP_GENERAL_PURPOSE_FLAG_USE_DATA_DESCRIPTOR) + != 0); + UTEST_COMPARE_UINT(fcookie.data_crc32, zip_cdh.crc32); + UTEST_COMPARE_UINT(fcookie.data_len, zip_cdh.uncompressed_size); + UTEST_COMPARE_UINT(fcookie.zdata_len, zip_cdh.compressed_size); + UTEST_COMPARE_UINT(zip_cdh.local_header_offset, 0); + check_str = __tc__zip_compare_entry(&entry, &cdh_entry); + if (check_str != NULL) return check_str; + /* -- Read file data */ + const size_t pos_file_data = + lfh_read_len + zip_lfh.filename_len + zip_lfh.extrafield_len; + UTEST_ASSERT(strncmp((const char*)wbuff.ptr + pos_file_data, + (const char*)fcookie.zdata, + fcookie.zdata_len) + == 0); + /* -- Read ZIP data descriptor */ + wbuff.pos = pos_file_data + zip_cdh.compressed_size; + struct gmio_zip_data_descriptor zip_dd = {0}; + gmio_zip_read_data_descriptor(&stream, &zip_dd, &error); + UTEST_COMPARE_INT(error, GMIO_ERROR_OK); + UTEST_COMPARE_UINT(zip_dd.crc32, zip_cdh.crc32); + UTEST_COMPARE_UINT(zip_dd.compressed_size, zip_cdh.compressed_size); + UTEST_COMPARE_UINT(zip_dd.uncompressed_size, zip_cdh.uncompressed_size); + } + + /* + * Write one-entry Zip64 file + */ + { + wbuff.pos = 0; + entry.feature_version = + GMIO_ZIP_FEATURE_VERSION_FILE_ZIP64_FORMAT_EXTENSIONS; + UTEST_ASSERT(gmio_zip_write_single_file(&stream, &entry, &error)); + UTEST_COMPARE_UINT(error, GMIO_ERROR_OK); +#if 1 + __tc__write_file("test_output_one_file_64.zip", wbuff.ptr, wbuff.pos); +#endif + + const uintmax_t zip_archive_len = wbuff.pos; + /* -- Read ZIP end of central directory record */ + wbuff.pos = + zip_archive_len - GMIO_ZIP_SIZE_END_OF_CENTRAL_DIRECTORY_RECORD; + struct gmio_zip_end_of_central_directory_record zip_eocdr = {0}; + gmio_zip_read_end_of_central_directory_record( + &stream, &zip_eocdr, &error); + UTEST_COMPARE_INT(GMIO_ERROR_OK, error); + UTEST_COMPARE_UINT(UINT16_MAX, zip_eocdr.entry_count); + UTEST_COMPARE_UINT(UINT32_MAX, zip_eocdr.central_dir_size); + UTEST_COMPARE_UINT(UINT32_MAX, zip_eocdr.central_dir_offset); + /* -- Read Zip64 end of central directory locator */ + wbuff.pos = + zip_archive_len + - GMIO_ZIP_SIZE_END_OF_CENTRAL_DIRECTORY_RECORD + - GMIO_ZIP64_SIZE_END_OF_CENTRAL_DIRECTORY_LOCATOR; + struct gmio_zip64_end_of_central_directory_locator zip64_eocdl = {0}; + gmio_zip64_read_end_of_central_directory_locator( + &stream, &zip64_eocdl, &error); + UTEST_COMPARE_INT(GMIO_ERROR_OK, error); + /* -- Read Zip64 end of central directory record */ + wbuff.pos = zip64_eocdl.zip64_end_of_central_dir_offset; + struct gmio_zip64_end_of_central_directory_record zip64_eocdr = {0}; + gmio_zip64_read_end_of_central_directory_record( + &stream, &zip64_eocdr, &error); + UTEST_COMPARE_INT(GMIO_ERROR_OK, error); + UTEST_COMPARE_UINT( + GMIO_ZIP_FEATURE_VERSION_FILE_ZIP64_FORMAT_EXTENSIONS, + zip64_eocdr.version_needed_to_extract); + UTEST_COMPARE_UINT(1, zip64_eocdr.entry_count); + /* -- Read ZIP central directory header */ + wbuff.pos = zip64_eocdr.central_dir_offset; + struct gmio_zip_central_directory_header zip_cdh = {0}; + size_t zip_cdh_len = + gmio_zip_read_central_directory_header(&stream, &zip_cdh, &error); + zip_cdh_len += + zip_cdh.filename_len + + zip_cdh.extrafield_len + + zip_cdh.filecomment_len; + UTEST_COMPARE_INT(GMIO_ERROR_OK, error); + UTEST_COMPARE_UINT(zip64_eocdr.central_dir_size, zip_cdh_len); + UTEST_ASSERT((zip_cdh.general_purpose_flags & + GMIO_ZIP_GENERAL_PURPOSE_FLAG_USE_DATA_DESCRIPTOR) + != 0); + UTEST_COMPARE_UINT(fcookie.data_crc32, zip_cdh.crc32); + UTEST_COMPARE_UINT(UINT32_MAX, zip_cdh.uncompressed_size); + UTEST_COMPARE_UINT(UINT32_MAX, zip_cdh.compressed_size); + UTEST_COMPARE_UINT(UINT32_MAX, zip_cdh.local_header_offset); + struct gmio_zip_file_entry cdh_entry = {0}; + cdh_entry.compress_method = zip_cdh.compress_method; + cdh_entry.feature_version = zip_cdh.version_needed_to_extract; + cdh_entry.filename = (const char*)wbuff.ptr + wbuff.pos; + cdh_entry.filename_len = zip_cdh.filename_len; + const char* check_str = __tc__zip_compare_entry(&entry, &cdh_entry); + if (check_str != NULL) return check_str; + /* Read Zip64 extra field */ + wbuff.pos = + zip64_eocdr.central_dir_offset + + GMIO_ZIP_SIZE_CENTRAL_DIRECTORY_HEADER + + zip_cdh.filename_len; + struct gmio_zip64_extrafield zip64_extra = {0}; + gmio_zip64_read_extrafield(&stream, &zip64_extra, &error); + UTEST_COMPARE_INT(GMIO_ERROR_OK, error); + UTEST_COMPARE_UINT(fcookie.data_len, zip64_extra.uncompressed_size); + UTEST_COMPARE_UINT(fcookie.zdata_len, zip64_extra.compressed_size); + UTEST_COMPARE_UINT(0, zip64_extra.local_header_offset); + /* Read ZIP local file header */ + wbuff.pos = 0; + struct gmio_zip_local_file_header zip_lfh = {0}; + gmio_zip_read_local_file_header(&stream, &zip_lfh, &error); + UTEST_COMPARE_INT(GMIO_ERROR_OK, error); + UTEST_COMPARE_INT(0, zip_lfh.crc32); + UTEST_COMPARE_INT(0, zip_lfh.compressed_size); + UTEST_COMPARE_INT(0, zip_lfh.uncompressed_size); + /* Read ZIP local file header extrafield */ + wbuff.pos = GMIO_ZIP_SIZE_LOCAL_FILE_HEADER + zip_lfh.filename_len; + gmio_zip64_read_extrafield(&stream, &zip64_extra, &error); + UTEST_COMPARE_INT(GMIO_ERROR_OK, error); + UTEST_COMPARE_UINT(0, zip64_extra.uncompressed_size); + UTEST_COMPARE_UINT(0, zip64_extra.compressed_size); + UTEST_COMPARE_UINT(0, zip64_extra.local_header_offset); + /* Read Zip64 data descriptor */ + wbuff.pos += fcookie.zdata_len; + struct gmio_zip_data_descriptor zip_dd = {0}; + gmio_zip64_read_data_descriptor(&stream, &zip_dd, &error); + UTEST_COMPARE_INT(GMIO_ERROR_OK, error); + UTEST_COMPARE_UINT(fcookie.data_crc32, zip_dd.crc32); + UTEST_COMPARE_UINT(fcookie.data_len, zip_dd.uncompressed_size); + UTEST_COMPARE_UINT(fcookie.zdata_len, zip_dd.compressed_size); + } + + free(bytes); + return NULL; +} From bd1600a10daeb96a872b656cc1da5693116554ce Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Thu, 19 Jan 2017 17:26:42 +0100 Subject: [PATCH 47/81] gmio_amf: rename some ZIP fields in gmio_amf_write_options --- src/gmio_amf/amf_io.c | 14 +++++++------- src/gmio_amf/amf_io_options.h | 16 +++++++++++++--- tests/test_amf_io.c | 6 +++--- 3 files changed, 23 insertions(+), 13 deletions(-) diff --git a/src/gmio_amf/amf_io.c b/src/gmio_amf/amf_io.c index 54188d4..26b1a29 100644 --- a/src/gmio_amf/amf_io.c +++ b/src/gmio_amf/amf_io.c @@ -725,7 +725,7 @@ static size_t gmio_amf_ostringstream_write( struct gmio_amf_wcontext* context = (struct gmio_amf_wcontext*)cookie; size_t len_written = 0; if (gmio_no_error(context->error)) { - if (context->options->compress) { + if (context->options->create_zip_archive) { len_written = gmio_amf_ostringstream_write_zlib(context, stream, ptr, len); } @@ -833,13 +833,13 @@ static int gmio_amf_write_file_data( return context->error; if (!gmio_amf_write_root_constellations(context)) return context->error; - if (context->options->compress) { + if (context->options->create_zip_archive) { gmio_ostringstream_flush(sstream); context->z_flush = Z_FINISH; } gmio_ostringstream_write_chararray(sstream, "\n"); gmio_ostringstream_flush(sstream); - if (context->options->compress && dd != NULL) { + if (context->options->create_zip_archive && dd != NULL) { dd->crc32 = context->z_crc32; dd->uncompressed_size = context->z_uncompressed_size; dd->compressed_size = context->z_compressed_size; @@ -887,7 +887,7 @@ int gmio_amf_write( context.f64_format.precision = opts->float64_prec != 0 ? opts->float64_prec : 16; - if (opts->compress) { + if (opts->create_zip_archive) { /* Initialize internal zlib stream for compression */ const size_t mblock_halfsize = memblock->size / 2; context.sstream.strbuff.capacity = mblock_halfsize; @@ -907,7 +907,7 @@ int gmio_amf_write( struct gmio_zip_file_entry file_entry = {0}; file_entry.compress_method = GMIO_ZIP_COMPRESS_METHOD_DEFLATE; file_entry.feature_version = - opts->force_zip64_format ? + !opts->dont_use_zip64_extensions ? GMIO_ZIP_FEATURE_VERSION_FILE_ZIP64_FORMAT_EXTENSIONS : GMIO_ZIP_FEATURE_VERSION_FILE_COMPRESSED_DEFLATE; const struct gmio_zip_entry_filename zip_entry_filename = @@ -923,7 +923,7 @@ int gmio_amf_write( } label_end: - if (opts->compress) + if (opts->create_zip_archive) deflateEnd(&context.z_stream); gmio_memblock_helper_release(&mblock_helper); return context.error; @@ -934,7 +934,7 @@ int gmio_amf_write_file( const struct gmio_amf_document* doc, const struct gmio_amf_write_options* opts) { - const bool compress = opts != NULL ? opts->compress : false; + const bool compress = opts != NULL ? opts->create_zip_archive : false; FILE* file = fopen(filepath, compress ? "wb" : "w"); if (file != NULL) { /* TODO: if opts->zip_entry_filename is empty then try to take the diff --git a/src/gmio_amf/amf_io_options.h b/src/gmio_amf/amf_io_options.h index 15146bf..dc2c1f0 100644 --- a/src/gmio_amf/amf_io_options.h +++ b/src/gmio_amf/amf_io_options.h @@ -78,11 +78,21 @@ struct gmio_amf_write_options /* ZIP/Deflate compression */ - bool compress; - struct gmio_zlib_compress_options z_compress_options; + /*! Flag to write AMF geometry in a ZIP archive containing one file entry. + * Options below have no effect if create_zip_archive==false */ + bool create_zip_archive; + + /*! Filename of the single AMF entry within the ZIP archive */ const char* zip_entry_filename; + + /*! Filename length of the single AMF entry within the ZIP archive */ uint16_t zip_entry_filename_len; - bool force_zip64_format; + + /*! Flag to disable use of the Zip64 format extensions */ + bool dont_use_zip64_extensions; + + /*! Options for the deflate(zlib) compression */ + struct gmio_zlib_compress_options z_compress_options; }; #endif /* GMIO_AMF_IO_OPTIONS_H */ diff --git a/tests/test_amf_io.c b/tests/test_amf_io.c index 7da98e4..02a2156 100644 --- a/tests/test_amf_io.c +++ b/tests/test_amf_io.c @@ -306,9 +306,10 @@ static const char* test_amf_write_doc_1_zip() wbuff.pos = 0; struct gmio_amf_write_options options = {0}; options.float64_prec = 9; - options.compress = true; + options.create_zip_archive = true; options.zip_entry_filename = zip_entry_filename; options.zip_entry_filename_len = zip_entry_filename_len; + options.dont_use_zip64_extensions = true; const int error = __tamf__write_amf(&wbuff, &doc, &options); UTEST_COMPARE_INT(error, GMIO_ERROR_OK); #if 1 @@ -390,10 +391,9 @@ static const char* test_amf_write_doc_1_zip64() wbuff.pos = 0; struct gmio_amf_write_options options = {0}; options.float64_prec = 9; - options.compress = true; + options.create_zip_archive = true; options.zip_entry_filename = zip_entry_filename; options.zip_entry_filename_len = zip_entry_filename_len; - options.force_zip64_format = true; const int error = __tamf__write_amf(&wbuff, &doc, &options); UTEST_COMPARE_INT(error, GMIO_ERROR_OK); #if 1 From 4f319710be5b8dc73dfb0ba3b245134382acbe4e Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Thu, 19 Jan 2017 17:49:11 +0100 Subject: [PATCH 48/81] gmio_core: test zlib enum values --- src/gmio_core/zlib_compress.h | 2 -- tests/main_test_core.c | 1 + tests/test_core_internal.c | 16 ++++++++++++++++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/gmio_core/zlib_compress.h b/src/gmio_core/zlib_compress.h index ad937c1..882dcb5 100644 --- a/src/gmio_core/zlib_compress.h +++ b/src/gmio_core/zlib_compress.h @@ -39,7 +39,6 @@ #include "global.h" -/* TODO: check enum values in unit tests*/ /*! zlib compression level, specific values */ enum gmio_zlib_compress_level { @@ -49,7 +48,6 @@ enum gmio_zlib_compress_level GMIO_ZLIB_COMPRESS_LEVEL_BEST_SIZE = 9 /*! -> Z_BEST_COMPRESSION */ }; -/* TODO: check enum values in unit tests*/ /*! zlib compression strategy */ enum gmio_zlib_compress_strategy { diff --git a/tests/main_test_core.c b/tests/main_test_core.c index 31f3a0d..8561fe0 100644 --- a/tests/main_test_core.c +++ b/tests/main_test_core.c @@ -57,6 +57,7 @@ const char* all_tests() UTEST_RUN(test_internal__string_ascii_utils); UTEST_RUN(test_internal__benchmark_gmio_fast_atof); UTEST_RUN(test_internal__zip_utils); + UTEST_RUN(test_internal__zlib_enumvalues); return NULL; } diff --git a/tests/test_core_internal.c b/tests/test_core_internal.c index 2c2b5a1..9f2112f 100644 --- a/tests/test_core_internal.c +++ b/tests/test_core_internal.c @@ -815,3 +815,19 @@ static const char* test_internal__zip_utils() free(bytes); return NULL; } + +static const char* test_internal__zlib_enumvalues() +{ + /* enum gmio_zlib_compress_level */ + UTEST_COMPARE_INT(Z_BEST_SPEED, GMIO_ZLIB_COMPRESS_LEVEL_BEST_SPEED); + UTEST_COMPARE_INT(Z_BEST_COMPRESSION, GMIO_ZLIB_COMPRESS_LEVEL_BEST_SIZE); + UTEST_COMPARE_INT(0, GMIO_ZLIB_COMPRESS_LEVEL_DEFAULT); + UTEST_COMPARE_INT(-1, GMIO_ZLIB_COMPRESS_LEVEL_NONE); + + /* enum gmio_zlib_compress_strategy */ + UTEST_COMPARE_INT(Z_DEFAULT_STRATEGY, GMIO_ZLIB_COMPRESSION_STRATEGY_DEFAULT); + UTEST_COMPARE_INT(Z_FILTERED, GMIO_ZLIB_COMPRESSION_STRATEGY_FILTERED); + UTEST_COMPARE_INT(Z_HUFFMAN_ONLY, GMIO_ZLIB_COMPRESSION_STRATEGY_HUFFMAN_ONLY); + UTEST_COMPARE_INT(Z_RLE, GMIO_ZLIB_COMPRESSION_STRATEGY_RLE); + UTEST_COMPARE_INT(Z_FIXED, GMIO_ZLIB_COMPRESSION_STRATEGY_FIXED); +} From 6897ca12d5e06bfcb1833ed502be1f41e8972f51 Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Thu, 26 Jan 2017 17:23:03 +0100 Subject: [PATCH 49/81] gmio_core: add new internal functions gmio_fileutils_find_basefilename() gmio_const_string_concat() --- src/gmio_core/internal/const_string.c | 48 +++++++++++++++++++ src/gmio_core/internal/const_string.h | 7 +++ src/gmio_core/internal/file_utils.c | 60 ++++++++++++++++++++++++ src/gmio_core/internal/file_utils.h | 40 ++++++++++++++++ tests/main_test_core.c | 2 + tests/test_core_internal.c | 66 +++++++++++++++++++++++++++ 6 files changed, 223 insertions(+) create mode 100644 src/gmio_core/internal/const_string.c create mode 100644 src/gmio_core/internal/file_utils.c create mode 100644 src/gmio_core/internal/file_utils.h diff --git a/src/gmio_core/internal/const_string.c b/src/gmio_core/internal/const_string.c new file mode 100644 index 0000000..5684915 --- /dev/null +++ b/src/gmio_core/internal/const_string.c @@ -0,0 +1,48 @@ +/**************************************************************************** +** Copyright (c) 2016, Fougue Ltd. +** All rights reserved. +** +** Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions +** are met: +** +** 1. Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** +** 2. Redistributions in binary form must reproduce the above +** copyright notice, this list of conditions and the following +** disclaimer in the documentation and/or other materials provided +** with the distribution. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +****************************************************************************/ + +#include "const_string.h" +#include "min_max.h" + +#include + +size_t gmio_const_string_concat( + char* dst, size_t dst_capacity, + const struct gmio_const_string* lhs, + const struct gmio_const_string* rhs) +{ + const size_t capacity_sub_rhs = dst_capacity - rhs->len - 1; + const size_t lhs_copy_len = GMIO_MIN(capacity_sub_rhs, lhs->len); + strncpy(dst, lhs->ptr, lhs_copy_len); + const size_t dst_remaining_cap = dst_capacity - lhs_copy_len; + const size_t rhs_copy_len = GMIO_MIN(dst_remaining_cap, rhs->len); + strncpy(dst + lhs_copy_len, rhs->ptr, rhs_copy_len); + dst[lhs_copy_len + rhs_copy_len] = '\0'; + return lhs_copy_len + rhs_copy_len; +} diff --git a/src/gmio_core/internal/const_string.h b/src/gmio_core/internal/const_string.h index 85014c1..e7e491e 100644 --- a/src/gmio_core/internal/const_string.h +++ b/src/gmio_core/internal/const_string.h @@ -59,6 +59,13 @@ GMIO_INLINE struct gmio_const_string gmio_const_string(const char* ptr, size_t l /*! Returns \c true if \p str has no characters, otherwise returns \c false */ GMIO_INLINE bool gmio_const_string_is_empty(const struct gmio_const_string* str); +/*! Concatenates \p lhs + \p rhs into destination string \p dst and returns + * total string length */ +size_t gmio_const_string_concat( + char* dst, size_t dst_capacity, + const struct gmio_const_string* lhs, + const struct gmio_const_string* rhs); + /* * -- Implementation */ diff --git a/src/gmio_core/internal/file_utils.c b/src/gmio_core/internal/file_utils.c new file mode 100644 index 0000000..6cdfa0e --- /dev/null +++ b/src/gmio_core/internal/file_utils.c @@ -0,0 +1,60 @@ +/**************************************************************************** +** Copyright (c) 2016, Fougue Ltd. +** All rights reserved. +** +** Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions +** are met: +** +** 1. Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** +** 2. Redistributions in binary form must reproduce the above +** copyright notice, this list of conditions and the following +** disclaimer in the documentation and/or other materials provided +** with the distribution. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +****************************************************************************/ + +#include "file_utils.h" + +#include + +struct gmio_const_string gmio_fileutils_find_basefilename(const char* filepath) +{ + struct gmio_const_string basefilename = {0}; + const size_t filepath_len = filepath != NULL ? strlen(filepath) : 0; + if (filepath_len == 0) + return basefilename; + + const char* const pos_filepath_begin = filepath; + const char* const pos_filepath_end = filepath + filepath_len; + const char* pos_last_dot = pos_filepath_end; + const char* it = filepath_len != 0 ? pos_filepath_end - 1 : NULL; + while (it != pos_filepath_begin + && *it != '/' + && *it != '\\') + { + if (*it == '.' && pos_last_dot == pos_filepath_end) + pos_last_dot = it; + --it; + } + it = it != pos_filepath_begin ? it + 1 : it; + basefilename.ptr = it; + basefilename.len = + filepath_len + - (it - pos_filepath_begin) /* complete filename */ + - (pos_filepath_end - pos_last_dot); /* filename suffix */ + return basefilename; +} diff --git a/src/gmio_core/internal/file_utils.h b/src/gmio_core/internal/file_utils.h new file mode 100644 index 0000000..ebebac0 --- /dev/null +++ b/src/gmio_core/internal/file_utils.h @@ -0,0 +1,40 @@ +/**************************************************************************** +** Copyright (c) 2016, Fougue Ltd. +** All rights reserved. +** +** Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions +** are met: +** +** 1. Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** +** 2. Redistributions in binary form must reproduce the above +** copyright notice, this list of conditions and the following +** disclaimer in the documentation and/or other materials provided +** with the distribution. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +****************************************************************************/ + +#ifndef GMIO_INTERNAL_FILE_UTILS_H +#define GMIO_INTERNAL_FILE_UTILS_H + +#include "const_string.h" + +/*! Returns the base name of the file without the path. + * The base name consists of all characters in the file up to (but not including) + * the last '.' character. */ +struct gmio_const_string gmio_fileutils_find_basefilename(const char* filepath); + +#endif /* GMIO_INTERNAL_FILE_UTILS_H */ diff --git a/tests/main_test_core.c b/tests/main_test_core.c index 8561fe0..3bf231b 100644 --- a/tests/main_test_core.c +++ b/tests/main_test_core.c @@ -48,6 +48,7 @@ const char* all_tests() UTEST_RUN(test_internal__byte_swap); UTEST_RUN(test_internal__byte_codec); + UTEST_RUN(test_internal__const_string); UTEST_RUN(test_internal__fast_atof); UTEST_RUN(test_internal__locale_utils); UTEST_RUN(test_internal__error_check); @@ -58,6 +59,7 @@ const char* all_tests() UTEST_RUN(test_internal__benchmark_gmio_fast_atof); UTEST_RUN(test_internal__zip_utils); UTEST_RUN(test_internal__zlib_enumvalues); + UTEST_RUN(test_internal__file_utils); return NULL; } diff --git a/tests/test_core_internal.c b/tests/test_core_internal.c index 9f2112f..11e62be 100644 --- a/tests/test_core_internal.c +++ b/tests/test_core_internal.c @@ -37,6 +37,7 @@ #include "../src/gmio_core/internal/convert.h" #include "../src/gmio_core/internal/error_check.h" #include "../src/gmio_core/internal/fast_atof.h" +#include "../src/gmio_core/internal/file_utils.h" #include "../src/gmio_core/internal/helper_stream.h" #include "../src/gmio_core/internal/locale_utils.h" #include "../src/gmio_core/internal/numeric_utils.h" @@ -106,6 +107,35 @@ static const char* test_internal__byte_codec() return NULL; } +static const char* test_internal__const_string() +{ + char buff[512] = {0}; + struct gmio_const_string lhs = { "file", 4 }; + struct gmio_const_string rhs = { ".txt", 4 }; + UTEST_COMPARE_UINT( + lhs.len + rhs.len, + gmio_const_string_concat(buff, sizeof(buff), &lhs, &rhs)); + UTEST_COMPARE_CSTR("file.txt", buff); + + lhs = gmio_const_string("a", 1); + rhs = gmio_const_string("b", 1); + UTEST_COMPARE_UINT( + lhs.len + rhs.len, + gmio_const_string_concat(buff, sizeof(buff), &lhs, &rhs)); + UTEST_COMPARE_CSTR("ab", buff); + + char small_buff[8] = {0}; + lhs = gmio_const_string("1234567890", 10); + rhs = gmio_const_string("abc", 3); + UTEST_COMPARE_UINT( + sizeof(small_buff)-1, + gmio_const_string_concat( + small_buff, sizeof(small_buff), &lhs, &rhs)); + UTEST_COMPARE_CSTR("1234abc", small_buff); + + return NULL; +} + static void __tc__fprintf_atof_err( const char* func_fast_atof_str, const char* val_str, @@ -830,4 +860,40 @@ static const char* test_internal__zlib_enumvalues() UTEST_COMPARE_INT(Z_HUFFMAN_ONLY, GMIO_ZLIB_COMPRESSION_STRATEGY_HUFFMAN_ONLY); UTEST_COMPARE_INT(Z_RLE, GMIO_ZLIB_COMPRESSION_STRATEGY_RLE); UTEST_COMPARE_INT(Z_FIXED, GMIO_ZLIB_COMPRESSION_STRATEGY_FIXED); + + return NULL; +} + +static const char* test_internal__file_utils() +{ + struct gmio_const_string cstr = {0}; + + cstr = gmio_fileutils_find_basefilename(""); + UTEST_ASSERT(gmio_const_string_is_empty(&cstr)); + + cstr = gmio_fileutils_find_basefilename("file"); + UTEST_ASSERT(strncmp("file", cstr.ptr, cstr.len) == 0); + + cstr = gmio_fileutils_find_basefilename("file.txt"); + UTEST_ASSERT(strncmp("file", cstr.ptr, cstr.len) == 0); + + cstr = gmio_fileutils_find_basefilename("file.txt.zip"); + UTEST_ASSERT(strncmp("file.txt", cstr.ptr, cstr.len) == 0); + + cstr = gmio_fileutils_find_basefilename("/home/me/file.txt"); + UTEST_ASSERT(strncmp("file", cstr.ptr, cstr.len) == 0); + + cstr = gmio_fileutils_find_basefilename("/home/me/file."); + UTEST_ASSERT(strncmp("file", cstr.ptr, cstr.len) == 0); + + cstr = gmio_fileutils_find_basefilename("/home/me/file"); + UTEST_ASSERT(strncmp("file", cstr.ptr, cstr.len) == 0); + + cstr = gmio_fileutils_find_basefilename("/home/me/file for you.txt"); + UTEST_ASSERT(strncmp("file for you", cstr.ptr, cstr.len) == 0); + + cstr = gmio_fileutils_find_basefilename("C:\\Program Files\\gmio\\file.txt"); + UTEST_ASSERT(strncmp("file", cstr.ptr, cstr.len) == 0); + + return NULL; } From 14a7be93a636a070c789c70c28e4a6e45eae25c9 Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Thu, 26 Jan 2017 17:24:54 +0100 Subject: [PATCH 50/81] gmio_amf: auto-define ZIP entry filename from filepath in gmio_amf_write_file() --- src/gmio_amf/amf_io.c | 33 +++++++++++++++++++++++++++------ src/gmio_amf/amf_io_options.h | 20 +++++++------------- tests/main_test_amf.c | 1 + tests/test_amf_io.c | 12 ++++++++++++ 4 files changed, 47 insertions(+), 19 deletions(-) diff --git a/src/gmio_amf/amf_io.c b/src/gmio_amf/amf_io.c index 26b1a29..2051e51 100644 --- a/src/gmio_amf/amf_io.c +++ b/src/gmio_amf/amf_io.c @@ -32,6 +32,7 @@ #include "../gmio_core/error.h" #include "../gmio_core/internal/error_check.h" +#include "../gmio_core/internal/file_utils.h" #include "../gmio_core/internal/float_format_utils.h" #include "../gmio_core/internal/helper_memblock.h" #include "../gmio_core/internal/helper_stream.h" @@ -936,13 +937,33 @@ int gmio_amf_write_file( { const bool compress = opts != NULL ? opts->create_zip_archive : false; FILE* file = fopen(filepath, compress ? "wb" : "w"); + int error = GMIO_ERROR_OK; if (file != NULL) { - /* TODO: if opts->zip_entry_filename is empty then try to take the - * filename part of filepath */ struct gmio_stream stream = gmio_stream_stdio(file); - const int error = gmio_amf_write(&stream, doc, opts); - fclose(file); - return error; + if (compress && opts->zip_entry_filename_len == 0) { + /* opts->zip_entry_filename is empty then try to take the filename + * part of filepath */ + const struct gmio_const_string basefilename = + gmio_fileutils_find_basefilename(filepath); + if (!gmio_const_string_is_empty(&basefilename)) { + char filename[512] = {0}; + const struct gmio_const_string suffix = { ".amf", 4 }; + const size_t filename_len = gmio_const_string_concat( + filename, sizeof(filename), &basefilename, &suffix); + struct gmio_amf_write_options ovr_opts = *opts; + ovr_opts.zip_entry_filename = filename; + ovr_opts.zip_entry_filename_len = (uint16_t)filename_len; + error = gmio_amf_write(&stream, doc, &ovr_opts); + goto label_end; + } + } + error = gmio_amf_write(&stream, doc, opts); } - return GMIO_ERROR_STDIO; + else { + error = GMIO_ERROR_STDIO; + } + +label_end: + fclose(file); + return error; } diff --git a/src/gmio_amf/amf_io_options.h b/src/gmio_amf/amf_io_options.h index dc2c1f0..ebfcd66 100644 --- a/src/gmio_amf/amf_io_options.h +++ b/src/gmio_amf/amf_io_options.h @@ -51,11 +51,9 @@ */ struct gmio_amf_write_options { - /*! Used by the stream to bufferize I/O operations - * + /*! Used by the stream to bufferize I/O operations. * If null, then a temporary memblock is created with the global default * constructor function - * * \sa gmio_memblock_isnull() * \sa gmio_memblock_default() */ struct gmio_memblock stream_memblock; @@ -63,17 +61,13 @@ struct gmio_amf_write_options /*! Optional interface by which the I/O operation can be controlled */ struct gmio_task_iface task_iface; - /*! The format used when writting double values as strings - * - * Defaulted to \c GMIO_FLOAT_TEXT_FORMAT_DECIMAL_LOWERCASE when calling - * gmio_amf_write() with \c options==NULL - */ + /*! The format used when writting double values as strings. + * Defaults to \c GMIO_FLOAT_TEXT_FORMAT_DECIMAL_LOWERCASE when calling + * gmio_amf_write() with \c options==NULL */ enum gmio_float_text_format float64_format; - /*! The maximum number of significant digits when writting double values - * - * Defaulted to \c 16 when calling gmio_amf_write() with \c options==NULL - */ + /*! The maximum number of significant digits when writting \c double values. + * Defaults to \c 16 when calling gmio_amf_write() with \c options==NULL */ uint8_t float64_prec; /* ZIP/Deflate compression */ @@ -91,7 +85,7 @@ struct gmio_amf_write_options /*! Flag to disable use of the Zip64 format extensions */ bool dont_use_zip64_extensions; - /*! Options for the deflate(zlib) compression */ + /*! Options for the zlib(deflate) compression */ struct gmio_zlib_compress_options z_compress_options; }; diff --git a/tests/main_test_amf.c b/tests/main_test_amf.c index 3693789..3ffce5e 100644 --- a/tests/main_test_amf.c +++ b/tests/main_test_amf.c @@ -52,6 +52,7 @@ const char* all_tests() UTEST_RUN(test_amf_write_doc_1_plaintext); UTEST_RUN(test_amf_write_doc_1_zip); UTEST_RUN(test_amf_write_doc_1_zip64); + UTEST_RUN(test_amf_write_doc_1_zip64_file); return NULL; } diff --git a/tests/test_amf_io.c b/tests/test_amf_io.c index 02a2156..59aabc9 100644 --- a/tests/test_amf_io.c +++ b/tests/test_amf_io.c @@ -439,3 +439,15 @@ static const char* test_amf_write_doc_1_zip64() free(wbuff.ptr); return NULL; } + +static const char* test_amf_write_doc_1_zip64_file() +{ + const struct __tamf__document testdoc = __tamf__create_doc_1(); + const struct gmio_amf_document doc = __tamf_create_doc(&testdoc); + struct gmio_amf_write_options options = {0}; + options.float64_prec = 9; + options.create_zip_archive = true; + const int error = gmio_amf_write_file("output_64_file.zip", &doc, &options); + UTEST_COMPARE_INT(error, GMIO_ERROR_OK); + return NULL; +} From e7a36b4a60845594d75c8622e7883c18b7d0fd22 Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Thu, 26 Jan 2017 17:25:05 +0100 Subject: [PATCH 51/81] Minor doc improvements --- src/gmio_core/internal/string.h | 9 +++------ src/gmio_core/internal/zlib_utils.h | 12 +++++------- src/gmio_core/zlib_compress.h | 18 +++++------------- 3 files changed, 13 insertions(+), 26 deletions(-) diff --git a/src/gmio_core/internal/string.h b/src/gmio_core/internal/string.h index 105956f..185bc00 100644 --- a/src/gmio_core/internal/string.h +++ b/src/gmio_core/internal/string.h @@ -34,10 +34,9 @@ #include -/*! Stores a mutable string of 8-bit chars. +/*! Stores a mutable string of chars. * For faster lookups, it knowns the length of its contents. Length must not - * exceeds the maximum size(capacity). - */ + * exceeds the maximum size(capacity). */ struct gmio_string { char* ptr; /*!< Contents */ @@ -103,9 +102,7 @@ char* gmio_cstr_copy( char* dst, size_t dst_capacity, const char* src, size_t src_len) { const size_t copy_len = - dst_capacity > 0 ? - GMIO_MIN(dst_capacity - 1, src_len) : - 0; + dst_capacity > 0 ? GMIO_MIN(dst_capacity - 1, src_len) : 0; if (copy_len > 0) { strncpy(dst, src, copy_len); dst[copy_len] = '\0'; diff --git a/src/gmio_core/internal/zlib_utils.h b/src/gmio_core/internal/zlib_utils.h index 41bb15d..40b142e 100644 --- a/src/gmio_core/internal/zlib_utils.h +++ b/src/gmio_core/internal/zlib_utils.h @@ -47,22 +47,20 @@ bool gmio_check_zlib_compress_options( int* error, const struct gmio_zlib_compress_options* z_opts); /*! Decompresses the source buffer into the destination buffer. - * - * \p sourceLen is the byte length of the source buffer. Upon entry, \p destLen + * \p src_len is the byte length of the source buffer. Upon entry, \p dest_len * is the total size of the destination buffer, which must be large enough to * hold the entire uncompressed data. - * Upon exit, destLen is the actual size of the compressed buffer. - */ + * Upon exit, \p dest_len is the actual size of the compressed buffer. */ int gmio_zlib_uncompress_buffer( uint8_t* dest, size_t* dest_len, const uint8_t* src, size_t src_len); -/*! Computes the CRC-32 value with the bytes buff[0..buff_len-1] */ +/*! Computes the CRC-32 value with the bytes from \p buff */ uint32_t gmio_zlib_crc32(const uint8_t* buff, size_t buff_len); -/*! Returns the required initial value for the gmio_zlib_crc32_update() */ +/*! Returns the required initial value for gmio_zlib_crc32_update() */ uint32_t gmio_zlib_crc32_initial(); -/*! Updates a running CRC-32 with the bytes buff[0..buff_len-1] */ +/*! Updates a running CRC-32 with the bytes from \p buff */ uint32_t gmio_zlib_crc32_update( uint32_t crc, const uint8_t* buff, size_t buff_len); diff --git a/src/gmio_core/zlib_compress.h b/src/gmio_core/zlib_compress.h index 882dcb5..93e7af3 100644 --- a/src/gmio_core/zlib_compress.h +++ b/src/gmio_core/zlib_compress.h @@ -62,21 +62,14 @@ enum gmio_zlib_compress_strategy * * Initialising gmio_zlib_compress_options with \c {0} (or \c {} in C++) is the * convenient way to set default values. - */ +*/ struct gmio_zlib_compress_options { - /*! Compression level - * - * \c 0 : default compression - * \c 1 : best speed - * \c 9 : best compression */ + /*! Compression level. + * Use enum value from \c gmio_zlib_compress_level */ uint8_t level; - /*! Compression strategy - * - * \c 0 : default strategy - * \c 1 : filtered - * \c 9 : best compression */ + /*! Compression strategy */ enum gmio_zlib_compress_strategy strategy; /*! Specifies how much memory should be allocated for the internal @@ -86,8 +79,7 @@ struct gmio_zlib_compress_options * default usage. * * \c 1 uses minimum memory but is slow and reduces compression ratio - * \c 9 uses maximum memory for optimal speed - */ + * \c 9 uses maximum memory for optimal speed */ uint8_t memory_usage; }; From 1b1b2f03eaf46cf768ad8503609248eb8a51d866 Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Thu, 26 Jan 2017 17:42:12 +0100 Subject: [PATCH 52/81] gmio_amf: make z_stream alloc/free functions parametrizable --- src/gmio_amf/amf_io.c | 3 +++ src/gmio_core/zlib_compress.h | 14 ++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/src/gmio_amf/amf_io.c b/src/gmio_amf/amf_io.c index 2051e51..6a0c339 100644 --- a/src/gmio_amf/amf_io.c +++ b/src/gmio_amf/amf_io.c @@ -898,6 +898,9 @@ int gmio_amf_write( mblock_halfsize, NULL); context.z_crc32 = gmio_zlib_crc32_initial(); + context.z_stream.zalloc = opts->z_compress_options.func_alloc; + context.z_stream.zfree = opts->z_compress_options.func_free; + context.z_stream.opaque = opts->z_compress_options.opaque; context.error = gmio_zlib_compress_init( &context.z_stream, &opts->z_compress_options); diff --git a/src/gmio_core/zlib_compress.h b/src/gmio_core/zlib_compress.h index 93e7af3..fe5d292 100644 --- a/src/gmio_core/zlib_compress.h +++ b/src/gmio_core/zlib_compress.h @@ -81,6 +81,20 @@ struct gmio_zlib_compress_options * \c 1 uses minimum memory but is slow and reduces compression ratio * \c 9 uses maximum memory for optimal speed */ uint8_t memory_usage; + + /*! Optional pointer to a function used to allocate the internal state + * within \c z_stream structure. + * \sa z_stream::zalloc */ + void* (*func_alloc)(void* opaque, unsigned int items, unsigned int size); + + /*! Optional pointer to a function used to free the internal state within + * \c z_stream structure. + * \sa z_stream::zfree */ + void (*func_free)(void* opaque, void* address); + + /*! Optional private data object passed to func_alloc and func_free. + * \sa z_stream::opaque */ + void* opaque; }; #endif /* GMIO_ZLIB_COMPRESS_H */ From 70453b15a88d04ed0ac38730823e2a8fb83e0805 Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Thu, 26 Jan 2017 18:05:12 +0100 Subject: [PATCH 53/81] copyright: 2016 -> 2017 --- CMakeLists.txt | 2 +- LICENSE.txt | 2 +- benchmarks/CMakeLists.txt | 2 +- benchmarks/benchmark_assimp/CMakeLists.txt | 2 +- benchmarks/benchmark_assimp/main.cpp | 2 +- benchmarks/benchmark_gmio/CMakeLists.txt | 2 +- benchmarks/benchmark_gmio/main.c | 2 +- benchmarks/benchmark_lib3mf/CMakeLists.txt | 2 +- benchmarks/benchmark_lib3mf/main.cpp | 2 +- benchmarks/benchmark_opencascade/CMakeLists.txt | 2 +- benchmarks/benchmark_opencascade/main.cpp | 2 +- benchmarks/benchmark_other/CMakeLists.txt | 2 +- benchmarks/commons/benchmark_tools.c | 2 +- benchmarks/commons/benchmark_tools.h | 2 +- doc/CMakeLists.txt | 2 +- doc/footer.html | 2 +- examples/CMakeLists.txt | 2 +- src/CMakeLists.txt | 2 +- src/gmio_amf/amf_document.h | 2 +- src/gmio_amf/amf_error.h | 2 +- src/gmio_amf/amf_global.h | 2 +- src/gmio_amf/amf_io.c | 2 +- src/gmio_amf/amf_io.h | 2 +- src/gmio_amf/amf_io_options.h | 2 +- src/gmio_core/config.h.cmake | 2 +- src/gmio_core/endian.c | 2 +- src/gmio_core/endian.h | 2 +- src/gmio_core/error.h | 2 +- src/gmio_core/global.h | 2 +- src/gmio_core/internal/byte_codec.h | 2 +- src/gmio_core/internal/byte_swap.h | 2 +- src/gmio_core/internal/c99_math_compat.h | 2 +- src/gmio_core/internal/c99_stdio_compat.h | 2 +- src/gmio_core/internal/c99_stdlib_compat.h | 2 +- src/gmio_core/internal/const_string.c | 2 +- src/gmio_core/internal/const_string.h | 2 +- src/gmio_core/internal/convert.h | 2 +- src/gmio_core/internal/error_check.c | 2 +- src/gmio_core/internal/error_check.h | 2 +- src/gmio_core/internal/file_utils.c | 2 +- src/gmio_core/internal/file_utils.h | 2 +- src/gmio_core/internal/float_format_utils.c | 2 +- src/gmio_core/internal/float_format_utils.h | 2 +- src/gmio_core/internal/google_doubleconversion.cpp | 2 +- src/gmio_core/internal/google_doubleconversion.h | 2 +- src/gmio_core/internal/helper_memblock.h | 2 +- src/gmio_core/internal/helper_stream.h | 2 +- src/gmio_core/internal/helper_task_iface.h | 2 +- src/gmio_core/internal/itoa.h | 2 +- src/gmio_core/internal/locale_utils.c | 2 +- src/gmio_core/internal/locale_utils.h | 2 +- src/gmio_core/internal/min_max.h | 2 +- src/gmio_core/internal/numeric_utils.c | 2 +- src/gmio_core/internal/numeric_utils.h | 2 +- src/gmio_core/internal/ostringstream.c | 2 +- src/gmio_core/internal/ostringstream.h | 2 +- src/gmio_core/internal/safe_cast.h | 2 +- src/gmio_core/internal/string.h | 2 +- src/gmio_core/internal/string_ascii_istrstr.c | 2 +- src/gmio_core/internal/string_ascii_utils.h | 2 +- src/gmio_core/internal/stringstream.c | 2 +- src/gmio_core/internal/stringstream.h | 2 +- src/gmio_core/internal/vecgeom_utils.h | 2 +- src/gmio_core/internal/zip_utils.c | 2 +- src/gmio_core/internal/zip_utils.h | 2 +- src/gmio_core/internal/zlib_utils.c | 2 +- src/gmio_core/internal/zlib_utils.h | 2 +- src/gmio_core/memblock.c | 2 +- src/gmio_core/memblock.h | 2 +- src/gmio_core/stream.c | 2 +- src/gmio_core/stream.h | 2 +- src/gmio_core/streampos.h | 2 +- src/gmio_core/task_iface.h | 2 +- src/gmio_core/text_format.h | 2 +- src/gmio_core/vecgeom.h | 2 +- src/gmio_core/version.h.cmake | 2 +- src/gmio_core/zlib_compress.h | 2 +- src/gmio_stl/internal/helper_stl_mesh_creator.h | 2 +- src/gmio_stl/internal/stl_error_check.c | 2 +- src/gmio_stl/internal/stl_error_check.h | 2 +- src/gmio_stl/internal/stl_funptr_typedefs.h | 2 +- src/gmio_stl/internal/stla_infos_probe.c | 2 +- src/gmio_stl/internal/stla_infos_probe.h | 2 +- src/gmio_stl/internal/stla_parsing.h | 2 +- src/gmio_stl/internal/stla_write.c | 2 +- src/gmio_stl/internal/stla_write.h | 2 +- src/gmio_stl/internal/stlb_byte_swap.c | 2 +- src/gmio_stl/internal/stlb_byte_swap.h | 2 +- src/gmio_stl/internal/stlb_infos_probe.c | 2 +- src/gmio_stl/internal/stlb_infos_probe.h | 2 +- src/gmio_stl/internal/stlb_write.c | 2 +- src/gmio_stl/internal/stlb_write.h | 2 +- src/gmio_stl/stl_constants.h | 2 +- src/gmio_stl/stl_error.h | 2 +- src/gmio_stl/stl_format.c | 2 +- src/gmio_stl/stl_format.h | 2 +- src/gmio_stl/stl_global.h | 2 +- src/gmio_stl/stl_infos.c | 2 +- src/gmio_stl/stl_infos.h | 2 +- src/gmio_stl/stl_io.c | 2 +- src/gmio_stl/stl_io.h | 2 +- src/gmio_stl/stl_io_options.h | 2 +- src/gmio_stl/stl_mesh.h | 2 +- src/gmio_stl/stl_mesh_creator.h | 2 +- src/gmio_stl/stl_triangle.c | 2 +- src/gmio_stl/stl_triangle.h | 2 +- src/gmio_stl/stla_read.c | 2 +- src/gmio_stl/stlb_header.c | 2 +- src/gmio_stl/stlb_header.h | 2 +- src/gmio_stl/stlb_read.c | 2 +- src/gmio_support/stl_occ_brep.cpp | 2 +- src/gmio_support/stl_occ_brep.h | 2 +- src/gmio_support/stl_occ_mesh.cpp | 2 +- src/gmio_support/stl_occ_mesh.h | 2 +- src/gmio_support/stl_occ_meshvs.cpp | 2 +- src/gmio_support/stl_occ_meshvs.h | 2 +- src/gmio_support/stl_occ_utils.h | 2 +- src/gmio_support/stream_cpp.h | 2 +- src/gmio_support/stream_qt.cpp | 2 +- src/gmio_support/stream_qt.h | 2 +- src/gmio_support/support_global.h | 2 +- tests/CMakeLists.txt | 2 +- tests/core_utils.c | 2 +- tests/core_utils.h | 2 +- tests/fake_support/CMakeLists.txt | 2 +- tests/main_test_amf.c | 2 +- tests/main_test_core.c | 2 +- tests/main_test_stl.c | 2 +- tests/stl_testcases.c | 2 +- tests/stl_testcases.h | 2 +- tests/stl_utils.c | 2 +- tests/stl_utils.h | 2 +- tests/stream_buffer.c | 2 +- tests/stream_buffer.h | 2 +- tests/test_amf_io.c | 2 +- tests/test_core.c | 2 +- tests/test_core_benchmark_fast_atof.c | 2 +- tests/test_core_internal.c | 2 +- tests/test_core_platform.c | 2 +- tests/test_stl_infos.c | 2 +- tests/test_stl_internal.c | 2 +- tests/test_stl_io.c | 2 +- tests/test_stl_triangle.c | 2 +- tests/test_stlb_header.c | 2 +- 144 files changed, 144 insertions(+), 144 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 28ace2b..2a6de08 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ ############################################################################# -## Copyright (c) 2016, Fougue Ltd. +## Copyright (c) 2017, Fougue Ltd. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/LICENSE.txt b/LICENSE.txt index ac805de..e7955bc 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,6 +1,6 @@ BSD 2-Clause License -Copyright (c) 2016, Fougue Ltd. +Copyright (c) 2017, Fougue Ltd. All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/benchmarks/CMakeLists.txt b/benchmarks/CMakeLists.txt index c3e5a74..f85d4bb 100644 --- a/benchmarks/CMakeLists.txt +++ b/benchmarks/CMakeLists.txt @@ -1,5 +1,5 @@ ############################################################################# -## Copyright (c) 2016, Fougue Ltd. +## Copyright (c) 2017, Fougue Ltd. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/benchmarks/benchmark_assimp/CMakeLists.txt b/benchmarks/benchmark_assimp/CMakeLists.txt index fe7093d..adc0a9d 100644 --- a/benchmarks/benchmark_assimp/CMakeLists.txt +++ b/benchmarks/benchmark_assimp/CMakeLists.txt @@ -1,5 +1,5 @@ ############################################################################# -## Copyright (c) 2016, Fougue Ltd. +## Copyright (c) 2017, Fougue Ltd. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/benchmarks/benchmark_assimp/main.cpp b/benchmarks/benchmark_assimp/main.cpp index 9648c2f..bdaa834 100644 --- a/benchmarks/benchmark_assimp/main.cpp +++ b/benchmarks/benchmark_assimp/main.cpp @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/benchmarks/benchmark_gmio/CMakeLists.txt b/benchmarks/benchmark_gmio/CMakeLists.txt index ed8a48e..187aa80 100644 --- a/benchmarks/benchmark_gmio/CMakeLists.txt +++ b/benchmarks/benchmark_gmio/CMakeLists.txt @@ -1,5 +1,5 @@ ############################################################################# -## Copyright (c) 2016, Fougue Ltd. +## Copyright (c) 2017, Fougue Ltd. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/benchmarks/benchmark_gmio/main.c b/benchmarks/benchmark_gmio/main.c index e10afec..3e41286 100644 --- a/benchmarks/benchmark_gmio/main.c +++ b/benchmarks/benchmark_gmio/main.c @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/benchmarks/benchmark_lib3mf/CMakeLists.txt b/benchmarks/benchmark_lib3mf/CMakeLists.txt index acadb69..e27c071 100644 --- a/benchmarks/benchmark_lib3mf/CMakeLists.txt +++ b/benchmarks/benchmark_lib3mf/CMakeLists.txt @@ -1,5 +1,5 @@ ############################################################################# -## Copyright (c) 2016, Fougue Ltd. +## Copyright (c) 2017, Fougue Ltd. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/benchmarks/benchmark_lib3mf/main.cpp b/benchmarks/benchmark_lib3mf/main.cpp index c7d34ac..f368db5 100644 --- a/benchmarks/benchmark_lib3mf/main.cpp +++ b/benchmarks/benchmark_lib3mf/main.cpp @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/benchmarks/benchmark_opencascade/CMakeLists.txt b/benchmarks/benchmark_opencascade/CMakeLists.txt index daa9e72..a74008b 100644 --- a/benchmarks/benchmark_opencascade/CMakeLists.txt +++ b/benchmarks/benchmark_opencascade/CMakeLists.txt @@ -1,5 +1,5 @@ ############################################################################# -## Copyright (c) 2016, Fougue Ltd. +## Copyright (c) 2017, Fougue Ltd. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/benchmarks/benchmark_opencascade/main.cpp b/benchmarks/benchmark_opencascade/main.cpp index f6bcc1a..6a0689f 100644 --- a/benchmarks/benchmark_opencascade/main.cpp +++ b/benchmarks/benchmark_opencascade/main.cpp @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/benchmarks/benchmark_other/CMakeLists.txt b/benchmarks/benchmark_other/CMakeLists.txt index 9ce8e37..62cbb50 100644 --- a/benchmarks/benchmark_other/CMakeLists.txt +++ b/benchmarks/benchmark_other/CMakeLists.txt @@ -1,5 +1,5 @@ ############################################################################# -## Copyright (c) 2016, Fougue Ltd. +## Copyright (c) 2017, Fougue Ltd. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/benchmarks/commons/benchmark_tools.c b/benchmarks/commons/benchmark_tools.c index b47d248..488f0ab 100644 --- a/benchmarks/commons/benchmark_tools.c +++ b/benchmarks/commons/benchmark_tools.c @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/benchmarks/commons/benchmark_tools.h b/benchmarks/commons/benchmark_tools.h index b4dc919..f3f7ebb 100644 --- a/benchmarks/commons/benchmark_tools.h +++ b/benchmarks/commons/benchmark_tools.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index b3d3f99..fb5805f 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -1,5 +1,5 @@ ############################################################################# -## Copyright (c) 2016, Fougue Ltd. +## Copyright (c) 2017, Fougue Ltd. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/doc/footer.html b/doc/footer.html index 1e42d32..55117ad 100644 --- a/doc/footer.html +++ b/doc/footer.html @@ -14,7 +14,7 @@
- + diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index b6d60e8..ef9159d 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -1,5 +1,5 @@ ############################################################################# -## Copyright (c) 2016, Fougue Ltd. +## Copyright (c) 2017, Fougue Ltd. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1ce8cf5..86029e4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,5 +1,5 @@ ############################################################################# -## Copyright (c) 2016, Fougue Ltd. +## Copyright (c) 2017, Fougue Ltd. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_amf/amf_document.h b/src/gmio_amf/amf_document.h index 2841e03..f4caa2c 100644 --- a/src/gmio_amf/amf_document.h +++ b/src/gmio_amf/amf_document.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_amf/amf_error.h b/src/gmio_amf/amf_error.h index de56522..b423322 100644 --- a/src/gmio_amf/amf_error.h +++ b/src/gmio_amf/amf_error.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_amf/amf_global.h b/src/gmio_amf/amf_global.h index dc92177..41b76ac 100644 --- a/src/gmio_amf/amf_global.h +++ b/src/gmio_amf/amf_global.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_amf/amf_io.c b/src/gmio_amf/amf_io.c index 6a0c339..4305f42 100644 --- a/src/gmio_amf/amf_io.c +++ b/src/gmio_amf/amf_io.c @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_amf/amf_io.h b/src/gmio_amf/amf_io.h index fb3db88..4285aab 100644 --- a/src/gmio_amf/amf_io.h +++ b/src/gmio_amf/amf_io.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_amf/amf_io_options.h b/src/gmio_amf/amf_io_options.h index ebfcd66..9b66381 100644 --- a/src/gmio_amf/amf_io_options.h +++ b/src/gmio_amf/amf_io_options.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_core/config.h.cmake b/src/gmio_core/config.h.cmake index d87ce35..61a1ba4 100644 --- a/src/gmio_core/config.h.cmake +++ b/src/gmio_core/config.h.cmake @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_core/endian.c b/src/gmio_core/endian.c index ec7f0e2..00e75ce 100644 --- a/src/gmio_core/endian.c +++ b/src/gmio_core/endian.c @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_core/endian.h b/src/gmio_core/endian.h index 125cea9..666e8d4 100644 --- a/src/gmio_core/endian.h +++ b/src/gmio_core/endian.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_core/error.h b/src/gmio_core/error.h index a329997..e7be2f8 100644 --- a/src/gmio_core/error.h +++ b/src/gmio_core/error.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_core/global.h b/src/gmio_core/global.h index bb32792..b8e3e35 100644 --- a/src/gmio_core/global.h +++ b/src/gmio_core/global.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_core/internal/byte_codec.h b/src/gmio_core/internal/byte_codec.h index f9261d4..3701d91 100644 --- a/src/gmio_core/internal/byte_codec.h +++ b/src/gmio_core/internal/byte_codec.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_core/internal/byte_swap.h b/src/gmio_core/internal/byte_swap.h index 7618266..4f06d3d 100644 --- a/src/gmio_core/internal/byte_swap.h +++ b/src/gmio_core/internal/byte_swap.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_core/internal/c99_math_compat.h b/src/gmio_core/internal/c99_math_compat.h index 8c071e7..ccc5be6 100644 --- a/src/gmio_core/internal/c99_math_compat.h +++ b/src/gmio_core/internal/c99_math_compat.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_core/internal/c99_stdio_compat.h b/src/gmio_core/internal/c99_stdio_compat.h index ac8b084..429bb53 100644 --- a/src/gmio_core/internal/c99_stdio_compat.h +++ b/src/gmio_core/internal/c99_stdio_compat.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_core/internal/c99_stdlib_compat.h b/src/gmio_core/internal/c99_stdlib_compat.h index 2587188..ae30059 100644 --- a/src/gmio_core/internal/c99_stdlib_compat.h +++ b/src/gmio_core/internal/c99_stdlib_compat.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_core/internal/const_string.c b/src/gmio_core/internal/const_string.c index 5684915..f0d7c06 100644 --- a/src/gmio_core/internal/const_string.c +++ b/src/gmio_core/internal/const_string.c @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_core/internal/const_string.h b/src/gmio_core/internal/const_string.h index e7e491e..12ddf75 100644 --- a/src/gmio_core/internal/const_string.h +++ b/src/gmio_core/internal/const_string.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_core/internal/convert.h b/src/gmio_core/internal/convert.h index 7b704d1..11b6f15 100644 --- a/src/gmio_core/internal/convert.h +++ b/src/gmio_core/internal/convert.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_core/internal/error_check.c b/src/gmio_core/internal/error_check.c index 5969ec5..1405ed1 100644 --- a/src/gmio_core/internal/error_check.c +++ b/src/gmio_core/internal/error_check.c @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_core/internal/error_check.h b/src/gmio_core/internal/error_check.h index adf0025..80cd8ed 100644 --- a/src/gmio_core/internal/error_check.h +++ b/src/gmio_core/internal/error_check.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_core/internal/file_utils.c b/src/gmio_core/internal/file_utils.c index 6cdfa0e..e3eb065 100644 --- a/src/gmio_core/internal/file_utils.c +++ b/src/gmio_core/internal/file_utils.c @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_core/internal/file_utils.h b/src/gmio_core/internal/file_utils.h index ebebac0..506d2a3 100644 --- a/src/gmio_core/internal/file_utils.h +++ b/src/gmio_core/internal/file_utils.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_core/internal/float_format_utils.c b/src/gmio_core/internal/float_format_utils.c index 86b1088..74e2952 100644 --- a/src/gmio_core/internal/float_format_utils.c +++ b/src/gmio_core/internal/float_format_utils.c @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_core/internal/float_format_utils.h b/src/gmio_core/internal/float_format_utils.h index 025cfa6..1627624 100644 --- a/src/gmio_core/internal/float_format_utils.h +++ b/src/gmio_core/internal/float_format_utils.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_core/internal/google_doubleconversion.cpp b/src/gmio_core/internal/google_doubleconversion.cpp index e9b80a7..b60858b 100644 --- a/src/gmio_core/internal/google_doubleconversion.cpp +++ b/src/gmio_core/internal/google_doubleconversion.cpp @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_core/internal/google_doubleconversion.h b/src/gmio_core/internal/google_doubleconversion.h index dc3310b..482b335 100644 --- a/src/gmio_core/internal/google_doubleconversion.h +++ b/src/gmio_core/internal/google_doubleconversion.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_core/internal/helper_memblock.h b/src/gmio_core/internal/helper_memblock.h index e11c811..fcd850a 100644 --- a/src/gmio_core/internal/helper_memblock.h +++ b/src/gmio_core/internal/helper_memblock.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_core/internal/helper_stream.h b/src/gmio_core/internal/helper_stream.h index 8de7792..b7c06e8 100644 --- a/src/gmio_core/internal/helper_stream.h +++ b/src/gmio_core/internal/helper_stream.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_core/internal/helper_task_iface.h b/src/gmio_core/internal/helper_task_iface.h index 6b450cc..e0c5b05 100644 --- a/src/gmio_core/internal/helper_task_iface.h +++ b/src/gmio_core/internal/helper_task_iface.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_core/internal/itoa.h b/src/gmio_core/internal/itoa.h index f017543..cda7099 100644 --- a/src/gmio_core/internal/itoa.h +++ b/src/gmio_core/internal/itoa.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_core/internal/locale_utils.c b/src/gmio_core/internal/locale_utils.c index 40bc8d1..6c9441c 100644 --- a/src/gmio_core/internal/locale_utils.c +++ b/src/gmio_core/internal/locale_utils.c @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_core/internal/locale_utils.h b/src/gmio_core/internal/locale_utils.h index f797f5d..c233b00 100644 --- a/src/gmio_core/internal/locale_utils.h +++ b/src/gmio_core/internal/locale_utils.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_core/internal/min_max.h b/src/gmio_core/internal/min_max.h index f0c909d..2323242 100644 --- a/src/gmio_core/internal/min_max.h +++ b/src/gmio_core/internal/min_max.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_core/internal/numeric_utils.c b/src/gmio_core/internal/numeric_utils.c index 7d0b4cf..0fc8da8 100644 --- a/src/gmio_core/internal/numeric_utils.c +++ b/src/gmio_core/internal/numeric_utils.c @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_core/internal/numeric_utils.h b/src/gmio_core/internal/numeric_utils.h index f14098b..0853344 100644 --- a/src/gmio_core/internal/numeric_utils.h +++ b/src/gmio_core/internal/numeric_utils.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_core/internal/ostringstream.c b/src/gmio_core/internal/ostringstream.c index 80f9898..1e1b5bb 100644 --- a/src/gmio_core/internal/ostringstream.c +++ b/src/gmio_core/internal/ostringstream.c @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_core/internal/ostringstream.h b/src/gmio_core/internal/ostringstream.h index 4865c6a..b4fa159 100644 --- a/src/gmio_core/internal/ostringstream.h +++ b/src/gmio_core/internal/ostringstream.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_core/internal/safe_cast.h b/src/gmio_core/internal/safe_cast.h index ae6d909..aca1e3c 100644 --- a/src/gmio_core/internal/safe_cast.h +++ b/src/gmio_core/internal/safe_cast.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_core/internal/string.h b/src/gmio_core/internal/string.h index 185bc00..129e19b 100644 --- a/src/gmio_core/internal/string.h +++ b/src/gmio_core/internal/string.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_core/internal/string_ascii_istrstr.c b/src/gmio_core/internal/string_ascii_istrstr.c index dae60ca..f355c53 100644 --- a/src/gmio_core/internal/string_ascii_istrstr.c +++ b/src/gmio_core/internal/string_ascii_istrstr.c @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_core/internal/string_ascii_utils.h b/src/gmio_core/internal/string_ascii_utils.h index 3c7daf6..ecc3a19 100644 --- a/src/gmio_core/internal/string_ascii_utils.h +++ b/src/gmio_core/internal/string_ascii_utils.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_core/internal/stringstream.c b/src/gmio_core/internal/stringstream.c index 9064ea6..2d17635 100644 --- a/src/gmio_core/internal/stringstream.c +++ b/src/gmio_core/internal/stringstream.c @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_core/internal/stringstream.h b/src/gmio_core/internal/stringstream.h index 0bbe7c7..3409332 100644 --- a/src/gmio_core/internal/stringstream.h +++ b/src/gmio_core/internal/stringstream.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_core/internal/vecgeom_utils.h b/src/gmio_core/internal/vecgeom_utils.h index 81c25b1..618ce29 100644 --- a/src/gmio_core/internal/vecgeom_utils.h +++ b/src/gmio_core/internal/vecgeom_utils.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_core/internal/zip_utils.c b/src/gmio_core/internal/zip_utils.c index 87c0f63..e5cc473 100644 --- a/src/gmio_core/internal/zip_utils.c +++ b/src/gmio_core/internal/zip_utils.c @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_core/internal/zip_utils.h b/src/gmio_core/internal/zip_utils.h index 27e2ba0..d10e132 100644 --- a/src/gmio_core/internal/zip_utils.h +++ b/src/gmio_core/internal/zip_utils.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_core/internal/zlib_utils.c b/src/gmio_core/internal/zlib_utils.c index b7c24e7..e3b5acb 100644 --- a/src/gmio_core/internal/zlib_utils.c +++ b/src/gmio_core/internal/zlib_utils.c @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_core/internal/zlib_utils.h b/src/gmio_core/internal/zlib_utils.h index 40b142e..3978eb6 100644 --- a/src/gmio_core/internal/zlib_utils.h +++ b/src/gmio_core/internal/zlib_utils.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_core/memblock.c b/src/gmio_core/memblock.c index b05d748..a9b49e8 100644 --- a/src/gmio_core/memblock.c +++ b/src/gmio_core/memblock.c @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_core/memblock.h b/src/gmio_core/memblock.h index e05bbf5..828ba89 100644 --- a/src/gmio_core/memblock.h +++ b/src/gmio_core/memblock.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_core/stream.c b/src/gmio_core/stream.c index e1dfe14..a67b30e 100644 --- a/src/gmio_core/stream.c +++ b/src/gmio_core/stream.c @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_core/stream.h b/src/gmio_core/stream.h index 3a28e25..8a89428 100644 --- a/src/gmio_core/stream.h +++ b/src/gmio_core/stream.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_core/streampos.h b/src/gmio_core/streampos.h index 753691a..7f0fe84 100644 --- a/src/gmio_core/streampos.h +++ b/src/gmio_core/streampos.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_core/task_iface.h b/src/gmio_core/task_iface.h index 5000f7a..59ca80a 100644 --- a/src/gmio_core/task_iface.h +++ b/src/gmio_core/task_iface.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_core/text_format.h b/src/gmio_core/text_format.h index 9ff0421..eb1d1e8 100644 --- a/src/gmio_core/text_format.h +++ b/src/gmio_core/text_format.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_core/vecgeom.h b/src/gmio_core/vecgeom.h index cad1664..bc49538 100644 --- a/src/gmio_core/vecgeom.h +++ b/src/gmio_core/vecgeom.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_core/version.h.cmake b/src/gmio_core/version.h.cmake index 48350e6..d7ee2c2 100644 --- a/src/gmio_core/version.h.cmake +++ b/src/gmio_core/version.h.cmake @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_core/zlib_compress.h b/src/gmio_core/zlib_compress.h index fe5d292..75a5589 100644 --- a/src/gmio_core/zlib_compress.h +++ b/src/gmio_core/zlib_compress.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_stl/internal/helper_stl_mesh_creator.h b/src/gmio_stl/internal/helper_stl_mesh_creator.h index cb2e42c..79c4564 100644 --- a/src/gmio_stl/internal/helper_stl_mesh_creator.h +++ b/src/gmio_stl/internal/helper_stl_mesh_creator.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_stl/internal/stl_error_check.c b/src/gmio_stl/internal/stl_error_check.c index ea2db7b..2cb118a 100644 --- a/src/gmio_stl/internal/stl_error_check.c +++ b/src/gmio_stl/internal/stl_error_check.c @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_stl/internal/stl_error_check.h b/src/gmio_stl/internal/stl_error_check.h index 6eefae9..1710808 100644 --- a/src/gmio_stl/internal/stl_error_check.h +++ b/src/gmio_stl/internal/stl_error_check.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_stl/internal/stl_funptr_typedefs.h b/src/gmio_stl/internal/stl_funptr_typedefs.h index 4364349..d7ce6c6 100644 --- a/src/gmio_stl/internal/stl_funptr_typedefs.h +++ b/src/gmio_stl/internal/stl_funptr_typedefs.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_stl/internal/stla_infos_probe.c b/src/gmio_stl/internal/stla_infos_probe.c index 00440db..3aaab3b 100644 --- a/src/gmio_stl/internal/stla_infos_probe.c +++ b/src/gmio_stl/internal/stla_infos_probe.c @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_stl/internal/stla_infos_probe.h b/src/gmio_stl/internal/stla_infos_probe.h index 169575a..b0400cb 100644 --- a/src/gmio_stl/internal/stla_infos_probe.h +++ b/src/gmio_stl/internal/stla_infos_probe.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_stl/internal/stla_parsing.h b/src/gmio_stl/internal/stla_parsing.h index 11433c6..dc01950 100644 --- a/src/gmio_stl/internal/stla_parsing.h +++ b/src/gmio_stl/internal/stla_parsing.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_stl/internal/stla_write.c b/src/gmio_stl/internal/stla_write.c index 61860ac..2015e9e 100644 --- a/src/gmio_stl/internal/stla_write.c +++ b/src/gmio_stl/internal/stla_write.c @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_stl/internal/stla_write.h b/src/gmio_stl/internal/stla_write.h index f17dcc4..4fa6cfd 100644 --- a/src/gmio_stl/internal/stla_write.h +++ b/src/gmio_stl/internal/stla_write.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_stl/internal/stlb_byte_swap.c b/src/gmio_stl/internal/stlb_byte_swap.c index aa28030..4bb0d1e 100644 --- a/src/gmio_stl/internal/stlb_byte_swap.c +++ b/src/gmio_stl/internal/stlb_byte_swap.c @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_stl/internal/stlb_byte_swap.h b/src/gmio_stl/internal/stlb_byte_swap.h index 2c25417..3359182 100644 --- a/src/gmio_stl/internal/stlb_byte_swap.h +++ b/src/gmio_stl/internal/stlb_byte_swap.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_stl/internal/stlb_infos_probe.c b/src/gmio_stl/internal/stlb_infos_probe.c index ae10c07..d49c8a1 100644 --- a/src/gmio_stl/internal/stlb_infos_probe.c +++ b/src/gmio_stl/internal/stlb_infos_probe.c @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_stl/internal/stlb_infos_probe.h b/src/gmio_stl/internal/stlb_infos_probe.h index 7d73a27..9fe9eb3 100644 --- a/src/gmio_stl/internal/stlb_infos_probe.h +++ b/src/gmio_stl/internal/stlb_infos_probe.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_stl/internal/stlb_write.c b/src/gmio_stl/internal/stlb_write.c index 0155938..7b6a8e3 100644 --- a/src/gmio_stl/internal/stlb_write.c +++ b/src/gmio_stl/internal/stlb_write.c @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_stl/internal/stlb_write.h b/src/gmio_stl/internal/stlb_write.h index 692b472..b65ce39 100644 --- a/src/gmio_stl/internal/stlb_write.h +++ b/src/gmio_stl/internal/stlb_write.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_stl/stl_constants.h b/src/gmio_stl/stl_constants.h index c68de2d..9b5fa6e 100644 --- a/src/gmio_stl/stl_constants.h +++ b/src/gmio_stl/stl_constants.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_stl/stl_error.h b/src/gmio_stl/stl_error.h index 6af020b..38b3fc5 100644 --- a/src/gmio_stl/stl_error.h +++ b/src/gmio_stl/stl_error.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_stl/stl_format.c b/src/gmio_stl/stl_format.c index 06b22f5..f5ebbc1 100644 --- a/src/gmio_stl/stl_format.c +++ b/src/gmio_stl/stl_format.c @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_stl/stl_format.h b/src/gmio_stl/stl_format.h index 63b6500..77d0626 100644 --- a/src/gmio_stl/stl_format.h +++ b/src/gmio_stl/stl_format.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_stl/stl_global.h b/src/gmio_stl/stl_global.h index 788bfa3..273a1c8 100644 --- a/src/gmio_stl/stl_global.h +++ b/src/gmio_stl/stl_global.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_stl/stl_infos.c b/src/gmio_stl/stl_infos.c index 3dfdeb0..64caf7f 100644 --- a/src/gmio_stl/stl_infos.c +++ b/src/gmio_stl/stl_infos.c @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_stl/stl_infos.h b/src/gmio_stl/stl_infos.h index ecd7d78..682becf 100644 --- a/src/gmio_stl/stl_infos.h +++ b/src/gmio_stl/stl_infos.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_stl/stl_io.c b/src/gmio_stl/stl_io.c index dba5984..7845831 100644 --- a/src/gmio_stl/stl_io.c +++ b/src/gmio_stl/stl_io.c @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_stl/stl_io.h b/src/gmio_stl/stl_io.h index 12e81e2..d8de585 100644 --- a/src/gmio_stl/stl_io.h +++ b/src/gmio_stl/stl_io.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_stl/stl_io_options.h b/src/gmio_stl/stl_io_options.h index 423acf0..42936e8 100644 --- a/src/gmio_stl/stl_io_options.h +++ b/src/gmio_stl/stl_io_options.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_stl/stl_mesh.h b/src/gmio_stl/stl_mesh.h index e6206fb..7843e8d 100644 --- a/src/gmio_stl/stl_mesh.h +++ b/src/gmio_stl/stl_mesh.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_stl/stl_mesh_creator.h b/src/gmio_stl/stl_mesh_creator.h index f96cc89..132dcdd 100644 --- a/src/gmio_stl/stl_mesh_creator.h +++ b/src/gmio_stl/stl_mesh_creator.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_stl/stl_triangle.c b/src/gmio_stl/stl_triangle.c index b1e4634..b0d77d8 100644 --- a/src/gmio_stl/stl_triangle.c +++ b/src/gmio_stl/stl_triangle.c @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_stl/stl_triangle.h b/src/gmio_stl/stl_triangle.h index 4c64e23..5d83f36 100644 --- a/src/gmio_stl/stl_triangle.h +++ b/src/gmio_stl/stl_triangle.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_stl/stla_read.c b/src/gmio_stl/stla_read.c index c6ed424..40a0c80 100644 --- a/src/gmio_stl/stla_read.c +++ b/src/gmio_stl/stla_read.c @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_stl/stlb_header.c b/src/gmio_stl/stlb_header.c index 06bf9ba..ff405a2 100644 --- a/src/gmio_stl/stlb_header.c +++ b/src/gmio_stl/stlb_header.c @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_stl/stlb_header.h b/src/gmio_stl/stlb_header.h index 2362d96..a146fbb 100644 --- a/src/gmio_stl/stlb_header.h +++ b/src/gmio_stl/stlb_header.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_stl/stlb_read.c b/src/gmio_stl/stlb_read.c index b65072f..d8077bb 100644 --- a/src/gmio_stl/stlb_read.c +++ b/src/gmio_stl/stlb_read.c @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_support/stl_occ_brep.cpp b/src/gmio_support/stl_occ_brep.cpp index ddc1bd8..81bbf28 100644 --- a/src/gmio_support/stl_occ_brep.cpp +++ b/src/gmio_support/stl_occ_brep.cpp @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_support/stl_occ_brep.h b/src/gmio_support/stl_occ_brep.h index 8ffcf13..fefa9d3 100644 --- a/src/gmio_support/stl_occ_brep.h +++ b/src/gmio_support/stl_occ_brep.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_support/stl_occ_mesh.cpp b/src/gmio_support/stl_occ_mesh.cpp index c0c7db9..54da8e2 100644 --- a/src/gmio_support/stl_occ_mesh.cpp +++ b/src/gmio_support/stl_occ_mesh.cpp @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_support/stl_occ_mesh.h b/src/gmio_support/stl_occ_mesh.h index 8871f7f..71a5f0f 100644 --- a/src/gmio_support/stl_occ_mesh.h +++ b/src/gmio_support/stl_occ_mesh.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_support/stl_occ_meshvs.cpp b/src/gmio_support/stl_occ_meshvs.cpp index 515ea87..17020c7 100644 --- a/src/gmio_support/stl_occ_meshvs.cpp +++ b/src/gmio_support/stl_occ_meshvs.cpp @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_support/stl_occ_meshvs.h b/src/gmio_support/stl_occ_meshvs.h index c66537d..b118104 100644 --- a/src/gmio_support/stl_occ_meshvs.h +++ b/src/gmio_support/stl_occ_meshvs.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_support/stl_occ_utils.h b/src/gmio_support/stl_occ_utils.h index 8b4853a..5bc566a 100644 --- a/src/gmio_support/stl_occ_utils.h +++ b/src/gmio_support/stl_occ_utils.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_support/stream_cpp.h b/src/gmio_support/stream_cpp.h index de4a2d6..3d319e7 100644 --- a/src/gmio_support/stream_cpp.h +++ b/src/gmio_support/stream_cpp.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_support/stream_qt.cpp b/src/gmio_support/stream_qt.cpp index 1b12455..d8101ca 100644 --- a/src/gmio_support/stream_qt.cpp +++ b/src/gmio_support/stream_qt.cpp @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_support/stream_qt.h b/src/gmio_support/stream_qt.h index 2d9b7d3..aa56d80 100644 --- a/src/gmio_support/stream_qt.h +++ b/src/gmio_support/stream_qt.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/src/gmio_support/support_global.h b/src/gmio_support/support_global.h index 5c120eb..eea51dc 100644 --- a/src/gmio_support/support_global.h +++ b/src/gmio_support/support_global.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index bc59774..ed56ad0 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,5 +1,5 @@ ############################################################################# -## Copyright (c) 2016, Fougue Ltd. +## Copyright (c) 2017, Fougue Ltd. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/tests/core_utils.c b/tests/core_utils.c index 468ed03..2a6fa95 100644 --- a/tests/core_utils.c +++ b/tests/core_utils.c @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/tests/core_utils.h b/tests/core_utils.h index fdb34c4..690e041 100644 --- a/tests/core_utils.h +++ b/tests/core_utils.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/tests/fake_support/CMakeLists.txt b/tests/fake_support/CMakeLists.txt index 8b15601..198d550 100644 --- a/tests/fake_support/CMakeLists.txt +++ b/tests/fake_support/CMakeLists.txt @@ -1,5 +1,5 @@ ############################################################################# -## Copyright (c) 2016, Fougue Ltd. +## Copyright (c) 2017, Fougue Ltd. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/tests/main_test_amf.c b/tests/main_test_amf.c index 3ffce5e..161fa2c 100644 --- a/tests/main_test_amf.c +++ b/tests/main_test_amf.c @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/tests/main_test_core.c b/tests/main_test_core.c index 3bf231b..32a3f48 100644 --- a/tests/main_test_core.c +++ b/tests/main_test_core.c @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/tests/main_test_stl.c b/tests/main_test_stl.c index aed68f2..e810b38 100644 --- a/tests/main_test_stl.c +++ b/tests/main_test_stl.c @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/tests/stl_testcases.c b/tests/stl_testcases.c index 1d57992..1d69ba0 100644 --- a/tests/stl_testcases.c +++ b/tests/stl_testcases.c @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/tests/stl_testcases.h b/tests/stl_testcases.h index 6ba8de2..391dab7 100644 --- a/tests/stl_testcases.h +++ b/tests/stl_testcases.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/tests/stl_utils.c b/tests/stl_utils.c index f4df926..d06cfbc 100644 --- a/tests/stl_utils.c +++ b/tests/stl_utils.c @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/tests/stl_utils.h b/tests/stl_utils.h index 44cdb5c..740f080 100644 --- a/tests/stl_utils.h +++ b/tests/stl_utils.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/tests/stream_buffer.c b/tests/stream_buffer.c index 5417762..19172c9 100644 --- a/tests/stream_buffer.c +++ b/tests/stream_buffer.c @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/tests/stream_buffer.h b/tests/stream_buffer.h index 1d95794..7348632 100644 --- a/tests/stream_buffer.h +++ b/tests/stream_buffer.h @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/tests/test_amf_io.c b/tests/test_amf_io.c index 59aabc9..becd089 100644 --- a/tests/test_amf_io.c +++ b/tests/test_amf_io.c @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/tests/test_core.c b/tests/test_core.c index d05b48e..40ab73b 100644 --- a/tests/test_core.c +++ b/tests/test_core.c @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/tests/test_core_benchmark_fast_atof.c b/tests/test_core_benchmark_fast_atof.c index f6fba3b..ad10bea 100644 --- a/tests/test_core_benchmark_fast_atof.c +++ b/tests/test_core_benchmark_fast_atof.c @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/tests/test_core_internal.c b/tests/test_core_internal.c index 11e62be..6998c5a 100644 --- a/tests/test_core_internal.c +++ b/tests/test_core_internal.c @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/tests/test_core_platform.c b/tests/test_core_platform.c index f79057a..cf15f96 100644 --- a/tests/test_core_platform.c +++ b/tests/test_core_platform.c @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/tests/test_stl_infos.c b/tests/test_stl_infos.c index c8343c4..cd1ea18 100644 --- a/tests/test_stl_infos.c +++ b/tests/test_stl_infos.c @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/tests/test_stl_internal.c b/tests/test_stl_internal.c index 471fb4b..85c41c0 100644 --- a/tests/test_stl_internal.c +++ b/tests/test_stl_internal.c @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/tests/test_stl_io.c b/tests/test_stl_io.c index 7a6c70e..8861e12 100644 --- a/tests/test_stl_io.c +++ b/tests/test_stl_io.c @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/tests/test_stl_triangle.c b/tests/test_stl_triangle.c index 9080388..82dcaf5 100644 --- a/tests/test_stl_triangle.c +++ b/tests/test_stl_triangle.c @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without diff --git a/tests/test_stlb_header.c b/tests/test_stlb_header.c index 03434b6..b680081 100644 --- a/tests/test_stlb_header.c +++ b/tests/test_stlb_header.c @@ -1,5 +1,5 @@ /**************************************************************************** -** Copyright (c) 2016, Fougue Ltd. +** Copyright (c) 2017, Fougue Ltd. ** All rights reserved. ** ** Redistribution and use in source and binary forms, with or without From f4d5402ca9194629cd804c6d11969b62b24e62b8 Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Fri, 27 Jan 2017 11:42:24 +0100 Subject: [PATCH 54/81] zlib: 1.2.8 -> 1.2.11 --- src/3rdparty/zlib/CMakeLists.txt | 2 +- src/3rdparty/zlib/ChangeLog | 55 +- src/3rdparty/zlib/README | 6 +- src/3rdparty/zlib/adler32.c | 21 +- src/3rdparty/zlib/compress.c | 42 +- src/3rdparty/zlib/crc32.c | 41 +- src/3rdparty/zlib/deflate.c | 860 ++++++++++++++--------- src/3rdparty/zlib/deflate.h | 35 +- src/3rdparty/zlib/gzguts.h | 23 +- src/3rdparty/zlib/gzlib.c | 31 +- src/3rdparty/zlib/gzread.c | 158 +++-- src/3rdparty/zlib/gzwrite.c | 334 +++++---- src/3rdparty/zlib/infback.c | 4 +- src/3rdparty/zlib/inffast.c | 85 +-- src/3rdparty/zlib/inflate.c | 123 +++- src/3rdparty/zlib/inflate.h | 11 +- src/3rdparty/zlib/inftrees.c | 26 +- src/3rdparty/zlib/treebuild.xml | 6 +- src/3rdparty/zlib/trees.c | 99 +-- src/3rdparty/zlib/uncompr.c | 114 +-- src/3rdparty/zlib/win32/README-WIN32.txt | 6 +- src/3rdparty/zlib/win32/VisualC.txt | 2 +- src/3rdparty/zlib/win32/zlib.def | 8 + src/3rdparty/zlib/win32/zlib1.rc | 2 +- src/3rdparty/zlib/zconf.h.cmakein | 41 +- src/3rdparty/zlib/zconf.h.in | 41 +- src/3rdparty/zlib/zconf.h.included | 41 +- src/3rdparty/zlib/zlib.h | 444 ++++++++---- src/3rdparty/zlib/zlib.map | 11 + src/3rdparty/zlib/zutil.c | 49 +- src/3rdparty/zlib/zutil.h | 52 +- 31 files changed, 1750 insertions(+), 1023 deletions(-) diff --git a/src/3rdparty/zlib/CMakeLists.txt b/src/3rdparty/zlib/CMakeLists.txt index b97c3aa..097bccf 100644 --- a/src/3rdparty/zlib/CMakeLists.txt +++ b/src/3rdparty/zlib/CMakeLists.txt @@ -3,7 +3,7 @@ set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON) project(zlib C) -set(VERSION "1.2.8") +set(VERSION "1.2.11") option(ASM686 "Enable building i686 assembly implementation") option(AMD64 "Enable building amd64 assembly implementation") diff --git a/src/3rdparty/zlib/ChangeLog b/src/3rdparty/zlib/ChangeLog index f22aaba..30199a6 100644 --- a/src/3rdparty/zlib/ChangeLog +++ b/src/3rdparty/zlib/ChangeLog @@ -1,10 +1,53 @@ ChangeLog file for zlib +Changes in 1.2.11 (15 Jan 2017) +- Fix deflate stored bug when pulling last block from window +- Permit immediate deflateParams changes before any deflate input + +Changes in 1.2.10 (2 Jan 2017) +- Avoid warnings on snprintf() return value +- Fix bug in deflate_stored() for zero-length input +- Fix bug in gzwrite.c that produced corrupt gzip files +- Remove files to be installed before copying them in Makefile.in +- Add warnings when compiling with assembler code + +Changes in 1.2.9 (31 Dec 2016) +- Fix contrib/minizip to permit unzipping with desktop API [Zouzou] +- Improve contrib/blast to return unused bytes +- Assure that gzoffset() is correct when appending +- Improve compress() and uncompress() to support large lengths +- Fix bug in test/example.c where error code not saved +- Remedy Coverity warning [Randers-Pehrson] +- Improve speed of gzprintf() in transparent mode +- Fix inflateInit2() bug when windowBits is 16 or 32 +- Change DEBUG macro to ZLIB_DEBUG +- Avoid uninitialized access by gzclose_w() +- Allow building zlib outside of the source directory +- Fix bug that accepted invalid zlib header when windowBits is zero +- Fix gzseek() problem on MinGW due to buggy _lseeki64 there +- Loop on write() calls in gzwrite.c in case of non-blocking I/O +- Add --warn (-w) option to ./configure for more compiler warnings +- Reject a window size of 256 bytes if not using the zlib wrapper +- Fix bug when level 0 used with Z_HUFFMAN or Z_RLE +- Add --debug (-d) option to ./configure to define ZLIB_DEBUG +- Fix bugs in creating a very large gzip header +- Add uncompress2() function, which returns the input size used +- Assure that deflateParams() will not switch functions mid-block +- Dramatically speed up deflation for level 0 (storing) +- Add gzfread(), duplicating the interface of fread() +- Add gzfwrite(), duplicating the interface of fwrite() +- Add deflateGetDictionary() function +- Use snprintf() for later versions of Microsoft C +- Fix *Init macros to use z_ prefix when requested +- Replace as400 with os400 for OS/400 support [Monnerat] +- Add crc32_z() and adler32_z() functions with size_t lengths +- Update Visual Studio project files [AraHaan] + Changes in 1.2.8 (28 Apr 2013) - Update contrib/minizip/iowin32.c for Windows RT [Vollant] - Do not force Z_CONST for C++ -- Clean up contrib/vstudio [Ro§] +- Clean up contrib/vstudio [Roß] - Correct spelling error in zlib.h - Fix mixed line endings in contrib/vstudio @@ -34,7 +77,7 @@ Changes in 1.2.7.1 (24 Mar 2013) - Clean up the usage of z_const and respect const usage within zlib - Clean up examples/gzlog.[ch] comparisons of different types - Avoid shift equal to bits in type (caused endless loop) -- Fix unintialized value bug in gzputc() introduced by const patches +- Fix uninitialized value bug in gzputc() introduced by const patches - Fix memory allocation error in examples/zran.c [Nor] - Fix bug where gzopen(), gzclose() would write an empty file - Fix bug in gzclose() when gzwrite() runs out of memory @@ -194,7 +237,7 @@ Changes in 1.2.5.2 (17 Dec 2011) - Add a transparent write mode to gzopen() when 'T' is in the mode - Update python link in zlib man page - Get inffixed.h and MAKEFIXED result to match -- Add a ./config --solo option to make zlib subset with no libary use +- Add a ./config --solo option to make zlib subset with no library use - Add undocumented inflateResetKeep() function for CAB file decoding - Add --cover option to ./configure for gcc coverage testing - Add #define ZLIB_CONST option to use const in the z_stream interface @@ -564,7 +607,7 @@ Changes in 1.2.3.1 (16 August 2006) - Update make_vms.com [Zinser] - Use -fPIC for shared build in configure [Teredesai, Nicholson] - Use only major version number for libz.so on IRIX and OSF1 [Reinholdtsen] -- Use fdopen() (not _fdopen()) for Interix in zutil.h [BŠck] +- Use fdopen() (not _fdopen()) for Interix in zutil.h [Bäck] - Add some FAQ entries about the contrib directory - Update the MVS question in the FAQ - Avoid extraneous reads after EOF in gzio.c [Brown] @@ -1178,7 +1221,7 @@ Changes in 1.0.6 (19 Jan 1998) 386 asm code replacing longest_match(). contrib/iostream/ by Kevin Ruland A C++ I/O streams interface to the zlib gz* functions - contrib/iostream2/ by Tyge Løvset + contrib/iostream2/ by Tyge Løvset Another C++ I/O streams interface contrib/untgz/ by "Pedro A. Aranda Guti\irrez" A very simple tar.gz file extractor using zlib @@ -1267,7 +1310,7 @@ Changes in 1.0.1 (20 May 96) [1.0 skipped to avoid confusion] - fix array overlay in deflate.c which sometimes caused bad compressed data - fix inflate bug with empty stored block - fix MSDOS medium model which was broken in 0.99 -- fix deflateParams() which could generated bad compressed data. +- fix deflateParams() which could generate bad compressed data. - Bytef is define'd instead of typedef'ed (work around Borland bug) - added an INDEX file - new makefiles for DJGPP (Makefile.dj2), 32-bit Borland (Makefile.b32), diff --git a/src/3rdparty/zlib/README b/src/3rdparty/zlib/README index 5ca9d12..51106de 100644 --- a/src/3rdparty/zlib/README +++ b/src/3rdparty/zlib/README @@ -1,6 +1,6 @@ ZLIB DATA COMPRESSION LIBRARY -zlib 1.2.8 is a general purpose data compression library. All the code is +zlib 1.2.11 is a general purpose data compression library. All the code is thread safe. The data format used by the zlib library is described by RFCs (Request for Comments) 1950 to 1952 in the files http://tools.ietf.org/html/rfc1950 (zlib format), rfc1951 (deflate format) and @@ -31,7 +31,7 @@ Mark Nelson wrote an article about zlib for the Jan. 1997 issue of Dr. Dobb's Journal; a copy of the article is available at http://marknelson.us/1997/01/01/zlib-engine/ . -The changes made in version 1.2.8 are documented in the file ChangeLog. +The changes made in version 1.2.11 are documented in the file ChangeLog. Unsupported third party contributions are provided in directory contrib/ . @@ -84,7 +84,7 @@ Acknowledgments: Copyright notice: - (C) 1995-2013 Jean-loup Gailly and Mark Adler + (C) 1995-2017 Jean-loup Gailly and Mark Adler This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/src/3rdparty/zlib/adler32.c b/src/3rdparty/zlib/adler32.c index a868f07..d0be438 100644 --- a/src/3rdparty/zlib/adler32.c +++ b/src/3rdparty/zlib/adler32.c @@ -1,5 +1,5 @@ /* adler32.c -- compute the Adler-32 checksum of a data stream - * Copyright (C) 1995-2011 Mark Adler + * Copyright (C) 1995-2011, 2016 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -7,11 +7,9 @@ #include "zutil.h" -#define local static - local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2)); -#define BASE 65521 /* largest prime smaller than 65536 */ +#define BASE 65521U /* largest prime smaller than 65536 */ #define NMAX 5552 /* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */ @@ -62,10 +60,10 @@ local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2)); #endif /* ========================================================================= */ -uLong ZEXPORT adler32(adler, buf, len) +uLong ZEXPORT adler32_z(adler, buf, len) uLong adler; const Bytef *buf; - uInt len; + z_size_t len; { unsigned long sum2; unsigned n; @@ -132,6 +130,15 @@ uLong ZEXPORT adler32(adler, buf, len) return adler | (sum2 << 16); } +/* ========================================================================= */ +uLong ZEXPORT adler32(adler, buf, len) + uLong adler; + const Bytef *buf; + uInt len; +{ + return adler32_z(adler, buf, len); +} + /* ========================================================================= */ local uLong adler32_combine_(adler1, adler2, len2) uLong adler1; @@ -156,7 +163,7 @@ local uLong adler32_combine_(adler1, adler2, len2) sum2 += ((adler1 >> 16) & 0xffff) + ((adler2 >> 16) & 0xffff) + BASE - rem; if (sum1 >= BASE) sum1 -= BASE; if (sum1 >= BASE) sum1 -= BASE; - if (sum2 >= (BASE << 1)) sum2 -= (BASE << 1); + if (sum2 >= ((unsigned long)BASE << 1)) sum2 -= ((unsigned long)BASE << 1); if (sum2 >= BASE) sum2 -= BASE; return sum1 | (sum2 << 16); } diff --git a/src/3rdparty/zlib/compress.c b/src/3rdparty/zlib/compress.c index 6e97626..e2db404 100644 --- a/src/3rdparty/zlib/compress.c +++ b/src/3rdparty/zlib/compress.c @@ -1,5 +1,5 @@ /* compress.c -- compress a memory buffer - * Copyright (C) 1995-2005 Jean-loup Gailly. + * Copyright (C) 1995-2005, 2014, 2016 Jean-loup Gailly, Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -28,16 +28,11 @@ int ZEXPORT compress2 (dest, destLen, source, sourceLen, level) { z_stream stream; int err; + const uInt max = (uInt)-1; + uLong left; - stream.next_in = (z_const Bytef *)source; - stream.avail_in = (uInt)sourceLen; -#ifdef MAXSEG_64K - /* Check for source > 64K on 16-bit machine: */ - if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR; -#endif - stream.next_out = dest; - stream.avail_out = (uInt)*destLen; - if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR; + left = *destLen; + *destLen = 0; stream.zalloc = (alloc_func)0; stream.zfree = (free_func)0; @@ -46,15 +41,26 @@ int ZEXPORT compress2 (dest, destLen, source, sourceLen, level) err = deflateInit(&stream, level); if (err != Z_OK) return err; - err = deflate(&stream, Z_FINISH); - if (err != Z_STREAM_END) { - deflateEnd(&stream); - return err == Z_OK ? Z_BUF_ERROR : err; - } - *destLen = stream.total_out; + stream.next_out = dest; + stream.avail_out = 0; + stream.next_in = (z_const Bytef *)source; + stream.avail_in = 0; - err = deflateEnd(&stream); - return err; + do { + if (stream.avail_out == 0) { + stream.avail_out = left > (uLong)max ? max : (uInt)left; + left -= stream.avail_out; + } + if (stream.avail_in == 0) { + stream.avail_in = sourceLen > (uLong)max ? max : (uInt)sourceLen; + sourceLen -= stream.avail_in; + } + err = deflate(&stream, sourceLen ? Z_NO_FLUSH : Z_FINISH); + } while (err == Z_OK); + + *destLen = stream.total_out; + deflateEnd(&stream); + return err == Z_STREAM_END ? Z_OK : err; } /* =========================================================================== diff --git a/src/3rdparty/zlib/crc32.c b/src/3rdparty/zlib/crc32.c index 979a719..9580440 100644 --- a/src/3rdparty/zlib/crc32.c +++ b/src/3rdparty/zlib/crc32.c @@ -1,5 +1,5 @@ /* crc32.c -- compute the CRC-32 of a data stream - * Copyright (C) 1995-2006, 2010, 2011, 2012 Mark Adler + * Copyright (C) 1995-2006, 2010, 2011, 2012, 2016 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h * * Thanks to Rodney Brown for his contribution of faster @@ -30,17 +30,15 @@ #include "zutil.h" /* for STDC and FAR definitions */ -#define local static - /* Definitions for doing the crc four data bytes at a time. */ #if !defined(NOBYFOUR) && defined(Z_U4) # define BYFOUR #endif #ifdef BYFOUR local unsigned long crc32_little OF((unsigned long, - const unsigned char FAR *, unsigned)); + const unsigned char FAR *, z_size_t)); local unsigned long crc32_big OF((unsigned long, - const unsigned char FAR *, unsigned)); + const unsigned char FAR *, z_size_t)); # define TBLS 8 #else # define TBLS 1 @@ -201,10 +199,10 @@ const z_crc_t FAR * ZEXPORT get_crc_table() #define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1 /* ========================================================================= */ -unsigned long ZEXPORT crc32(crc, buf, len) +unsigned long ZEXPORT crc32_z(crc, buf, len) unsigned long crc; const unsigned char FAR *buf; - uInt len; + z_size_t len; { if (buf == Z_NULL) return 0UL; @@ -235,8 +233,29 @@ unsigned long ZEXPORT crc32(crc, buf, len) return crc ^ 0xffffffffUL; } +/* ========================================================================= */ +unsigned long ZEXPORT crc32(crc, buf, len) + unsigned long crc; + const unsigned char FAR *buf; + uInt len; +{ + return crc32_z(crc, buf, len); +} + #ifdef BYFOUR +/* + This BYFOUR code accesses the passed unsigned char * buffer with a 32-bit + integer pointer type. This violates the strict aliasing rule, where a + compiler can assume, for optimization purposes, that two pointers to + fundamentally different types won't ever point to the same memory. This can + manifest as a problem only if one of the pointers is written to. This code + only reads from those pointers. So long as this code remains isolated in + this compilation unit, there won't be a problem. For this reason, this code + should not be copied and pasted into a compilation unit in which other code + writes to the buffer that is passed to these routines. + */ + /* ========================================================================= */ #define DOLIT4 c ^= *buf4++; \ c = crc_table[3][c & 0xff] ^ crc_table[2][(c >> 8) & 0xff] ^ \ @@ -247,7 +266,7 @@ unsigned long ZEXPORT crc32(crc, buf, len) local unsigned long crc32_little(crc, buf, len) unsigned long crc; const unsigned char FAR *buf; - unsigned len; + z_size_t len; { register z_crc_t c; register const z_crc_t FAR *buf4; @@ -278,7 +297,7 @@ local unsigned long crc32_little(crc, buf, len) } /* ========================================================================= */ -#define DOBIG4 c ^= *++buf4; \ +#define DOBIG4 c ^= *buf4++; \ c = crc_table[4][c & 0xff] ^ crc_table[5][(c >> 8) & 0xff] ^ \ crc_table[6][(c >> 16) & 0xff] ^ crc_table[7][c >> 24] #define DOBIG32 DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4 @@ -287,7 +306,7 @@ local unsigned long crc32_little(crc, buf, len) local unsigned long crc32_big(crc, buf, len) unsigned long crc; const unsigned char FAR *buf; - unsigned len; + z_size_t len; { register z_crc_t c; register const z_crc_t FAR *buf4; @@ -300,7 +319,6 @@ local unsigned long crc32_big(crc, buf, len) } buf4 = (const z_crc_t FAR *)(const void FAR *)buf; - buf4--; while (len >= 32) { DOBIG32; len -= 32; @@ -309,7 +327,6 @@ local unsigned long crc32_big(crc, buf, len) DOBIG4; len -= 4; } - buf4++; buf = (const unsigned char FAR *)buf4; if (len) do { diff --git a/src/3rdparty/zlib/deflate.c b/src/3rdparty/zlib/deflate.c index 6969577..1ec7614 100644 --- a/src/3rdparty/zlib/deflate.c +++ b/src/3rdparty/zlib/deflate.c @@ -1,5 +1,5 @@ /* deflate.c -- compress data using the deflation algorithm - * Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler + * Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -52,7 +52,7 @@ #include "deflate.h" const char deflate_copyright[] = - " deflate 1.2.8 Copyright 1995-2013 Jean-loup Gailly and Mark Adler "; + " deflate 1.2.11 Copyright 1995-2017 Jean-loup Gailly and Mark Adler "; /* If you use the zlib library in a product, an acknowledgment is welcome in the documentation of your product. If for some reason you cannot @@ -73,6 +73,8 @@ typedef enum { typedef block_state (*compress_func) OF((deflate_state *s, int flush)); /* Compression function. Returns the block state after the call. */ +local int deflateStateCheck OF((z_streamp strm)); +local void slide_hash OF((deflate_state *s)); local void fill_window OF((deflate_state *s)); local block_state deflate_stored OF((deflate_state *s, int flush)); local block_state deflate_fast OF((deflate_state *s, int flush)); @@ -84,15 +86,16 @@ local block_state deflate_huff OF((deflate_state *s, int flush)); local void lm_init OF((deflate_state *s)); local void putShortMSB OF((deflate_state *s, uInt b)); local void flush_pending OF((z_streamp strm)); -local int read_buf OF((z_streamp strm, Bytef *buf, unsigned size)); +local unsigned read_buf OF((z_streamp strm, Bytef *buf, unsigned size)); #ifdef ASMV +# pragma message("Assembler code may have bugs -- use at your own risk") void match_init OF((void)); /* asm code initialization */ uInt longest_match OF((deflate_state *s, IPos cur_match)); #else local uInt longest_match OF((deflate_state *s, IPos cur_match)); #endif -#ifdef DEBUG +#ifdef ZLIB_DEBUG local void check_match OF((deflate_state *s, IPos start, IPos match, int length)); #endif @@ -148,21 +151,14 @@ local const config configuration_table[10] = { * meaning. */ -#define EQUAL 0 -/* result of memcmp for equal strings */ - -#ifndef NO_DUMMY_DECL -struct static_tree_desc_s {int dummy;}; /* for buggy compilers */ -#endif - /* rank Z_BLOCK between Z_NO_FLUSH and Z_PARTIAL_FLUSH */ -#define RANK(f) (((f) << 1) - ((f) > 4 ? 9 : 0)) +#define RANK(f) (((f) * 2) - ((f) > 4 ? 9 : 0)) /* =========================================================================== * Update a hash value with the given input byte - * IN assertion: all calls to to UPDATE_HASH are made with consecutive - * input characters, so that a running hash key can be computed from the - * previous key instead of complete recalculation each time. + * IN assertion: all calls to UPDATE_HASH are made with consecutive input + * characters, so that a running hash key can be computed from the previous + * key instead of complete recalculation each time. */ #define UPDATE_HASH(s,h,c) (h = (((h)<hash_shift) ^ (c)) & s->hash_mask) @@ -173,9 +169,9 @@ struct static_tree_desc_s {int dummy;}; /* for buggy compilers */ * the previous length of the hash chain. * If this file is compiled with -DFASTEST, the compression level is forced * to 1, and no hash chains are maintained. - * IN assertion: all calls to to INSERT_STRING are made with consecutive - * input characters and the first MIN_MATCH bytes of str are valid - * (except for the last MIN_MATCH-1 bytes of the input file). + * IN assertion: all calls to INSERT_STRING are made with consecutive input + * characters and the first MIN_MATCH bytes of str are valid (except for + * the last MIN_MATCH-1 bytes of the input file). */ #ifdef FASTEST #define INSERT_STRING(s, str, match_head) \ @@ -197,6 +193,37 @@ struct static_tree_desc_s {int dummy;}; /* for buggy compilers */ s->head[s->hash_size-1] = NIL; \ zmemzero((Bytef *)s->head, (unsigned)(s->hash_size-1)*sizeof(*s->head)); +/* =========================================================================== + * Slide the hash table when sliding the window down (could be avoided with 32 + * bit values at the expense of memory usage). We slide even when level == 0 to + * keep the hash table consistent if we switch back to level > 0 later. + */ +local void slide_hash(s) + deflate_state *s; +{ + unsigned n, m; + Posf *p; + uInt wsize = s->w_size; + + n = s->hash_size; + p = &s->head[n]; + do { + m = *--p; + *p = (Pos)(m >= wsize ? m - wsize : NIL); + } while (--n); + n = wsize; +#ifndef FASTEST + p = &s->prev[n]; + do { + m = *--p; + *p = (Pos)(m >= wsize ? m - wsize : NIL); + /* If n is not on any hash chain, prev[n] is garbage but + * its value will never be used. + */ + } while (--n); +#endif +} + /* ========================================================================= */ int ZEXPORT deflateInit_(strm, level, version, stream_size) z_streamp strm; @@ -270,7 +297,7 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy, #endif if (memLevel < 1 || memLevel > MAX_MEM_LEVEL || method != Z_DEFLATED || windowBits < 8 || windowBits > 15 || level < 0 || level > 9 || - strategy < 0 || strategy > Z_FIXED) { + strategy < 0 || strategy > Z_FIXED || (windowBits == 8 && wrap != 1)) { return Z_STREAM_ERROR; } if (windowBits == 8) windowBits = 9; /* until 256-byte window bug fixed */ @@ -278,14 +305,15 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy, if (s == Z_NULL) return Z_MEM_ERROR; strm->state = (struct internal_state FAR *)s; s->strm = strm; + s->status = INIT_STATE; /* to pass state test in deflateReset() */ s->wrap = wrap; s->gzhead = Z_NULL; - s->w_bits = windowBits; + s->w_bits = (uInt)windowBits; s->w_size = 1 << s->w_bits; s->w_mask = s->w_size - 1; - s->hash_bits = memLevel + 7; + s->hash_bits = (uInt)memLevel + 7; s->hash_size = 1 << s->hash_bits; s->hash_mask = s->hash_size - 1; s->hash_shift = ((s->hash_bits+MIN_MATCH-1)/MIN_MATCH); @@ -319,6 +347,31 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy, return deflateReset(strm); } +/* ========================================================================= + * Check for a valid deflate stream state. Return 0 if ok, 1 if not. + */ +local int deflateStateCheck (strm) + z_streamp strm; +{ + deflate_state *s; + if (strm == Z_NULL || + strm->zalloc == (alloc_func)0 || strm->zfree == (free_func)0) + return 1; + s = strm->state; + if (s == Z_NULL || s->strm != strm || (s->status != INIT_STATE && +#ifdef GZIP + s->status != GZIP_STATE && +#endif + s->status != EXTRA_STATE && + s->status != NAME_STATE && + s->status != COMMENT_STATE && + s->status != HCRC_STATE && + s->status != BUSY_STATE && + s->status != FINISH_STATE)) + return 1; + return 0; +} + /* ========================================================================= */ int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength) z_streamp strm; @@ -331,7 +384,7 @@ int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength) unsigned avail; z_const unsigned char *next; - if (strm == Z_NULL || strm->state == Z_NULL || dictionary == Z_NULL) + if (deflateStateCheck(strm) || dictionary == Z_NULL) return Z_STREAM_ERROR; s = strm->state; wrap = s->wrap; @@ -388,14 +441,35 @@ int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength) return Z_OK; } +/* ========================================================================= */ +int ZEXPORT deflateGetDictionary (strm, dictionary, dictLength) + z_streamp strm; + Bytef *dictionary; + uInt *dictLength; +{ + deflate_state *s; + uInt len; + + if (deflateStateCheck(strm)) + return Z_STREAM_ERROR; + s = strm->state; + len = s->strstart + s->lookahead; + if (len > s->w_size) + len = s->w_size; + if (dictionary != Z_NULL && len) + zmemcpy(dictionary, s->window + s->strstart + s->lookahead - len, len); + if (dictLength != Z_NULL) + *dictLength = len; + return Z_OK; +} + /* ========================================================================= */ int ZEXPORT deflateResetKeep (strm) z_streamp strm; { deflate_state *s; - if (strm == Z_NULL || strm->state == Z_NULL || - strm->zalloc == (alloc_func)0 || strm->zfree == (free_func)0) { + if (deflateStateCheck(strm)) { return Z_STREAM_ERROR; } @@ -410,7 +484,11 @@ int ZEXPORT deflateResetKeep (strm) if (s->wrap < 0) { s->wrap = -s->wrap; /* was made negative by deflate(..., Z_FINISH); */ } - s->status = s->wrap ? INIT_STATE : BUSY_STATE; + s->status = +#ifdef GZIP + s->wrap == 2 ? GZIP_STATE : +#endif + s->wrap ? INIT_STATE : BUSY_STATE; strm->adler = #ifdef GZIP s->wrap == 2 ? crc32(0L, Z_NULL, 0) : @@ -440,8 +518,8 @@ int ZEXPORT deflateSetHeader (strm, head) z_streamp strm; gz_headerp head; { - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; - if (strm->state->wrap != 2) return Z_STREAM_ERROR; + if (deflateStateCheck(strm) || strm->state->wrap != 2) + return Z_STREAM_ERROR; strm->state->gzhead = head; return Z_OK; } @@ -452,7 +530,7 @@ int ZEXPORT deflatePending (strm, pending, bits) int *bits; z_streamp strm; { - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + if (deflateStateCheck(strm)) return Z_STREAM_ERROR; if (pending != Z_NULL) *pending = strm->state->pending; if (bits != Z_NULL) @@ -469,7 +547,7 @@ int ZEXPORT deflatePrime (strm, bits, value) deflate_state *s; int put; - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + if (deflateStateCheck(strm)) return Z_STREAM_ERROR; s = strm->state; if ((Bytef *)(s->d_buf) < s->pending_out + ((Buf_size + 7) >> 3)) return Z_BUF_ERROR; @@ -494,9 +572,8 @@ int ZEXPORT deflateParams(strm, level, strategy) { deflate_state *s; compress_func func; - int err = Z_OK; - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + if (deflateStateCheck(strm)) return Z_STREAM_ERROR; s = strm->state; #ifdef FASTEST @@ -510,13 +587,22 @@ int ZEXPORT deflateParams(strm, level, strategy) func = configuration_table[s->level].func; if ((strategy != s->strategy || func != configuration_table[level].func) && - strm->total_in != 0) { + s->high_water) { /* Flush the last buffer: */ - err = deflate(strm, Z_BLOCK); - if (err == Z_BUF_ERROR && s->pending == 0) - err = Z_OK; + int err = deflate(strm, Z_BLOCK); + if (err == Z_STREAM_ERROR) + return err; + if (strm->avail_out == 0) + return Z_BUF_ERROR; } if (s->level != level) { + if (s->level == 0 && s->matches != 0) { + if (s->matches == 1) + slide_hash(s); + else + CLEAR_HASH(s); + s->matches = 0; + } s->level = level; s->max_lazy_match = configuration_table[level].max_lazy; s->good_match = configuration_table[level].good_length; @@ -524,7 +610,7 @@ int ZEXPORT deflateParams(strm, level, strategy) s->max_chain_length = configuration_table[level].max_chain; } s->strategy = strategy; - return err; + return Z_OK; } /* ========================================================================= */ @@ -537,12 +623,12 @@ int ZEXPORT deflateTune(strm, good_length, max_lazy, nice_length, max_chain) { deflate_state *s; - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + if (deflateStateCheck(strm)) return Z_STREAM_ERROR; s = strm->state; - s->good_match = good_length; - s->max_lazy_match = max_lazy; + s->good_match = (uInt)good_length; + s->max_lazy_match = (uInt)max_lazy; s->nice_match = nice_length; - s->max_chain_length = max_chain; + s->max_chain_length = (uInt)max_chain; return Z_OK; } @@ -569,14 +655,13 @@ uLong ZEXPORT deflateBound(strm, sourceLen) { deflate_state *s; uLong complen, wraplen; - Bytef *str; /* conservative upper bound for compressed data */ complen = sourceLen + ((sourceLen + 7) >> 3) + ((sourceLen + 63) >> 6) + 5; /* if can't get parameters, return conservative bound plus zlib wrapper */ - if (strm == Z_NULL || strm->state == Z_NULL) + if (deflateStateCheck(strm)) return complen + 6; /* compute wrapper length */ @@ -588,9 +673,11 @@ uLong ZEXPORT deflateBound(strm, sourceLen) case 1: /* zlib wrapper */ wraplen = 6 + (s->strstart ? 4 : 0); break; +#ifdef GZIP case 2: /* gzip wrapper */ wraplen = 18; if (s->gzhead != Z_NULL) { /* user-supplied gzip header */ + Bytef *str; if (s->gzhead->extra != Z_NULL) wraplen += 2 + s->gzhead->extra_len; str = s->gzhead->name; @@ -607,6 +694,7 @@ uLong ZEXPORT deflateBound(strm, sourceLen) wraplen += 2; } break; +#endif default: /* for compiler happiness */ wraplen = 6; } @@ -634,10 +722,10 @@ local void putShortMSB (s, b) } /* ========================================================================= - * Flush as much pending output as possible. All deflate() output goes - * through this function so some applications may wish to modify it - * to avoid allocating a large strm->next_out buffer and copying into it. - * (See also read_buf()). + * Flush as much pending output as possible. All deflate() output, except for + * some deflate_stored() output, goes through this function so some + * applications may wish to modify it to avoid allocating a large + * strm->next_out buffer and copying into it. (See also read_buf()). */ local void flush_pending(strm) z_streamp strm; @@ -654,13 +742,23 @@ local void flush_pending(strm) strm->next_out += len; s->pending_out += len; strm->total_out += len; - strm->avail_out -= len; - s->pending -= len; + strm->avail_out -= len; + s->pending -= len; if (s->pending == 0) { s->pending_out = s->pending_buf; } } +/* =========================================================================== + * Update the header CRC with the bytes s->pending_buf[beg..s->pending - 1]. + */ +#define HCRC_UPDATE(beg) \ + do { \ + if (s->gzhead->hcrc && s->pending > (beg)) \ + strm->adler = crc32(strm->adler, s->pending_buf + (beg), \ + s->pending - (beg)); \ + } while (0) + /* ========================================================================= */ int ZEXPORT deflate (strm, flush) z_streamp strm; @@ -669,203 +767,21 @@ int ZEXPORT deflate (strm, flush) int old_flush; /* value of flush param for previous deflate call */ deflate_state *s; - if (strm == Z_NULL || strm->state == Z_NULL || - flush > Z_BLOCK || flush < 0) { + if (deflateStateCheck(strm) || flush > Z_BLOCK || flush < 0) { return Z_STREAM_ERROR; } s = strm->state; if (strm->next_out == Z_NULL || - (strm->next_in == Z_NULL && strm->avail_in != 0) || + (strm->avail_in != 0 && strm->next_in == Z_NULL) || (s->status == FINISH_STATE && flush != Z_FINISH)) { ERR_RETURN(strm, Z_STREAM_ERROR); } if (strm->avail_out == 0) ERR_RETURN(strm, Z_BUF_ERROR); - s->strm = strm; /* just in case */ old_flush = s->last_flush; s->last_flush = flush; - /* Write the header */ - if (s->status == INIT_STATE) { -#ifdef GZIP - if (s->wrap == 2) { - strm->adler = crc32(0L, Z_NULL, 0); - put_byte(s, 31); - put_byte(s, 139); - put_byte(s, 8); - if (s->gzhead == Z_NULL) { - put_byte(s, 0); - put_byte(s, 0); - put_byte(s, 0); - put_byte(s, 0); - put_byte(s, 0); - put_byte(s, s->level == 9 ? 2 : - (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ? - 4 : 0)); - put_byte(s, OS_CODE); - s->status = BUSY_STATE; - } - else { - put_byte(s, (s->gzhead->text ? 1 : 0) + - (s->gzhead->hcrc ? 2 : 0) + - (s->gzhead->extra == Z_NULL ? 0 : 4) + - (s->gzhead->name == Z_NULL ? 0 : 8) + - (s->gzhead->comment == Z_NULL ? 0 : 16) - ); - put_byte(s, (Byte)(s->gzhead->time & 0xff)); - put_byte(s, (Byte)((s->gzhead->time >> 8) & 0xff)); - put_byte(s, (Byte)((s->gzhead->time >> 16) & 0xff)); - put_byte(s, (Byte)((s->gzhead->time >> 24) & 0xff)); - put_byte(s, s->level == 9 ? 2 : - (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ? - 4 : 0)); - put_byte(s, s->gzhead->os & 0xff); - if (s->gzhead->extra != Z_NULL) { - put_byte(s, s->gzhead->extra_len & 0xff); - put_byte(s, (s->gzhead->extra_len >> 8) & 0xff); - } - if (s->gzhead->hcrc) - strm->adler = crc32(strm->adler, s->pending_buf, - s->pending); - s->gzindex = 0; - s->status = EXTRA_STATE; - } - } - else -#endif - { - uInt header = (Z_DEFLATED + ((s->w_bits-8)<<4)) << 8; - uInt level_flags; - - if (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2) - level_flags = 0; - else if (s->level < 6) - level_flags = 1; - else if (s->level == 6) - level_flags = 2; - else - level_flags = 3; - header |= (level_flags << 6); - if (s->strstart != 0) header |= PRESET_DICT; - header += 31 - (header % 31); - - s->status = BUSY_STATE; - putShortMSB(s, header); - - /* Save the adler32 of the preset dictionary: */ - if (s->strstart != 0) { - putShortMSB(s, (uInt)(strm->adler >> 16)); - putShortMSB(s, (uInt)(strm->adler & 0xffff)); - } - strm->adler = adler32(0L, Z_NULL, 0); - } - } -#ifdef GZIP - if (s->status == EXTRA_STATE) { - if (s->gzhead->extra != Z_NULL) { - uInt beg = s->pending; /* start of bytes to update crc */ - - while (s->gzindex < (s->gzhead->extra_len & 0xffff)) { - if (s->pending == s->pending_buf_size) { - if (s->gzhead->hcrc && s->pending > beg) - strm->adler = crc32(strm->adler, s->pending_buf + beg, - s->pending - beg); - flush_pending(strm); - beg = s->pending; - if (s->pending == s->pending_buf_size) - break; - } - put_byte(s, s->gzhead->extra[s->gzindex]); - s->gzindex++; - } - if (s->gzhead->hcrc && s->pending > beg) - strm->adler = crc32(strm->adler, s->pending_buf + beg, - s->pending - beg); - if (s->gzindex == s->gzhead->extra_len) { - s->gzindex = 0; - s->status = NAME_STATE; - } - } - else - s->status = NAME_STATE; - } - if (s->status == NAME_STATE) { - if (s->gzhead->name != Z_NULL) { - uInt beg = s->pending; /* start of bytes to update crc */ - int val; - - do { - if (s->pending == s->pending_buf_size) { - if (s->gzhead->hcrc && s->pending > beg) - strm->adler = crc32(strm->adler, s->pending_buf + beg, - s->pending - beg); - flush_pending(strm); - beg = s->pending; - if (s->pending == s->pending_buf_size) { - val = 1; - break; - } - } - val = s->gzhead->name[s->gzindex++]; - put_byte(s, val); - } while (val != 0); - if (s->gzhead->hcrc && s->pending > beg) - strm->adler = crc32(strm->adler, s->pending_buf + beg, - s->pending - beg); - if (val == 0) { - s->gzindex = 0; - s->status = COMMENT_STATE; - } - } - else - s->status = COMMENT_STATE; - } - if (s->status == COMMENT_STATE) { - if (s->gzhead->comment != Z_NULL) { - uInt beg = s->pending; /* start of bytes to update crc */ - int val; - - do { - if (s->pending == s->pending_buf_size) { - if (s->gzhead->hcrc && s->pending > beg) - strm->adler = crc32(strm->adler, s->pending_buf + beg, - s->pending - beg); - flush_pending(strm); - beg = s->pending; - if (s->pending == s->pending_buf_size) { - val = 1; - break; - } - } - val = s->gzhead->comment[s->gzindex++]; - put_byte(s, val); - } while (val != 0); - if (s->gzhead->hcrc && s->pending > beg) - strm->adler = crc32(strm->adler, s->pending_buf + beg, - s->pending - beg); - if (val == 0) - s->status = HCRC_STATE; - } - else - s->status = HCRC_STATE; - } - if (s->status == HCRC_STATE) { - if (s->gzhead->hcrc) { - if (s->pending + 2 > s->pending_buf_size) - flush_pending(strm); - if (s->pending + 2 <= s->pending_buf_size) { - put_byte(s, (Byte)(strm->adler & 0xff)); - put_byte(s, (Byte)((strm->adler >> 8) & 0xff)); - strm->adler = crc32(0L, Z_NULL, 0); - s->status = BUSY_STATE; - } - } - else - s->status = BUSY_STATE; - } -#endif - /* Flush as much pending output as possible */ if (s->pending != 0) { flush_pending(strm); @@ -894,15 +810,197 @@ int ZEXPORT deflate (strm, flush) ERR_RETURN(strm, Z_BUF_ERROR); } + /* Write the header */ + if (s->status == INIT_STATE) { + /* zlib header */ + uInt header = (Z_DEFLATED + ((s->w_bits-8)<<4)) << 8; + uInt level_flags; + + if (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2) + level_flags = 0; + else if (s->level < 6) + level_flags = 1; + else if (s->level == 6) + level_flags = 2; + else + level_flags = 3; + header |= (level_flags << 6); + if (s->strstart != 0) header |= PRESET_DICT; + header += 31 - (header % 31); + + putShortMSB(s, header); + + /* Save the adler32 of the preset dictionary: */ + if (s->strstart != 0) { + putShortMSB(s, (uInt)(strm->adler >> 16)); + putShortMSB(s, (uInt)(strm->adler & 0xffff)); + } + strm->adler = adler32(0L, Z_NULL, 0); + s->status = BUSY_STATE; + + /* Compression must start with an empty pending buffer */ + flush_pending(strm); + if (s->pending != 0) { + s->last_flush = -1; + return Z_OK; + } + } +#ifdef GZIP + if (s->status == GZIP_STATE) { + /* gzip header */ + strm->adler = crc32(0L, Z_NULL, 0); + put_byte(s, 31); + put_byte(s, 139); + put_byte(s, 8); + if (s->gzhead == Z_NULL) { + put_byte(s, 0); + put_byte(s, 0); + put_byte(s, 0); + put_byte(s, 0); + put_byte(s, 0); + put_byte(s, s->level == 9 ? 2 : + (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ? + 4 : 0)); + put_byte(s, OS_CODE); + s->status = BUSY_STATE; + + /* Compression must start with an empty pending buffer */ + flush_pending(strm); + if (s->pending != 0) { + s->last_flush = -1; + return Z_OK; + } + } + else { + put_byte(s, (s->gzhead->text ? 1 : 0) + + (s->gzhead->hcrc ? 2 : 0) + + (s->gzhead->extra == Z_NULL ? 0 : 4) + + (s->gzhead->name == Z_NULL ? 0 : 8) + + (s->gzhead->comment == Z_NULL ? 0 : 16) + ); + put_byte(s, (Byte)(s->gzhead->time & 0xff)); + put_byte(s, (Byte)((s->gzhead->time >> 8) & 0xff)); + put_byte(s, (Byte)((s->gzhead->time >> 16) & 0xff)); + put_byte(s, (Byte)((s->gzhead->time >> 24) & 0xff)); + put_byte(s, s->level == 9 ? 2 : + (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ? + 4 : 0)); + put_byte(s, s->gzhead->os & 0xff); + if (s->gzhead->extra != Z_NULL) { + put_byte(s, s->gzhead->extra_len & 0xff); + put_byte(s, (s->gzhead->extra_len >> 8) & 0xff); + } + if (s->gzhead->hcrc) + strm->adler = crc32(strm->adler, s->pending_buf, + s->pending); + s->gzindex = 0; + s->status = EXTRA_STATE; + } + } + if (s->status == EXTRA_STATE) { + if (s->gzhead->extra != Z_NULL) { + ulg beg = s->pending; /* start of bytes to update crc */ + uInt left = (s->gzhead->extra_len & 0xffff) - s->gzindex; + while (s->pending + left > s->pending_buf_size) { + uInt copy = s->pending_buf_size - s->pending; + zmemcpy(s->pending_buf + s->pending, + s->gzhead->extra + s->gzindex, copy); + s->pending = s->pending_buf_size; + HCRC_UPDATE(beg); + s->gzindex += copy; + flush_pending(strm); + if (s->pending != 0) { + s->last_flush = -1; + return Z_OK; + } + beg = 0; + left -= copy; + } + zmemcpy(s->pending_buf + s->pending, + s->gzhead->extra + s->gzindex, left); + s->pending += left; + HCRC_UPDATE(beg); + s->gzindex = 0; + } + s->status = NAME_STATE; + } + if (s->status == NAME_STATE) { + if (s->gzhead->name != Z_NULL) { + ulg beg = s->pending; /* start of bytes to update crc */ + int val; + do { + if (s->pending == s->pending_buf_size) { + HCRC_UPDATE(beg); + flush_pending(strm); + if (s->pending != 0) { + s->last_flush = -1; + return Z_OK; + } + beg = 0; + } + val = s->gzhead->name[s->gzindex++]; + put_byte(s, val); + } while (val != 0); + HCRC_UPDATE(beg); + s->gzindex = 0; + } + s->status = COMMENT_STATE; + } + if (s->status == COMMENT_STATE) { + if (s->gzhead->comment != Z_NULL) { + ulg beg = s->pending; /* start of bytes to update crc */ + int val; + do { + if (s->pending == s->pending_buf_size) { + HCRC_UPDATE(beg); + flush_pending(strm); + if (s->pending != 0) { + s->last_flush = -1; + return Z_OK; + } + beg = 0; + } + val = s->gzhead->comment[s->gzindex++]; + put_byte(s, val); + } while (val != 0); + HCRC_UPDATE(beg); + } + s->status = HCRC_STATE; + } + if (s->status == HCRC_STATE) { + if (s->gzhead->hcrc) { + if (s->pending + 2 > s->pending_buf_size) { + flush_pending(strm); + if (s->pending != 0) { + s->last_flush = -1; + return Z_OK; + } + } + put_byte(s, (Byte)(strm->adler & 0xff)); + put_byte(s, (Byte)((strm->adler >> 8) & 0xff)); + strm->adler = crc32(0L, Z_NULL, 0); + } + s->status = BUSY_STATE; + + /* Compression must start with an empty pending buffer */ + flush_pending(strm); + if (s->pending != 0) { + s->last_flush = -1; + return Z_OK; + } + } +#endif + /* Start a new block or continue the current one. */ if (strm->avail_in != 0 || s->lookahead != 0 || (flush != Z_NO_FLUSH && s->status != FINISH_STATE)) { block_state bstate; - bstate = s->strategy == Z_HUFFMAN_ONLY ? deflate_huff(s, flush) : - (s->strategy == Z_RLE ? deflate_rle(s, flush) : - (*(configuration_table[s->level].func))(s, flush)); + bstate = s->level == 0 ? deflate_stored(s, flush) : + s->strategy == Z_HUFFMAN_ONLY ? deflate_huff(s, flush) : + s->strategy == Z_RLE ? deflate_rle(s, flush) : + (*(configuration_table[s->level].func))(s, flush); if (bstate == finish_started || bstate == finish_done) { s->status = FINISH_STATE; @@ -944,7 +1042,6 @@ int ZEXPORT deflate (strm, flush) } } } - Assert(strm->avail_out > 0, "bug2"); if (flush != Z_FINISH) return Z_OK; if (s->wrap <= 0) return Z_STREAM_END; @@ -981,18 +1078,9 @@ int ZEXPORT deflateEnd (strm) { int status; - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + if (deflateStateCheck(strm)) return Z_STREAM_ERROR; status = strm->state->status; - if (status != INIT_STATE && - status != EXTRA_STATE && - status != NAME_STATE && - status != COMMENT_STATE && - status != HCRC_STATE && - status != BUSY_STATE && - status != FINISH_STATE) { - return Z_STREAM_ERROR; - } /* Deallocate in reverse order of allocations: */ TRY_FREE(strm, strm->state->pending_buf); @@ -1023,7 +1111,7 @@ int ZEXPORT deflateCopy (dest, source) ushf *overlay; - if (source == Z_NULL || dest == Z_NULL || source->state == Z_NULL) { + if (deflateStateCheck(source) || dest == Z_NULL) { return Z_STREAM_ERROR; } @@ -1073,7 +1161,7 @@ int ZEXPORT deflateCopy (dest, source) * allocating a large strm->next_in buffer and copying from it. * (See also flush_pending()). */ -local int read_buf(strm, buf, size) +local unsigned read_buf(strm, buf, size) z_streamp strm; Bytef *buf; unsigned size; @@ -1097,7 +1185,7 @@ local int read_buf(strm, buf, size) strm->next_in += len; strm->total_in += len; - return (int)len; + return len; } /* =========================================================================== @@ -1151,9 +1239,9 @@ local uInt longest_match(s, cur_match) { unsigned chain_length = s->max_chain_length;/* max hash chain length */ register Bytef *scan = s->window + s->strstart; /* current string */ - register Bytef *match; /* matched string */ + register Bytef *match; /* matched string */ register int len; /* length of current match */ - int best_len = s->prev_length; /* best match length so far */ + int best_len = (int)s->prev_length; /* best match length so far */ int nice_match = s->nice_match; /* stop if match long enough */ IPos limit = s->strstart > (IPos)MAX_DIST(s) ? s->strstart - (IPos)MAX_DIST(s) : NIL; @@ -1188,7 +1276,7 @@ local uInt longest_match(s, cur_match) /* Do not look for matches beyond the end of the input. This is necessary * to make deflate deterministic. */ - if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead; + if ((uInt)nice_match > s->lookahead) nice_match = (int)s->lookahead; Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead"); @@ -1349,7 +1437,11 @@ local uInt longest_match(s, cur_match) #endif /* FASTEST */ -#ifdef DEBUG +#ifdef ZLIB_DEBUG + +#define EQUAL 0 +/* result of memcmp for equal strings */ + /* =========================================================================== * Check that the match at match_start is indeed a match. */ @@ -1375,7 +1467,7 @@ local void check_match(s, start, match, length) } #else # define check_match(s, start, match, length) -#endif /* DEBUG */ +#endif /* ZLIB_DEBUG */ /* =========================================================================== * Fill the window when the lookahead becomes insufficient. @@ -1390,8 +1482,7 @@ local void check_match(s, start, match, length) local void fill_window(s) deflate_state *s; { - register unsigned n, m; - register Posf *p; + unsigned n; unsigned more; /* Amount of free space at the end of the window. */ uInt wsize = s->w_size; @@ -1418,35 +1509,11 @@ local void fill_window(s) */ if (s->strstart >= wsize+MAX_DIST(s)) { - zmemcpy(s->window, s->window+wsize, (unsigned)wsize); + zmemcpy(s->window, s->window+wsize, (unsigned)wsize - more); s->match_start -= wsize; s->strstart -= wsize; /* we now have strstart >= MAX_DIST */ s->block_start -= (long) wsize; - - /* Slide the hash table (could be avoided with 32 bit values - at the expense of memory usage). We slide even when level == 0 - to keep the hash table consistent if we switch back to level > 0 - later. (Using level 0 permanently is not an optimal usage of - zlib, so we don't care about this pathological case.) - */ - n = s->hash_size; - p = &s->head[n]; - do { - m = *--p; - *p = (Pos)(m >= wsize ? m-wsize : NIL); - } while (--n); - - n = wsize; -#ifndef FASTEST - p = &s->prev[n]; - do { - m = *--p; - *p = (Pos)(m >= wsize ? m-wsize : NIL); - /* If n is not on any hash chain, prev[n] is garbage but - * its value will never be used. - */ - } while (--n); -#endif + slide_hash(s); more += wsize; } if (s->strm->avail_in == 0) break; @@ -1552,70 +1619,199 @@ local void fill_window(s) if (s->strm->avail_out == 0) return (last) ? finish_started : need_more; \ } +/* Maximum stored block length in deflate format (not including header). */ +#define MAX_STORED 65535 + +/* Minimum of a and b. */ +#define MIN(a, b) ((a) > (b) ? (b) : (a)) + /* =========================================================================== * Copy without compression as much as possible from the input stream, return * the current block state. - * This function does not insert new strings in the dictionary since - * uncompressible data is probably not useful. This function is used - * only for the level=0 compression option. - * NOTE: this function should be optimized to avoid extra copying from - * window to pending_buf. + * + * In case deflateParams() is used to later switch to a non-zero compression + * level, s->matches (otherwise unused when storing) keeps track of the number + * of hash table slides to perform. If s->matches is 1, then one hash table + * slide will be done when switching. If s->matches is 2, the maximum value + * allowed here, then the hash table will be cleared, since two or more slides + * is the same as a clear. + * + * deflate_stored() is written to minimize the number of times an input byte is + * copied. It is most efficient with large input and output buffers, which + * maximizes the opportunites to have a single copy from next_in to next_out. */ local block_state deflate_stored(s, flush) deflate_state *s; int flush; { - /* Stored blocks are limited to 0xffff bytes, pending_buf is limited - * to pending_buf_size, and each stored block has a 5 byte header: + /* Smallest worthy block size when not flushing or finishing. By default + * this is 32K. This can be as small as 507 bytes for memLevel == 1. For + * large input and output buffers, the stored block size will be larger. */ - ulg max_block_size = 0xffff; - ulg max_start; + unsigned min_block = MIN(s->pending_buf_size - 5, s->w_size); - if (max_block_size > s->pending_buf_size - 5) { - max_block_size = s->pending_buf_size - 5; - } - - /* Copy as much as possible from input to output: */ - for (;;) { - /* Fill the window as much as possible: */ - if (s->lookahead <= 1) { - - Assert(s->strstart < s->w_size+MAX_DIST(s) || - s->block_start >= (long)s->w_size, "slide too late"); - - fill_window(s); - if (s->lookahead == 0 && flush == Z_NO_FLUSH) return need_more; - - if (s->lookahead == 0) break; /* flush the current block */ - } - Assert(s->block_start >= 0L, "block gone"); - - s->strstart += s->lookahead; - s->lookahead = 0; - - /* Emit a stored block if pending_buf will be full: */ - max_start = s->block_start + max_block_size; - if (s->strstart == 0 || (ulg)s->strstart >= max_start) { - /* strstart == 0 is possible when wraparound on 16-bit machine */ - s->lookahead = (uInt)(s->strstart - max_start); - s->strstart = (uInt)max_start; - FLUSH_BLOCK(s, 0); - } - /* Flush if we may have to slide, otherwise block_start may become - * negative and the data will be gone: + /* Copy as many min_block or larger stored blocks directly to next_out as + * possible. If flushing, copy the remaining available input to next_out as + * stored blocks, if there is enough space. + */ + unsigned len, left, have, last = 0; + unsigned used = s->strm->avail_in; + do { + /* Set len to the maximum size block that we can copy directly with the + * available input data and output space. Set left to how much of that + * would be copied from what's left in the window. */ - if (s->strstart - (uInt)s->block_start >= MAX_DIST(s)) { - FLUSH_BLOCK(s, 0); + len = MAX_STORED; /* maximum deflate stored block length */ + have = (s->bi_valid + 42) >> 3; /* number of header bytes */ + if (s->strm->avail_out < have) /* need room for header */ + break; + /* maximum stored block length that will fit in avail_out: */ + have = s->strm->avail_out - have; + left = s->strstart - s->block_start; /* bytes left in window */ + if (len > (ulg)left + s->strm->avail_in) + len = left + s->strm->avail_in; /* limit len to the input */ + if (len > have) + len = have; /* limit len to the output */ + + /* If the stored block would be less than min_block in length, or if + * unable to copy all of the available input when flushing, then try + * copying to the window and the pending buffer instead. Also don't + * write an empty block when flushing -- deflate() does that. + */ + if (len < min_block && ((len == 0 && flush != Z_FINISH) || + flush == Z_NO_FLUSH || + len != left + s->strm->avail_in)) + break; + + /* Make a dummy stored block in pending to get the header bytes, + * including any pending bits. This also updates the debugging counts. + */ + last = flush == Z_FINISH && len == left + s->strm->avail_in ? 1 : 0; + _tr_stored_block(s, (char *)0, 0L, last); + + /* Replace the lengths in the dummy stored block with len. */ + s->pending_buf[s->pending - 4] = len; + s->pending_buf[s->pending - 3] = len >> 8; + s->pending_buf[s->pending - 2] = ~len; + s->pending_buf[s->pending - 1] = ~len >> 8; + + /* Write the stored block header bytes. */ + flush_pending(s->strm); + +#ifdef ZLIB_DEBUG + /* Update debugging counts for the data about to be copied. */ + s->compressed_len += len << 3; + s->bits_sent += len << 3; +#endif + + /* Copy uncompressed bytes from the window to next_out. */ + if (left) { + if (left > len) + left = len; + zmemcpy(s->strm->next_out, s->window + s->block_start, left); + s->strm->next_out += left; + s->strm->avail_out -= left; + s->strm->total_out += left; + s->block_start += left; + len -= left; } + + /* Copy uncompressed bytes directly from next_in to next_out, updating + * the check value. + */ + if (len) { + read_buf(s->strm, s->strm->next_out, len); + s->strm->next_out += len; + s->strm->avail_out -= len; + s->strm->total_out += len; + } + } while (last == 0); + + /* Update the sliding window with the last s->w_size bytes of the copied + * data, or append all of the copied data to the existing window if less + * than s->w_size bytes were copied. Also update the number of bytes to + * insert in the hash tables, in the event that deflateParams() switches to + * a non-zero compression level. + */ + used -= s->strm->avail_in; /* number of input bytes directly copied */ + if (used) { + /* If any input was used, then no unused input remains in the window, + * therefore s->block_start == s->strstart. + */ + if (used >= s->w_size) { /* supplant the previous history */ + s->matches = 2; /* clear hash */ + zmemcpy(s->window, s->strm->next_in - s->w_size, s->w_size); + s->strstart = s->w_size; + } + else { + if (s->window_size - s->strstart <= used) { + /* Slide the window down. */ + s->strstart -= s->w_size; + zmemcpy(s->window, s->window + s->w_size, s->strstart); + if (s->matches < 2) + s->matches++; /* add a pending slide_hash() */ + } + zmemcpy(s->window + s->strstart, s->strm->next_in - used, used); + s->strstart += used; + } + s->block_start = s->strstart; + s->insert += MIN(used, s->w_size - s->insert); } - s->insert = 0; - if (flush == Z_FINISH) { - FLUSH_BLOCK(s, 1); + if (s->high_water < s->strstart) + s->high_water = s->strstart; + + /* If the last block was written to next_out, then done. */ + if (last) return finish_done; + + /* If flushing and all input has been consumed, then done. */ + if (flush != Z_NO_FLUSH && flush != Z_FINISH && + s->strm->avail_in == 0 && (long)s->strstart == s->block_start) + return block_done; + + /* Fill the window with any remaining input. */ + have = s->window_size - s->strstart - 1; + if (s->strm->avail_in > have && s->block_start >= (long)s->w_size) { + /* Slide the window down. */ + s->block_start -= s->w_size; + s->strstart -= s->w_size; + zmemcpy(s->window, s->window + s->w_size, s->strstart); + if (s->matches < 2) + s->matches++; /* add a pending slide_hash() */ + have += s->w_size; /* more space now */ } - if ((long)s->strstart > s->block_start) - FLUSH_BLOCK(s, 0); - return block_done; + if (have > s->strm->avail_in) + have = s->strm->avail_in; + if (have) { + read_buf(s->strm, s->window + s->strstart, have); + s->strstart += have; + } + if (s->high_water < s->strstart) + s->high_water = s->strstart; + + /* There was not enough avail_out to write a complete worthy or flushed + * stored block to next_out. Write a stored block to pending instead, if we + * have enough input for a worthy block, or if flushing and there is enough + * room for the remaining input as a stored block in the pending buffer. + */ + have = (s->bi_valid + 42) >> 3; /* number of header bytes */ + /* maximum stored block length that will fit in pending: */ + have = MIN(s->pending_buf_size - have, MAX_STORED); + min_block = MIN(have, s->w_size); + left = s->strstart - s->block_start; + if (left >= min_block || + ((left || flush == Z_FINISH) && flush != Z_NO_FLUSH && + s->strm->avail_in == 0 && left <= have)) { + len = MIN(left, have); + last = flush == Z_FINISH && s->strm->avail_in == 0 && + len == left ? 1 : 0; + _tr_stored_block(s, (charf *)s->window + s->block_start, len, last); + s->block_start += len; + flush_pending(s->strm); + } + + /* We've done all we can with the available input and output. */ + return last ? finish_started : need_more; } /* =========================================================================== @@ -1892,7 +2088,7 @@ local block_state deflate_rle(s, flush) prev == *++scan && prev == *++scan && prev == *++scan && prev == *++scan && scan < strend); - s->match_length = MAX_MATCH - (int)(strend - scan); + s->match_length = MAX_MATCH - (uInt)(strend - scan); if (s->match_length > s->lookahead) s->match_length = s->lookahead; } diff --git a/src/3rdparty/zlib/deflate.h b/src/3rdparty/zlib/deflate.h index ce0299e..23ecdd3 100644 --- a/src/3rdparty/zlib/deflate.h +++ b/src/3rdparty/zlib/deflate.h @@ -1,5 +1,5 @@ /* deflate.h -- internal compression state - * Copyright (C) 1995-2012 Jean-loup Gailly + * Copyright (C) 1995-2016 Jean-loup Gailly * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -51,13 +51,16 @@ #define Buf_size 16 /* size of bit buffer in bi_buf */ -#define INIT_STATE 42 -#define EXTRA_STATE 69 -#define NAME_STATE 73 -#define COMMENT_STATE 91 -#define HCRC_STATE 103 -#define BUSY_STATE 113 -#define FINISH_STATE 666 +#define INIT_STATE 42 /* zlib header -> BUSY_STATE */ +#ifdef GZIP +# define GZIP_STATE 57 /* gzip header -> BUSY_STATE | EXTRA_STATE */ +#endif +#define EXTRA_STATE 69 /* gzip extra block -> NAME_STATE */ +#define NAME_STATE 73 /* gzip file name -> COMMENT_STATE */ +#define COMMENT_STATE 91 /* gzip comment -> HCRC_STATE */ +#define HCRC_STATE 103 /* gzip header CRC -> BUSY_STATE */ +#define BUSY_STATE 113 /* deflate -> FINISH_STATE */ +#define FINISH_STATE 666 /* stream complete */ /* Stream status */ @@ -83,7 +86,7 @@ typedef struct static_tree_desc_s static_tree_desc; typedef struct tree_desc_s { ct_data *dyn_tree; /* the dynamic tree */ int max_code; /* largest code with non zero frequency */ - static_tree_desc *stat_desc; /* the corresponding static tree */ + const static_tree_desc *stat_desc; /* the corresponding static tree */ } FAR tree_desc; typedef ush Pos; @@ -100,10 +103,10 @@ typedef struct internal_state { Bytef *pending_buf; /* output still pending */ ulg pending_buf_size; /* size of pending_buf */ Bytef *pending_out; /* next pending byte to output to the stream */ - uInt pending; /* nb of bytes in the pending buffer */ + ulg pending; /* nb of bytes in the pending buffer */ int wrap; /* bit 0 true for zlib, bit 1 true for gzip */ gz_headerp gzhead; /* gzip header information to write */ - uInt gzindex; /* where in extra, name, or comment */ + ulg gzindex; /* where in extra, name, or comment */ Byte method; /* can only be DEFLATED */ int last_flush; /* value of flush param for previous deflate call */ @@ -249,7 +252,7 @@ typedef struct internal_state { uInt matches; /* number of string matches in current block */ uInt insert; /* bytes at end of window left to insert */ -#ifdef DEBUG +#ifdef ZLIB_DEBUG ulg compressed_len; /* total bit length of compressed file mod 2^32 */ ulg bits_sent; /* bit length of compressed data sent mod 2^32 */ #endif @@ -275,7 +278,7 @@ typedef struct internal_state { /* Output a byte on the stream. * IN assertion: there is enough room in pending_buf. */ -#define put_byte(s, c) {s->pending_buf[s->pending++] = (c);} +#define put_byte(s, c) {s->pending_buf[s->pending++] = (Bytef)(c);} #define MIN_LOOKAHEAD (MAX_MATCH+MIN_MATCH+1) @@ -309,7 +312,7 @@ void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf, * used. */ -#ifndef DEBUG +#ifndef ZLIB_DEBUG /* Inline versions of _tr_tally for speed: */ #if defined(GEN_TREES_H) || !defined(STDC) @@ -328,8 +331,8 @@ void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf, flush = (s->last_lit == s->lit_bufsize-1); \ } # define _tr_tally_dist(s, distance, length, flush) \ - { uch len = (length); \ - ush dist = (distance); \ + { uch len = (uch)(length); \ + ush dist = (ush)(distance); \ s->d_buf[s->last_lit] = dist; \ s->l_buf[s->last_lit++] = len; \ dist--; \ diff --git a/src/3rdparty/zlib/gzguts.h b/src/3rdparty/zlib/gzguts.h index d87659d..990a4d2 100644 --- a/src/3rdparty/zlib/gzguts.h +++ b/src/3rdparty/zlib/gzguts.h @@ -1,5 +1,5 @@ /* gzguts.h -- zlib internal header definitions for gz* operations - * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013 Mark Adler + * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013, 2016 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -25,6 +25,10 @@ # include # include #endif + +#ifndef _POSIX_SOURCE +# define _POSIX_SOURCE +#endif #include #ifdef _WIN32 @@ -35,6 +39,10 @@ # include #endif +#if defined(_WIN32) || defined(__CYGWIN__) +# define WIDECHAR +#endif + #ifdef WINAPI_FAMILY # define open _open # define read _read @@ -95,18 +103,19 @@ # endif #endif -/* unlike snprintf (which is required in C99, yet still not supported by - Microsoft more than a decade later!), _snprintf does not guarantee null - termination of the result -- however this is only used in gzlib.c where +/* unlike snprintf (which is required in C99), _snprintf does not guarantee + null termination of the result -- however this is only used in gzlib.c where the result is assured to fit in the space provided */ -#ifdef _MSC_VER +#if defined(_MSC_VER) && _MSC_VER < 1900 # define snprintf _snprintf #endif #ifndef local # define local static #endif -/* compile with -Dlocal if your debugger can't find static symbols */ +/* since "static" is used to mean two completely different things in C, we + define "local" for the non-static meaning of "static", for readability + (compile with -Dlocal if your debugger can't find static symbols) */ /* gz* functions always use library allocation functions */ #ifndef STDC @@ -170,7 +179,7 @@ typedef struct { char *path; /* path or fd for error messages */ unsigned size; /* buffer size, zero if not allocated yet */ unsigned want; /* requested buffer size, default is GZBUFSIZE */ - unsigned char *in; /* input buffer */ + unsigned char *in; /* input buffer (double-sized when writing) */ unsigned char *out; /* output buffer (double-sized when reading) */ int direct; /* 0 if processing gzip, 1 if transparent */ /* just for reading */ diff --git a/src/3rdparty/zlib/gzlib.c b/src/3rdparty/zlib/gzlib.c index fae202e..4105e6a 100644 --- a/src/3rdparty/zlib/gzlib.c +++ b/src/3rdparty/zlib/gzlib.c @@ -1,11 +1,11 @@ /* gzlib.c -- zlib functions common to reading and writing gzip files - * Copyright (C) 2004, 2010, 2011, 2012, 2013 Mark Adler + * Copyright (C) 2004-2017 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ #include "gzguts.h" -#if defined(_WIN32) && !defined(__BORLANDC__) +#if defined(_WIN32) && !defined(__BORLANDC__) && !defined(__MINGW32__) # define LSEEK _lseeki64 #else #if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0 @@ -94,7 +94,7 @@ local gzFile gz_open(path, fd, mode) const char *mode; { gz_statep state; - size_t len; + z_size_t len; int oflag; #ifdef O_CLOEXEC int cloexec = 0; @@ -188,10 +188,10 @@ local gzFile gz_open(path, fd, mode) } /* save the path name for error messages */ -#ifdef _WIN32 +#ifdef WIDECHAR if (fd == -2) { len = wcstombs(NULL, path, 0); - if (len == (size_t)-1) + if (len == (z_size_t)-1) len = 0; } else @@ -202,7 +202,7 @@ local gzFile gz_open(path, fd, mode) free(state); return NULL; } -#ifdef _WIN32 +#ifdef WIDECHAR if (fd == -2) if (len) wcstombs(state->path, path, len + 1); @@ -211,7 +211,7 @@ local gzFile gz_open(path, fd, mode) else #endif #if !defined(NO_snprintf) && !defined(NO_vsnprintf) - snprintf(state->path, len + 1, "%s", (const char *)path); + (void)snprintf(state->path, len + 1, "%s", (const char *)path); #else strcpy(state->path, path); #endif @@ -239,7 +239,7 @@ local gzFile gz_open(path, fd, mode) /* open the file with the appropriate flags (or just use fd) */ state->fd = fd > -1 ? fd : ( -#ifdef _WIN32 +#ifdef WIDECHAR fd == -2 ? _wopen(path, oflag, 0666) : #endif open((const char *)path, oflag, 0666)); @@ -248,8 +248,10 @@ local gzFile gz_open(path, fd, mode) free(state); return NULL; } - if (state->mode == GZ_APPEND) + if (state->mode == GZ_APPEND) { + LSEEK(state->fd, 0, SEEK_END); /* so gzoffset() is correct */ state->mode = GZ_WRITE; /* simplify later checks */ + } /* save the current position for rewinding (only if reading) */ if (state->mode == GZ_READ) { @@ -291,7 +293,7 @@ gzFile ZEXPORT gzdopen(fd, mode) if (fd == -1 || (path = (char *)malloc(7 + 3 * sizeof(int))) == NULL) return NULL; #if !defined(NO_snprintf) && !defined(NO_vsnprintf) - snprintf(path, 7 + 3 * sizeof(int), "", fd); /* for debugging */ + (void)snprintf(path, 7 + 3 * sizeof(int), "", fd); #else sprintf(path, "", fd); /* for debugging */ #endif @@ -301,7 +303,7 @@ gzFile ZEXPORT gzdopen(fd, mode) } /* -- see zlib.h -- */ -#ifdef _WIN32 +#ifdef WIDECHAR gzFile ZEXPORT gzopen_w(path, mode) const wchar_t *path; const char *mode; @@ -329,6 +331,8 @@ int ZEXPORT gzbuffer(file, size) return -1; /* check and set requested size */ + if ((size << 1) < size) + return -1; /* need to be able to double it */ if (size < 2) size = 2; /* need two bytes to check magic header */ state->want = size; @@ -604,14 +608,13 @@ void ZLIB_INTERNAL gz_error(state, err, msg) return; } #if !defined(NO_snprintf) && !defined(NO_vsnprintf) - snprintf(state->msg, strlen(state->path) + strlen(msg) + 3, - "%s%s%s", state->path, ": ", msg); + (void)snprintf(state->msg, strlen(state->path) + strlen(msg) + 3, + "%s%s%s", state->path, ": ", msg); #else strcpy(state->msg, state->path); strcat(state->msg, ": "); strcat(state->msg, msg); #endif - return; } #ifndef INT_MAX diff --git a/src/3rdparty/zlib/gzread.c b/src/3rdparty/zlib/gzread.c index bf4538e..956b91e 100644 --- a/src/3rdparty/zlib/gzread.c +++ b/src/3rdparty/zlib/gzread.c @@ -1,5 +1,5 @@ /* gzread.c -- zlib functions for reading gzip files - * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013 Mark Adler + * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013, 2016 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -12,6 +12,7 @@ local int gz_look OF((gz_statep)); local int gz_decomp OF((gz_statep)); local int gz_fetch OF((gz_statep)); local int gz_skip OF((gz_statep, z_off64_t)); +local z_size_t gz_read OF((gz_statep, voidp, z_size_t)); /* Use read() to load a buffer -- return -1 on error, otherwise 0. Read from state->fd, and update state->eof, state->err, and state->msg as appropriate. @@ -24,13 +25,17 @@ local int gz_load(state, buf, len, have) unsigned *have; { int ret; + unsigned get, max = ((unsigned)-1 >> 2) + 1; *have = 0; do { - ret = read(state->fd, buf + *have, len - *have); + get = len - *have; + if (get > max) + get = max; + ret = read(state->fd, buf + *have, get); if (ret <= 0) break; - *have += ret; + *have += (unsigned)ret; } while (*have < len); if (ret < 0) { gz_error(state, Z_ERRNO, zstrerror()); @@ -94,10 +99,8 @@ local int gz_look(state) state->in = (unsigned char *)malloc(state->want); state->out = (unsigned char *)malloc(state->want << 1); if (state->in == NULL || state->out == NULL) { - if (state->out != NULL) - free(state->out); - if (state->in != NULL) - free(state->in); + free(state->out); + free(state->in); gz_error(state, Z_MEM_ERROR, "out of memory"); return -1; } @@ -284,33 +287,17 @@ local int gz_skip(state, len) return 0; } -/* -- see zlib.h -- */ -int ZEXPORT gzread(file, buf, len) - gzFile file; - voidp buf; - unsigned len; -{ - unsigned got, n; +/* Read len bytes into buf from file, or less than len up to the end of the + input. Return the number of bytes read. If zero is returned, either the + end of file was reached, or there was an error. state->err must be + consulted in that case to determine which. */ +local z_size_t gz_read(state, buf, len) gz_statep state; - z_streamp strm; - - /* get internal structure */ - if (file == NULL) - return -1; - state = (gz_statep)file; - strm = &(state->strm); - - /* check that we're reading and that there's no (serious) error */ - if (state->mode != GZ_READ || - (state->err != Z_OK && state->err != Z_BUF_ERROR)) - return -1; - - /* since an int is returned, make sure len fits in one, otherwise return - with an error (this avoids the flaw in the interface) */ - if ((int)len < 0) { - gz_error(state, Z_DATA_ERROR, "requested length does not fit in int"); - return -1; - } + voidp buf; + z_size_t len; +{ + z_size_t got; + unsigned n; /* if len is zero, avoid unnecessary operations */ if (len == 0) @@ -320,32 +307,38 @@ int ZEXPORT gzread(file, buf, len) if (state->seek) { state->seek = 0; if (gz_skip(state, state->skip) == -1) - return -1; + return 0; } /* get len bytes to buf, or less than len if at the end */ got = 0; do { + /* set n to the maximum amount of len that fits in an unsigned int */ + n = -1; + if (n > len) + n = len; + /* first just try copying data from the output buffer */ if (state->x.have) { - n = state->x.have > len ? len : state->x.have; + if (state->x.have < n) + n = state->x.have; memcpy(buf, state->x.next, n); state->x.next += n; state->x.have -= n; } /* output buffer empty -- return if we're at the end of the input */ - else if (state->eof && strm->avail_in == 0) { + else if (state->eof && state->strm.avail_in == 0) { state->past = 1; /* tried to read past end */ break; } /* need output data -- for small len or new stream load up our output buffer */ - else if (state->how == LOOK || len < (state->size << 1)) { + else if (state->how == LOOK || n < (state->size << 1)) { /* get more output, looking for header if required */ if (gz_fetch(state) == -1) - return -1; + return 0; continue; /* no progress yet -- go back to copy above */ /* the copy above assures that we will leave with space in the output buffer, allowing at least one gzungetc() to succeed */ @@ -353,16 +346,16 @@ int ZEXPORT gzread(file, buf, len) /* large len -- read directly into user buffer */ else if (state->how == COPY) { /* read directly */ - if (gz_load(state, (unsigned char *)buf, len, &n) == -1) - return -1; + if (gz_load(state, (unsigned char *)buf, n, &n) == -1) + return 0; } /* large len -- decompress directly into user buffer */ else { /* state->how == GZIP */ - strm->avail_out = len; - strm->next_out = (unsigned char *)buf; + state->strm.avail_out = n; + state->strm.next_out = (unsigned char *)buf; if (gz_decomp(state) == -1) - return -1; + return 0; n = state->x.have; state->x.have = 0; } @@ -374,8 +367,75 @@ int ZEXPORT gzread(file, buf, len) state->x.pos += n; } while (len); - /* return number of bytes read into user buffer (will fit in int) */ - return (int)got; + /* return number of bytes read into user buffer */ + return got; +} + +/* -- see zlib.h -- */ +int ZEXPORT gzread(file, buf, len) + gzFile file; + voidp buf; + unsigned len; +{ + gz_statep state; + + /* get internal structure */ + if (file == NULL) + return -1; + state = (gz_statep)file; + + /* check that we're reading and that there's no (serious) error */ + if (state->mode != GZ_READ || + (state->err != Z_OK && state->err != Z_BUF_ERROR)) + return -1; + + /* since an int is returned, make sure len fits in one, otherwise return + with an error (this avoids a flaw in the interface) */ + if ((int)len < 0) { + gz_error(state, Z_STREAM_ERROR, "request does not fit in an int"); + return -1; + } + + /* read len or fewer bytes to buf */ + len = gz_read(state, buf, len); + + /* check for an error */ + if (len == 0 && state->err != Z_OK && state->err != Z_BUF_ERROR) + return -1; + + /* return the number of bytes read (this is assured to fit in an int) */ + return (int)len; +} + +/* -- see zlib.h -- */ +z_size_t ZEXPORT gzfread(buf, size, nitems, file) + voidp buf; + z_size_t size; + z_size_t nitems; + gzFile file; +{ + z_size_t len; + gz_statep state; + + /* get internal structure */ + if (file == NULL) + return 0; + state = (gz_statep)file; + + /* check that we're reading and that there's no (serious) error */ + if (state->mode != GZ_READ || + (state->err != Z_OK && state->err != Z_BUF_ERROR)) + return 0; + + /* compute bytes to read -- error on overflow */ + len = nitems * size; + if (size && len / size != nitems) { + gz_error(state, Z_STREAM_ERROR, "request does not fit in a size_t"); + return 0; + } + + /* read len or fewer bytes to buf, return the number of full items read */ + return len ? gz_read(state, buf, len) / size : 0; } /* -- see zlib.h -- */ @@ -408,8 +468,8 @@ int ZEXPORT gzgetc(file) return *(state->x.next)++; } - /* nothing there -- try gzread() */ - ret = gzread(file, buf, 1); + /* nothing there -- try gz_read() */ + ret = gz_read(state, buf, 1); return ret < 1 ? -1 : buf[0]; } @@ -451,7 +511,7 @@ int ZEXPORT gzungetc(c, file) if (state->x.have == 0) { state->x.have = 1; state->x.next = state->out + (state->size << 1) - 1; - state->x.next[0] = c; + state->x.next[0] = (unsigned char)c; state->x.pos--; state->past = 0; return c; @@ -473,7 +533,7 @@ int ZEXPORT gzungetc(c, file) } state->x.have++; state->x.next--; - state->x.next[0] = c; + state->x.next[0] = (unsigned char)c; state->x.pos--; state->past = 0; return c; diff --git a/src/3rdparty/zlib/gzwrite.c b/src/3rdparty/zlib/gzwrite.c index aa767fb..c7b5651 100644 --- a/src/3rdparty/zlib/gzwrite.c +++ b/src/3rdparty/zlib/gzwrite.c @@ -1,5 +1,5 @@ /* gzwrite.c -- zlib functions for writing gzip files - * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013 Mark Adler + * Copyright (C) 2004-2017 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -9,17 +9,19 @@ local int gz_init OF((gz_statep)); local int gz_comp OF((gz_statep, int)); local int gz_zero OF((gz_statep, z_off64_t)); +local z_size_t gz_write OF((gz_statep, voidpc, z_size_t)); /* Initialize state for writing a gzip file. Mark initialization by setting - state->size to non-zero. Return -1 on failure or 0 on success. */ + state->size to non-zero. Return -1 on a memory allocation failure, or 0 on + success. */ local int gz_init(state) gz_statep state; { int ret; z_streamp strm = &(state->strm); - /* allocate input buffer */ - state->in = (unsigned char *)malloc(state->want); + /* allocate input buffer (double size for gzprintf) */ + state->in = (unsigned char *)malloc(state->want << 1); if (state->in == NULL) { gz_error(state, Z_MEM_ERROR, "out of memory"); return -1; @@ -47,6 +49,7 @@ local int gz_init(state) gz_error(state, Z_MEM_ERROR, "out of memory"); return -1; } + strm->next_in = NULL; } /* mark state as initialized */ @@ -62,17 +65,17 @@ local int gz_init(state) } /* Compress whatever is at avail_in and next_in and write to the output file. - Return -1 if there is an error writing to the output file, otherwise 0. - flush is assumed to be a valid deflate() flush value. If flush is Z_FINISH, - then the deflate() state is reset to start a new gzip stream. If gz->direct - is true, then simply write to the output file without compressing, and - ignore flush. */ + Return -1 if there is an error writing to the output file or if gz_init() + fails to allocate memory, otherwise 0. flush is assumed to be a valid + deflate() flush value. If flush is Z_FINISH, then the deflate() state is + reset to start a new gzip stream. If gz->direct is true, then simply write + to the output file without compressing, and ignore flush. */ local int gz_comp(state, flush) gz_statep state; int flush; { - int ret, got; - unsigned have; + int ret, writ; + unsigned have, put, max = ((unsigned)-1 >> 2) + 1; z_streamp strm = &(state->strm); /* allocate memory if this is the first time through */ @@ -81,12 +84,16 @@ local int gz_comp(state, flush) /* write directly if requested */ if (state->direct) { - got = write(state->fd, strm->next_in, strm->avail_in); - if (got < 0 || (unsigned)got != strm->avail_in) { - gz_error(state, Z_ERRNO, zstrerror()); - return -1; + while (strm->avail_in) { + put = strm->avail_in > max ? max : strm->avail_in; + writ = write(state->fd, strm->next_in, put); + if (writ < 0) { + gz_error(state, Z_ERRNO, zstrerror()); + return -1; + } + strm->avail_in -= (unsigned)writ; + strm->next_in += writ; } - strm->avail_in = 0; return 0; } @@ -97,17 +104,21 @@ local int gz_comp(state, flush) doing Z_FINISH then don't write until we get to Z_STREAM_END */ if (strm->avail_out == 0 || (flush != Z_NO_FLUSH && (flush != Z_FINISH || ret == Z_STREAM_END))) { - have = (unsigned)(strm->next_out - state->x.next); - if (have && ((got = write(state->fd, state->x.next, have)) < 0 || - (unsigned)got != have)) { - gz_error(state, Z_ERRNO, zstrerror()); - return -1; + while (strm->next_out > state->x.next) { + put = strm->next_out - state->x.next > (int)max ? max : + (unsigned)(strm->next_out - state->x.next); + writ = write(state->fd, state->x.next, put); + if (writ < 0) { + gz_error(state, Z_ERRNO, zstrerror()); + return -1; + } + state->x.next += writ; } if (strm->avail_out == 0) { strm->avail_out = state->size; strm->next_out = state->out; + state->x.next = state->out; } - state->x.next = strm->next_out; } /* compress */ @@ -129,7 +140,8 @@ local int gz_comp(state, flush) return 0; } -/* Compress len zeros to output. Return -1 on error, 0 on success. */ +/* Compress len zeros to output. Return -1 on a write error or memory + allocation failure by gz_comp(), or 0 on success. */ local int gz_zero(state, len) gz_statep state; z_off64_t len; @@ -161,32 +173,14 @@ local int gz_zero(state, len) return 0; } -/* -- see zlib.h -- */ -int ZEXPORT gzwrite(file, buf, len) - gzFile file; - voidpc buf; - unsigned len; -{ - unsigned put = len; +/* Write len bytes from buf to file. Return the number of bytes written. If + the returned value is less than len, then there was an error. */ +local z_size_t gz_write(state, buf, len) gz_statep state; - z_streamp strm; - - /* get internal structure */ - if (file == NULL) - return 0; - state = (gz_statep)file; - strm = &(state->strm); - - /* check that we're writing and that there's no error */ - if (state->mode != GZ_WRITE || state->err != Z_OK) - return 0; - - /* since an int is returned, make sure len fits in one, otherwise return - with an error (this avoids the flaw in the interface) */ - if ((int)len < 0) { - gz_error(state, Z_DATA_ERROR, "requested length does not fit in int"); - return 0; - } + voidpc buf; + z_size_t len; +{ + z_size_t put = len; /* if len is zero, avoid unnecessary operations */ if (len == 0) @@ -209,14 +203,15 @@ int ZEXPORT gzwrite(file, buf, len) do { unsigned have, copy; - if (strm->avail_in == 0) - strm->next_in = state->in; - have = (unsigned)((strm->next_in + strm->avail_in) - state->in); + if (state->strm.avail_in == 0) + state->strm.next_in = state->in; + have = (unsigned)((state->strm.next_in + state->strm.avail_in) - + state->in); copy = state->size - have; if (copy > len) copy = len; memcpy(state->in + have, buf, copy); - strm->avail_in += copy; + state->strm.avail_in += copy; state->x.pos += copy; buf = (const char *)buf + copy; len -= copy; @@ -226,19 +221,83 @@ int ZEXPORT gzwrite(file, buf, len) } else { /* consume whatever's left in the input buffer */ - if (strm->avail_in && gz_comp(state, Z_NO_FLUSH) == -1) + if (state->strm.avail_in && gz_comp(state, Z_NO_FLUSH) == -1) return 0; /* directly compress user buffer to file */ - strm->avail_in = len; - strm->next_in = (z_const Bytef *)buf; - state->x.pos += len; - if (gz_comp(state, Z_NO_FLUSH) == -1) - return 0; + state->strm.next_in = (z_const Bytef *)buf; + do { + unsigned n = (unsigned)-1; + if (n > len) + n = len; + state->strm.avail_in = n; + state->x.pos += n; + if (gz_comp(state, Z_NO_FLUSH) == -1) + return 0; + len -= n; + } while (len); } - /* input was all buffered or compressed (put will fit in int) */ - return (int)put; + /* input was all buffered or compressed */ + return put; +} + +/* -- see zlib.h -- */ +int ZEXPORT gzwrite(file, buf, len) + gzFile file; + voidpc buf; + unsigned len; +{ + gz_statep state; + + /* get internal structure */ + if (file == NULL) + return 0; + state = (gz_statep)file; + + /* check that we're writing and that there's no error */ + if (state->mode != GZ_WRITE || state->err != Z_OK) + return 0; + + /* since an int is returned, make sure len fits in one, otherwise return + with an error (this avoids a flaw in the interface) */ + if ((int)len < 0) { + gz_error(state, Z_DATA_ERROR, "requested length does not fit in int"); + return 0; + } + + /* write len bytes from buf (the return value will fit in an int) */ + return (int)gz_write(state, buf, len); +} + +/* -- see zlib.h -- */ +z_size_t ZEXPORT gzfwrite(buf, size, nitems, file) + voidpc buf; + z_size_t size; + z_size_t nitems; + gzFile file; +{ + z_size_t len; + gz_statep state; + + /* get internal structure */ + if (file == NULL) + return 0; + state = (gz_statep)file; + + /* check that we're writing and that there's no error */ + if (state->mode != GZ_WRITE || state->err != Z_OK) + return 0; + + /* compute bytes to read -- error on overflow */ + len = nitems * size; + if (size && len / size != nitems) { + gz_error(state, Z_STREAM_ERROR, "request does not fit in a size_t"); + return 0; + } + + /* write len bytes to buf, return the number of full items written */ + return len ? gz_write(state, buf, len) / size : 0; } /* -- see zlib.h -- */ @@ -275,7 +334,7 @@ int ZEXPORT gzputc(file, c) strm->next_in = state->in; have = (unsigned)((strm->next_in + strm->avail_in) - state->in); if (have < state->size) { - state->in[have] = c; + state->in[have] = (unsigned char)c; strm->avail_in++; state->x.pos++; return c & 0xff; @@ -283,8 +342,8 @@ int ZEXPORT gzputc(file, c) } /* no room in buffer or not initialized, use gz_write() */ - buf[0] = c; - if (gzwrite(file, buf, 1) != 1) + buf[0] = (unsigned char)c; + if (gz_write(state, buf, 1) != 1) return -1; return c & 0xff; } @@ -295,11 +354,21 @@ int ZEXPORT gzputs(file, str) const char *str; { int ret; - unsigned len; + z_size_t len; + gz_statep state; + + /* get internal structure */ + if (file == NULL) + return -1; + state = (gz_statep)file; + + /* check that we're writing and that there's no error */ + if (state->mode != GZ_WRITE || state->err != Z_OK) + return -1; /* write string */ - len = (unsigned)strlen(str); - ret = gzwrite(file, str, len); + len = strlen(str); + ret = gz_write(state, str, len); return ret == 0 && len != 0 ? -1 : ret; } @@ -309,63 +378,73 @@ int ZEXPORT gzputs(file, str) /* -- see zlib.h -- */ int ZEXPORTVA gzvprintf(gzFile file, const char *format, va_list va) { - int size, len; + int len; + unsigned left; + char *next; gz_statep state; z_streamp strm; /* get internal structure */ if (file == NULL) - return -1; + return Z_STREAM_ERROR; state = (gz_statep)file; strm = &(state->strm); /* check that we're writing and that there's no error */ if (state->mode != GZ_WRITE || state->err != Z_OK) - return 0; + return Z_STREAM_ERROR; /* make sure we have some buffer space */ if (state->size == 0 && gz_init(state) == -1) - return 0; + return state->err; /* check for seek request */ if (state->seek) { state->seek = 0; if (gz_zero(state, state->skip) == -1) - return 0; + return state->err; } - /* consume whatever's left in the input buffer */ - if (strm->avail_in && gz_comp(state, Z_NO_FLUSH) == -1) - return 0; - - /* do the printf() into the input buffer, put length in len */ - size = (int)(state->size); - state->in[size - 1] = 0; + /* do the printf() into the input buffer, put length in len -- the input + buffer is double-sized just for this function, so there is guaranteed to + be state->size bytes available after the current contents */ + if (strm->avail_in == 0) + strm->next_in = state->in; + next = (char *)(state->in + (strm->next_in - state->in) + strm->avail_in); + next[state->size - 1] = 0; #ifdef NO_vsnprintf # ifdef HAS_vsprintf_void - (void)vsprintf((char *)(state->in), format, va); - for (len = 0; len < size; len++) - if (state->in[len] == 0) break; + (void)vsprintf(next, format, va); + for (len = 0; len < state->size; len++) + if (next[len] == 0) break; # else - len = vsprintf((char *)(state->in), format, va); + len = vsprintf(next, format, va); # endif #else # ifdef HAS_vsnprintf_void - (void)vsnprintf((char *)(state->in), size, format, va); - len = strlen((char *)(state->in)); + (void)vsnprintf(next, state->size, format, va); + len = strlen(next); # else - len = vsnprintf((char *)(state->in), size, format, va); + len = vsnprintf(next, state->size, format, va); # endif #endif /* check that printf() results fit in buffer */ - if (len <= 0 || len >= (int)size || state->in[size - 1] != 0) + if (len == 0 || (unsigned)len >= state->size || next[state->size - 1] != 0) return 0; - /* update buffer and position, defer compression until needed */ - strm->avail_in = (unsigned)len; - strm->next_in = state->in; + /* update buffer and position, compress first half if past that */ + strm->avail_in += (unsigned)len; state->x.pos += len; + if (strm->avail_in >= state->size) { + left = strm->avail_in - state->size; + strm->avail_in = state->size; + if (gz_comp(state, Z_NO_FLUSH) == -1) + return state->err; + memcpy(state->in, state->in + state->size, left); + strm->next_in = state->in; + strm->avail_in = left; + } return len; } @@ -390,73 +469,82 @@ int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, int a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20; { - int size, len; + unsigned len, left; + char *next; gz_statep state; z_streamp strm; /* get internal structure */ if (file == NULL) - return -1; + return Z_STREAM_ERROR; state = (gz_statep)file; strm = &(state->strm); /* check that can really pass pointer in ints */ if (sizeof(int) != sizeof(void *)) - return 0; + return Z_STREAM_ERROR; /* check that we're writing and that there's no error */ if (state->mode != GZ_WRITE || state->err != Z_OK) - return 0; + return Z_STREAM_ERROR; /* make sure we have some buffer space */ if (state->size == 0 && gz_init(state) == -1) - return 0; + return state->error; /* check for seek request */ if (state->seek) { state->seek = 0; if (gz_zero(state, state->skip) == -1) - return 0; + return state->error; } - /* consume whatever's left in the input buffer */ - if (strm->avail_in && gz_comp(state, Z_NO_FLUSH) == -1) - return 0; - - /* do the printf() into the input buffer, put length in len */ - size = (int)(state->size); - state->in[size - 1] = 0; + /* do the printf() into the input buffer, put length in len -- the input + buffer is double-sized just for this function, so there is guaranteed to + be state->size bytes available after the current contents */ + if (strm->avail_in == 0) + strm->next_in = state->in; + next = (char *)(strm->next_in + strm->avail_in); + next[state->size - 1] = 0; #ifdef NO_snprintf # ifdef HAS_sprintf_void - sprintf((char *)(state->in), format, a1, a2, a3, a4, a5, a6, a7, a8, - a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20); + sprintf(next, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, + a13, a14, a15, a16, a17, a18, a19, a20); for (len = 0; len < size; len++) - if (state->in[len] == 0) break; + if (next[len] == 0) + break; # else - len = sprintf((char *)(state->in), format, a1, a2, a3, a4, a5, a6, a7, a8, - a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20); + len = sprintf(next, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, + a12, a13, a14, a15, a16, a17, a18, a19, a20); # endif #else # ifdef HAS_snprintf_void - snprintf((char *)(state->in), size, format, a1, a2, a3, a4, a5, a6, a7, a8, - a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20); - len = strlen((char *)(state->in)); + snprintf(next, state->size, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20); + len = strlen(next); # else - len = snprintf((char *)(state->in), size, format, a1, a2, a3, a4, a5, a6, - a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, - a19, a20); + len = snprintf(next, state->size, format, a1, a2, a3, a4, a5, a6, a7, a8, + a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20); # endif #endif /* check that printf() results fit in buffer */ - if (len <= 0 || len >= (int)size || state->in[size - 1] != 0) + if (len == 0 || len >= state->size || next[state->size - 1] != 0) return 0; - /* update buffer and position, defer compression until needed */ - strm->avail_in = (unsigned)len; - strm->next_in = state->in; + /* update buffer and position, compress first half if past that */ + strm->avail_in += len; state->x.pos += len; - return len; + if (strm->avail_in >= state->size) { + left = strm->avail_in - state->size; + strm->avail_in = state->size; + if (gz_comp(state, Z_NO_FLUSH) == -1) + return state->err; + memcpy(state->in, state->in + state->size, left); + strm->next_in = state->in; + strm->avail_in = left; + } + return (int)len; } #endif @@ -470,7 +558,7 @@ int ZEXPORT gzflush(file, flush) /* get internal structure */ if (file == NULL) - return -1; + return Z_STREAM_ERROR; state = (gz_statep)file; /* check that we're writing and that there's no error */ @@ -485,11 +573,11 @@ int ZEXPORT gzflush(file, flush) if (state->seek) { state->seek = 0; if (gz_zero(state, state->skip) == -1) - return -1; + return state->err; } /* compress remaining data with requested flush */ - gz_comp(state, flush); + (void)gz_comp(state, flush); return state->err; } @@ -520,13 +608,13 @@ int ZEXPORT gzsetparams(file, level, strategy) if (state->seek) { state->seek = 0; if (gz_zero(state, state->skip) == -1) - return -1; + return state->err; } /* change compression parameters for subsequent input */ if (state->size) { /* flush previous input with previous parameters before changing */ - if (strm->avail_in && gz_comp(state, Z_PARTIAL_FLUSH) == -1) + if (strm->avail_in && gz_comp(state, Z_BLOCK) == -1) return state->err; deflateParams(strm, level, strategy); } diff --git a/src/3rdparty/zlib/infback.c b/src/3rdparty/zlib/infback.c index f3833c2..59679ec 100644 --- a/src/3rdparty/zlib/infback.c +++ b/src/3rdparty/zlib/infback.c @@ -1,5 +1,5 @@ /* infback.c -- inflate using a call-back interface - * Copyright (C) 1995-2011 Mark Adler + * Copyright (C) 1995-2016 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -61,7 +61,7 @@ int stream_size; Tracev((stderr, "inflate: allocated\n")); strm->state = (struct internal_state FAR *)state; state->dmax = 32768U; - state->wbits = windowBits; + state->wbits = (uInt)windowBits; state->wsize = 1U << windowBits; state->window = window; state->wnext = 0; diff --git a/src/3rdparty/zlib/inffast.c b/src/3rdparty/zlib/inffast.c index bda59ce..0dbd1db 100644 --- a/src/3rdparty/zlib/inffast.c +++ b/src/3rdparty/zlib/inffast.c @@ -1,5 +1,5 @@ /* inffast.c -- fast decoding - * Copyright (C) 1995-2008, 2010, 2013 Mark Adler + * Copyright (C) 1995-2017 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -8,26 +8,9 @@ #include "inflate.h" #include "inffast.h" -#ifndef ASMINF - -/* Allow machine dependent optimization for post-increment or pre-increment. - Based on testing to date, - Pre-increment preferred for: - - PowerPC G3 (Adler) - - MIPS R5000 (Randers-Pehrson) - Post-increment preferred for: - - none - No measurable difference: - - Pentium III (Anderson) - - M68060 (Nikl) - */ -#ifdef POSTINC -# define OFF 0 -# define PUP(a) *(a)++ +#ifdef ASMINF +# pragma message("Assembler code may have bugs -- use at your own risk") #else -# define OFF 1 -# define PUP(a) *++(a) -#endif /* Decode literal, length, and distance codes and write out the resulting @@ -96,9 +79,9 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */ /* copy state to local variables */ state = (struct inflate_state FAR *)strm->state; - in = strm->next_in - OFF; + in = strm->next_in; last = in + (strm->avail_in - 5); - out = strm->next_out - OFF; + out = strm->next_out; beg = out - (start - strm->avail_out); end = out + (strm->avail_out - 257); #ifdef INFLATE_STRICT @@ -119,9 +102,9 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */ input data or output space */ do { if (bits < 15) { - hold += (unsigned long)(PUP(in)) << bits; + hold += (unsigned long)(*in++) << bits; bits += 8; - hold += (unsigned long)(PUP(in)) << bits; + hold += (unsigned long)(*in++) << bits; bits += 8; } here = lcode[hold & lmask]; @@ -134,14 +117,14 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */ Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ? "inflate: literal '%c'\n" : "inflate: literal 0x%02x\n", here.val)); - PUP(out) = (unsigned char)(here.val); + *out++ = (unsigned char)(here.val); } else if (op & 16) { /* length base */ len = (unsigned)(here.val); op &= 15; /* number of extra bits */ if (op) { if (bits < op) { - hold += (unsigned long)(PUP(in)) << bits; + hold += (unsigned long)(*in++) << bits; bits += 8; } len += (unsigned)hold & ((1U << op) - 1); @@ -150,9 +133,9 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */ } Tracevv((stderr, "inflate: length %u\n", len)); if (bits < 15) { - hold += (unsigned long)(PUP(in)) << bits; + hold += (unsigned long)(*in++) << bits; bits += 8; - hold += (unsigned long)(PUP(in)) << bits; + hold += (unsigned long)(*in++) << bits; bits += 8; } here = dcode[hold & dmask]; @@ -165,10 +148,10 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */ dist = (unsigned)(here.val); op &= 15; /* number of extra bits */ if (bits < op) { - hold += (unsigned long)(PUP(in)) << bits; + hold += (unsigned long)(*in++) << bits; bits += 8; if (bits < op) { - hold += (unsigned long)(PUP(in)) << bits; + hold += (unsigned long)(*in++) << bits; bits += 8; } } @@ -196,30 +179,30 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */ #ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR if (len <= op - whave) { do { - PUP(out) = 0; + *out++ = 0; } while (--len); continue; } len -= op - whave; do { - PUP(out) = 0; + *out++ = 0; } while (--op > whave); if (op == 0) { from = out - dist; do { - PUP(out) = PUP(from); + *out++ = *from++; } while (--len); continue; } #endif } - from = window - OFF; + from = window; if (wnext == 0) { /* very common case */ from += wsize - op; if (op < len) { /* some from window */ len -= op; do { - PUP(out) = PUP(from); + *out++ = *from++; } while (--op); from = out - dist; /* rest from output */ } @@ -230,14 +213,14 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */ if (op < len) { /* some from end of window */ len -= op; do { - PUP(out) = PUP(from); + *out++ = *from++; } while (--op); - from = window - OFF; + from = window; if (wnext < len) { /* some from start of window */ op = wnext; len -= op; do { - PUP(out) = PUP(from); + *out++ = *from++; } while (--op); from = out - dist; /* rest from output */ } @@ -248,35 +231,35 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */ if (op < len) { /* some from window */ len -= op; do { - PUP(out) = PUP(from); + *out++ = *from++; } while (--op); from = out - dist; /* rest from output */ } } while (len > 2) { - PUP(out) = PUP(from); - PUP(out) = PUP(from); - PUP(out) = PUP(from); + *out++ = *from++; + *out++ = *from++; + *out++ = *from++; len -= 3; } if (len) { - PUP(out) = PUP(from); + *out++ = *from++; if (len > 1) - PUP(out) = PUP(from); + *out++ = *from++; } } else { from = out - dist; /* copy direct from output */ do { /* minimum length is three */ - PUP(out) = PUP(from); - PUP(out) = PUP(from); - PUP(out) = PUP(from); + *out++ = *from++; + *out++ = *from++; + *out++ = *from++; len -= 3; } while (len > 2); if (len) { - PUP(out) = PUP(from); + *out++ = *from++; if (len > 1) - PUP(out) = PUP(from); + *out++ = *from++; } } } @@ -313,8 +296,8 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */ hold &= (1U << bits) - 1; /* update state and return */ - strm->next_in = in + OFF; - strm->next_out = out + OFF; + strm->next_in = in; + strm->next_out = out; strm->avail_in = (unsigned)(in < last ? 5 + (last - in) : 5 - (in - last)); strm->avail_out = (unsigned)(out < end ? 257 + (end - out) : 257 - (out - end)); diff --git a/src/3rdparty/zlib/inflate.c b/src/3rdparty/zlib/inflate.c index 870f89b..ac333e8 100644 --- a/src/3rdparty/zlib/inflate.c +++ b/src/3rdparty/zlib/inflate.c @@ -1,5 +1,5 @@ /* inflate.c -- zlib decompression - * Copyright (C) 1995-2012 Mark Adler + * Copyright (C) 1995-2016 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -92,6 +92,7 @@ #endif /* function prototypes */ +local int inflateStateCheck OF((z_streamp strm)); local void fixedtables OF((struct inflate_state FAR *state)); local int updatewindow OF((z_streamp strm, const unsigned char FAR *end, unsigned copy)); @@ -101,12 +102,26 @@ local int updatewindow OF((z_streamp strm, const unsigned char FAR *end, local unsigned syncsearch OF((unsigned FAR *have, const unsigned char FAR *buf, unsigned len)); +local int inflateStateCheck(strm) +z_streamp strm; +{ + struct inflate_state FAR *state; + if (strm == Z_NULL || + strm->zalloc == (alloc_func)0 || strm->zfree == (free_func)0) + return 1; + state = (struct inflate_state FAR *)strm->state; + if (state == Z_NULL || state->strm != strm || + state->mode < HEAD || state->mode > SYNC) + return 1; + return 0; +} + int ZEXPORT inflateResetKeep(strm) z_streamp strm; { struct inflate_state FAR *state; - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + if (inflateStateCheck(strm)) return Z_STREAM_ERROR; state = (struct inflate_state FAR *)strm->state; strm->total_in = strm->total_out = state->total = 0; strm->msg = Z_NULL; @@ -131,7 +146,7 @@ z_streamp strm; { struct inflate_state FAR *state; - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + if (inflateStateCheck(strm)) return Z_STREAM_ERROR; state = (struct inflate_state FAR *)strm->state; state->wsize = 0; state->whave = 0; @@ -147,7 +162,7 @@ int windowBits; struct inflate_state FAR *state; /* get the state */ - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + if (inflateStateCheck(strm)) return Z_STREAM_ERROR; state = (struct inflate_state FAR *)strm->state; /* extract wrap request from windowBits parameter */ @@ -156,7 +171,7 @@ int windowBits; windowBits = -windowBits; } else { - wrap = (windowBits >> 4) + 1; + wrap = (windowBits >> 4) + 5; #ifdef GUNZIP if (windowBits < 48) windowBits &= 15; @@ -210,7 +225,9 @@ int stream_size; if (state == Z_NULL) return Z_MEM_ERROR; Tracev((stderr, "inflate: allocated\n")); strm->state = (struct internal_state FAR *)state; + state->strm = strm; state->window = Z_NULL; + state->mode = HEAD; /* to pass state test in inflateReset2() */ ret = inflateReset2(strm, windowBits); if (ret != Z_OK) { ZFREE(strm, state); @@ -234,17 +251,17 @@ int value; { struct inflate_state FAR *state; - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + if (inflateStateCheck(strm)) return Z_STREAM_ERROR; state = (struct inflate_state FAR *)strm->state; if (bits < 0) { state->hold = 0; state->bits = 0; return Z_OK; } - if (bits > 16 || state->bits + bits > 32) return Z_STREAM_ERROR; + if (bits > 16 || state->bits + (uInt)bits > 32) return Z_STREAM_ERROR; value &= (1L << bits) - 1; - state->hold += value << state->bits; - state->bits += bits; + state->hold += (unsigned)value << state->bits; + state->bits += (uInt)bits; return Z_OK; } @@ -625,7 +642,7 @@ int flush; static const unsigned short order[19] = /* permutation of code lengths */ {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15}; - if (strm == Z_NULL || strm->state == Z_NULL || strm->next_out == Z_NULL || + if (inflateStateCheck(strm) || strm->next_out == Z_NULL || (strm->next_in == Z_NULL && strm->avail_in != 0)) return Z_STREAM_ERROR; @@ -645,6 +662,8 @@ int flush; NEEDBITS(16); #ifdef GUNZIP if ((state->wrap & 2) && hold == 0x8b1f) { /* gzip header */ + if (state->wbits == 0) + state->wbits = 15; state->check = crc32(0L, Z_NULL, 0); CRC2(state->check, hold); INITBITS(); @@ -672,7 +691,7 @@ int flush; len = BITS(4) + 8; if (state->wbits == 0) state->wbits = len; - else if (len > state->wbits) { + if (len > 15 || len > state->wbits) { strm->msg = (char *)"invalid window size"; state->mode = BAD; break; @@ -699,14 +718,16 @@ int flush; } if (state->head != Z_NULL) state->head->text = (int)((hold >> 8) & 1); - if (state->flags & 0x0200) CRC2(state->check, hold); + if ((state->flags & 0x0200) && (state->wrap & 4)) + CRC2(state->check, hold); INITBITS(); state->mode = TIME; case TIME: NEEDBITS(32); if (state->head != Z_NULL) state->head->time = hold; - if (state->flags & 0x0200) CRC4(state->check, hold); + if ((state->flags & 0x0200) && (state->wrap & 4)) + CRC4(state->check, hold); INITBITS(); state->mode = OS; case OS: @@ -715,7 +736,8 @@ int flush; state->head->xflags = (int)(hold & 0xff); state->head->os = (int)(hold >> 8); } - if (state->flags & 0x0200) CRC2(state->check, hold); + if ((state->flags & 0x0200) && (state->wrap & 4)) + CRC2(state->check, hold); INITBITS(); state->mode = EXLEN; case EXLEN: @@ -724,7 +746,8 @@ int flush; state->length = (unsigned)(hold); if (state->head != Z_NULL) state->head->extra_len = (unsigned)hold; - if (state->flags & 0x0200) CRC2(state->check, hold); + if ((state->flags & 0x0200) && (state->wrap & 4)) + CRC2(state->check, hold); INITBITS(); } else if (state->head != Z_NULL) @@ -742,7 +765,7 @@ int flush; len + copy > state->head->extra_max ? state->head->extra_max - len : copy); } - if (state->flags & 0x0200) + if ((state->flags & 0x0200) && (state->wrap & 4)) state->check = crc32(state->check, next, copy); have -= copy; next += copy; @@ -761,9 +784,9 @@ int flush; if (state->head != Z_NULL && state->head->name != Z_NULL && state->length < state->head->name_max) - state->head->name[state->length++] = len; + state->head->name[state->length++] = (Bytef)len; } while (len && copy < have); - if (state->flags & 0x0200) + if ((state->flags & 0x0200) && (state->wrap & 4)) state->check = crc32(state->check, next, copy); have -= copy; next += copy; @@ -782,9 +805,9 @@ int flush; if (state->head != Z_NULL && state->head->comment != Z_NULL && state->length < state->head->comm_max) - state->head->comment[state->length++] = len; + state->head->comment[state->length++] = (Bytef)len; } while (len && copy < have); - if (state->flags & 0x0200) + if ((state->flags & 0x0200) && (state->wrap & 4)) state->check = crc32(state->check, next, copy); have -= copy; next += copy; @@ -796,7 +819,7 @@ int flush; case HCRC: if (state->flags & 0x0200) { NEEDBITS(16); - if (hold != (state->check & 0xffff)) { + if ((state->wrap & 4) && hold != (state->check & 0xffff)) { strm->msg = (char *)"header crc mismatch"; state->mode = BAD; break; @@ -1177,11 +1200,11 @@ int flush; out -= left; strm->total_out += out; state->total += out; - if (out) + if ((state->wrap & 4) && out) strm->adler = state->check = UPDATE(state->check, put - out, out); out = left; - if (( + if ((state->wrap & 4) && ( #ifdef GUNZIP state->flags ? hold : #endif @@ -1240,10 +1263,10 @@ int flush; strm->total_in += in; strm->total_out += out; state->total += out; - if (state->wrap && out) + if ((state->wrap & 4) && out) strm->adler = state->check = UPDATE(state->check, strm->next_out - out, out); - strm->data_type = state->bits + (state->last ? 64 : 0) + + strm->data_type = (int)state->bits + (state->last ? 64 : 0) + (state->mode == TYPE ? 128 : 0) + (state->mode == LEN_ || state->mode == COPY_ ? 256 : 0); if (((in == 0 && out == 0) || flush == Z_FINISH) && ret == Z_OK) @@ -1255,7 +1278,7 @@ int ZEXPORT inflateEnd(strm) z_streamp strm; { struct inflate_state FAR *state; - if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0) + if (inflateStateCheck(strm)) return Z_STREAM_ERROR; state = (struct inflate_state FAR *)strm->state; if (state->window != Z_NULL) ZFREE(strm, state->window); @@ -1273,7 +1296,7 @@ uInt *dictLength; struct inflate_state FAR *state; /* check state */ - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + if (inflateStateCheck(strm)) return Z_STREAM_ERROR; state = (struct inflate_state FAR *)strm->state; /* copy dictionary */ @@ -1298,7 +1321,7 @@ uInt dictLength; int ret; /* check state */ - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + if (inflateStateCheck(strm)) return Z_STREAM_ERROR; state = (struct inflate_state FAR *)strm->state; if (state->wrap != 0 && state->mode != DICT) return Z_STREAM_ERROR; @@ -1330,7 +1353,7 @@ gz_headerp head; struct inflate_state FAR *state; /* check state */ - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + if (inflateStateCheck(strm)) return Z_STREAM_ERROR; state = (struct inflate_state FAR *)strm->state; if ((state->wrap & 2) == 0) return Z_STREAM_ERROR; @@ -1383,7 +1406,7 @@ z_streamp strm; struct inflate_state FAR *state; /* check parameters */ - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + if (inflateStateCheck(strm)) return Z_STREAM_ERROR; state = (struct inflate_state FAR *)strm->state; if (strm->avail_in == 0 && state->bits < 8) return Z_BUF_ERROR; @@ -1430,7 +1453,7 @@ z_streamp strm; { struct inflate_state FAR *state; - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + if (inflateStateCheck(strm)) return Z_STREAM_ERROR; state = (struct inflate_state FAR *)strm->state; return state->mode == STORED && state->bits == 0; } @@ -1445,8 +1468,7 @@ z_streamp source; unsigned wsize; /* check input */ - if (dest == Z_NULL || source == Z_NULL || source->state == Z_NULL || - source->zalloc == (alloc_func)0 || source->zfree == (free_func)0) + if (inflateStateCheck(source) || dest == Z_NULL) return Z_STREAM_ERROR; state = (struct inflate_state FAR *)source->state; @@ -1467,6 +1489,7 @@ z_streamp source; /* copy state */ zmemcpy((voidpf)dest, (voidpf)source, sizeof(z_stream)); zmemcpy((voidpf)copy, (voidpf)state, sizeof(struct inflate_state)); + copy->strm = dest; if (state->lencode >= state->codes && state->lencode <= state->codes + ENOUGH - 1) { copy->lencode = copy->codes + (state->lencode - state->codes); @@ -1488,25 +1511,51 @@ int subvert; { struct inflate_state FAR *state; - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + if (inflateStateCheck(strm)) return Z_STREAM_ERROR; state = (struct inflate_state FAR *)strm->state; - state->sane = !subvert; #ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR + state->sane = !subvert; return Z_OK; #else + (void)subvert; state->sane = 1; return Z_DATA_ERROR; #endif } +int ZEXPORT inflateValidate(strm, check) +z_streamp strm; +int check; +{ + struct inflate_state FAR *state; + + if (inflateStateCheck(strm)) return Z_STREAM_ERROR; + state = (struct inflate_state FAR *)strm->state; + if (check) + state->wrap |= 4; + else + state->wrap &= ~4; + return Z_OK; +} + long ZEXPORT inflateMark(strm) z_streamp strm; { struct inflate_state FAR *state; - if (strm == Z_NULL || strm->state == Z_NULL) return -1L << 16; + if (inflateStateCheck(strm)) + return -(1L << 16); state = (struct inflate_state FAR *)strm->state; - return ((long)(state->back) << 16) + + return (long)(((unsigned long)((long)state->back)) << 16) + (state->mode == COPY ? state->length : (state->mode == MATCH ? state->was - state->length : 0)); } + +unsigned long ZEXPORT inflateCodesUsed(strm) +z_streamp strm; +{ + struct inflate_state FAR *state; + if (inflateStateCheck(strm)) return (unsigned long)-1; + state = (struct inflate_state FAR *)strm->state; + return (unsigned long)(state->next - state->codes); +} diff --git a/src/3rdparty/zlib/inflate.h b/src/3rdparty/zlib/inflate.h index 95f4986..a46cce6 100644 --- a/src/3rdparty/zlib/inflate.h +++ b/src/3rdparty/zlib/inflate.h @@ -1,5 +1,5 @@ /* inflate.h -- internal inflate state definition - * Copyright (C) 1995-2009 Mark Adler + * Copyright (C) 1995-2016 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -18,7 +18,7 @@ /* Possible inflate modes between inflate() calls */ typedef enum { - HEAD, /* i: waiting for magic header */ + HEAD = 16180, /* i: waiting for magic header */ FLAGS, /* i: waiting for method and flags (gzip) */ TIME, /* i: waiting for modification time (gzip) */ OS, /* i: waiting for extra flags and operating system (gzip) */ @@ -77,11 +77,14 @@ typedef enum { CHECK -> LENGTH -> DONE */ -/* state maintained between inflate() calls. Approximately 10K bytes. */ +/* State maintained between inflate() calls -- approximately 7K bytes, not + including the allocated sliding window, which is up to 32K bytes. */ struct inflate_state { + z_streamp strm; /* pointer back to this zlib stream */ inflate_mode mode; /* current inflate mode */ int last; /* true if processing last block */ - int wrap; /* bit 0 true for zlib, bit 1 true for gzip */ + int wrap; /* bit 0 true for zlib, bit 1 true for gzip, + bit 2 true to validate check value */ int havedict; /* true if dictionary provided */ int flags; /* gzip header method and flags (0 if zlib) */ unsigned dmax; /* zlib header max distance (INFLATE_STRICT) */ diff --git a/src/3rdparty/zlib/inftrees.c b/src/3rdparty/zlib/inftrees.c index 44d89cf..2ea08fc 100644 --- a/src/3rdparty/zlib/inftrees.c +++ b/src/3rdparty/zlib/inftrees.c @@ -1,5 +1,5 @@ /* inftrees.c -- generate Huffman trees for efficient decoding - * Copyright (C) 1995-2013 Mark Adler + * Copyright (C) 1995-2017 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -9,7 +9,7 @@ #define MAXBITS 15 const char inflate_copyright[] = - " inflate 1.2.8 Copyright 1995-2013 Mark Adler "; + " inflate 1.2.11 Copyright 1995-2017 Mark Adler "; /* If you use the zlib library in a product, an acknowledgment is welcome in the documentation of your product. If for some reason you cannot @@ -54,7 +54,7 @@ unsigned short FAR *work; code FAR *next; /* next available space in table */ const unsigned short FAR *base; /* base value table to use */ const unsigned short FAR *extra; /* extra bits table to use */ - int end; /* use base and extra for symbol > end */ + unsigned match; /* use base and extra for symbol >= match */ unsigned short count[MAXBITS+1]; /* number of codes of each length */ unsigned short offs[MAXBITS+1]; /* offsets in table for each length */ static const unsigned short lbase[31] = { /* Length codes 257..285 base */ @@ -62,7 +62,7 @@ unsigned short FAR *work; 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0}; static const unsigned short lext[31] = { /* Length codes 257..285 extra */ 16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18, - 19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 72, 78}; + 19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 77, 202}; static const unsigned short dbase[32] = { /* Distance codes 0..29 base */ 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145, @@ -181,19 +181,17 @@ unsigned short FAR *work; switch (type) { case CODES: base = extra = work; /* dummy value--not used */ - end = 19; + match = 20; break; case LENS: base = lbase; - base -= 257; extra = lext; - extra -= 257; - end = 256; + match = 257; break; - default: /* DISTS */ + default: /* DISTS */ base = dbase; extra = dext; - end = -1; + match = 0; } /* initialize state for loop */ @@ -216,13 +214,13 @@ unsigned short FAR *work; for (;;) { /* create table entry */ here.bits = (unsigned char)(len - drop); - if ((int)(work[sym]) < end) { + if (work[sym] + 1U < match) { here.op = (unsigned char)0; here.val = work[sym]; } - else if ((int)(work[sym]) > end) { - here.op = (unsigned char)(extra[work[sym]]); - here.val = base[work[sym]]; + else if (work[sym] >= match) { + here.op = (unsigned char)(extra[work[sym] - match]); + here.val = base[work[sym] - match]; } else { here.op = (unsigned char)(32 + 64); /* end of block */ diff --git a/src/3rdparty/zlib/treebuild.xml b/src/3rdparty/zlib/treebuild.xml index 38d29d7..fd75525 100644 --- a/src/3rdparty/zlib/treebuild.xml +++ b/src/3rdparty/zlib/treebuild.xml @@ -1,6 +1,6 @@ - - + + zip compression library @@ -101,7 +101,7 @@
Fougue © 2016Fougue © 2017
Last Update: $date