X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Frfxswf.h;h=33b61d5eef2725d6f83026fb2ff5d37ddfbdbd10;hb=015ed9c49f56ad4be7828ba31c4e78e2e750f03f;hp=4e2fa40373717cbc8498167161e49aa3f1a6aff6;hpb=9a19cee223398f45126b6297298e6028c0bcd6f6;p=swftools.git diff --git a/lib/rfxswf.h b/lib/rfxswf.h index 4e2fa40..33b61d5 100644 --- a/lib/rfxswf.h +++ b/lib/rfxswf.h @@ -30,6 +30,7 @@ extern "C" { #include #include +#include #include #include #include @@ -100,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 { @@ -119,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 @@ -160,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; } @@ -190,7 +187,7 @@ typedef struct _SWF U16 frameRate; U16 frameCount; // valid after load and save TAG * firstTag; -} SWF, * LPSWF; +} SWF; // Basic Functions @@ -201,6 +198,7 @@ int swf_WriteSWF(int handle,SWF * swf); // Writes SWF to file, returns lengt int swf_WriteSWC(int handle, SWF * swf); // for convenience, equal to swf->compressed=1;swf_WriteSWF(..) int swf_WriteCGI(SWF * swf); // Outputs SWF with valid CGI header to stdout void swf_FreeTags(SWF * swf); // Frees all malloc'ed memory for swf +SWF* swf_CopySWF(SWF*swf); // for streaming: int swf_WriteHeader(int handle,SWF * swf); // Writes Header of swf to file @@ -360,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 @@ -374,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 ! { @@ -395,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: */ @@ -433,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); @@ -455,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); @@ -491,7 +491,7 @@ typedef struct _SWFLAYOUT SRECT * bounds; U16 kerningcount; SWFKERNING * kerning; -} SWFLAYOUT, * LPSWFLAYOUT; +} SWFLAYOUT; typedef struct { S16 advance; @@ -501,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 @@ -528,7 +528,7 @@ typedef struct _SWFFONT FONTUSAGE * use; -} SWFFONT, * LPSWFFONT; +} SWFFONT; #define ET_HASTEXT 32768 @@ -548,6 +548,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 @@ -557,7 +562,7 @@ typedef struct _EditTextLayout U16 leading; } EditTextLayout; -int swf_FontEnumerate(SWF * swf,void (*FontCallback) (U16,U8*)); +int swf_FontEnumerate(SWF * swf,void (*FontCallback) (void*,U16,U8*), void*self); // -> void fontcallback(U16 id,U8 * name); returns number of defined fonts int swf_FontExtract(SWF * swf,int id,SWFFONT ** f); @@ -701,7 +706,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); @@ -714,6 +719,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) @@ -745,6 +751,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 @@ -960,6 +968,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);