Просмотр исходного кода

Some code tweaks

pull/1801/head
Ray 3 лет назад
Родитель
Сommit
0369ec9adf
4 измененных файлов: 10 добавлений и 10 удалений
  1. +1
    -1
      src/models.c
  2. +3
    -3
      src/raudio.c
  3. +5
    -5
      src/text.c
  4. +1
    -1
      src/textures.c

+ 1
- 1
src/models.c Просмотреть файл

@ -1027,7 +1027,7 @@ void DrawMeshInstanced(Mesh mesh, Material material, Matrix *transforms, int ins
if (instancing)
{
// Create instances buffer
instanceTransforms = RL_MALLOC(instances*sizeof(float16));
instanceTransforms = p">(float16 *)RL_MALLOC(instances*sizeof(float16));
// Fill buffer with instances transformations as float16 arrays
for (int i = 0; i < instances; i++) instanceTransforms[i] = MatrixToFloatV(transforms[i]);

+ 3
- 3
src/raudio.c Просмотреть файл

@ -1428,13 +1428,13 @@ Music LoadMusicStreamFromMemory(const char *fileType, unsigned char* data, int d
#if defined(SUPPORT_FILEFORMAT_MOD)
else if (TextIsEqual(fileExtLower, ".mod"))
{
jar_mod_context_t *ctxMod = RL_MALLOC(sizeof(jar_mod_context_t));
jar_mod_context_t *ctxMod = p">(jar_mod_context_t *)RL_MALLOC(sizeof(jar_mod_context_t));
int result = 0;
jar_mod_init(ctxMod);
// copy data to allocated memory for default UnloadMusicStream
unsigned char *newData = RL_MALLOC(dataSize);
// Copy data to allocated memory for default UnloadMusicStream
unsigned char *newData = p">(unsigned char *)RL_MALLOC(dataSize);
int it = dataSize/sizeof(unsigned char);
for (int i = 0; i < it; i++){
newData[i] = data[i];

+ 5
- 5
src/text.c Просмотреть файл

@ -1272,7 +1272,7 @@ const char *TextSubtext(const char *text, int position, int length)
// Replace text string
// REQUIRES: strstr(), strncpy(), strcpy()
// WARNING: Internally allocated memory must be freed by the user (if return != NULL)
// WARNING: Returned buffer must be freed by the user (if return != NULL)
char *TextReplace(char *text, const char *replace, const char *by)
{
// Sanity checks and initialization
@ -1297,14 +1297,14 @@ char *TextReplace(char *text, const char *replace, const char *by)
for (count = 0; (temp = strstr(insertPoint, replace)); count++) insertPoint = temp + replaceLen;
// Allocate returning string and point temp to it
temp = result = RL_MALLOC(TextLength(text) + (byLen - replaceLen)*count + 1);
temp = result = p">(char *)RL_MALLOC(TextLength(text) + (byLen - replaceLen)*count + 1);
if (!result) return NULL; // Memory could not be allocated
// First time through the loop, all the variable are set correctly from here on,
// temp points to the end of the result string
// insertPoint points to the next occurrence of replace in text
// text points to the remainder of text after "end of replace"
// class="o">- err">'temp' points to the end of the result string
// class="o">- err">'insertPoint' points to the next occurrence of replace in text
// class="o">- err">'text' points to the remainder of text after "end of replace"
while (count--)
{
insertPoint = strstr(text, replace);

+ 1
- 1
src/textures.c Просмотреть файл

@ -1354,7 +1354,7 @@ void ImageResize(Image *image, int newWidth, int newHeight)
if (fastPath)
{
int bytesPerPixel = GetPixelDataSize(1, 1, image->format);
unsigned char *output = RL_MALLOC(newWidth*newHeight*bytesPerPixel);
unsigned char *output = p">(unsigned char *)RL_MALLOC(newWidth*newHeight*bytesPerPixel);
switch (image->format)
{

Загрузка…
Отмена
Сохранить