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:
authorRob Haarsma <phaseIV@zonnet.nl>2003-05-14 14:01:36 +0400
committerRob Haarsma <phaseIV@zonnet.nl>2003-05-14 14:01:36 +0400
commit3ce849949e5c60e14ee0e0fac2c2ca365e5e0344 (patch)
tree88533bfd2cbbb65b78ff1e0adc4e94422a9a992d /source/blender/ftfont
parentc760bd6e3cd4a16a4a17f9e7f718c2c9e67e9be2 (diff)
doubled the size of the string to be translated, which fixes
the italian mo crash.
Diffstat (limited to 'source/blender/ftfont')
-rw-r--r--source/blender/ftfont/intern/FTF_TTFont.cpp14
1 files changed, 5 insertions, 9 deletions
diff --git a/source/blender/ftfont/intern/FTF_TTFont.cpp b/source/blender/ftfont/intern/FTF_TTFont.cpp
index a253a7f23af..a9f4408f58a 100644
--- a/source/blender/ftfont/intern/FTF_TTFont.cpp
+++ b/source/blender/ftfont/intern/FTF_TTFont.cpp
@@ -57,7 +57,7 @@
#define FONT_SIZE_DEFAULT 12
//#define FONT_PATH_DEFAULT ".bfont.ttf"
-#define FTF_MAX_STR_SIZE 256
+#define FTF_MAX_STR_SIZE 512
int utf8towchar(wchar_t *w, char *c)
{
@@ -240,8 +240,7 @@ int FTF_TTFont::TransConvString(char* str, char* ustr, unsigned int flag)
float FTF_TTFont::DrawString(char* str, unsigned int flag, int select)
{
- char ustr[FTF_MAX_STR_SIZE*2]={0};
- wchar_t wstr[255]={'\0'};
+ wchar_t wstr[FTF_MAX_STR_SIZE-1]={'\0'};
int len=0;
if (FTF_USE_GETTEXT & flag)
@@ -269,8 +268,7 @@ float FTF_TTFont::DrawString(char* str, unsigned int flag, int select)
float FTF_TTFont::DrawStringRGB(char* str, unsigned int flag, float r, float g, float b)
{
- char ustr[FTF_MAX_STR_SIZE*2]={0};
- wchar_t wstr[255]={'\0'};
+ wchar_t wstr[FTF_MAX_STR_SIZE-1]={'\0'};
int len=0;
if (FTF_USE_GETTEXT & flag)
@@ -294,8 +292,7 @@ float FTF_TTFont::DrawStringRGB(char* str, unsigned int flag, float r, float g,
float FTF_TTFont::GetStringWidth(char* str, unsigned int flag)
{
- char ustr[FTF_MAX_STR_SIZE*2]={0};
- wchar_t wstr[511]={'\0'};
+ wchar_t wstr[FTF_MAX_STR_SIZE-1]={'\0'};
int len=0;
if (FTF_USE_GETTEXT & flag)
@@ -309,8 +306,7 @@ float FTF_TTFont::GetStringWidth(char* str, unsigned int flag)
void FTF_TTFont::GetBoundingBox(char* str, float *llx, float *lly, float *llz, float *urx, float *ury, float *urz, unsigned int flag)
{
- char ustr[FTF_MAX_STR_SIZE*2]={0};
- wchar_t wstr[255]={'\0'};
+ wchar_t wstr[FTF_MAX_STR_SIZE-1]={'\0'};
int len=0;
if (FTF_USE_GETTEXT & flag)