X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Frfxswf.h;h=9225807d78d50b8e0e66852d2ecd7b55b5b69779;hb=cb30f215c366a62f965f58cff33139120cdececb;hp=38883190a61320e8f8e835c635313087b0f32e59;hpb=ce3c08fef5972b6e05b7b1bb6fb65ff249c33505;p=swftools.git

diff --git a/lib/rfxswf.h b/lib/rfxswf.h
index 3888319..9225807 100644
--- a/lib/rfxswf.h
+++ b/lib/rfxswf.h
@@ -101,14 +101,14 @@ typedef         signed long     SCOORD;
 typedef struct _SPOINT
 { SCOORD        x;
   SCOORD        y;
-} SPOINT, * LPSPOINT;
+} SPOINT;
 
 typedef struct _RGBA
 { U8    a;
   U8    r;
   U8    g;
   U8    b;
-} RGBA, * LPRGBA;
+} RGBA;
 
 typedef struct _YUV
 {
@@ -120,23 +120,19 @@ typedef struct _SRECT
   SCOORD        ymin;
   SCOORD        xmax;
   SCOORD        ymax;
-} SRECT, * LPSRECT;
+} SRECT;
 
 typedef struct _MATRIX
-{ SFIXED        sx;     // factor x
-  SFIXED        sy;
-  SFIXED        r0;     // rotation
-  SFIXED        r1;
-  SCOORD        tx;     // delta x
-  SCOORD        ty;
-} MATRIX, * LPMATRIX;
+{ SFIXED        sx,r1, tx;
+  SFIXED        r0,sy, ty;
+} MATRIX;
 
 typedef struct _CXFORM
 { S16           a0, a1; /* mult, add */
   S16           r0, r1;
   S16           g0, g1;
   S16           b0, b1;
-} CXFORM, * LPCXFORM;
+} CXFORM;
 
 #define GRADIENT_LINEAR 0x10
 #define GRADIENT_RADIAL 0x12
@@ -161,7 +157,7 @@ typedef struct _TAG             // NEVER access a Tag-Struct directly !
   U8            readBit;        // for Bit-Manipulating Functions [read]
   U8            writeBit;       // [write]
   
-} TAG, * LPTAG;
+} TAG;
 
 #define swf_ResetReadBits(tag)   if (tag->readBit)  { tag->pos++; tag->readBit = 0; }
 #define swf_ResetWriteBits(tag)  if (tag->writeBit) { tag->writeBit = 0; }
@@ -191,7 +187,7 @@ typedef struct _SWF
   U16           frameRate;
   U16           frameCount;     // valid after load and save
   TAG *         firstTag;
-} SWF, * LPSWF;
+} SWF;
 
 // Basic Functions
 
@@ -362,7 +358,7 @@ SRECT swf_TurnRect(SRECT r, MATRIX* m);
 typedef struct _LINESTYLE
 { U16           width;
   RGBA          color;
-} LINESTYLE, * LPLINESTYLE;
+} LINESTYLE;
 
 #define FILL_SOLID      0x00
 #define FILL_LINEAR     0x10  // Gradient
@@ -376,7 +372,7 @@ typedef struct _FILLSTYLE
   MATRIX    m; 
   U16	    id_bitmap;
   GRADIENT  gradient;
-} FILLSTYLE, * LPFILLSTYLE;
+} FILLSTYLE;
      
 typedef struct _SHAPE           // NEVER access a Shape-Struct directly !
 {                 
@@ -397,7 +393,7 @@ typedef struct _SHAPE           // NEVER access a Shape-Struct directly !
   				// used by Get/SetSimpleShape and glyph handling
   U8 *          data;
   U32           bitlen;         // length of data in bits
-} SHAPE, * LPSHAPE;
+} SHAPE;
 
 /* SHAPE can be converted into SHAPE2: */
 
