X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Frfxswf.h;h=5fa7d1b74595050b24083dca7a19975c00f3d265;hb=efc92c191c8417ab626b0e8e639f8d516e4000ff;hp=83db4f06c4133fb66d2582814c90517f7b59221e;hpb=103fd3207b8a4d7be7fa8d4e0e8ee43c31ac4911;p=swftools.git

diff --git a/lib/rfxswf.h b/lib/rfxswf.h
index 83db4f0..5fa7d1b 100644
--- a/lib/rfxswf.h
+++ b/lib/rfxswf.h
@@ -70,6 +70,11 @@ extern "C" {
 #define REVERSESWAP16(s) ((((s)>>8)&0x00ff)|(((s)<<8)&0xff00))
 #define REVERSESWAP32(s) (REVERSESWAP16(((s)>>16)&0x0000ffff)|((REVERSESWAP16(s)<<16)&0xffff0000))
 #endif
+
+#define ALLOC_ARRAY(type, num) (((type)*)rfxalloc(sizeof(type)*(num)))
+void* rfxalloc(int size);
+void rfxdealloc(void*data);
+
 // SWF Types
 
 typedef         unsigned long   U32;
@@ -239,6 +244,7 @@ int   swf_SetBlock(TAG * t,U8 * b,int l);
 
 U8    swf_GetU8(TAG * t);                   // resets Bitcount
 U16   swf_GetU16(TAG * t);
+#define swf_GetS16(tag)     ((S16)swf_GetU16(tag))
 U32   swf_GetU32(TAG * t);
 void  swf_GetRGB(TAG * t, RGBA * col);
 void  swf_GetRGBA(TAG * t, RGBA * col);
@@ -246,7 +252,9 @@ void  swf_GetGradient(TAG * t, GRADIENT * gradient, char alpha);
 char* swf_GetString(TAG*t);
 int   swf_SetU8(TAG * t,U8 v);              // resets Bitcount
 int   swf_SetU16(TAG * t,U16 v);
+void  swf_SetS16(TAG * t,int v);
 int   swf_SetU32(TAG * t,U32 v);
+#define swf_SetString(t,s)  swf_SetBlock(t,s,strlen(s)+1)
 
 //int   swf_GetPoint(TAG * t,SPOINT * p);     // resets Bitcount
 int   swf_GetRect(TAG * t,SRECT * r);
@@ -271,27 +279,9 @@ void swf_ExpandRect3(SRECT*src, SPOINT center, int radius);
 SPOINT swf_TurnPoint(SPOINT p, MATRIX* m);
 SRECT swf_TurnRect(SRECT r, MATRIX* m);
 
-// Function Macros
-
-#define swf_GetS8(tag)      ((S8)swf_GetU8(tag))
-#define swf_GetS16(tag)     ((S16)swf_GetU16(tag))
-#define swf_GetS32(tag)     ((S32)swf_GetU32(tag))
-#define swf_GetCoord(tag)   ((SCOORD)swf_GetU32(tag))
-#define swf_GetFixed(tag)   ((SFIXED)swf_GetU32(tag))
-
-#define swf_SetS8(tag,v)    swf_SetU8(tag,(U8)v)
-#define swf_SetS16(tag,v)   swf_SetU16(tag,(U16)v)
-#define swf_SetS32(tag,v)   swf_SetU32(tag,(U32)v)
-#define swf_SetCoord(tag,v) swf_SetU32(tag,(U32)v)
-#define swf_SetFixed(tag,v) swf_SetU32(tag,(U32)v)
-#define swf_SetString(t,s)  swf_SetBlock(t,s,strlen(s)+1)
-
 #ifndef FAILED
 #define FAILED(b)       ((b)<0)
 #endif
-#ifndef SUCCEEDED
-#define SUCCEEDED(b)     ((b)>=0)
-#endif
 
 // Tag IDs (adopted from J. C. Kessels' Form2Flash)
 
@@ -365,6 +355,12 @@ typedef struct _LINESTYLE
   RGBA          color;
 } LINESTYLE, * LPLINESTYLE;
 
+#define FILL_SOLID      0x00
+#define FILL_LINEAR     0x10  // Gradient
+#define FILL_RADIAL     0x12
+#define FILL_TILED      0x40  // Bitmap
+#define FILL_CLIPPED    0x41
+
 typedef struct _FILLSTYLE
 { U8	    type;
   RGBA	    color;
@@ -707,6 +703,7 @@ void swf_GetJPEGSize(char * fname, int*width, int*height);
 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);
 
 #define BYTES_PER_SCANLINE(width) ((width+3)&0xfffffffc)
 
@@ -717,6 +714,9 @@ int swf_SetJPEGBits3(TAG * tag,U16 width,U16 height,RGBA* bitmap, int quality);
 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);
+RGBA* swf_DefineLosslessBitsTagToImage(TAG*tag, int*width, int*height);
+
+RGBA* swf_ExtractImage(TAG*tag, int*dwidth, int*dheight);
 
 // swfsound.c
 void swf_SetSoundStreamHead(TAG*tag, int avgnumsamples);
@@ -726,6 +726,7 @@ void swf_SetSoundInfo(TAG*tag, SOUNDINFO*info);
 
 // swftools.c
 
+void swf_Optimize(SWF*swf);
 U8 swf_isDefiningTag(TAG * t);
 U8 swf_isPseudoDefiningTag(TAG * t);
 U8 swf_isAllowedSpriteTag(TAG * t);