Changeset 1538 for sdl_gfx


Ignore:
Timestamp:
Apr 18, 2016, 11:16:56 PM (9 years ago)
Author:
valerius
Message:

sdl_gfx: Fixed calling convention to use SDLCALL.

Location:
sdl_gfx/trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • TabularUnified sdl_gfx/trunk/SDL_framerate.h

    r1430 r1538  
    7070        /* ---- Function Prototypes */
    7171
    72 #ifdef _MSC_VER
     72#if defined(_MSC_VER) || defined(__EMX__)
    7373#  if defined(DLL_EXPORT) && !defined(LIBSDL_GFX_DLL_IMPORT)
    7474#    define SDL_FRAMERATE_SCOPE __declspec(dllexport)
    … …  
    8585        /* Functions return 0 or value for sucess and -1 for error */
    8686
    87         SDL_FRAMERATE_SCOPE void SDL_initFramerate(FPSmanager * manager);
    88         SDL_FRAMERATE_SCOPE int SDL_setFramerate(FPSmanager * manager, Uint32 rate);
    89         SDL_FRAMERATE_SCOPE int SDL_getFramerate(FPSmanager * manager);
    90         SDL_FRAMERATE_SCOPE int SDL_getFramecount(FPSmanager * manager);
    91         SDL_FRAMERATE_SCOPE Uint32 SDL_framerateDelay(FPSmanager * manager);
     87        SDL_FRAMERATE_SCOPE void SDLCALL SDL_initFramerate(FPSmanager * manager);
     88        SDL_FRAMERATE_SCOPE int SDLCALL SDL_setFramerate(FPSmanager * manager, Uint32 rate);
     89        SDL_FRAMERATE_SCOPE int SDLCALL SDL_getFramerate(FPSmanager * manager);
     90        SDL_FRAMERATE_SCOPE int SDLCALL SDL_getFramecount(FPSmanager * manager);
     91        SDL_FRAMERATE_SCOPE Uint32 SDLCALL SDL_framerateDelay(FPSmanager * manager);
    9292
    9393        /* --- */

  • TabularUnified sdl_gfx/trunk/SDL_gfxBlitFunc.h

    r1430 r1538  
    4747        /* ---- Function Prototypes */
    4848
    49 #ifdef _MSC_VER
     49#if defined(_MSC_VER) || defined(__EMX__)
    5050#  if defined(DLL_EXPORT) && !defined(LIBSDL_GFX_DLL_IMPORT)
    5151#    define SDL_GFXBLITFUNC_SCOPE __declspec(dllexport)
    … …  
    6161
    6262
    63         SDL_GFXBLITFUNC_SCOPE int SDL_gfxBlitRGBA(SDL_Surface * src, SDL_Rect * srcrect, SDL_Surface * dst, SDL_Rect * dstrect);
     63        SDL_GFXBLITFUNC_SCOPE int SDLCALL SDL_gfxBlitRGBA(SDL_Surface * src, SDL_Rect * srcrect, SDL_Surface * dst, SDL_Rect * dstrect);
    6464
    65         SDL_GFXBLITFUNC_SCOPE int SDL_gfxSetAlpha(SDL_Surface * src, Uint8 a);
     65        SDL_GFXBLITFUNC_SCOPE int SDLCALL SDL_gfxSetAlpha(SDL_Surface * src, Uint8 a);
    6666
    67         SDL_GFXBLITFUNC_SCOPE int SDL_gfxMultiplyAlpha(SDL_Surface * src, Uint8 a);
     67        SDL_GFXBLITFUNC_SCOPE int SDLCALL SDL_gfxMultiplyAlpha(SDL_Surface * src, Uint8 a);
    6868
    6969        /* -------- Macros */

  • TabularUnified sdl_gfx/trunk/SDL_gfxPrimitives.h

    r1430 r1538  
    5252        /* ---- Function Prototypes */
    5353
    54 #ifdef _MSC_VER
     54#if define(_MSC_VER) || define(__EMX__)
    5555#  if defined(DLL_EXPORT) && !defined(LIBSDL_GFX_DLL_IMPORT)
    5656#    define SDL_GFXPRIMITIVES_SCOPE __declspec(dllexport)
    … …  
    6969        /* Pixel */
    7070
    71         SDL_GFXPRIMITIVES_SCOPE int pixelColor(SDL_Surface * dst, Sint16 x, Sint16 y, Uint32 color);
    72         SDL_GFXPRIMITIVES_SCOPE int pixelRGBA(SDL_Surface * dst, Sint16 x, Sint16 y, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
     71        SDL_GFXPRIMITIVES_SCOPE int SDLCALL pixelColor(SDL_Surface * dst, Sint16 x, Sint16 y, Uint32 color);
     72        SDL_GFXPRIMITIVES_SCOPE int SDLCALL pixelRGBA(SDL_Surface * dst, Sint16 x, Sint16 y, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
    7373
    7474        /* Horizontal line */
    7575
    76         SDL_GFXPRIMITIVES_SCOPE int hlineColor(SDL_Surface * dst, Sint16 x1, Sint16 x2, Sint16 y, Uint32 color);
    77         SDL_GFXPRIMITIVES_SCOPE int hlineRGBA(SDL_Surface * dst, Sint16 x1, Sint16 x2, Sint16 y, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
     76        SDL_GFXPRIMITIVES_SCOPE int SDLCALL hlineColor(SDL_Surface * dst, Sint16 x1, Sint16 x2, Sint16 y, Uint32 color);
     77        SDL_GFXPRIMITIVES_SCOPE int SDLCALL hlineRGBA(SDL_Surface * dst, Sint16 x1, Sint16 x2, Sint16 y, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
    7878
    7979        /* Vertical line */
    8080
    81         SDL_GFXPRIMITIVES_SCOPE int vlineColor(SDL_Surface * dst, Sint16 x, Sint16 y1, Sint16 y2, Uint32 color);
    82         SDL_GFXPRIMITIVES_SCOPE int vlineRGBA(SDL_Surface * dst, Sint16 x, Sint16 y1, Sint16 y2, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
     81        SDL_GFXPRIMITIVES_SCOPE int SDLCALL vlineColor(SDL_Surface * dst, Sint16 x, Sint16 y1, Sint16 y2, Uint32 color);
     82        SDL_GFXPRIMITIVES_SCOPE int SDLCALL vlineRGBA(SDL_Surface * dst, Sint16 x, Sint16 y1, Sint16 y2, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
    8383
    8484        /* Rectangle */
    8585
    86         SDL_GFXPRIMITIVES_SCOPE int rectangleColor(SDL_Surface * dst, Sint16 x1, Sint16 y1, Sint16 x2, Sint16 y2, Uint32 color);
    87         SDL_GFXPRIMITIVES_SCOPE int rectangleRGBA(SDL_Surface * dst, Sint16 x1, Sint16 y1,
     86        SDL_GFXPRIMITIVES_SCOPE int SDLCALL rectangleColor(SDL_Surface * dst, Sint16 x1, Sint16 y1, Sint16 x2, Sint16 y2, Uint32 color);
     87        SDL_GFXPRIMITIVES_SCOPE int SDLCALL rectangleRGBA(SDL_Surface * dst, Sint16 x1, Sint16 y1,
    8888                Sint16 x2, Sint16 y2, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
    8989
    9090        /* Rounded-Corner Rectangle */
    9191
    92         SDL_GFXPRIMITIVES_SCOPE int roundedRectangleColor(SDL_Surface * dst, Sint16 x1, Sint16 y1, Sint16 x2, Sint16 y2, Sint16 rad, Uint32 color);
    93         SDL_GFXPRIMITIVES_SCOPE int roundedRectangleRGBA(SDL_Surface * dst, Sint16 x1, Sint16 y1,
     92        SDL_GFXPRIMITIVES_SCOPE int SDLCALL roundedRectangleColor(SDL_Surface * dst, Sint16 x1, Sint16 y1, Sint16 x2, Sint16 y2, Sint16 rad, Uint32 color);
     93        SDL_GFXPRIMITIVES_SCOPE int SDLCALL roundedRectangleRGBA(SDL_Surface * dst, Sint16 x1, Sint16 y1,
    9494                Sint16 x2, Sint16 y2, Sint16 rad, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
    9595
    9696        /* Filled rectangle (Box) */
    9797
    98         SDL_GFXPRIMITIVES_SCOPE int boxColor(SDL_Surface * dst, Sint16 x1, Sint16 y1, Sint16 x2, Sint16 y2, Uint32 color);
    99         SDL_GFXPRIMITIVES_SCOPE int boxRGBA(SDL_Surface * dst, Sint16 x1, Sint16 y1, Sint16 x2,
     98        SDL_GFXPRIMITIVES_SCOPE int SDLCALL boxColor(SDL_Surface * dst, Sint16 x1, Sint16 y1, Sint16 x2, Sint16 y2, Uint32 color);
     99        SDL_GFXPRIMITIVES_SCOPE int SDLCALL boxRGBA(SDL_Surface * dst, Sint16 x1, Sint16 y1, Sint16 x2,
    100100                Sint16 y2, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
    101101
    102102        /* Rounded-Corner Filled rectangle (Box) */
    103103
    104         SDL_GFXPRIMITIVES_SCOPE int roundedBoxColor(SDL_Surface * dst, Sint16 x1, Sint16 y1, Sint16 x2, Sint16 y2, Sint16 rad, Uint32 color);
    105         SDL_GFXPRIMITIVES_SCOPE int roundedBoxRGBA(SDL_Surface * dst, Sint16 x1, Sint16 y1, Sint16 x2,
     104        SDL_GFXPRIMITIVES_SCOPE int SDLCALL roundedBoxColor(SDL_Surface * dst, Sint16 x1, Sint16 y1, Sint16 x2, Sint16 y2, Sint16 rad, Uint32 color);
     105        SDL_GFXPRIMITIVES_SCOPE int SDLCALL roundedBoxRGBA(SDL_Surface * dst, Sint16 x1, Sint16 y1, Sint16 x2,
    106106                Sint16 y2, Sint16 rad, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
    107107
    108108        /* Line */
    109109
    110         SDL_GFXPRIMITIVES_SCOPE int lineColor(SDL_Surface * dst, Sint16 x1, Sint16 y1, Sint16 x2, Sint16 y2, Uint32 color);
    111         SDL_GFXPRIMITIVES_SCOPE int lineRGBA(SDL_Surface * dst, Sint16 x1, Sint16 y1,
     110        SDL_GFXPRIMITIVES_SCOPE int SDLCALL lineColor(SDL_Surface * dst, Sint16 x1, Sint16 y1, Sint16 x2, Sint16 y2, Uint32 color);
     111        SDL_GFXPRIMITIVES_SCOPE int SDLCALL lineRGBA(SDL_Surface * dst, Sint16 x1, Sint16 y1,
    112112                Sint16 x2, Sint16 y2, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
    113113
    114114        /* AA Line */
    115115
    116         SDL_GFXPRIMITIVES_SCOPE int aalineColor(SDL_Surface * dst, Sint16 x1, Sint16 y1, Sint16 x2, Sint16 y2, Uint32 color);
    117         SDL_GFXPRIMITIVES_SCOPE int aalineRGBA(SDL_Surface * dst, Sint16 x1, Sint16 y1,
     116        SDL_GFXPRIMITIVES_SCOPE int SDLCALL aalineColor(SDL_Surface * dst, Sint16 x1, Sint16 y1, Sint16 x2, Sint16 y2, Uint32 color);
     117        SDL_GFXPRIMITIVES_SCOPE int SDLCALL aalineRGBA(SDL_Surface * dst, Sint16 x1, Sint16 y1,
    118118                Sint16 x2, Sint16 y2, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
    119119
    120120        /* Thick Line */
    121         SDL_GFXPRIMITIVES_SCOPE int thickLineColor(SDL_Surface * dst, Sint16 x1, Sint16 y1, Sint16 x2, Sint16 y2,
     121        SDL_GFXPRIMITIVES_SCOPE int SDLCALL thickLineColor(SDL_Surface * dst, Sint16 x1, Sint16 y1, Sint16 x2, Sint16 y2,
    122122                Uint8 width, Uint32 color);
    123         SDL_GFXPRIMITIVES_SCOPE int thickLineRGBA(SDL_Surface * dst, Sint16 x1, Sint16 y1, Sint16 x2, Sint16 y2,
     123        SDL_GFXPRIMITIVES_SCOPE int SDLCALL thickLineRGBA(SDL_Surface * dst, Sint16 x1, Sint16 y1, Sint16 x2, Sint16 y2,
    124124                Uint8 width, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
    125125
    126126        /* Circle */
    127127
    128         SDL_GFXPRIMITIVES_SCOPE int circleColor(SDL_Surface * dst, Sint16 x, Sint16 y, Sint16 rad, Uint32 color);
    129         SDL_GFXPRIMITIVES_SCOPE int circleRGBA(SDL_Surface * dst, Sint16 x, Sint16 y, Sint16 rad, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
     128        SDL_GFXPRIMITIVES_SCOPE int SDLCALL circleColor(SDL_Surface * dst, Sint16 x, Sint16 y, Sint16 rad, Uint32 color);
     129        SDL_GFXPRIMITIVES_SCOPE int SDLCALL circleRGBA(SDL_Surface * dst, Sint16 x, Sint16 y, Sint16 rad, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
    130130
    131131        /* Arc */
    132132
    133         SDL_GFXPRIMITIVES_SCOPE int arcColor(SDL_Surface * dst, Sint16 x, Sint16 y, Sint16 rad, Sint16 start, Sint16 end, Uint32 color);
    134         SDL_GFXPRIMITIVES_SCOPE int arcRGBA(SDL_Surface * dst, Sint16 x, Sint16 y, Sint16 rad, Sint16 start, Sint16 end,
     133        SDL_GFXPRIMITIVES_SCOPE int SDLCALL arcColor(SDL_Surface * dst, Sint16 x, Sint16 y, Sint16 rad, Sint16 start, Sint16 end, Uint32 color);
     134        SDL_GFXPRIMITIVES_SCOPE int SDLCALL arcRGBA(SDL_Surface * dst, Sint16 x, Sint16 y, Sint16 rad, Sint16 start, Sint16 end,
    135135                Uint8 r, Uint8 g, Uint8 b, Uint8 a);
    136136
    137137        /* AA Circle */
    138138
    139         SDL_GFXPRIMITIVES_SCOPE int aacircleColor(SDL_Surface * dst, Sint16 x, Sint16 y, Sint16 rad, Uint32 color);
    140         SDL_GFXPRIMITIVES_SCOPE int aacircleRGBA(SDL_Surface * dst, Sint16 x, Sint16 y,
     139        SDL_GFXPRIMITIVES_SCOPE int SDLCALL aacircleColor(SDL_Surface * dst, Sint16 x, Sint16 y, Sint16 rad, Uint32 color);
     140        SDL_GFXPRIMITIVES_SCOPE int SDLCALL aacircleRGBA(SDL_Surface * dst, Sint16 x, Sint16 y,
    141141                Sint16 rad, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
    142142
    143143        /* Filled Circle */
    144144
    145         SDL_GFXPRIMITIVES_SCOPE int filledCircleColor(SDL_Surface * dst, Sint16 x, Sint16 y, Sint16 r, Uint32 color);
    146         SDL_GFXPRIMITIVES_SCOPE int filledCircleRGBA(SDL_Surface * dst, Sint16 x, Sint16 y,
     145        SDL_GFXPRIMITIVES_SCOPE int SDLCALL filledCircleColor(SDL_Surface * dst, Sint16 x, Sint16 y, Sint16 r, Uint32 color);
     146        SDL_GFXPRIMITIVES_SCOPE int SDLCALL filledCircleRGBA(SDL_Surface * dst, Sint16 x, Sint16 y,
    147147                Sint16 rad, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
    148148
    149149        /* Ellipse */
    150150
    151         SDL_GFXPRIMITIVES_SCOPE int ellipseColor(SDL_Surface * dst, Sint16 x, Sint16 y, Sint16 rx, Sint16 ry, Uint32 color);
    152         SDL_GFXPRIMITIVES_SCOPE int ellipseRGBA(SDL_Surface * dst, Sint16 x, Sint16 y,
     151        SDL_GFXPRIMITIVES_SCOPE int SDLCALL ellipseColor(SDL_Surface * dst, Sint16 x, Sint16 y, Sint16 rx, Sint16 ry, Uint32 color);
     152        SDL_GFXPRIMITIVES_SCOPE int SDLCALL ellipseRGBA(SDL_Surface * dst, Sint16 x, Sint16 y,
    153153                Sint16 rx, Sint16 ry, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
    154154
    155155        /* AA Ellipse */
    156156
    157         SDL_GFXPRIMITIVES_SCOPE int aaellipseColor(SDL_Surface * dst, Sint16 x, Sint16 y, Sint16 rx, Sint16 ry, Uint32 color);
    158         SDL_GFXPRIMITIVES_SCOPE int aaellipseRGBA(SDL_Surface * dst, Sint16 x, Sint16 y,
     157        SDL_GFXPRIMITIVES_SCOPE int SDLCALL aaellipseColor(SDL_Surface * dst, Sint16 x, Sint16 y, Sint16 rx, Sint16 ry, Uint32 color);
     158        SDL_GFXPRIMITIVES_SCOPE int SDLCALL aaellipseRGBA(SDL_Surface * dst, Sint16 x, Sint16 y,
    159159                Sint16 rx, Sint16 ry, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
    160160
    161161        /* Filled Ellipse */
    162162
    163         SDL_GFXPRIMITIVES_SCOPE int filledEllipseColor(SDL_Surface * dst, Sint16 x, Sint16 y, Sint16 rx, Sint16 ry, Uint32 color);
    164         SDL_GFXPRIMITIVES_SCOPE int filledEllipseRGBA(SDL_Surface * dst, Sint16 x, Sint16 y,
     163        SDL_GFXPRIMITIVES_SCOPE int SDLCALL filledEllipseColor(SDL_Surface * dst, Sint16 x, Sint16 y, Sint16 rx, Sint16 ry, Uint32 color);
     164        SDL_GFXPRIMITIVES_SCOPE int SDLCALL filledEllipseRGBA(SDL_Surface * dst, Sint16 x, Sint16 y,
    165165                Sint16 rx, Sint16 ry, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
    166166
    167167        /* Pie */
    168168
    169         SDL_GFXPRIMITIVES_SCOPE int pieColor(SDL_Surface * dst, Sint16 x, Sint16 y, Sint16 rad,
     169        SDL_GFXPRIMITIVES_SCOPE int SDLCALL pieColor(SDL_Surface * dst, Sint16 x, Sint16 y, Sint16 rad,
    170170                Sint16 start, Sint16 end, Uint32 color);
    171         SDL_GFXPRIMITIVES_SCOPE int pieRGBA(SDL_Surface * dst, Sint16 x, Sint16 y, Sint16 rad,
     171        SDL_GFXPRIMITIVES_SCOPE int SDLCALL pieRGBA(SDL_Surface * dst, Sint16 x, Sint16 y, Sint16 rad,
    172172                Sint16 start, Sint16 end, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
    173173
    174174        /* Filled Pie */
    175175
    176         SDL_GFXPRIMITIVES_SCOPE int filledPieColor(SDL_Surface * dst, Sint16 x, Sint16 y, Sint16 rad,
     176        SDL_GFXPRIMITIVES_SCOPE int SDLCALL filledPieColor(SDL_Surface * dst, Sint16 x, Sint16 y, Sint16 rad,
    177177                Sint16 start, Sint16 end, Uint32 color);
    178         SDL_GFXPRIMITIVES_SCOPE int filledPieRGBA(SDL_Surface * dst, Sint16 x, Sint16 y, Sint16 rad,
     178        SDL_GFXPRIMITIVES_SCOPE int SDLCALL filledPieRGBA(SDL_Surface * dst, Sint16 x, Sint16 y, Sint16 rad,
    179179                Sint16 start, Sint16 end, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
    180180
    181181        /* Trigon */
    182182
    183         SDL_GFXPRIMITIVES_SCOPE int trigonColor(SDL_Surface * dst, Sint16 x1, Sint16 y1, Sint16 x2, Sint16 y2, Sint16 x3, Sint16 y3, Uint32 color);
    184         SDL_GFXPRIMITIVES_SCOPE int trigonRGBA(SDL_Surface * dst, Sint16 x1, Sint16 y1, Sint16 x2, Sint16 y2, Sint16 x3, Sint16 y3,
     183        SDL_GFXPRIMITIVES_SCOPE int SDLCALL trigonColor(SDL_Surface * dst, Sint16 x1, Sint16 y1, Sint16 x2, Sint16 y2, Sint16 x3, Sint16 y3, Uint32 color);
     184        SDL_GFXPRIMITIVES_SCOPE int SDLCALL trigonRGBA(SDL_Surface * dst, Sint16 x1, Sint16 y1, Sint16 x2, Sint16 y2, Sint16 x3, Sint16 y3,
    185185                Uint8 r, Uint8 g, Uint8 b, Uint8 a);
    186186
    187187        /* AA-Trigon */
    188188
    189         SDL_GFXPRIMITIVES_SCOPE int aatrigonColor(SDL_Surface * dst, Sint16 x1, Sint16 y1, Sint16 x2, Sint16 y2, Sint16 x3, Sint16 y3, Uint32 color);
    190         SDL_GFXPRIMITIVES_SCOPE int aatrigonRGBA(SDL_Surface * dst,  Sint16 x1, Sint16 y1, Sint16 x2, Sint16 y2, Sint16 x3, Sint16 y3,
     189        SDL_GFXPRIMITIVES_SCOPE int SDLCALL aatrigonColor(SDL_Surface * dst, Sint16 x1, Sint16 y1, Sint16 x2, Sint16 y2, Sint16 x3, Sint16 y3, Uint32 color);
     190        SDL_GFXPRIMITIVES_SCOPE int SDLCALL aatrigonRGBA(SDL_Surface * dst,  Sint16 x1, Sint16 y1, Sint16 x2, Sint16 y2, Sint16 x3, Sint16 y3,
    191191                Uint8 r, Uint8 g, Uint8 b, Uint8 a);
    192192
    193193        /* Filled Trigon */
    194194
    195         SDL_GFXPRIMITIVES_SCOPE int filledTrigonColor(SDL_Surface * dst, Sint16 x1, Sint16 y1, Sint16 x2, Sint16 y2, Sint16 x3, Sint16 y3, Uint32 color);
    196         SDL_GFXPRIMITIVES_SCOPE int filledTrigonRGBA(SDL_Surface * dst, Sint16 x1, Sint16 y1, Sint16 x2, Sint16 y2, Sint16 x3, Sint16 y3,
     195        SDL_GFXPRIMITIVES_SCOPE int SDLCALL filledTrigonColor(SDL_Surface * dst, Sint16 x1, Sint16 y1, Sint16 x2, Sint16 y2, Sint16 x3, Sint16 y3, Uint32 color);
     196        SDL_GFXPRIMITIVES_SCOPE int SDLCALL filledTrigonRGBA(SDL_Surface * dst, Sint16 x1, Sint16 y1, Sint16 x2, Sint16 y2, Sint16 x3, Sint16 y3,
    197197                Uint8 r, Uint8 g, Uint8 b, Uint8 a);
    198198
    199199        /* Polygon */
    200200
    201         SDL_GFXPRIMITIVES_SCOPE int polygonColor(SDL_Surface * dst, const Sint16 * vx, const Sint16 * vy, int n, Uint32 color);
    202         SDL_GFXPRIMITIVES_SCOPE int polygonRGBA(SDL_Surface * dst, const Sint16 * vx, const Sint16 * vy,
     201        SDL_GFXPRIMITIVES_SCOPE int SDLCALL polygonColor(SDL_Surface * dst, const Sint16 * vx, const Sint16 * vy, int n, Uint32 color);
     202        SDL_GFXPRIMITIVES_SCOPE int SDLCALL polygonRGBA(SDL_Surface * dst, const Sint16 * vx, const Sint16 * vy,
    203203                int n, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
    204204
    205205        /* AA-Polygon */
    206206
    207         SDL_GFXPRIMITIVES_SCOPE int aapolygonColor(SDL_Surface * dst, const Sint16 * vx, const Sint16 * vy, int n, Uint32 color);
    208         SDL_GFXPRIMITIVES_SCOPE int aapolygonRGBA(SDL_Surface * dst, const Sint16 * vx, const Sint16 * vy,
     207        SDL_GFXPRIMITIVES_SCOPE int SDLCALL aapolygonColor(SDL_Surface * dst, const Sint16 * vx, const Sint16 * vy, int n, Uint32 color);
     208        SDL_GFXPRIMITIVES_SCOPE int SDLCALL aapolygonRGBA(SDL_Surface * dst, const Sint16 * vx, const Sint16 * vy,
    209209                int n, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
    210210
    211211        /* Filled Polygon */
    212212
    213         SDL_GFXPRIMITIVES_SCOPE int filledPolygonColor(SDL_Surface * dst, const Sint16 * vx, const Sint16 * vy, int n, Uint32 color);
    214         SDL_GFXPRIMITIVES_SCOPE int filledPolygonRGBA(SDL_Surface * dst, const Sint16 * vx,
     213        SDL_GFXPRIMITIVES_SCOPE int SDLCALL filledPolygonColor(SDL_Surface * dst, const Sint16 * vx, const Sint16 * vy, int n, Uint32 color);
     214        SDL_GFXPRIMITIVES_SCOPE int SDLCALL filledPolygonRGBA(SDL_Surface * dst, const Sint16 * vx,
    215215                const Sint16 * vy, int n, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
    216         SDL_GFXPRIMITIVES_SCOPE int texturedPolygon(SDL_Surface * dst, const Sint16 * vx, const Sint16 * vy, int n, SDL_Surface * texture,int texture_dx,int texture_dy);
     216        SDL_GFXPRIMITIVES_SCOPE int SDLCALL texturedPolygon(SDL_Surface * dst, const Sint16 * vx, const Sint16 * vy, int n, SDL_Surface * texture,int texture_dx,int texture_dy);
    217217
    218218        /* (Note: These MT versions are required for multi-threaded operation.) */
    219219
    220         SDL_GFXPRIMITIVES_SCOPE int filledPolygonColorMT(SDL_Surface * dst, const Sint16 * vx, const Sint16 * vy, int n, Uint32 color, int **polyInts, int *polyAllocated);
    221         SDL_GFXPRIMITIVES_SCOPE int filledPolygonRGBAMT(SDL_Surface * dst, const Sint16 * vx,
     220        SDL_GFXPRIMITIVES_SCOPE int SDLCALL filledPolygonColorMT(SDL_Surface * dst, const Sint16 * vx, const Sint16 * vy, int n, Uint32 color, int **polyInts, int *polyAllocated);
     221        SDL_GFXPRIMITIVES_SCOPE int SDLCALL filledPolygonRGBAMT(SDL_Surface * dst, const Sint16 * vx,
    222222                const Sint16 * vy, int n, Uint8 r, Uint8 g, Uint8 b, Uint8 a,
    223223                int **polyInts, int *polyAllocated);
    224         SDL_GFXPRIMITIVES_SCOPE int texturedPolygonMT(SDL_Surface * dst, const Sint16 * vx, const Sint16 * vy, int n, SDL_Surface * texture,int texture_dx,int texture_dy, int **polyInts, int *polyAllocated);
     224        SDL_GFXPRIMITIVES_SCOPE int SDLCALL texturedPolygonMT(SDL_Surface * dst, const Sint16 * vx, const Sint16 * vy, int n, SDL_Surface * texture,int texture_dx,int texture_dy, int **polyInts, int *polyAllocated);
    225225
    226226        /* Bezier */
    227227
    228         SDL_GFXPRIMITIVES_SCOPE int bezierColor(SDL_Surface * dst, const Sint16 * vx, const Sint16 * vy, int n, int s, Uint32 color);
    229         SDL_GFXPRIMITIVES_SCOPE int bezierRGBA(SDL_Surface * dst, const Sint16 * vx, const Sint16 * vy,
     228        SDL_GFXPRIMITIVES_SCOPE int SDLCALL bezierColor(SDL_Surface * dst, const Sint16 * vx, const Sint16 * vy, int n, int s, Uint32 color);
     229        SDL_GFXPRIMITIVES_SCOPE int SDLCALL bezierRGBA(SDL_Surface * dst, const Sint16 * vx, const Sint16 * vy,
    230230                int n, int s, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
    231231
    232232        /* Characters/Strings */
    233233
    234         SDL_GFXPRIMITIVES_SCOPE void gfxPrimitivesSetFont(const void *fontdata, Uint32 cw, Uint32 ch);
    235         SDL_GFXPRIMITIVES_SCOPE void gfxPrimitivesSetFontRotation(Uint32 rotation);
    236         SDL_GFXPRIMITIVES_SCOPE int characterColor(SDL_Surface * dst, Sint16 x, Sint16 y, char c, Uint32 color);
    237         SDL_GFXPRIMITIVES_SCOPE int characterRGBA(SDL_Surface * dst, Sint16 x, Sint16 y, char c, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
    238         SDL_GFXPRIMITIVES_SCOPE int stringColor(SDL_Surface * dst, Sint16 x, Sint16 y, const char *s, Uint32 color);
    239         SDL_GFXPRIMITIVES_SCOPE int stringRGBA(SDL_Surface * dst, Sint16 x, Sint16 y, const char *s, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
     234        SDL_GFXPRIMITIVES_SCOPE void SDLCALL gfxPrimitivesSetFont(const void *fontdata, Uint32 cw, Uint32 ch);
     235        SDL_GFXPRIMITIVES_SCOPE void SDLCALL gfxPrimitivesSetFontRotation(Uint32 rotation);
     236        SDL_GFXPRIMITIVES_SCOPE int SDLCALL characterColor(SDL_Surface * dst, Sint16 x, Sint16 y, char c, Uint32 color);
     237        SDL_GFXPRIMITIVES_SCOPE int SDLCALL characterRGBA(SDL_Surface * dst, Sint16 x, Sint16 y, char c, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
     238        SDL_GFXPRIMITIVES_SCOPE int SDLCALL stringColor(SDL_Surface * dst, Sint16 x, Sint16 y, const char *s, Uint32 color);
     239        SDL_GFXPRIMITIVES_SCOPE int SDLCALL stringRGBA(SDL_Surface * dst, Sint16 x, Sint16 y, const char *s, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
    240240
    241241        /* Ends C function definitions when using C++ */

  • TabularUnified sdl_gfx/trunk/SDL_imageFilter.h

    r1430 r1538  
    3838        /* ---- Function Prototypes */
    3939
    40 #ifdef _MSC_VER
     40#if defined(_MSC_VER) || defined(__EMX__)
    4141#  if defined(DLL_EXPORT) && !defined(LIBSDL_GFX_DLL_IMPORT)
    4242#    define SDL_IMAGEFILTER_SCOPE __declspec(dllexport)
    … …  
    5757
    5858        // Detect MMX capability in CPU
    59         SDL_IMAGEFILTER_SCOPE int SDL_imageFilterMMXdetect(void);
     59        SDL_IMAGEFILTER_SCOPE int SDLCALL SDL_imageFilterMMXdetect(void);
    6060
    6161        // Force use of MMX off (or turn possible use back on)
    62         SDL_IMAGEFILTER_SCOPE void SDL_imageFilterMMXoff(void);
    63         SDL_IMAGEFILTER_SCOPE void SDL_imageFilterMMXon(void);
     62        SDL_IMAGEFILTER_SCOPE void SDLCALL SDL_imageFilterMMXoff(void);
     63        SDL_IMAGEFILTER_SCOPE void SDLCALL SDL_imageFilterMMXon(void);
    6464
    6565        //
    … …  
    7070
    7171        //  SDL_imageFilterAdd: D = saturation255(S1 + S2)
    72         SDL_IMAGEFILTER_SCOPE int SDL_imageFilterAdd(unsigned char *Src1, unsigned char *Src2, unsigned char *Dest, unsigned int length);
     72        SDL_IMAGEFILTER_SCOPE int SDLCALL SDL_imageFilterAdd(unsigned char *Src1, unsigned char *Src2, unsigned char *Dest, unsigned int length);
    7373
    7474        //  SDL_imageFilterMean: D = S1/2 + S2/2
    75         SDL_IMAGEFILTER_SCOPE int SDL_imageFilterMean(unsigned char *Src1, unsigned char *Src2, unsigned char *Dest, unsigned int length);
     75        SDL_IMAGEFILTER_SCOPE int SDLCALL SDL_imageFilterMean(unsigned char *Src1, unsigned char *Src2, unsigned char *Dest, unsigned int length);
    7676
    7777        //  SDL_imageFilterSub: D = saturation0(S1 - S2)
    78         SDL_IMAGEFILTER_SCOPE int SDL_imageFilterSub(unsigned char *Src1, unsigned char *Src2, unsigned char *Dest, unsigned int length);
     78        SDL_IMAGEFILTER_SCOPE int SDLCALL SDL_imageFilterSub(unsigned char *Src1, unsigned char *Src2, unsigned char *Dest, unsigned int length);
    7979
    8080        //  SDL_imageFilterAbsDiff: D = | S1 - S2 |
    81         SDL_IMAGEFILTER_SCOPE int SDL_imageFilterAbsDiff(unsigned char *Src1, unsigned char *Src2, unsigned char *Dest, unsigned int length);
     81        SDL_IMAGEFILTER_SCOPE int SDLCALL SDL_imageFilterAbsDiff(unsigned char *Src1, unsigned char *Src2, unsigned char *Dest, unsigned int length);
    8282
    8383        //  SDL_imageFilterMult: D = saturation(S1 * S2)
    84         SDL_IMAGEFILTER_SCOPE int SDL_imageFilterMult(unsigned char *Src1, unsigned char *Src2, unsigned char *Dest, unsigned int length);
     84        SDL_IMAGEFILTER_SCOPE int SDLCALL SDL_imageFilterMult(unsigned char *Src1, unsigned char *Src2, unsigned char *Dest, unsigned int length);
    8585
    8686        //  SDL_imageFilterMultNor: D = S1 * S2   (non-MMX)
    87         SDL_IMAGEFILTER_SCOPE int SDL_imageFilterMultNor(unsigned char *Src1, unsigned char *Src2, unsigned char *Dest, unsigned int length);
     87        SDL_IMAGEFILTER_SCOPE int SDLCALL SDL_imageFilterMultNor(unsigned char *Src1, unsigned char *Src2, unsigned char *Dest, unsigned int length);
    8888
    8989        //  SDL_imageFilterMultDivby2: D = saturation255(S1/2 * S2)
    90         SDL_IMAGEFILTER_SCOPE int SDL_imageFilterMultDivby2(unsigned char *Src1, unsigned char *Src2, unsigned char *Dest,
     90        SDL_IMAGEFILTER_SCOPE int SDLCALL SDL_imageFilterMultDivby2(unsigned char *Src1, unsigned char *Src2, unsigned char *Dest,
    9191                unsigned int length);
    9292
    9393        //  SDL_imageFilterMultDivby4: D = saturation255(S1/2 * S2/2)
    94         SDL_IMAGEFILTER_SCOPE int SDL_imageFilterMultDivby4(unsigned char *Src1, unsigned char *Src2, unsigned char *Dest,
     94        SDL_IMAGEFILTER_SCOPE int SDLCALL SDL_imageFilterMultDivby4(unsigned char *Src1, unsigned char *Src2, unsigned char *Dest,
    9595                unsigned int length);
    9696
    9797        //  SDL_imageFilterBitAnd: D = S1 & S2
    98         SDL_IMAGEFILTER_SCOPE int SDL_imageFilterBitAnd(unsigned char *Src1, unsigned char *Src2, unsigned char *Dest, unsigned int length);
     98        SDL_IMAGEFILTER_SCOPE int SDLCALL SDL_imageFilterBitAnd(unsigned char *Src1, unsigned char *Src2, unsigned char *Dest, unsigned int length);
    9999
    100100        //  SDL_imageFilterBitOr: D = S1 | S2
    101         SDL_IMAGEFILTER_SCOPE int SDL_imageFilterBitOr(unsigned char *Src1, unsigned char *Src2, unsigned char *Dest, unsigned int length);
     101        SDL_IMAGEFILTER_SCOPE int SDLCALL SDL_imageFilterBitOr(unsigned char *Src1, unsigned char *Src2, unsigned char *Dest, unsigned int length);
    102102
    103103        //  SDL_imageFilterDiv: D = S1 / S2   (non-MMX)
    104         SDL_IMAGEFILTER_SCOPE int SDL_imageFilterDiv(unsigned char *Src1, unsigned char *Src2, unsigned char *Dest, unsigned int length);
     104        SDL_IMAGEFILTER_SCOPE int SDLCALL SDL_imageFilterDiv(unsigned char *Src1, unsigned char *Src2, unsigned char *Dest, unsigned int length);
    105105
    106106        //  SDL_imageFilterBitNegation: D = !S
    107         SDL_IMAGEFILTER_SCOPE int SDL_imageFilterBitNegation(unsigned char *Src1, unsigned char *Dest, unsigned int length);
     107        SDL_IMAGEFILTER_SCOPE int SDLCALL SDL_imageFilterBitNegation(unsigned char *Src1, unsigned char *Dest, unsigned int length);
    108108
    109109        //  SDL_imageFilterAddByte: D = saturation255(S + C)
    110         SDL_IMAGEFILTER_SCOPE int SDL_imageFilterAddByte(unsigned char *Src1, unsigned char *Dest, unsigned int length, unsigned char C);
     110        SDL_IMAGEFILTER_SCOPE int SDLCALL SDL_imageFilterAddByte(unsigned char *Src1, unsigned char *Dest, unsigned int length, unsigned char C);
    111111
    112112        //  SDL_imageFilterAddUint: D = saturation255(S + (uint)C)
    113         SDL_IMAGEFILTER_SCOPE int SDL_imageFilterAddUint(unsigned char *Src1, unsigned char *Dest, unsigned int length, unsigned int C);
     113        SDL_IMAGEFILTER_SCOPE int SDLCALL SDL_imageFilterAddUint(unsigned char *Src1, unsigned char *Dest, unsigned int length, unsigned int C);
    114114
    115115        //  SDL_imageFilterAddByteToHalf: D = saturation255(S/2 + C)
    116         SDL_IMAGEFILTER_SCOPE int SDL_imageFilterAddByteToHalf(unsigned char *Src1, unsigned char *Dest, unsigned int length,
     116        SDL_IMAGEFILTER_SCOPE int SDLCALL SDL_imageFilterAddByteToHalf(unsigned char *Src1, unsigned char *Dest, unsigned int length,
    117117                unsigned char C);
    118118
    119119        //  SDL_imageFilterSubByte: D = saturation0(S - C)
    120         SDL_IMAGEFILTER_SCOPE int SDL_imageFilterSubByte(unsigned char *Src1, unsigned char *Dest, unsigned int length, unsigned char C);
     120        SDL_IMAGEFILTER_SCOPE int SDLCALL SDL_imageFilterSubByte(unsigned char *Src1, unsigned char *Dest, unsigned int length, unsigned char C);
    121121
    122122        //  SDL_imageFilterSubUint: D = saturation0(S - (uint)C)
    123         SDL_IMAGEFILTER_SCOPE int SDL_imageFilterSubUint(unsigned char *Src1, unsigned char *Dest, unsigned int length, unsigned int C);
     123        SDL_IMAGEFILTER_SCOPE int SDLCALL SDL_imageFilterSubUint(unsigned char *Src1, unsigned char *Dest, unsigned int length, unsigned int C);
    124124
    125125        //  SDL_imageFilterShiftRight: D = saturation0(S >> N)
    126         SDL_IMAGEFILTER_SCOPE int SDL_imageFilterShiftRight(unsigned char *Src1, unsigned char *Dest, unsigned int length, unsigned char N);
     126        SDL_IMAGEFILTER_SCOPE int SDLCALL SDL_imageFilterShiftRight(unsigned char *Src1, unsigned char *Dest, unsigned int length, unsigned char N);
    127127
    128128        //  SDL_imageFilterShiftRightUint: D = saturation0((uint)S >> N)
    129         SDL_IMAGEFILTER_SCOPE int SDL_imageFilterShiftRightUint(unsigned char *Src1, unsigned char *Dest, unsigned int length, unsigned char N);
     129        SDL_IMAGEFILTER_SCOPE int SDLCALL SDL_imageFilterShiftRightUint(unsigned char *Src1, unsigned char *Dest, unsigned int length, unsigned char N);
    130130
    131131        //  SDL_imageFilterMultByByte: D = saturation255(S * C)
    132         SDL_IMAGEFILTER_SCOPE int SDL_imageFilterMultByByte(unsigned char *Src1, unsigned char *Dest, unsigned int length, unsigned char C);
     132        SDL_IMAGEFILTER_SCOPE int SDLCALL SDL_imageFilterMultByByte(unsigned char *Src1, unsigned char *Dest, unsigned int length, unsigned char C);
    133133
    134134        //  SDL_imageFilterShiftRightAndMultByByte: D = saturation255((S >> N) * C)
    135         SDL_IMAGEFILTER_SCOPE int SDL_imageFilterShiftRightAndMultByByte(unsigned char *Src1, unsigned char *Dest, unsigned int length,
     135        SDL_IMAGEFILTER_SCOPE int SDLCALL SDL_imageFilterShiftRightAndMultByByte(unsigned char *Src1, unsigned char *Dest, unsigned int length,
    136136                unsigned char N, unsigned char C);
    137137
    138138        //  SDL_imageFilterShiftLeftByte: D = (S << N)
    139         SDL_IMAGEFILTER_SCOPE int SDL_imageFilterShiftLeftByte(unsigned char *Src1, unsigned char *Dest, unsigned int length,
     139        SDL_IMAGEFILTER_SCOPE int SDLCALL SDL_imageFilterShiftLeftByte(unsigned char *Src1, unsigned char *Dest, unsigned int length,
    140140                unsigned char N);
    141141
    142142        //  SDL_imageFilterShiftLeftUint: D = ((uint)S << N)
    143         SDL_IMAGEFILTER_SCOPE int SDL_imageFilterShiftLeftUint(unsigned char *Src1, unsigned char *Dest, unsigned int length,
     143        SDL_IMAGEFILTER_SCOPE int SDLCALL SDL_imageFilterShiftLeftUint(unsigned char *Src1, unsigned char *Dest, unsigned int length,
    144144                unsigned char N);
    145145
    146146        //  SDL_imageFilterShiftLeft: D = saturation255(S << N)
    147         SDL_IMAGEFILTER_SCOPE int SDL_imageFilterShiftLeft(unsigned char *Src1, unsigned char *Dest, unsigned int length, unsigned char N);
     147        SDL_IMAGEFILTER_SCOPE int SDLCALL SDL_imageFilterShiftLeft(unsigned char *Src1, unsigned char *Dest, unsigned int length, unsigned char N);
    148148
    149149        //  SDL_imageFilterBinarizeUsingThreshold: D = S >= T ? 255:0
    150         SDL_IMAGEFILTER_SCOPE int SDL_imageFilterBinarizeUsingThreshold(unsigned char *Src1, unsigned char *Dest, unsigned int length,
     150        SDL_IMAGEFILTER_SCOPE int SDLCALL SDL_imageFilterBinarizeUsingThreshold(unsigned char *Src1, unsigned char *Dest, unsigned int length,
    151151                unsigned char T);
    152152
    153153        //  SDL_imageFilterClipToRange: D = (S >= Tmin) & (S <= Tmax) 255:0
    154         SDL_IMAGEFILTER_SCOPE int SDL_imageFilterClipToRange(unsigned char *Src1, unsigned char *Dest, unsigned int length,
     154        SDL_IMAGEFILTER_SCOPE int SDLCALL SDL_imageFilterClipToRange(unsigned char *Src1, unsigned char *Dest, unsigned int length,
    155155                unsigned char Tmin, unsigned char Tmax);
    156156
    157157        //  SDL_imageFilterNormalizeLinear: D = saturation255((Nmax - Nmin)/(Cmax - Cmin)*(S - Cmin) + Nmin)
    158         SDL_IMAGEFILTER_SCOPE int SDL_imageFilterNormalizeLinear(unsigned char *Src, unsigned char *Dest, unsigned int length, int Cmin,
     158        SDL_IMAGEFILTER_SCOPE int SDLCALL SDL_imageFilterNormalizeLinear(unsigned char *Src, unsigned char *Dest, unsigned int length, int Cmin,
    159159                int Cmax, int Nmin, int Nmax);
    160160
    … …  
    162162
    163163        //  SDL_imageFilterConvolveKernel3x3Divide: Dij = saturation0and255( ... )
    164         SDL_IMAGEFILTER_SCOPE int SDL_imageFilterConvolveKernel3x3Divide(unsigned char *Src, unsigned char *Dest, int rows,
     164        SDL_IMAGEFILTER_SCOPE int SDLCALL SDL_imageFilterConvolveKernel3x3Divide(unsigned char *Src, unsigned char *Dest, int rows,
    165165                int columns, signed short *Kernel, unsigned char Divisor);
    166166
    167167        //  SDL_imageFilterConvolveKernel5x5Divide: Dij = saturation0and255( ... )
    168         SDL_IMAGEFILTER_SCOPE int SDL_imageFilterConvolveKernel5x5Divide(unsigned char *Src, unsigned char *Dest, int rows,
     168        SDL_IMAGEFILTER_SCOPE int SDLCALL SDL_imageFilterConvolveKernel5x5Divide(unsigned char *Src, unsigned char *Dest, int rows,
    169169                int columns, signed short *Kernel, unsigned char Divisor);
    170170
    171171        //  SDL_imageFilterConvolveKernel7x7Divide: Dij = saturation0and255( ... )
    172         SDL_IMAGEFILTER_SCOPE int SDL_imageFilterConvolveKernel7x7Divide(unsigned char *Src, unsigned char *Dest, int rows,
     172        SDL_IMAGEFILTER_SCOPE int SDLCALL SDL_imageFilterConvolveKernel7x7Divide(unsigned char *Src, unsigned char *Dest, int rows,
    173173                int columns, signed short *Kernel, unsigned char Divisor);
    174174
    175175        //  SDL_imageFilterConvolveKernel9x9Divide: Dij = saturation0and255( ... )
    176         SDL_IMAGEFILTER_SCOPE int SDL_imageFilterConvolveKernel9x9Divide(unsigned char *Src, unsigned char *Dest, int rows,
     176        SDL_IMAGEFILTER_SCOPE int SDLCALL SDL_imageFilterConvolveKernel9x9Divide(unsigned char *Src, unsigned char *Dest, int rows,
    177177                int columns, signed short *Kernel, unsigned char Divisor);
    178178
    179179        //  SDL_imageFilterConvolveKernel3x3ShiftRight: Dij = saturation0and255( ... )
    180         SDL_IMAGEFILTER_SCOPE int SDL_imageFilterConvolveKernel3x3ShiftRight(unsigned char *Src, unsigned char *Dest, int rows,
     180        SDL_IMAGEFILTER_SCOPE int SDLCALL SDL_imageFilterConvolveKernel3x3ShiftRight(unsigned char *Src, unsigned char *Dest, int rows,
    181181                int columns, signed short *Kernel,
    182182                unsigned char NRightShift);
    183183
    184184        //  SDL_imageFilterConvolveKernel5x5ShiftRight: Dij = saturation0and255( ... )
    185         SDL_IMAGEFILTER_SCOPE int SDL_imageFilterConvolveKernel5x5ShiftRight(unsigned char *Src, unsigned char *Dest, int rows,
     185        SDL_IMAGEFILTER_SCOPE int SDLCALL SDL_imageFilterConvolveKernel5x5ShiftRight(unsigned char *Src, unsigned char *Dest, int rows,
    186186                int columns, signed short *Kernel,
    187187                unsigned char NRightShift);
    188188
    189189        //  SDL_imageFilterConvolveKernel7x7ShiftRight: Dij = saturation0and255( ... )
    190         SDL_IMAGEFILTER_SCOPE int SDL_imageFilterConvolveKernel7x7ShiftRight(unsigned char *Src, unsigned char *Dest, int rows,
     190        SDL_IMAGEFILTER_SCOPE int SDLCALL SDL_imageFilterConvolveKernel7x7ShiftRight(unsigned char *Src, unsigned char *Dest, int rows,
    191191                int columns, signed short *Kernel,
    192192                unsigned char NRightShift);
    193193
    194194        //  SDL_imageFilterConvolveKernel9x9ShiftRight: Dij = saturation0and255( ... )
    195         SDL_IMAGEFILTER_SCOPE int SDL_imageFilterConvolveKernel9x9ShiftRight(unsigned char *Src, unsigned char *Dest, int rows,
     195        SDL_IMAGEFILTER_SCOPE int SDLCALL SDL_imageFilterConvolveKernel9x9ShiftRight(unsigned char *Src, unsigned char *Dest, int rows,
    196196                int columns, signed short *Kernel,
    197197                unsigned char NRightShift);
    198198
    199199        //  SDL_imageFilterSobelX: Dij = saturation255( ... )
    200         SDL_IMAGEFILTER_SCOPE int SDL_imageFilterSobelX(unsigned char *Src, unsigned char *Dest, int rows, int columns);
     200        SDL_IMAGEFILTER_SCOPE int SDLCALL SDL_imageFilterSobelX(unsigned char *Src, unsigned char *Dest, int rows, int columns);
    201201
    202202        //  SDL_imageFilterSobelXShiftRight: Dij = saturation255( ... )
    203         SDL_IMAGEFILTER_SCOPE int SDL_imageFilterSobelXShiftRight(unsigned char *Src, unsigned char *Dest, int rows, int columns,
     203        SDL_IMAGEFILTER_SCOPE int SDLCALL SDL_imageFilterSobelXShiftRight(unsigned char *Src, unsigned char *Dest, int rows, int columns,
    204204                unsigned char NRightShift);
    205205
    206206        // Align/restore stack to 32 byte boundary -- Functionality untested! --
    207         SDL_IMAGEFILTER_SCOPE void SDL_imageFilterAlignStack(void);
    208         SDL_IMAGEFILTER_SCOPE void SDL_imageFilterRestoreStack(void);
     207        SDL_IMAGEFILTER_SCOPE void SDLCALL SDL_imageFilterAlignStack(void);
     208        SDL_IMAGEFILTER_SCOPE void SDLCALL SDL_imageFilterRestoreStack(void);
    209209
    210210        /* Ends C function definitions when using C++ */

  • TabularUnified sdl_gfx/trunk/SDL_rotozoom.h

    r1430 r1538  
    5858        /* ---- Function Prototypes */
    5959
    60 #ifdef _MSC_VER
     60#if defined(_MSC_VER) || defined(__EMX__)
    6161#  if defined(DLL_EXPORT) && !defined(LIBSDL_GFX_DLL_IMPORT)
    6262#    define SDL_ROTOZOOM_SCOPE __declspec(dllexport)
    … …  
    7777        */
    7878
    79         SDL_ROTOZOOM_SCOPE SDL_Surface *rotozoomSurface(SDL_Surface * src, double angle, double zoom, int smooth);
     79        SDL_ROTOZOOM_SCOPE SDL_Surface * SDLCALL rotozoomSurface(SDL_Surface * src, double angle, double zoom, int smooth);
    8080
    81         SDL_ROTOZOOM_SCOPE SDL_Surface *rotozoomSurfaceXY
     81        SDL_ROTOZOOM_SCOPE SDL_Surface * SDLCALL rotozoomSurfaceXY
    8282                (SDL_Surface * src, double angle, double zoomx, double zoomy, int smooth);
    8383
    8484
    85         SDL_ROTOZOOM_SCOPE void rotozoomSurfaceSize(int width, int height, double angle, double zoom, int *dstwidth,
     85        SDL_ROTOZOOM_SCOPE void SDLCALL rotozoomSurfaceSize(int width, int height, double angle, double zoom, int *dstwidth,
    8686                int *dstheight);
    8787
    88         SDL_ROTOZOOM_SCOPE void rotozoomSurfaceSizeXY
     88        SDL_ROTOZOOM_SCOPE void SDLCALL rotozoomSurfaceSizeXY
    8989                (int width, int height, double angle, double zoomx, double zoomy,
    9090                int *dstwidth, int *dstheight);
    … …  
    9696        */
    9797
    98         SDL_ROTOZOOM_SCOPE SDL_Surface *zoomSurface(SDL_Surface * src, double zoomx, double zoomy, int smooth);
     98        SDL_ROTOZOOM_SCOPE SDL_Surface * SDLCALL zoomSurface(SDL_Surface * src, double zoomx, double zoomy, int smooth);
    9999
    100         SDL_ROTOZOOM_SCOPE void zoomSurfaceSize(int width, int height, double zoomx, double zoomy, int *dstwidth, int *dstheight);
     100        SDL_ROTOZOOM_SCOPE void SDLCALL zoomSurfaceSize(int width, int height, double zoomx, double zoomy, int *dstwidth, int *dstheight);
    101101
    102102        /*
    … …  
    106106        */     
    107107
    108         SDL_ROTOZOOM_SCOPE SDL_Surface *shrinkSurface(SDL_Surface * src, int factorx, int factory);
     108        SDL_ROTOZOOM_SCOPE SDL_Surface * SDLCALL shrinkSurface(SDL_Surface * src, int factorx, int factory);
    109109
    110110        /*
    … …  
    114114        */
    115115
    116         SDL_ROTOZOOM_SCOPE SDL_Surface* rotateSurface90Degrees(SDL_Surface* src, int numClockwiseTurns);
     116        SDL_ROTOZOOM_SCOPE SDL_Surface* SDLCALL rotateSurface90Degrees(SDL_Surface* src, int numClockwiseTurns);
    117117
    118118        /* Ends C function definitions when using C++ */
Note: See TracChangeset for help on using the changeset viewer.