diff options
Diffstat (limited to 'source/blender/blenpluginapi')
-rw-r--r-- | source/blender/blenpluginapi/externdef.h | 5 | ||||
-rw-r--r-- | source/blender/blenpluginapi/iff.h | 64 | ||||
-rw-r--r-- | source/blender/blenpluginapi/plugin.h | 19 |
3 files changed, 46 insertions, 42 deletions
diff --git a/source/blender/blenpluginapi/externdef.h b/source/blender/blenpluginapi/externdef.h index 7322841e608..14a3115ce33 100644 --- a/source/blender/blenpluginapi/externdef.h +++ b/source/blender/blenpluginapi/externdef.h @@ -33,11 +33,14 @@ #ifdef WIN32 #ifdef PLUGIN_INTERN #define LIBEXPORT __declspec(dllexport) + #define LIBIMPORT __declspec(dllexport) #else - #define LIBEXPORT extern __declspec(dllimport) + #define LIBEXPORT __declspec(dllexport) + #define LIBIMPORT extern __declspec(dllimport) #endif #elif !defined(WIN32) #define LIBEXPORT extern + #define LIBIMPORT extern #endif #endif /* _EXTERNDEF_H */ diff --git a/source/blender/blenpluginapi/iff.h b/source/blender/blenpluginapi/iff.h index 5eb52158a1a..19bea621d24 100644 --- a/source/blender/blenpluginapi/iff.h +++ b/source/blender/blenpluginapi/iff.h @@ -167,49 +167,49 @@ typedef struct ImBuf { struct ImBuf *mipmap[IB_MIPMAP_LEVELS]; /**< MipMap levels, a series of halved images */ } ImBuf; -LIBEXPORT struct ImBuf *allocImBuf(short,short,uchar,uint,uchar); -LIBEXPORT struct ImBuf *dupImBuf(struct ImBuf *); -LIBEXPORT void freeImBuf(struct ImBuf*); +LIBIMPORT struct ImBuf *allocImBuf(short,short,uchar,uint,uchar); +LIBIMPORT struct ImBuf *dupImBuf(struct ImBuf *); +LIBIMPORT void freeImBuf(struct ImBuf*); -LIBEXPORT short converttocmap(struct ImBuf* ibuf); +LIBIMPORT short converttocmap(struct ImBuf* ibuf); -LIBEXPORT short saveiff(struct ImBuf *,char *,int); +LIBIMPORT short saveiff(struct ImBuf *,char *,int); -LIBEXPORT struct ImBuf *loadiffmem(int *,int); -LIBEXPORT struct ImBuf *loadifffile(int,int); -LIBEXPORT struct ImBuf *loadiffname(char *,int); -LIBEXPORT struct ImBuf *testiffname(char *,int); +LIBIMPORT struct ImBuf *loadiffmem(int *,int); +LIBIMPORT struct ImBuf *loadifffile(int,int); +LIBIMPORT struct ImBuf *loadiffname(char *,int); +LIBIMPORT struct ImBuf *testiffname(char *,int); -LIBEXPORT struct ImBuf *onehalf(struct ImBuf *); -LIBEXPORT struct ImBuf *onethird(struct ImBuf *); -LIBEXPORT struct ImBuf *halflace(struct ImBuf *); -LIBEXPORT struct ImBuf *half_x(struct ImBuf *); -LIBEXPORT struct ImBuf *half_y(struct ImBuf *); -LIBEXPORT struct ImBuf *double_x(struct ImBuf *); -LIBEXPORT struct ImBuf *double_y(struct ImBuf *); -LIBEXPORT struct ImBuf *double_fast_x(struct ImBuf *); -LIBEXPORT struct ImBuf *double_fast_y(struct ImBuf *); +LIBIMPORT struct ImBuf *onehalf(struct ImBuf *); +LIBIMPORT struct ImBuf *onethird(struct ImBuf *); +LIBIMPORT struct ImBuf *halflace(struct ImBuf *); +LIBIMPORT struct ImBuf *half_x(struct ImBuf *); +LIBIMPORT struct ImBuf *half_y(struct ImBuf *); +LIBIMPORT struct ImBuf *double_x(struct ImBuf *); +LIBIMPORT struct ImBuf *double_y(struct ImBuf *); +LIBIMPORT struct ImBuf *double_fast_x(struct ImBuf *); +LIBIMPORT struct ImBuf *double_fast_y(struct ImBuf *); -LIBEXPORT int ispic(char *); +LIBIMPORT int ispic(char *); -LIBEXPORT void dit2(struct ImBuf *, short, short); -LIBEXPORT void dit0(struct ImBuf *, short, short); +LIBIMPORT void dit2(struct ImBuf *, short, short); +LIBIMPORT void dit0(struct ImBuf *, short, short); -LIBEXPORT struct ImBuf *scaleImBuf(struct ImBuf *, short, short); -LIBEXPORT struct ImBuf *scalefastImBuf(struct ImBuf *, short, short); -LIBEXPORT struct ImBuf *scalefieldImBuf(struct ImBuf *, short, short); -LIBEXPORT struct ImBuf *scalefastfieldImBuf(struct ImBuf *, short, short); +LIBIMPORT struct ImBuf *scaleImBuf(struct ImBuf *, short, short); +LIBIMPORT struct ImBuf *scalefastImBuf(struct ImBuf *, short, short); +LIBIMPORT struct ImBuf *scalefieldImBuf(struct ImBuf *, short, short); +LIBIMPORT struct ImBuf *scalefastfieldImBuf(struct ImBuf *, short, short); -LIBEXPORT void de_interlace(struct ImBuf *ib); -LIBEXPORT void interlace(struct ImBuf *ib); -LIBEXPORT void gamwarp(struct ImBuf *ibuf, double gamma); +LIBIMPORT void de_interlace(struct ImBuf *ib); +LIBIMPORT void interlace(struct ImBuf *ib); +LIBIMPORT void gamwarp(struct ImBuf *ibuf, double gamma); -LIBEXPORT void IMB_rectcpy(struct ImBuf *dbuf, struct ImBuf *sbuf, +LIBIMPORT void IMB_rectcpy(struct ImBuf *dbuf, struct ImBuf *sbuf, int destx, int desty, int srcx, int srcy, int width, int height); -LIBEXPORT void IMB_rectfill(struct ImBuf *drect, float col[4]); -LIBEXPORT void IMB_rectfill_area(struct ImBuf *ibuf, float *col, int x1, int y1, int x2, int y2); -LIBEXPORT void buf_rectfill_area(unsigned char *rect, float *rectf, int width, int height, float *col, int x1, int y1, int x2, int y2); +LIBIMPORT void IMB_rectfill(struct ImBuf *drect, float col[4]); +LIBIMPORT void IMB_rectfill_area(struct ImBuf *ibuf, float *col, int x1, int y1, int x2, int y2); +LIBIMPORT void buf_rectfill_area(unsigned char *rect, float *rectf, int width, int height, float *col, int x1, int y1, int x2, int y2); #endif /* IFF_H */ diff --git a/source/blender/blenpluginapi/plugin.h b/source/blender/blenpluginapi/plugin.h index 1f6140130eb..da044cf7317 100644 --- a/source/blender/blenpluginapi/plugin.h +++ b/source/blender/blenpluginapi/plugin.h @@ -36,9 +36,10 @@ #include "util.h" #include "floatpatch.h" -#define B_PLUGIN_VERSION 5 +#define B_PLUGIN_VERSION 6 -typedef int (*TexDoit)(int, void*, float*, float*, float*); +typedef int (*TexDoit)(int, void*, float*, float*, float*, float*); +typedef int (*TexDoitold)(int, void*, float*, float*, float*); typedef void (*SeqDoit)(void*, float, float, int, int, ImBuf*, ImBuf*, ImBuf*, ImBuf*); typedef struct VarStruct { @@ -66,9 +67,9 @@ typedef struct _PluginInfo { void (*instance_init)(void *); } PluginInfo; -int plugin_tex_getversion(void); -int plugin_seq_getversion(void); -void plugin_getinfo(PluginInfo *); +LIBEXPORT int plugin_tex_getversion(void); +LIBEXPORT int plugin_seq_getversion(void); +LIBEXPORT void plugin_getinfo(PluginInfo *); /* *************** defines for button types ************** */ @@ -90,14 +91,14 @@ void plugin_getinfo(PluginInfo *); /* *************** API functions ******************** */ /* derived from the famous Perlin noise */ -LIBEXPORT float hnoise(float noisesize, float x, float y, float z); +LIBIMPORT float hnoise(float noisesize, float x, float y, float z); /* the original Perlin noise */ -LIBEXPORT float hnoisep(float noisesize, float x, float y, float z); +LIBIMPORT float hnoisep(float noisesize, float x, float y, float z); /* soft turbulence */ -LIBEXPORT float turbulence(float noisesize, float x, float y, float z, int depth); +LIBIMPORT float turbulence(float noisesize, float x, float y, float z, int depth); /* hard turbulence */ -LIBEXPORT float turbulence1(float noisesize, float x, float y, float z, int depth); +LIBIMPORT float turbulence1(float noisesize, float x, float y, float z, int depth); #endif /* PLUGIN_H */ |