Browse Source
Merge pull request #587 from christophe-f8/master
Added a preprocessor definition to disable the use of stb_imageshared-context
Mikko Mononen
GitHub
4 years ago
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Unified View
Diff Options
-
+5 -0src/nanovg.c
+ 5
- 0
src/nanovg.c
View File
| @@ -24,8 +24,11 @@ | |||||
| #include "nanovg.h" | #include "nanovg.h" | ||||
| #define FONTSTASH_IMPLEMENTATION | #define FONTSTASH_IMPLEMENTATION | ||||
| #include "fontstash.h" | #include "fontstash.h" | ||||
| #ifndef NVG_NO_STB | |||||
| #define STB_IMAGE_IMPLEMENTATION | #define STB_IMAGE_IMPLEMENTATION | ||||
| #include "stb_image.h" | #include "stb_image.h" | ||||
| #endif | |||||
| #ifdef _MSC_VER | #ifdef _MSC_VER | ||||
| #pragma warning(disable: 4100) // unreferenced formal parameter | #pragma warning(disable: 4100) // unreferenced formal parameter | ||||
| @@ -788,6 +791,7 @@ void nvgFillPaint(NVGcontext* ctx, NVGpaint paint) | |||||
| nvgTransformMultiply(state->fill.xform, state->xform); | nvgTransformMultiply(state->fill.xform, state->xform); | ||||
| } | } | ||||
| #ifndef NVG_NO_STB | |||||
| int nvgCreateImage(NVGcontext* ctx, const char* filename, int imageFlags) | int nvgCreateImage(NVGcontext* ctx, const char* filename, int imageFlags) | ||||
| { | { | ||||
| int w, h, n, image; | int w, h, n, image; | ||||
| @@ -816,6 +820,7 @@ int nvgCreateImageMem(NVGcontext* ctx, int imageFlags, unsigned char* data, int | |||||
| stbi_image_free(img); | stbi_image_free(img); | ||||
| return image; | return image; | ||||
| } | } | ||||
| #endif | |||||
| int nvgCreateImageRGBA(NVGcontext* ctx, int w, int h, int imageFlags, const unsigned char* data) | int nvgCreateImageRGBA(NVGcontext* ctx, int w, int h, int imageFlags, const unsigned char* data) | ||||
| { | { | ||||