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:
authorAlexander Ewering <blender@instinctive.de>2005-06-18 01:04:27 +0400
committerAlexander Ewering <blender@instinctive.de>2005-06-18 01:04:27 +0400
commit97df61a7e5391e302d1a5f9069cf0b388f85e0c8 (patch)
tree1c0004b1efa87ebf22ffe014d836033ac2f2ac30 /source/blender/blenlib
parent9ee2a1ee095a1b9ce02b5ac30a50a4446f513ddc (diff)
Initial commit for new text object.
Important notes: - Full compatibility with old text objects not fully restored (word spacing will be 0.0, need to set it manually to 1.0), will either need version upgrade to 238 or a hack. Will check. - lorem.c (about to be committed) contains BF copyright notice, but as BF did not exist a few hundred years ago, probably best to remove it :) - If you notice any cross-platform issues (especially beloved windows), please report - A few tiny warnings left, I will fix those issues still. The rest has been said already - so have fun testing. And please do! === Reminder: === Documentation at http://blender.instinctive.de/docs/textobject.txt ===
Diffstat (limited to 'source/blender/blenlib')
-rw-r--r--source/blender/blenlib/intern/psfont.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/source/blender/blenlib/intern/psfont.c b/source/blender/blenlib/intern/psfont.c
index 74e8bef6e8a..f7fbf7e3d16 100644
--- a/source/blender/blenlib/intern/psfont.c
+++ b/source/blender/blenlib/intern/psfont.c
@@ -119,8 +119,8 @@ typedef struct pschar {
#define NOTHEX (100)
#define MC1 52845
#define MC2 22719
-#define MAXSUBRS 1000
-#define MAXCHARS 1000
+#define MAXSUBRS 4000
+#define MAXCHARS 4000
#define MAXTRIES 30
/* some local thingies */
@@ -215,7 +215,7 @@ static unsigned short int mr;
static char *bindat;
static int datbytes;
static int firsted;
-static short chardata[2000];
+static short chardata[20000];
static int nshorts;
static int thecharwidth, thesidebearing;
@@ -763,10 +763,12 @@ static int decryptprogram(char *buf, int len)
resetdecrypt(4330);
for(i=0; i<len; i++) {
- if(i<SKIP)
+ if(i<SKIP) {
mdecrypt(buf[i]);
- else
+ }
+ else {
buf[i-SKIP] = mdecrypt(buf[i]);
+ }
}
return len-SKIP;
}
@@ -1447,10 +1449,10 @@ static void spline_line(float x0, float y0, float x1, float y1)
static void spline_curveto(float x0, float y0, float x1, float y1, float x2, float y2, float x3, float y3)
{
applymat(mat,&x0,&y0);
+
applymat(mat,&x1,&y1);
applymat(mat,&x2,&y2);
applymat(mat,&x3,&y3);
-
if(sp_npnts == 0) {
chardata[nshorts++] = SP_MOVETO;
chardata[nshorts++] = floor(x0);