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:
authorTon Roosendaal <ton@blender.org>2004-11-08 20:09:16 +0300
committerTon Roosendaal <ton@blender.org>2004-11-08 20:09:16 +0300
commit72fd0789a46de765336a44c14805c9d3a1256b9a (patch)
treee1e896eeb96c72b0a7977da9ec68e00a6e94e185 /source/blender/ftfont
parente3a25e4765b02d50a767c36ae9bbfdbc8047ad54 (diff)
Casting added for unsigned/signed char weirdness in ftgl...
Diffstat (limited to 'source/blender/ftfont')
-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);