mirrors/raylib
1
0
Fork 0
mirror of https://github.com/raysan5/raylib.git synced 2025-09-15 15:58:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

REVIEWED: Some compilation warnings (for strict rules)

Browse Source
This commit is contained in:
Ray
2022-11-28 14:16:59 +01:00
parent 2fd6d7e8c0
commit fc5894e734
2 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/rcore.c
View File

@@ -2755,8 +2755,9 @@ float GetFrameTime(void)
// NOTE: On PLATFORM_DESKTOP, timer is initialized on glfwInit() // NOTE: On PLATFORM_DESKTOP, timer is initialized on glfwInit()
double GetTime(void) double GetTime(void)
{ {
double time = 0.0;
#if defined(PLATFORM_DESKTOP) || defined(PLATFORM_WEB) #if defined(PLATFORM_DESKTOP) || defined(PLATFORM_WEB)
return glfwGetTime(); // Elapsed time since glfwInit() time = glfwGetTime(); // Elapsed time since glfwInit()
#endif #endif
#if defined(PLATFORM_ANDROID) || defined(PLATFORM_RPI) || defined(PLATFORM_DRM) #if defined(PLATFORM_ANDROID) || defined(PLATFORM_RPI) || defined(PLATFORM_DRM)
@@ -2764,8 +2765,9 @@ double GetTime(void)
clock_gettime(CLOCK_MONOTONIC, &ts); clock_gettime(CLOCK_MONOTONIC, &ts);
unsigned long long int time = (unsigned long long int)ts.tv_sec*1000000000LLU + (unsigned long long int)ts.tv_nsec; unsigned long long int time = (unsigned long long int)ts.tv_sec*1000000000LLU + (unsigned long long int)ts.tv_nsec;
return (double)(time - CORE.Time.base)*1e-9; // Elapsed time since InitTimer() time = (double)(time - CORE.Time.base)*1e-9; // Elapsed time since InitTimer()
#endif #endif
return time;
} }
// Setup window configuration flags (view FLAGS) // Setup window configuration flags (view FLAGS)
@@ -3291,12 +3293,12 @@ unsigned char *DecompressData(const unsigned char *compData, int compDataSize, i
#if defined(SUPPORT_COMPRESSION_API) #if defined(SUPPORT_COMPRESSION_API)
// Decompress data from a valid DEFLATE stream // Decompress data from a valid DEFLATE stream
data = RL_CALLOC(MAX_DECOMPRESSION_SIZE*1024*1024, 1); data = (unsigned char *)RL_CALLOC(MAX_DECOMPRESSION_SIZE*1024*1024, 1);
int length = sinflate(data, MAX_DECOMPRESSION_SIZE*1024*1024, compData, compDataSize); int length = sinflate(data, MAX_DECOMPRESSION_SIZE*1024*1024, compData, compDataSize);
// WARNING: RL_REALLOC can make (and leave) data copies in memory, be careful with sensitive compressed data! // WARNING: RL_REALLOC can make (and leave) data copies in memory, be careful with sensitive compressed data!
// TODO: Use a different approach, create another buffer, copy data manually to it and wipe original buffer memory // TODO: Use a different approach, create another buffer, copy data manually to it and wipe original buffer memory
unsigned char *temp = RL_REALLOC(data, length); unsigned char *temp = (unsigned char *)RL_REALLOC(data, length);
if (temp != NULL) data = temp; if (temp != NULL) data = temp;
else TRACELOG(LOG_WARNING, "SYSTEM: Failed to re-allocate required decompression memory"); else TRACELOG(LOG_WARNING, "SYSTEM: Failed to re-allocate required decompression memory");
@@ -3322,7 +3324,7 @@ char *EncodeDataBase64(const unsigned char *data, int dataSize, int *outputSize)
*outputSize = 4*((dataSize + 2)/3); *outputSize = 4*((dataSize + 2)/3);
char *encodedData = RL_MALLOC(*outputSize); char *encodedData = (char *)RL_MALLOC(*outputSize);
if (encodedData == NULL) return NULL; if (encodedData == NULL) return NULL;

30
src/rtext.c
View File

@@ -199,11 +199,11 @@ extern void LoadFontDefault(void)
// Re-construct image from defaultFontData and generate OpenGL texture // Re-construct image from defaultFontData and generate OpenGL texture
//---------------------------------------------------------------------- //----------------------------------------------------------------------
Image imFont = { Image imFont = {
.data = calloc(128*128, 2), // 2 bytes per pixel (gray + alpha) .data = RL_CALLOC(128*128, 2), // 2 bytes per pixel (gray + alpha)
.width = 128, .width = 128,
.height = 128, .height = 128,
.format = PIXELFORMAT_UNCOMPRESSED_GRAY_ALPHA, .mipmaps = 1,
.mipmaps = 1 .format = PIXELFORMAT_UNCOMPRESSED_GRAY_ALPHA
}; };
// Fill image.data with defaultFontData (convert from bit to pixel!) // Fill image.data with defaultFontData (convert from bit to pixel!)
@@ -454,8 +454,8 @@ Font LoadFontFromImage(Image image, Color key, int firstChar)
.data = pixels, .data = pixels,
.width = image.width, .width = image.width,
.height = image.height, .height = image.height,
.format = PIXELFORMAT_UNCOMPRESSED_R8G8B8A8, .mipmaps = 1,
.mipmaps = 1 .format = PIXELFORMAT_UNCOMPRESSED_R8G8B8A8
}; };
// Set font with all data parsed from image // Set font with all data parsed from image
@@ -620,11 +620,11 @@ GlyphInfo *LoadFontData(const unsigned char *fileData, int dataSize, int fontSiz
if (ch == 32) if (ch == 32)
{ {
Image imSpace = { Image imSpace = {
.data = calloc(chars[i].advanceX*fontSize, 2), .data = RL_CALLOC(chars[i].advanceX*fontSize, 2),
.width = chars[i].advanceX, .width = chars[i].advanceX,
.height = fontSize, .height = fontSize,
.format = PIXELFORMAT_UNCOMPRESSED_GRAYSCALE, .mipmaps = 1,
.mipmaps = 1 .format = PIXELFORMAT_UNCOMPRESSED_GRAYSCALE
}; };
chars[i].image = imSpace; chars[i].image = imSpace;
@@ -896,7 +896,7 @@ bool ExportFontAsCode(Font font, const char *fileName)
// Compress font image data // Compress font image data
int compDataSize = 0; int compDataSize = 0;
unsigned char *compData = CompressData(image.data, imageDataSize, &compDataSize); unsigned char *compData = CompressData((const unsigned char *)image.data, imageDataSize, &compDataSize);
// Save font image data (compressed) // Save font image data (compressed)
byteCount += sprintf(txtData + byteCount, "#define COMPRESSED_DATA_SIZE_FONT_%s %i\n\n", TextToUpper(fileNamePascal), compDataSize); byteCount += sprintf(txtData + byteCount, "#define COMPRESSED_DATA_SIZE_FONT_%s %i\n\n", TextToUpper(fileNamePascal), compDataSize);
@@ -1665,7 +1665,7 @@ int *LoadCodepoints(const char *text, int *count)
int codepointCount = 0; int codepointCount = 0;
// Allocate a big enough buffer to store as many codepoints as text bytes // Allocate a big enough buffer to store as many codepoints as text bytes
int *codepoints = RL_CALLOC(textLength, sizeof(int)); int *codepoints = (int *)RL_CALLOC(textLength, sizeof(int));
for (int i = 0; i < textLength; codepointCount++) for (int i = 0; i < textLength; codepointCount++)
{ {
@@ -1674,7 +1674,7 @@ int *LoadCodepoints(const char *text, int *count)
} }
// Re-allocate buffer to the actual number of codepoints loaded // Re-allocate buffer to the actual number of codepoints loaded
void *temp = RL_REALLOC(codepoints, codepointCount*sizeof(int)); int *temp = (int *)RL_REALLOC(codepoints, codepointCount*sizeof(int));
if (temp != NULL) codepoints = temp; if (temp != NULL) codepoints = temp;
*count = codepointCount; *count = codepointCount;
@@ -1992,7 +1992,7 @@ static Font LoadBMFont(const char *fileName)
if (lastSlash != NULL) if (lastSlash != NULL)
{ {
// NOTE: We need some extra space to avoid memory corruption on next allocations! // NOTE: We need some extra space to avoid memory corruption on next allocations!
imPath = RL_CALLOC(TextLength(fileName) - TextLength(lastSlash) + TextLength(imFileName) + 4, 1); imPath = (char *)RL_CALLOC(TextLength(fileName) - TextLength(lastSlash) + TextLength(imFileName) + 4, 1);
memcpy(imPath, fileName, TextLength(fileName) - TextLength(lastSlash) + 1); memcpy(imPath, fileName, TextLength(fileName) - TextLength(lastSlash) + 1);
memcpy(imPath + TextLength(fileName) - TextLength(lastSlash) + 1, imFileName, TextLength(imFileName)); memcpy(imPath + TextLength(fileName) - TextLength(lastSlash) + 1, imFileName, TextLength(imFileName));
} }
@@ -2006,11 +2006,11 @@ static Font LoadBMFont(const char *fileName)
{ {
// Convert image to GRAYSCALE + ALPHA, using the mask as the alpha channel // Convert image to GRAYSCALE + ALPHA, using the mask as the alpha channel
Image imFontAlpha = { Image imFontAlpha = {
.data = calloc(imFont.width*imFont.height, 2), .data = RL_CALLOC(imFont.width*imFont.height, 2),
.width = imFont.width, .width = imFont.width,
.height = imFont.height, .height = imFont.height,
.format = PIXELFORMAT_UNCOMPRESSED_GRAY_ALPHA, .mipmaps = 1,
.mipmaps = 1 .format = PIXELFORMAT_UNCOMPRESSED_GRAY_ALPHA
}; };
for (int p = 0, i = 0; p < (imFont.width*imFont.height*2); p += 2, i++) for (int p = 0, i = 0; p < (imFont.width*imFont.height*2); p += 2, i++)