From e841503cad78efd62e8c12b900b36243776dab34 Mon Sep 17 00:00:00 2001 From: Samuel Marks <807580+SamuelMarks@users.noreply.github.com> Date: Wed, 10 Nov 2021 21:59:32 -0500 Subject: [PATCH] [CMakeLists.txt] Enforce C89; [examples/example6.c] Conform to C89; [miniz_zip.c] Use lowercase --- CMakeLists.txt | 10 ++++++++++ examples/example6.c | 32 +++++++++++++++++--------------- miniz_zip.c | 2 +- 3 files changed, 28 insertions(+), 16 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f12435b..112b8a5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,6 +11,16 @@ if(CMAKE_MINOR_VERSION LESS 12) # see issue https://gitlab.kitware.com/cmake/cmake/merge_requests/1799 else() project(miniz C) + set(CMAKE_C_STANDARD 90) + set(CMAKE_VERBOSE_MAKEFILE ON) + # set(CMAKE_C_VISIBILITY_PRESET hidden) + # set(CMAKE_VISIBILITY_INLINES_HIDDEN YES) + + if (MSVC) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W3 /WX /Zi /permissive-") + else () + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wshadow -Wformat=2 -Wall -Wno-overlength-strings -pedantic") + endif () endif() set(MINIZ_API_VERSION 2) diff --git a/examples/example6.c b/examples/example6.c index abbb64f..08df8b5 100644 --- a/examples/example6.c +++ b/examples/example6.c @@ -34,27 +34,29 @@ static void hsv_to_rgb(int hue, int min, int max, rgb_t *p) if (!saturation) { p->r = p->g = p->b = 255 * (max - hue) / (max - min); return; - } - double h = fmod(color_rotate + 1e-4 + 4.0 * (hue - min) / (max - min), 6); - double c = 255.0f * saturation; - double X = c * (1 - fabs(fmod(h, 2) - 1)); + } else { + const double h_dbl = fmod(color_rotate + 1e-4 + 4.0 * (hue - min) / (max - min), 6); + const double c_dbl = 255 * saturation; + const double X_dbl = c_dbl * (1 - fabs(fmod(h_dbl, 2) - 1)); + const int h = (int)h_dbl; + const int c = (int)c_dbl; + const int X = (int)X_dbl; - p->r = p->g = p->b = 0; + p->r = p->g = p->b = 0; - switch((int)h) { - case 0: p->r = c; p->g = X; return; - case 1: p->r = X; p->g = c; return; - case 2: p->g = c; p->b = X; return; - case 3: p->g = X; p->b = c; return; - case 4: p->r = X; p->b = c; return; - default:p->r = c; p->b = X; + switch(h) { + case 0: p->r = c; p->g = X; return; + case 1: p->r = X; p->g = c; return; + case 2: p->g = c; p->b = X; return; + case 3: p->g = X; p->b = c; return; + case 4: p->r = X; p->b = c; return; + default:p->r = c; p->b = X; + } } } int main(int argc, char *argv[]) { - (void)argc, (void)argv; - // Image resolution const int iXmax = 4096; const int iYmax = 4096; @@ -134,7 +136,7 @@ int main(int argc, char *argv[]) uint Iterations = color[0] | (color[1] << 8U); - hsv_to_rgb(Iterations, MinIter, MaxIter, (rgb_t *)color); + hsv_to_rgb((int)Iterations, MinIter, MaxIter, (rgb_t *)color); } } diff --git a/miniz_zip.c b/miniz_zip.c index 5b8f7c1..942a057 100644 --- a/miniz_zip.c +++ b/miniz_zip.c @@ -42,7 +42,7 @@ extern "C" { #if defined(_MSC_VER) || defined(__MINGW64__) #define WIN32_LEAN_AND_MEAN -#include +#include static WCHAR* mz_utf8z_to_widechar(const char* str) {