From 9c52a4932d8f5495724bb94a2e64b646df44fc29 Mon Sep 17 00:00:00 2001 From: raysan5 Date: Sun, 19 Jan 2020 12:49:33 +0100 Subject: [PATCH] Corrected issue with types --- src/external/jar_xm.h | 5 +++-- src/text.c | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/external/jar_xm.h b/src/external/jar_xm.h index cfb0d043..1839e619 100644 --- a/src/external/jar_xm.h +++ b/src/external/jar_xm.h @@ -51,6 +51,8 @@ #ifndef INCLUDE_JAR_XM_H #define INCLUDE_JAR_XM_H +#include + #define JAR_XM_DEBUG 0 #define JAR_XM_LINEAR_INTERPOLATION 1 // speed increase with decrease in quality #define JAR_XM_DEFENSIVE 1 @@ -69,7 +71,7 @@ struct jar_xm_context_s; typedef struct jar_xm_context_s jar_xm_context_t; #ifdef __cplusplus -extern "C" { +extern "C" { #endif /** Create a XM context. @@ -308,7 +310,6 @@ uint64_t jar_xm_get_remaining_samples(jar_xm_context_t* ctx); #include #include #include -#include #include #include diff --git a/src/text.c b/src/text.c index 7fe70b86..ae5b98da 100644 --- a/src/text.c +++ b/src/text.c @@ -557,7 +557,7 @@ CharInfo *LoadFontData(const char *fileName, int fontSize, int *fontChars, int c else chars[i].image.data = NULL; stbtt_GetCodepointHMetrics(&fontInfo, ch, &chars[i].advanceX, NULL); - chars[i].advanceX *= scaleFactor; + chars[i].advanceX = (int)((float)chars[i].advanceX*scaleFactor); // Load characters images chars[i].image.width = chw; @@ -977,7 +977,7 @@ void DrawTextRecEx(Font font, const char *text, Rectangle rec, float fontSize, f bool isGlyphSelected = false; if ((selectStart >= 0) && (k >= selectStart) && (k < (selectStart + selectLength))) { - DrawRectangleRec((Rectangle){ rec.x + textOffsetX - 1, rec.y + textOffsetY, glyphWidth, font.baseSize*scaleFactor }, selectBackTint); + DrawRectangleRec((Rectangle){ rec.x + textOffsetX - 1, rec.y + textOffsetY, glyphWidth, (int)((float)font.baseSize*scaleFactor) }, selectBackTint); isGlyphSelected = true; }