X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Frfxswf.h;h=1266d487095f4dc7e08e96287d71207db92e80ef;hb=1fc6433035d24984dd10458a1ff10d36fddc1cd3;hp=88cdf7c48307ee4928da1851ea9203ba6bdf88ec;hpb=c99484452927b16bc4ba7a292d96ae6c0dcd86c4;p=swftools.git

diff --git a/lib/rfxswf.h b/lib/rfxswf.h
index 88cdf7c..1266d48 100644
--- a/lib/rfxswf.h
+++ b/lib/rfxswf.h
@@ -431,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);
@@ -439,6 +440,7 @@ int   swf_SetShapeHeader(TAG * t,SHAPE * s); // one call for upper three functio
 
 int   swf_ShapeSetMove(TAG * t,SHAPE * s,S32 x,S32 y);
 int   swf_ShapeSetStyle(TAG * t,SHAPE * s,int line,int fill0,int fill1);
+#define UNDEFINED_COORD 0x7fffffff
 int   swf_ShapeSetAll(TAG * t,SHAPE * s,S32 x,S32 y,int line,int fill0,int fill1);
 
 int   swf_ShapeSetLine(TAG * t,SHAPE * s,S32 x,S32 y);
@@ -547,6 +549,11 @@ typedef struct _SWFFONT
 #define ET_HTML 2 /* MX? */
 #define ET_USEOUTLINES 1
 
+#define ET_ALIGN_LEFT 0
+#define ET_ALIGN_RIGHT  1
+#define ET_ALIGN_CENTER 2
+#define ET_ALIGN_JUSTIFY 3
+
 typedef struct _EditTextLayout
 {
     U8 align; // 0=left, 1=right, 2=center, 3=justify
@@ -700,12 +707,14 @@ int swf_ButtonPostProcess(TAG * t,int anz_action); // Set all offsets in DefineB
 
 // swfbits.c
 
-typedef int JPEGBITS;
+int swf_ImageHasAlpha(RGBA*img, int width, int height);
+int swf_ImageGetNumberOfPaletteEntries(RGBA*img, int width, int height, RGBA*palette);
 
-JPEGBITS * swf_SetJPEGBitsStart(TAG * t,int width,int height,int quality);
-int swf_SetJPEGBitsLines(JPEGBITS * jpegbits,U8 ** data,int n);
-int swf_SetJPEGBitsLine(JPEGBITS * jpegbits,U8 * data);
-int swf_SetJPEGBitsFinish(JPEGBITS * jpegbits);
+typedef int JPEGBITS;
+JPEGBITS * swf_SetJPEGBitsStart(TAG * t,int width,int height,int quality); // deprecated
+int swf_SetJPEGBitsLines(JPEGBITS * jpegbits,U8 ** data,int n); // deprecated
+int swf_SetJPEGBitsLine(JPEGBITS * jpegbits,U8 * data); // deprecated
+int swf_SetJPEGBitsFinish(JPEGBITS * jpegbits); // deprecated
 
 void swf_GetJPEGSize(char * fname, int*width, int*height);
 
@@ -713,6 +722,7 @@ int swf_SetJPEGBits(TAG * t,char * fname,int quality);
 void swf_SetJPEGBits2(TAG * t,U16 width,U16 height,RGBA * bitmap,int quality);
 int swf_SetJPEGBits3(TAG * tag,U16 width,U16 height,RGBA* bitmap, int quality);
 RGBA* swf_JPEG2TagToImage(TAG*tag, int*width, int*height);
+void swf_RemoveJPEGTables(SWF*swf);
 
 #define BYTES_PER_SCANLINE(width) ((width+3)&0xfffffffc)
 
@@ -723,9 +733,12 @@ RGBA* swf_JPEG2TagToImage(TAG*tag, int*width, int*height);
 int swf_SetLosslessBits(TAG * t,U16 width,U16 height,void * bitmap,U8 bitmap_flags);
 int swf_SetLosslessBitsIndexed(TAG * t,U16 width,U16 height,U8 * bitmap,RGBA * palette,U16 ncolors);
 int swf_SetLosslessBitsGrayscale(TAG * t,U16 width,U16 height,U8 * bitmap);
+void swf_SetLosslessImage(TAG*tag, RGBA*data, int width, int height); //WARNING: will change tag->id
+
 RGBA* swf_DefineLosslessBitsTagToImage(TAG*tag, int*width, int*height);
 
 RGBA* swf_ExtractImage(TAG*tag, int*dwidth, int*dheight);
+RGBA* swf_ImageScale(RGBA*data, int width, int height, int newwidth, int newheight);
 
 // swfsound.c
 void swf_SetSoundStreamHead(TAG*tag, int avgnumsamples);
@@ -744,6 +757,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