Merge branch 'master' into meson-config-2

Author: concatime

LICENSE

@@ -1,6 +1,6 @@
 BSD 2-Clause License
 
-Copyright (c) 2018-2020, Randy
+Copyright (c) 2018-2020, Randy <[email protected]>
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

spng/spng.c

@@ -369,13 +369,11 @@ static int spng__inflate_init(spng_ctx *ctx)
     if(inflateInit(&ctx->zstream) != Z_OK) return SPNG_EZLIB;
 
 #if ZLIB_VERNUM >= 0x1290 && !defined(SPNG_USE_MINIZ)
-    if(inflateValidate(&ctx->zstream, ctx->flags & SPNG_CTX_IGNORE_ADLER32)) return SPNG_EZLIB;
+    int validate = 1;
+    if(ctx->flags & SPNG_CTX_IGNORE_ADLER32) validate = 0;
+    if(inflateValidate(&ctx->zstream, validate)) return SPNG_EZLIB;
 #else /* This requires zlib >= 1.2.11 */
-#ifdef _MSC_VER
     #pragma message ("inflateValidate() not available, SPNG_CTX_IGNORE_ADLER32 will be ignored")
-#else
-    #warning "inflateValidate() not available, SPNG_CTX_IGNORE_ADLER32 will be ignored"
-#endif
 #endif
 
     return 0;
@@ -2962,7 +2960,7 @@ int spng_decode_image(spng_ctx *ctx, void *out, size_t len, int fmt, int flags)
         for(i=0; i < lut_entries; i++)
         {
             float c = pow((float)i / max, exponent) * max;
-            c = fmin(c, max);
+            if(c > max) c = max;
 
             gamma_lut[i] = (uint16_t)c;
         }