archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

doubled the size of the string to be translated, which fixes

Browse Source 
the italian mo crash.
This commit is contained in:
Rob Haarsma
2003-05-14 10:01:36 +00:00
parent c760bd6e3c
commit 3ce849949e
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/ftfont/intern/FTF_TTFont.cpp
View File

@@ -57,7 +57,7 @@
#define FONT_SIZE_DEFAULT 12 #define FONT_SIZE_DEFAULT 12
//#define FONT_PATH_DEFAULT ".bfont.ttf" //#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) 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) float FTF_TTFont::DrawString(char* str, unsigned int flag, int select)
{ {
char ustr[FTF_MAX_STR_SIZE*2]={0}; wchar_t wstr[FTF_MAX_STR_SIZE-1]={'\0'};
wchar_t wstr[255]={'\0'};
int len=0; int len=0;
if (FTF_USE_GETTEXT & flag) 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) 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[FTF_MAX_STR_SIZE-1]={'\0'};
wchar_t wstr[255]={'\0'};
int len=0; int len=0;
if (FTF_USE_GETTEXT & flag) 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) float FTF_TTFont::GetStringWidth(char* str, unsigned int flag)
{ {
char ustr[FTF_MAX_STR_SIZE*2]={0}; wchar_t wstr[FTF_MAX_STR_SIZE-1]={'\0'};
wchar_t wstr[511]={'\0'};
int len=0; int len=0;
if (FTF_USE_GETTEXT & flag) 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) 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[FTF_MAX_STR_SIZE-1]={'\0'};
wchar_t wstr[255]={'\0'};
int len=0; int len=0;
if (FTF_USE_GETTEXT & flag) if (FTF_USE_GETTEXT & flag)