diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-06-07 21:01:43 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-06-07 21:01:43 (GMT) |
| commit | dcb1fd031ab0bde51bda67abd8b376e3c7eca4c8 (patch) | |
| tree | 03c1d361864de57a16537de45d661fc75eb14a19 /generic | |
| parent | 1bb16cb845402c3a34ef32cca002861f09c41f66 (diff) | |
| parent | d6b5fbe3fda0c201c3b6d31f85628c313ccda001 (diff) | |
| download | tk-dcb1fd031ab0bde51bda67abd8b376e3c7eca4c8.zip tk-dcb1fd031ab0bde51bda67abd8b376e3c7eca4c8.tar.gz tk-dcb1fd031ab0bde51bda67abd8b376e3c7eca4c8.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/nanosvg.h | 5 | ||||
| -rw-r--r-- | generic/nanosvgrast.h | 8 | ||||
| -rw-r--r-- | generic/tkImgListFormat.c | 7 |
3 files changed, 12 insertions, 8 deletions
diff --git a/generic/nanosvg.h b/generic/nanosvg.h index 985f0ad..8cf637d 100644 --- a/generic/nanosvg.h +++ b/generic/nanosvg.h @@ -209,12 +209,11 @@ NANOSVG_SCOPE void nsvgDelete(NSVGimage* image); } #endif -#endif /* NANOSVG_H */ - #ifdef NANOSVG_IMPLEMENTATION #include <string.h> #include <stdlib.h> +#include <stdio.h> #include <math.h> #define NSVG_PI (3.14159265358979323846264338327f) @@ -3121,3 +3120,5 @@ void nsvgDelete(NSVGimage* image) } #endif + +#endif /* NANOSVG_H */ diff --git a/generic/nanosvgrast.h b/generic/nanosvgrast.h index 3625238..49c33b1 100644 --- a/generic/nanosvgrast.h +++ b/generic/nanosvgrast.h @@ -25,6 +25,8 @@ #ifndef NANOSVGRAST_H #define NANOSVGRAST_H +#include "nanosvg.h" + #ifdef __cplusplus extern "C" { #endif @@ -84,11 +86,11 @@ NANOSVG_SCOPE void nsvgDeleteRasterizer(NSVGrasterizer*); } #endif -#endif /* NANOSVGRAST_H */ - #ifdef NANOSVGRAST_IMPLEMENTATION #include <math.h> +#include <stdlib.h> +#include <string.h> #define NSVG__SUBSAMPLES 5 #define NSVG__FIXSHIFT 10 @@ -1469,3 +1471,5 @@ void nsvgRasterize(NSVGrasterizer* r, } #endif + +#endif /* NANOSVGRAST_H */ diff --git a/generic/tkImgListFormat.c b/generic/tkImgListFormat.c index 824d303..f5b416a 100644 --- a/generic/tkImgListFormat.c +++ b/generic/tkImgListFormat.c @@ -196,8 +196,7 @@ ParseFormatOptions( * this struct */ { - int index, optIndex, first; - enum ColorFormatType typeIndex; + int index, optIndex, first, typeIndex; const char *option; first = 1; @@ -258,7 +257,7 @@ ParseFormatOptions( return TCL_ERROR; } if (Tcl_GetIndexFromObj(NULL, objv[index], colorFormatNames, "", - TCL_EXACT, (int *)&typeIndex) != TCL_OK + TCL_EXACT, &typeIndex) != TCL_OK || (typeIndex != COLORFORMAT_LIST && typeIndex != COLORFORMAT_RGB2 && typeIndex != COLORFORMAT_RGBA2) ) { @@ -269,7 +268,7 @@ ParseFormatOptions( "BAD_COLOR_FORMAT", NULL); return TCL_ERROR; } - optPtr->colorFormat = typeIndex; + optPtr->colorFormat = (enum ColorFormatType)typeIndex; break; default: Tcl_Panic("ParseFormatOptions: unexpected switch fallthrough"); |