From 3a6af2cc57139f93fa48dfd4a39276dd7296d735 Mon Sep 17 00:00:00 2001 From: raysan5 Date: Sat, 9 May 2020 17:17:54 +0200 Subject: [PATCH] Remove SUPPORT_IMAGE_DRAWING flag ImageDraw() is actually used in multiple functions and it aslo depends on several functions... --- src/config.h | 2 -- src/textures.c | 6 ++---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/config.h b/src/config.h index 5b28a934b..52a09cefb 100644 --- a/src/config.h +++ b/src/config.h @@ -104,8 +104,6 @@ // Support multiple image editing functions to scale, adjust colors, flip, draw on images, crop... // If not defined, still some functions are supported: ImageFormat(), ImageCrop(), ImageToPOT() #define SUPPORT_IMAGE_MANIPULATION 1 -// Support drawing on image (software rendering) -#define SUPPORT_IMAGE_DRAWING 1 //------------------------------------------------------------------------------------ // Module: text - Configuration Flags diff --git a/src/textures.c b/src/textures.c index caaa14604..cfedf6be7 100644 --- a/src/textures.c +++ b/src/textures.c @@ -2162,7 +2162,6 @@ Rectangle GetImageAlphaBorder(Image image, float threshold) //------------------------------------------------------------------------------------ // Image drawing functions //------------------------------------------------------------------------------------ -#if defined(SUPPORT_IMAGE_DRAWING) // Clear image background with given color void ImageClearBackground(Image *dst, Color color) { @@ -2519,7 +2518,6 @@ void ImageDrawTextEx(Image *dst, Font font, const char *text, Vector2 position, UnloadImage(imText); } -#endif // SUPPORT_IMAGE_DRAWING //------------------------------------------------------------------------------------ // Texture loading functions @@ -2630,7 +2628,7 @@ TextureCubemap LoadTextureCubemap(Image image, int layoutType) // TODO: Image formating does not work with compressed textures! } - //for (int i = 0; i < 6; i++) ImageDraw(&faces, image, faceRecs[i], (Rectangle){ 0, (float)size*i, (float)size, (float)size }, WHITE); + for (int i = 0; i < 6; i++) ImageDraw(&faces, image, faceRecs[i], (Rectangle){ 0, (float)size*i, (float)size, (float)size }, WHITE); cubemap.id = rlLoadTextureCubemap(faces.data, size, faces.format); if (cubemap.id == 0) TRACELOG(LOG_WARNING, "IMAGE: Failed to load cubemap image"); @@ -3779,7 +3777,7 @@ static Image LoadPVR(const char *fileName) // Skip meta data header unsigned char unused = 0; - for (int i = 0; i < pvrHeader.metaDataSize; i++) fread(&unused, sizeof(unsigned char), 1, pvrFile); + for (unsigned int i = 0; i < pvrHeader.metaDataSize; i++) fread(&unused, sizeof(unsigned char), 1, pvrFile); // Calculate data size (depends on format) int bpp = 0;