From 5b5a2d035d61554b0032c3aa7b524a0cb0c52160 Mon Sep 17 00:00:00 2001 From: ubkp <118854183+ubkp@users.noreply.github.com> Date: Thu, 28 Dec 2023 19:13:47 -0300 Subject: [PATCH] Fix TextReplace warning for const (#3687) --- src/rtext.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/rtext.c b/src/rtext.c index 104e302a..4ead02ca 100644 --- a/src/rtext.c +++ b/src/rtext.c @@ -653,7 +653,7 @@ GlyphInfo *LoadFontData(const unsigned char *fileData, int dataSize, int fontSiz chars[i].offsetY += (int)((float)ascent*scaleFactor); } - // NOTE: We create an empty image for space character, + // NOTE: We create an empty image for space character, // it could be further required for atlas packing if (ch == 32) { @@ -1534,7 +1534,7 @@ char *TextReplace(const char *text, const char *replace, const char *by) byLen = TextLength(by); // Count the number of replacements needed - insertPoint = text; + insertPoint = (char*)text; for (count = 0; (temp = strstr(insertPoint, replace)); count++) insertPoint = temp + replaceLen; // Allocate returning string and point temp to it @@ -2086,9 +2086,9 @@ static Font LoadBMFont(const char *fileName) searchPoint = strstr(buffer, "lineHeight"); readVars = sscanf(searchPoint, "lineHeight=%i base=%i scaleW=%i scaleH=%i pages=%i", &fontSize, &base, &imWidth, &imHeight, &pageCount); fileTextPtr += (readBytes + 1); - + if (readVars < 4) { UnloadFileText(fileText); return font; } // Some data not available, file malformed - + if (pageCount > MAX_FONT_IMAGE_PAGES) { TRACELOG(LOG_WARNING, "FONT: [%s] Font defines more pages than supported: %i/%i", fileName, pageCount, MAX_FONT_IMAGE_PAGES); @@ -2148,17 +2148,17 @@ static Font LoadBMFont(const char *fileName) // NOTE: WARNING: This process could be really slow! if (pageCount > 1) { - // Resize font atlas to draw additional images - ImageResizeCanvas(&fullFont, imWidth, imHeight*pageCount, 0, 0, BLACK); + // Resize font atlas to draw additional images + ImageResizeCanvas(&fullFont, imWidth, imHeight*pageCount, 0, 0, BLACK); for (int i = 1; i < pageCount; i++) { Rectangle srcRec = { 0.0f, 0.0f, (float)imWidth, (float)imHeight }; Rectangle destRec = { 0.0f, (float)imHeight*(float)i, (float)imWidth, (float)imHeight }; - ImageDraw(&fullFont, imFonts[i], srcRec, destRec, WHITE); + ImageDraw(&fullFont, imFonts[i], srcRec, destRec, WHITE); } } - + RL_FREE(imFonts); font.texture = LoadTextureFromImage(fullFont); @@ -2178,7 +2178,7 @@ static Font LoadBMFont(const char *fileName) readVars = sscanf(buffer, "char id=%i x=%i y=%i width=%i height=%i xoffset=%i yoffset=%i xadvance=%i page=%i", &charId, &charX, &charY, &charWidth, &charHeight, &charOffsetX, &charOffsetY, &charAdvanceX, &pageID); fileTextPtr += (readBytes + 1); - + if (readVars == 9) // Make sure all char data has been properly read { // Get character rectangle in the font atlas texture