X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=lib%2Fmodules%2Fswftext.c;h=2a9a025e43fc07a23abebe90aeee15e214c26d40;hb=e495b5c67d32e40c50501af14c417b02b5f82f89;hp=6c67b48b890ce9ee5dc89041a98f26b11dcefc3b;hpb=6c3ab5574d31504d24710c2756899d49275c1a37;p=swftools.git

diff --git a/lib/modules/swftext.c b/lib/modules/swftext.c
index 6c67b48..2a9a025 100644
--- a/lib/modules/swftext.c
+++ b/lib/modules/swftext.c
@@ -237,8 +237,6 @@ int swf_FontExtract_DefineFontInfo(int id, SWFFONT * f, TAG * t)
 int swf_FontExtract_GlyphNames(int id, SWFFONT * f, TAG * tag)
 {
     U16 fid;
-    U16 maxcode;
-    U8 flags;
     swf_SaveTagPos(tag);
     swf_SetTagPos(tag, 0);
 
@@ -741,7 +739,7 @@ int swf_FontReduce(SWFFONT * f)
 
 void swf_FontSort(SWFFONT * font)
 {
-    int i, j, k;
+    int i, j;
     int *newplace;
     int *newpos;
     if (!font)
@@ -932,7 +930,6 @@ int swf_FontSetDefine2(TAG * tag, SWFFONT * f)
     U8 flags = 0;
     int t;
     int pos;
-    int pos2;
     swf_SetU16(tag, f->id);
 
     if (f->layout) flags |= 128;		// haslayout
@@ -1139,14 +1136,14 @@ void swf_FontFree(SWFFONT * f)
     rfx_free(f);
 }
 
-int swf_TextSetInfoRecord(TAG * t, SWFFONT * font, U16 size, RGBA * color, int dx, int dy)
+int swf_TextSetInfoRecord(TAG * t, SWFFONT * font, U16 size, RGBA * color, int x, int y)
 {
     U8 flags;
     if (!t)
 	return -1;
 
-    flags = TF_TEXTCONTROL | (font ? TF_HASFONT : 0) | (color ? TF_HASCOLOR : 0) | (dx ? TF_HASXOFFSET : 0)
-	| (dy ? TF_HASYOFFSET : 0);
+    flags = TF_TEXTCONTROL | (font ? TF_HASFONT : 0) | (color ? TF_HASCOLOR : 0) | (x ? TF_HASXOFFSET : 0)
+	| (y ? TF_HASYOFFSET : 0);
 
     swf_SetU8(t, flags);
     if (font)
@@ -1157,20 +1154,20 @@ int swf_TextSetInfoRecord(TAG * t, SWFFONT * font, U16 size, RGBA * color, int d
 	else
 	    swf_SetRGB(t, color);
     }
-    if (dx) {
-	if(dx != SET_TO_ZERO) {
-	    if(dx>32767 || dx<-32768)
-		fprintf(stderr, "Warning: Horizontal char position overflow: %d\n", dx);
-	    swf_SetS16(t, dx);
+    if (x) {
+	if(x != SET_TO_ZERO) {
+	    if(x>32767 || x<-32768)
+		fprintf(stderr, "Warning: Horizontal char position overflow: %d\n", x);
+	    swf_SetS16(t, x);
 	} else {
 	    swf_SetS16(t, 0);
 	}
     }
-    if (dy) {
-	if(dy != SET_TO_ZERO) {
-	    if(dy>32767 || dy<-32768)
-		fprintf(stderr, "Warning: Vertical char position overflow: %d\n", dy);
-	    swf_SetS16(t, dy);
+    if (y) {
+	if(y != SET_TO_ZERO) {
+	    if(y>32767 || y<-32768)
+		fprintf(stderr, "Warning: Vertical char position overflow: %d\n", y);
+	    swf_SetS16(t, y);
 	} else {
 	    swf_SetS16(t, 0);
 	}