Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source/blender/ftfont/intern/FTF_TTFont.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/ftfont/intern/FTF_TTFont.cpp b/source/blender/ftfont/intern/FTF_TTFont.cpp
index c0652ef50fe..d089abe5c49 100644
--- a/source/blender/ftfont/intern/FTF_TTFont.cpp
+++ b/source/blender/ftfont/intern/FTF_TTFont.cpp
@@ -172,7 +172,7 @@ int FTF_TTFont::SetFont(const unsigned char* str, int datasize, int fontsize)
fontl= NULL;
if(datasize) font = new FTGLPixmapFont(str, datasize);
- else font = new FTGLPixmapFont(str);
+ else font = new FTGLPixmapFont( (char *)str);
err = font->Error();
@@ -184,9 +184,9 @@ int FTF_TTFont::SetFont(const unsigned char* str, int datasize, int fontsize)
fontm= font;
if(datasize) fonts = new FTGLPixmapFont(str, datasize);
- else fonts = new FTGLPixmapFont(str);
+ else fonts = new FTGLPixmapFont((char *)str);
if(datasize) fontl = new FTGLPixmapFont(str, datasize);
- else fontl = new FTGLPixmapFont(str);
+ else fontl = new FTGLPixmapFont((char *)str);
success = fonts->FaceSize(fontsize-2<8?8:fontsize-2);
success = fontm->FaceSize(fontsize-1<8?8:fontsize-1);