@@ -435,6 +431,7 @@ int   swf_ShapeAddLineStyle(SHAPE * s,U16 width,RGBA * color);
 int   swf_ShapeAddSolidFillStyle(SHAPE * s,RGBA * color);
 int   swf_ShapeAddBitmapFillStyle(SHAPE * s,MATRIX * m,U16 id_bitmap,int clip);
 int   swf_ShapeAddGradientFillStyle(SHAPE * s,MATRIX * m,GRADIENT* gradient,int radial);
+int   swf_ShapeAddFillStyle2(SHAPE * s,FILLSTYLE*fs);
 
 int   swf_SetShapeStyles(TAG * t,SHAPE * s);
 int   swf_ShapeCountBits(SHAPE * s,U8 * fbits,U8 * lbits);
@@ -457,6 +454,7 @@ SHAPE2*	   swf_ShapeToShape2(SHAPE*shape);
 void	   swf_Shape2ToShape(SHAPE2*shape2, SHAPE*shape);
 SRECT	   swf_GetShapeBoundingBox(SHAPE2*shape);
 void	    swf_SetShape2(TAG*tag, SHAPE2*shape);
+SHAPE2*    swf_Shape2Clone(SHAPE2 * s);
 void	   swf_Shape2Free(SHAPE2 * s);
 void	swf_DumpShape(SHAPE2*shape2);
 
@@ -493,7 +491,7 @@ typedef struct _SWFLAYOUT
   SRECT      * bounds;
   U16	       kerningcount;
   SWFKERNING * kerning;
-} SWFLAYOUT, * LPSWFLAYOUT;
+} SWFLAYOUT;
 
 typedef struct
 { S16         advance;
@@ -503,7 +501,7 @@ typedef struct
 typedef struct _FONTUSAGE
 { int* chars;
   char is_reduced;
-} FONTUSAGE, * LPFONTUSAGE;
+} FONTUSAGE;
 
 #define FONT_STYLE_BOLD 1
 #define FONT_STYLE_ITALIC 2
@@ -530,7 +528,7 @@ typedef struct _SWFFONT
 
   FONTUSAGE *   use;
 
-} SWFFONT, * LPSWFFONT;
+} SWFFONT;
 
 
 #define ET_HASTEXT 32768
@@ -703,7 +701,7 @@ int swf_ButtonPostProcess(TAG * t,int anz_action); // Set all offsets in DefineB
 
 // swfbits.c
 
-typedef int JPEGBITS,* LPJPEGBITS; // cover libjpeg structures
+typedef int JPEGBITS;
 
 JPEGBITS * swf_SetJPEGBitsStart(TAG * t,int width,int height,int quality);
 int swf_SetJPEGBitsLines(JPEGBITS * jpegbits,U8 ** data,int n);
@@ -747,6 +745,8 @@ U8 swf_isShapeTag(TAG*tag);
 
 U16 swf_GetDefineID(TAG * t);
 SRECT swf_GetDefineBBox(TAG * t);
+void swf_SetDefineBBox(TAG * t, SRECT r);
+
 void swf_SetDefineID(TAG * t, U16 newid);
 U16 swf_GetPlaceID(TAG * t); //PLACEOBJECT, PLACEOBJECT2 (sometimes), REMOVEOBJECT
 int swf_GetDepth(TAG * t); //PLACEOBJECT,PLACEOBJECT2,REMOVEOBJECT,REMOVEOBJECT2,SETTABINDEX
@@ -962,6 +962,8 @@ typedef struct RENDERBUF
 } RENDERBUF;
 
 void swf_Render_Init(RENDERBUF*buf, int posx, int posy, int width, int height, char antialize, int scale);
+void swf_Render_SetBackground(RENDERBUF*buf, RGBA*img, int width, int height);
+void swf_Render_SetBackgroundColor(RENDERBUF*buf, RGBA color);
 RGBA* swf_Render(RENDERBUF*dest);
 void swf_RenderShape(RENDERBUF*dest, SHAPE2*shape, MATRIX*m, CXFORM*c, U16 depth,U16 clipdepth);
 void swf_Render_AddImage(RENDERBUF*buf, U16 id, RGBA*img, int width, int height);