UnrealXR/raylib
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove SUPPORT_IMAGE_DRAWING flag

Browse source 
ImageDraw() is actually used in multiple functions and it aslo depends on several functions...
This commit is contained in:
raysan5 2020-05-09 17:17:54 +02:00
parent 913ef1d56f
commit 3a6af2cc57
2 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/config.h
View file

@ -104,8 +104,6 @@
// Support multiple image editing functions to scale, adjust colors, flip, draw on images, crop... // 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() // If not defined, still some functions are supported: ImageFormat(), ImageCrop(), ImageToPOT()
#define SUPPORT_IMAGE_MANIPULATION 1 #define SUPPORT_IMAGE_MANIPULATION 1
// Support drawing on image (software rendering)
#define SUPPORT_IMAGE_DRAWING 1
//------------------------------------------------------------------------------------ //------------------------------------------------------------------------------------
// Module: text - Configuration Flags // Module: text - Configuration Flags

6
src/textures.c
View file

@ -2162,7 +2162,6 @@ Rectangle GetImageAlphaBorder(Image image, float threshold)
//------------------------------------------------------------------------------------ //------------------------------------------------------------------------------------
// Image drawing functions // Image drawing functions
//------------------------------------------------------------------------------------ //------------------------------------------------------------------------------------
#if defined(SUPPORT_IMAGE_DRAWING)
// Clear image background with given color // Clear image background with given color
void ImageClearBackground(Image *dst, Color color) void ImageClearBackground(Image *dst, Color color)
{ {
@ -2519,7 +2518,6 @@ void ImageDrawTextEx(Image *dst, Font font, const char *text, Vector2 position,
UnloadImage(imText); UnloadImage(imText);
} }
#endif // SUPPORT_IMAGE_DRAWING
//------------------------------------------------------------------------------------ //------------------------------------------------------------------------------------
// Texture loading functions // Texture loading functions
@ -2630,7 +2628,7 @@ TextureCubemap LoadTextureCubemap(Image image, int layoutType)
// TODO: Image formating does not work with compressed textures! // 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); cubemap.id = rlLoadTextureCubemap(faces.data, size, faces.format);
if (cubemap.id == 0) TRACELOG(LOG_WARNING, "IMAGE: Failed to load cubemap image"); 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 // Skip meta data header
unsigned char unused = 0; 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) // Calculate data size (depends on format)
int bpp = 0; int bpp = 0;