twix/raygui
1
0
Fork 0
mirror of https://github.com/raysan5/raygui.git synced 2026-02-01 03:39:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

Review custom allocators warnings

Browse Source
This commit is contained in:
Ray
2020-01-26 12:00:14 +01:00
parent 962661b7ea
commit e1e296583e
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/raygui.h
View File

@ -156,6 +156,11 @@
#endif #endif
#endif #endif
#if !defined(RAYGUI_MALLOC) && !defined(RAYGUI_CALLOC) && !defined(RAYGUI_FREE)
#include <stdlib.h> // Required for: malloc(), calloc(), free()
#endif
// Allow custom memory allocators // Allow custom memory allocators
#ifndef RAYGUI_MALLOC #ifndef RAYGUI_MALLOC
#define RAYGUI_MALLOC(sz) malloc(sz) #define RAYGUI_MALLOC(sz) malloc(sz)
@ -506,10 +511,6 @@ RAYGUIDEF bool GuiCheckIconPixel(int iconId, int x, int y); // Check icon pi
#include <stdio.h> // Required for: FILE, fopen(), fclose(), fprintf(), feof(), fscanf(), vsprintf() #include <stdio.h> // Required for: FILE, fopen(), fclose(), fprintf(), feof(), fscanf(), vsprintf()
#include <string.h> // Required for: strlen() on GuiTextBox() #include <string.h> // Required for: strlen() on GuiTextBox()
#if !defined(RAYGUI_MALLOC) && !defined(RAYGUI_CALLOC) && !defined(RAYGUI_FREE)
#include <stdlib.h> // Required for: malloc(), calloc(), free()
#endif
#if defined(RAYGUI_STANDALONE) #if defined(RAYGUI_STANDALONE)
#include <stdarg.h> // Required for: va_list, va_start(), vfprintf(), va_end() #include <stdarg.h> // Required for: va_list, va_start(), vfprintf(), va_end()
#endif #endif
@ -2980,12 +2981,12 @@ void GuiLoadStyle(const char *fileName)
int charsCount = 0; int charsCount = 0;
const char **chars = TextSplit(charValues, '\n', &charsCount); const char **chars = TextSplit(charValues, '\n', &charsCount);
int *values = (int *)malloc(charsCount*sizeof(int)); int *values = (int *)RAYGUI_MALLOC(charsCount*sizeof(int));
for (int i = 0; i < charsCount; i++) values[i] = TextToInteger(chars[i]); for (int i = 0; i < charsCount; i++) values[i] = TextToInteger(chars[i]);
font = LoadFontEx(TextFormat("%s/%s", GetDirectoryPath(fileName), fontFileName), fontSize, values, charsCount); font = LoadFontEx(TextFormat("%s/%s", GetDirectoryPath(fileName), fontFileName), fontSize, values, charsCount);
free(values); RAYGUI_FREE(values);
} }
} }
else font = LoadFontEx(TextFormat("%s/%s", GetDirectoryPath(fileName), fontFileName), fontSize, NULL, 0); else font = LoadFontEx(TextFormat("%s/%s", GetDirectoryPath(fileName), fontFileName), fontSize, NULL, 0);
@ -3078,7 +3079,7 @@ void GuiLoadStyle(const char *fileName)
fread(&imFont.height, 1, sizeof(int), rgsFile); fread(&imFont.height, 1, sizeof(int), rgsFile);
fread(&imFont.format, 1, sizeof(int), rgsFile); fread(&imFont.format, 1, sizeof(int), rgsFile);
imFont.data = (unsigned char *)malloc(fontImageSize); imFont.data = (unsigned char *)RAYGUI_MALLOC(fontImageSize);
fread(imFont.data, 1, fontImageSize, rgsFile); fread(imFont.data, 1, fontImageSize, rgsFile);
font.texture = LoadTextureFromImage(imFont); font.texture = LoadTextureFromImage(imFont);
@ -3087,11 +3088,11 @@ void GuiLoadStyle(const char *fileName)
} }
// Load font recs data // Load font recs data
font.recs = (Rectangle *)calloc(font.charsCount, sizeof(Rectangle)); font.recs = (Rectangle *)RAYGUI_CALLOC(font.charsCount, sizeof(Rectangle));
for (int i = 0; i < font.charsCount; i++) fread(&font.recs[i], 1, sizeof(Rectangle), rgsFile); for (int i = 0; i < font.charsCount; i++) fread(&font.recs[i], 1, sizeof(Rectangle), rgsFile);
// Load font chars info data // Load font chars info data
font.chars = (CharInfo *)calloc(font.charsCount, sizeof(CharInfo)); font.chars = (CharInfo *)RAYGUI_CALLOC(font.charsCount, sizeof(CharInfo));
for (int i = 0; i < font.charsCount; i++) for (int i = 0; i < font.charsCount; i++)
{ {
fread(&font.chars[i].value, 1, sizeof(int), rgsFile); fread(&font.chars[i].value, 1, sizeof(int), rgsFile);
@ -3280,10 +3281,10 @@ char **GuiLoadIcons(const char *fileName, bool loadIconsName)
{ {
if (loadIconsName) if (loadIconsName)
{ {
guiIconsName = (char **)malloc(iconsCount*sizeof(char **)); guiIconsName = (char **)RAYGUI_MALLOC(iconsCount*sizeof(char **));
for (int i = 0; i < iconsCount; i++) for (int i = 0; i < iconsCount; i++)
{ {
guiIconsName[i] = (char *)malloc(RICON_MAX_NAME_LENGTH); guiIconsName[i] = (char *)RAYGUI_MALLOC(RICON_MAX_NAME_LENGTH);
fread(guiIconsName[i], 32, 1, rgiFile); fread(guiIconsName[i], 32, 1, rgiFile);
} }
} }