X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=inline;f=lib%2Fmodules%2Fswftext.c;h=0a7c8869d62d565e59e95cce748fb3189d012335;hb=efeed7d08e118fbc4aa8dfb5b8520f3226d3c7dc;hp=270447d19ab4c15d32267f814fec9753b4acdbf7;hpb=727c1172f6b10691735fa9d8f94d27b960d4feec;p=swftools.git

diff --git a/lib/modules/swftext.c b/lib/modules/swftext.c
index 270447d..0a7c886 100644
--- a/lib/modules/swftext.c
+++ b/lib/modules/swftext.c
@@ -372,9 +372,9 @@ int swf_FontReduce(SWFFONT * f,FONTUSAGE * use)
       }
       else
       { swf_ShapeFree(f->glyph[i].shape);
-	f->ascii2glyph[f->glyph2ascii[i]] = -1;
+        f->ascii2glyph[f->glyph2ascii[i]] = -1;
 	f->glyph2ascii[i] = 0;
-        f->glyph[i].shape   = 0;
+        f->glyph[i].shape   = NULL;
         f->glyph[i].advance = 0;
       }
     } else f->ascii2glyph[f->glyph2ascii[i]] = -1;
@@ -671,15 +671,39 @@ U32 swf_TextGetWidth(SWFFONT * font,U8 * s,int scale)
   return res;
 }
 
-void swf_WriteFont(SWFFONT*font, char* filename, int useDefineFont2)
+SWFFONT* swf_ReadFont(char* filename)
+{
+  int f;
+  SWF swf;
+  if(!filename)
+      return 0;
+  f = open(filename,O_RDONLY);
+  
+  if (f<0 || swf_ReadSWF(f,&swf)<0)
+  { fprintf(stderr,"%s is not a valid SWF font file or contains errors.\n",filename);
+    close(f);
+    return 0;
+  }
+  else
+  { SWFFONT*font;
+    close(f);
+    if(swf_FontExtract(&swf, WRITEFONTID, &font) < 0)
+       return 0;
+    swf_FreeTags(&swf);
+    return font;
+  }
+}
+
+void swf_WriteFont(SWFFONT*font, char* filename)
 { SWF swf;
   TAG * t;
   SRECT r;
   RGBA rgb;
   int f;
+  int useDefineFont2 = 1;
 
   if(useDefineFont2) {
-      fprintf(stderr, "DefineFont2 is not yet supported!\n");
+      //fprintf(stderr, "DefineFont2 is not yet supported!\n");
       useDefineFont2 = 0;
   }
 
@@ -700,10 +724,10 @@ void swf_WriteFont(SWFFONT*font, char* filename, int useDefineFont2)
   {
       t = swf_InsertTag(NULL,ST_SETBACKGROUNDCOLOR);
       swf.firstTag = t;
-	    rgb.r = 0xff;
-	    rgb.g = 0xff;
-	    rgb.b = 0xff;
-	    swf_SetRGB(t,&rgb);
+            rgb.r = 0xff;
+            rgb.g = 0xff;
+            rgb.b = 0xff;
+            swf_SetRGB(t,&rgb);
       t = swf_InsertTag(t,ST_DEFINEFONT);
   }
   else
@@ -718,11 +742,10 @@ void swf_WriteFont(SWFFONT*font, char* filename, int useDefineFont2)
         swf_FontSetInfo(t,font);
 
   if(!useDefineFont2)
-  {
-	int textscale = 400;
+  {     int textscale = 400;
 	int s;
 	int xmax = 0;
-	int ymax = textscale * 20;
+	int ymax = textscale * 2 * 20;
 	U8 gbits,abits;
 	char text[257];
 	int x,y;
@@ -773,7 +796,7 @@ void swf_WriteFont(SWFFONT*font, char* filename, int useDefineFont2)
 		    }
 		}
 		if(c) {
-		  swf_TextSetInfoRecord(t,font,textscale,&rgb,lastx+1,textscale*y);
+		  swf_TextSetInfoRecord(t,font,textscale,&rgb,lastx+1,textscale*y*2);
 		  for(x=0;x<16;x++)
 		  {
 		      int g = font->ascii2glyph[y*16+x];
@@ -791,12 +814,13 @@ void swf_WriteFont(SWFFONT*font, char* filename, int useDefineFont2)
 		} 
 	    }
 	    swf_SetU8(t,0);
+
         
-	t = swf_InsertTag(t,ST_PLACEOBJECT2);
+        t = swf_InsertTag(t,ST_PLACEOBJECT2);
 
-	    swf_ObjectPlace(t,font->id+1,1,NULL,NULL,NULL);
+            swf_ObjectPlace(t,font->id+1,1,NULL,NULL,NULL);
      
-	t = swf_InsertTag(t,ST_SHOWFRAME);
+        t = swf_InsertTag(t,ST_SHOWFRAME);
   }
   
   t = swf_InsertTag(t,ST_END);
@@ -808,26 +832,4 @@ void swf_WriteFont(SWFFONT*font, char* filename, int useDefineFont2)
   swf_FreeTags(&swf);
 }
 
-SWFFONT* swf_ReadFont(char* filename)
-{
-  int f;
-  SWF swf;
-  if(!filename)
-      return 0;
-  f = open(filename,O_RDONLY);
-  
-  if (f<0 || swf_ReadSWF(f,&swf)<0)
-  { fprintf(stderr,"%s is not a valid SWF font file or contains errors.\n",filename);
-    close(f);
-    return 0;
-  }
-  else
-  { SWFFONT*font;
-    close(f);
-    if(swf_FontExtract(&swf, WRITEFONTID, &font) < 0)
-       return 0;
-    swf_FreeTags(&swf);
-    return font;
-  }
-}