fixes in swfstrings

diff --git a/lib/modules/swfobject.c b/lib/modules/swfobject.c
index ef6903e..36b66d4 100644 (file)
--- a/lib/modules/swfobject.c
+++ b/lib/modules/swfobject.c
@@ -153,8 +153,10 @@ void swf_SetPlaceObject(TAG * t,SWFPLACEOBJECT* obj)
 
 void swf_GetPlaceObject(TAG * tag,SWFPLACEOBJECT* obj)
 {
 
 void swf_GetPlaceObject(TAG * tag,SWFPLACEOBJECT* obj)
 {

-    if(!tag) {
+    if(obj)

        memset(obj, 0, sizeof(SWFPLACEOBJECT));
        memset(obj, 0, sizeof(SWFPLACEOBJECT));

+
+    if(!tag) {

        swf_GetMatrix(0, &obj->matrix);
        swf_GetCXForm(0, &obj->cxform, 1);
        //obj->internal = PF_CHAR|PF_MATRIX|PF_CXFORM;
        swf_GetMatrix(0, &obj->matrix);
        swf_GetCXForm(0, &obj->cxform, 1);
        //obj->internal = PF_CHAR|PF_MATRIX|PF_CXFORM;

diff --git a/src/swfstrings.c b/src/swfstrings.c
index 1bbd52f..f288276 100644 (file)
--- a/src/swfstrings.c
+++ b/src/swfstrings.c
@@ -151,7 +151,7 @@ void textcallback(void*self, int*glyphs, int*advance, int nr, int fontid, int fo
 
        unsigned char a; 
        int advance = 0;
 
        unsigned char a; 
        int advance = 0;

-       if(font>=0) {
+       if(font) {

            if(glyphs[t]<0 || glyphs[t] >= font->numchars  /*glyph is not in range*/
                    || !font->glyph2ascii /* font has ascii<->glyph mapping */
              ) a = glyphs[t];
            if(glyphs[t]<0 || glyphs[t] >= font->numchars  /*glyph is not in range*/
                    || !font->glyph2ascii /* font has ascii<->glyph mapping */
              ) a = glyphs[t];