github-mirrors/thirdparty-miniz
1
0
Fork 0
mirror of https://github.com/eledio-devices/thirdparty-miniz.git synced 2025-10-31 00:32:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #207 from SamuelMarks/c89

Browse Source 
C89 support
This commit is contained in:
Martin Raiber
2021-11-11 21:25:11 +01:00
committed by GitHub
parent 3a387ec369 e841503cad
commit 591faa9574
2 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@@ -11,6 +11,16 @@ if(CMAKE_MINOR_VERSION LESS 12)
# see issue https://gitlab.kitware.com/cmake/cmake/merge_requests/1799 # see issue https://gitlab.kitware.com/cmake/cmake/merge_requests/1799
else() else()
project(miniz C) 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() endif()
set(MINIZ_API_VERSION 2) set(MINIZ_API_VERSION 2)

18
examples/example6.c
View File

@@ -34,14 +34,17 @@ static void hsv_to_rgb(int hue, int min, int max, rgb_t *p)
if (!saturation) { if (!saturation) {
p->r = p->g = p->b = 255 * (max - hue) / (max - min); p->r = p->g = p->b = 255 * (max - hue) / (max - min);
return; return;
} } else {
double h = fmod(color_rotate + 1e-4 + 4.0 * (hue - min) / (max - min), 6); const double h_dbl = fmod(color_rotate + 1e-4 + 4.0 * (hue - min) / (max - min), 6);
double c = 255.0f * saturation; const double c_dbl = 255 * saturation;
double X = c * (1 - fabs(fmod(h, 2) - 1)); 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) { switch(h) {
case 0: p->r = c; p->g = X; return; case 0: p->r = c; p->g = X; return;
case 1: p->r = X; p->g = c; return; case 1: p->r = X; p->g = c; return;
case 2: p->g = c; p->b = X; return; case 2: p->g = c; p->b = X; return;
@@ -49,12 +52,11 @@ static void hsv_to_rgb(int hue, int min, int max, rgb_t *p)
case 4: p->r = X; p->b = c; return; case 4: p->r = X; p->b = c; return;
default:p->r = c; p->b = X; default:p->r = c; p->b = X;
} }
}
} }
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
(void)argc, (void)argv;
// Image resolution // Image resolution
const int iXmax = 4096; const int iXmax = 4096;
const int iYmax = 4096; const int iYmax = 4096;
@@ -134,7 +136,7 @@ int main(int argc, char *argv[])
uint Iterations = color[0] | (color[1] << 8U); 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);
} }
} }