Godot Engine – Multi-platform 2D and 3D game engine https://godotengine.org https://git.neuromancer.sk/godot.git/atom?h=2.1.4-stable 2017-08-27T11:05:52Z 2017-08-27T11:05:52Z Rémi Verschelde 2017-08-27T09:38:07Z urn:sha1:23813b4179c59bc42619972a3b0b107b400a73f8 Also fix documented OpenSSL version, it was updated to 1.0.2l in 67305d1b0a6dbcdb032d5a5a0e92122cf8f10b8d. (cherry picked from commit 560fc0f19932a7b51e02e9eda8a64f284f41e6d0) 2017-05-26T21:53:14Z Rémi Verschelde 2017-05-06T21:38:44Z urn:sha1:d432ad1e1731579e7cb18858bd2217d9eadace65 (cherry picked from commit c8aea60324e3e219945a805f871363c10292f38b) 2017-05-26T21:39:47Z Rémi Verschelde 2017-04-28T17:28:21Z urn:sha1:6cf507f004729ca82e56128d9128f6333393abcf Also move Box2D ConvexDecomposition contrib code to thirdparty/b2d_convexdecomp. (cherry picked from commit d4029aa51a0f0bce5dc73885af74b592e3aa33b7) 2017-05-26T21:35:15Z Rémi Verschelde 2017-04-28T17:00:11Z urn:sha1:86724ba1c6f9cc465b3e69caac6545b348a6d3f4 Code comes from https://github.com/antirez/smaz/blob/150e125cbae2e8fd20dd332432776ce13395d4d4/smaz.c With a small modification to match Godot expectations: ``` diff --git a/thirdparty/core/smaz.c b/thirdparty/core/smaz.c index 9b1ebc2..555dfea 100644 --- a/thirdparty/core/smaz.c +++ b/thirdparty/core/smaz.c @@ -14,7 +14,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND #include <string.h> /* Our compression codebook, used for compression */ -static char *Smaz_cb[241] = { +static const char *Smaz_cb[241] = { "\002s,\266", "\003had\232\002leW", "\003on \216", "", "\001yS", "\002ma\255\002li\227", "\003or \260", "", "\002ll\230\003s t\277", "\004fromg\002mel", "", "\003its\332", "\001z\333", "\003ingF", "\001>\336", @@ -89,7 +89,7 @@ static char *Smaz_rcb[254] = { "e, ", " it", "whi", " ma", "ge", "x", "e c", "men", ".com" }; -int smaz_compress(char *in, int inlen, char *out, int outlen) { +int smaz_compress(const char *in, int inlen, char *out, int outlen) { unsigned int h1,h2,h3=0; int verblen = 0, _outlen = outlen; char verb[256], *_out = out; @@ -167,7 +167,7 @@ out: return out-_out; } -int smaz_decompress(char *in, int inlen, char *out, int outlen) { +int smaz_decompress(const char *in, int inlen, char *out, int outlen) { unsigned char *c = (unsigned char*) in; char *_out = out; int _outlen = outlen; @@ -192,7 +192,7 @@ int smaz_decompress(char *in, int inlen, char *out, int outlen) { inlen -= 2+len; } else { /* Codebook entry */ - char *s = Smaz_rcb[*c]; + const char *s = Smaz_rcb[*c]; int len = strlen(s); if (outlen < len) return _outlen+1; diff --git a/thirdparty/core/smaz.h b/thirdparty/core/smaz.h index a547d89..a9d8a33 100644 --- a/thirdparty/core/smaz.h +++ b/thirdparty/core/smaz.h @@ -14,7 +14,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND #ifndef _SMAZ_H #define _SMAZ_H -int smaz_compress(char *in, int inlen, char *out, int outlen); -int smaz_decompress(char *in, int inlen, char *out, int outlen); +int smaz_compress(const char *in, int inlen, char *out, int outlen); +int smaz_decompress(const char *in, int inlen, char *out, int outlen); #endif ``` (cherry picked from commit c5f830d6b90574ef1e34fd2c35a0ebfa1ad92fe6) 2017-05-26T21:29:26Z Rémi Verschelde 2017-04-28T16:29:15Z urn:sha1:8312d421c6805d4bd25ce4f2937515cdfa43cb5d (cherry picked from commit 2398eb6ed4832fd7b8eec778981cbd974b89634f)