Removing useless GFX folder and use libsdl-gfx1.2-dev library.

Not tested yet.

CMakeLists.txt

@@ -4,17 +4,14 @@ project(ASCCI_Space_Destroyer_CLion)
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR})
 
 find_package(SDL)
+find_package(SDL_gfx)
 
-
-include_directories(${SDL_INCLUDE_DIR})
+include_directories(${SDL_INCLUDE_DIR} ${SDLGFX_INCLUDE_DIR})
 
 set(CMAKE_CXX_STANDARD 11)
 
 set(SOURCE_FILES
         main.cpp
-        SDL_GFX/SDL_gfxPrimitives.c
-        SDL_GFX/SDL_gfxBlitFunc.c
-        SDL_GFX/SDL_rotozoom.c
         Ally.cpp
         Foe.cpp
         Game.cpp
@@ -37,7 +34,6 @@ set(SOURCE_FILES
 
 add_executable(ASCCI_Space_Destroyer_CLion ${SOURCE_FILES})
 
-target_link_libraries(ASCCI_Space_Destroyer_CLion ${SDL_LIBRARY})
+target_link_libraries(ASCCI_Space_Destroyer_CLion ${SDL_LIBRARY} ${SDLGFX_LIBRARY})
 
-#file(COPY Resources DESTINATION ${RUNTIME_OUTPUT_DIRECTORY}/)
 file(COPY Resources DESTINATION .)

Game.h

@@ -10,7 +10,7 @@
 #include <SDL.h>
 #undef main
 
-#include "SDL_GFX/SDL_gfxPrimitives.h"
+#include <SDL/SDL_gfxPrimitives.h>
 
 // Local
 #include "HitManager.h"

HitManager.h

@@ -11,7 +11,7 @@
 #include <SDL.h>
 #undef main
 
-#include "SDL_GFX/SDL_gfxPrimitives.h"
+#include <SDL/SDL_gfxPrimitives.h>
 
 // Combat
 #include "Shot.h"

README.md

@@ -25,4 +25,20 @@ Libraries used :
 ## Related
 
 My own website where you can find more about this game, like executables (french).
-[Jovian Hersemeule - Projets - ASCII Space Destroyer(FR)](http://jovian-hersemeule.eu/projets/pro_ascii_space.php)
+[Jovian Hersemeule - Projets - ASCII Space Destroyer(FR)](http://jovian-hersemeule.eu/projets/pro_ascii_space.php)
+
+## Installation
+
+### To build
+
+#### Ubuntu
+Execute the following commands to install SDL and SDL GFX :
+`sudo apt install libsdl1.2-dev`
+`sudo apt install libsdl-gfx1.2-dev`
+
+### To play
+
+#### Ubuntu
+Execute the following commands to install SDL and SDL GFX :
+`sudo apt install libsdl1.2debian`
+`sudo apt install libsdl-gfx1.2-5`

SDL_GFX/SDL_gfxBlitFunc.c

@@ -1,637 +0,0 @@
-/* 
-
-SDL_gfxBlitFunc.c: custom blitters
-
-Copyright (C) 2001-2012  Andreas Schiffler
-
-This software is provided 'as-is', without any express or implied
-warranty. In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-claim that you wrote the original software. If you use this software
-in a product, an acknowledgment in the product documentation would be
-appreciated but is not required.
-
-2. Altered source versions must be plainly marked as such, and must not be
-misrepresented as being the original software.
-
-3. This notice may not be removed or altered from any source
-distribution.
-
-Andreas Schiffler -- aschiffler at ferzkopp dot net
-
-*/
-
-#include "SDL_gfxBlitFunc.h"
-
-/*!  
-\brief Alpha adjustment table for custom blitter.
-
-The table provides values for a modified, non-linear 
-transfer function which maintain brightness.
-
-*/
-const unsigned int GFX_ALPHA_ADJUST_ARRAY[256] = {
-        0,  /* 0 */
-        15,  /* 1 */
-        22,  /* 2 */
-        27,  /* 3 */
-        31,  /* 4 */
-        35,  /* 5 */
-        39,  /* 6 */
-        42,  /* 7 */
-        45,  /* 8 */
-        47,  /* 9 */
-        50,  /* 10 */
-        52,  /* 11 */
-        55,  /* 12 */
-        57,  /* 13 */
-        59,  /* 14 */
-        61,  /* 15 */
-        63,  /* 16 */
-        65,  /* 17 */
-        67,  /* 18 */
-        69,  /* 19 */
-        71,  /* 20 */
-        73,  /* 21 */
-        74,  /* 22 */
-        76,  /* 23 */
-        78,  /* 24 */
-        79,  /* 25 */
-        81,  /* 26 */
-        82,  /* 27 */
-        84,  /* 28 */
-        85,  /* 29 */
-        87,  /* 30 */
-        88,  /* 31 */
-        90,  /* 32 */
-        91,  /* 33 */
-        93,  /* 34 */
-        94,  /* 35 */
-        95,  /* 36 */
-        97,  /* 37 */
-        98,  /* 38 */
-        99,  /* 39 */
-        100,  /* 40 */
-        102,  /* 41 */
-        103,  /* 42 */
-        104,  /* 43 */
-        105,  /* 44 */
-        107,  /* 45 */
-        108,  /* 46 */
-        109,  /* 47 */
-        110,  /* 48 */
-        111,  /* 49 */
-        112,  /* 50 */
-        114,  /* 51 */
-        115,  /* 52 */
-        116,  /* 53 */
-        117,  /* 54 */
-        118,  /* 55 */
-        119,  /* 56 */
-        120,  /* 57 */
-        121,  /* 58 */
-        122,  /* 59 */
-        123,  /* 60 */
-        124,  /* 61 */
-        125,  /* 62 */
-        126,  /* 63 */
-        127,  /* 64 */
-        128,  /* 65 */
-        129,  /* 66 */
-        130,  /* 67 */
-        131,  /* 68 */
-        132,  /* 69 */
-        133,  /* 70 */
-        134,  /* 71 */
-        135,  /* 72 */
-        136,  /* 73 */
-        137,  /* 74 */
-        138,  /* 75 */
-        139,  /* 76 */
-        140,  /* 77 */
-        141,  /* 78 */
-        141,  /* 79 */
-        142,  /* 80 */
-        143,  /* 81 */
-        144,  /* 82 */
-        145,  /* 83 */
-        146,  /* 84 */
-        147,  /* 85 */
-        148,  /* 86 */
-        148,  /* 87 */
-        149,  /* 88 */
-        150,  /* 89 */
-        151,  /* 90 */
-        152,  /* 91 */
-        153,  /* 92 */
-        153,  /* 93 */
-        154,  /* 94 */
-        155,  /* 95 */
-        156,  /* 96 */
-        157,  /* 97 */
-        158,  /* 98 */
-        158,  /* 99 */
-        159,  /* 100 */
-        160,  /* 101 */
-        161,  /* 102 */
-        162,  /* 103 */
-        162,  /* 104 */
-        163,  /* 105 */
-        164,  /* 106 */
-        165,  /* 107 */
-        165,  /* 108 */
-        166,  /* 109 */
-        167,  /* 110 */
-        168,  /* 111 */
-        168,  /* 112 */
-        169,  /* 113 */
-        170,  /* 114 */
-        171,  /* 115 */
-        171,  /* 116 */
-        172,  /* 117 */
-        173,  /* 118 */
-        174,  /* 119 */
-        174,  /* 120 */
-        175,  /* 121 */
-        176,  /* 122 */
-        177,  /* 123 */
-        177,  /* 124 */
-        178,  /* 125 */
-        179,  /* 126 */
-        179,  /* 127 */
-        180,  /* 128 */
-        181,  /* 129 */
-        182,  /* 130 */
-        182,  /* 131 */
-        183,  /* 132 */
-        184,  /* 133 */
-        184,  /* 134 */
-        185,  /* 135 */
-        186,  /* 136 */
-        186,  /* 137 */
-        187,  /* 138 */
-        188,  /* 139 */
-        188,  /* 140 */
-        189,  /* 141 */
-        190,  /* 142 */
-        190,  /* 143 */
-        191,  /* 144 */
-        192,  /* 145 */
-        192,  /* 146 */
-        193,  /* 147 */
-        194,  /* 148 */
-        194,  /* 149 */
-        195,  /* 150 */
-        196,  /* 151 */
-        196,  /* 152 */
-        197,  /* 153 */
-        198,  /* 154 */
-        198,  /* 155 */
-        199,  /* 156 */
-        200,  /* 157 */
-        200,  /* 158 */
-        201,  /* 159 */
-        201,  /* 160 */
-        202,  /* 161 */
-        203,  /* 162 */
-        203,  /* 163 */
-        204,  /* 164 */
-        205,  /* 165 */
-        205,  /* 166 */
-        206,  /* 167 */
-        206,  /* 168 */
-        207,  /* 169 */
-        208,  /* 170 */
-        208,  /* 171 */
-        209,  /* 172 */
-        210,  /* 173 */
-        210,  /* 174 */
-        211,  /* 175 */
-        211,  /* 176 */
-        212,  /* 177 */
-        213,  /* 178 */
-        213,  /* 179 */
-        214,  /* 180 */
-        214,  /* 181 */
-        215,  /* 182 */
-        216,  /* 183 */
-        216,  /* 184 */
-        217,  /* 185 */
-        217,  /* 186 */
-        218,  /* 187 */
-        218,  /* 188 */
-        219,  /* 189 */
-        220,  /* 190 */
-        220,  /* 191 */
-        221,  /* 192 */
-        221,  /* 193 */
-        222,  /* 194 */
-        222,  /* 195 */
-        223,  /* 196 */
-        224,  /* 197 */
-        224,  /* 198 */
-        225,  /* 199 */
-        225,  /* 200 */
-        226,  /* 201 */
-        226,  /* 202 */
-        227,  /* 203 */
-        228,  /* 204 */
-        228,  /* 205 */
-        229,  /* 206 */
-        229,  /* 207 */
-        230,  /* 208 */
-        230,  /* 209 */
-        231,  /* 210 */
-        231,  /* 211 */
-        232,  /* 212 */
-        233,  /* 213 */
-        233,  /* 214 */
-        234,  /* 215 */
-        234,  /* 216 */
-        235,  /* 217 */
-        235,  /* 218 */
-        236,  /* 219 */
-        236,  /* 220 */
-        237,  /* 221 */
-        237,  /* 222 */
-        238,  /* 223 */
-        238,  /* 224 */
-        239,  /* 225 */
-        240,  /* 226 */
-        240,  /* 227 */
-        241,  /* 228 */
-        241,  /* 229 */
-        242,  /* 230 */
-        242,  /* 231 */
-        243,  /* 232 */
-        243,  /* 233 */
-        244,  /* 234 */
-        244,  /* 235 */
-        245,  /* 236 */
-        245,  /* 237 */
-        246,  /* 238 */
-        246,  /* 239 */
-        247,  /* 240 */
-        247,  /* 241 */
-        248,  /* 242 */
-        248,  /* 243 */
-        249,  /* 244 */
-        249,  /* 245 */
-        250,  /* 246 */
-        250,  /* 247 */
-        251,  /* 248 */
-        251,  /* 249 */
-        252,  /* 250 */
-        252,  /* 251 */
-        253,  /* 252 */
-        253,  /* 253 */
-        254,  /* 254 */
-        255   /* 255 */
-};
-
-/*!
-\brief Internal blitter using adjusted destination alpha during RGBA->RGBA blits.
-
-Performs the blit based on the 'info' structure and applies the transfer function
-to the destination 'a' values.
-
-\param info The blit info to use.
-*/
-void _SDL_gfxBlitBlitterRGBA(SDL_gfxBlitInfo *info) {
-    int width = info->d_width;
-    int height = info->d_height;
-    Uint8 *src = info->s_pixels;
-    int srcskip = info->s_skip;
-    Uint8 *dst = info->d_pixels;
-    int dstskip = info->d_skip;
-    SDL_PixelFormat *srcfmt = info->src;
-    SDL_PixelFormat *dstfmt = info->dst;
-    Uint8 srcbpp = srcfmt->BytesPerPixel;
-    Uint8 dstbpp = dstfmt->BytesPerPixel;
-
-    while (height--) {
-        GFX_DUFFS_LOOP4({
-                            Uint32 pixel;
-                            unsigned sR;
-                            unsigned sG;
-                            unsigned sB;
-                            unsigned sA;
-                            unsigned dR;
-                            unsigned dG;
-                            unsigned dB;
-                            unsigned dA;
-                            unsigned sAA;
-                            GFX_DISASSEMBLE_RGBA(src, srcbpp, srcfmt, pixel, sR, sG, sB, sA);
-                            GFX_DISASSEMBLE_RGBA(dst, dstbpp, dstfmt, pixel, dR, dG, dB, dA);
-                            sAA = GFX_ALPHA_ADJUST_ARRAY[sA & 255];
-                            GFX_ALPHA_BLEND(sR, sG, sB, sAA, dR, dG, dB);
-                            dA |= sAA;
-                            GFX_ASSEMBLE_RGBA(dst, dstbpp, dstfmt, dR, dG, dB, dA);
-                            src += srcbpp;
-                            dst += dstbpp;
-                        }, width);
-        src += srcskip;
-        dst += dstskip;
-    }
-}
-
-/*!
-\brief Internal blitter setup wrapper for RGBA->RGBA blits.
-
-Sets up the blitter info based on the 'src' and 'dst' surfaces and rectangles.
-
-\param src The source surface.
-\param srcrect The source rectangle.
-\param dst The destination surface.
-\param dstrect The destination rectangle.
-
-\returns Returns 1 if blit was performed, 0 otherwise.
-*/
-int _SDL_gfxBlitRGBACall(SDL_Surface *src, SDL_Rect *srcrect, SDL_Surface *dst, SDL_Rect *dstrect) {
-    /*
-    * Set up source and destination buffer pointers, then blit
-    */
-    if (srcrect->w && srcrect->h) {
-        SDL_gfxBlitInfo info;
-
-        /*
-        * Set up the blit information
-        */
-#if (SDL_MINOR_VERSION == 3)
-        info.s_pixels = (Uint8 *) src->pixels               + (Uint16) srcrect->y * src->pitch + (Uint16) srcrect->x * src->format->BytesPerPixel;
-#else
-        info.s_pixels = (Uint8 *) src->pixels + src->offset + (Uint16) srcrect->y * src->pitch +
-                        (Uint16) srcrect->x * src->format->BytesPerPixel;
-#endif
-        info.s_width = srcrect->w;
-        info.s_height = srcrect->h;
-        info.s_skip = (int) (src->pitch - info.s_width * src->format->BytesPerPixel);
-#if (SDL_MINOR_VERSION == 3)
-        info.d_pixels = (Uint8 *) dst->pixels               + (Uint16) dstrect->y * dst->pitch + (Uint16) dstrect->x * dst->format->BytesPerPixel;
-#else
-        info.d_pixels = (Uint8 *) dst->pixels + dst->offset + (Uint16) dstrect->y * dst->pitch +
-                        (Uint16) dstrect->x * dst->format->BytesPerPixel;
-#endif
-        info.d_width = dstrect->w;
-        info.d_height = dstrect->h;
-        info.d_skip = (int) (dst->pitch - info.d_width * dst->format->BytesPerPixel);
-        info.aux_data = NULL;
-        info.src = src->format;
-        info.table = NULL;
-        info.dst = dst->format;
-
-        /*
-        * Run the actual software blitter
-        */
-        _SDL_gfxBlitBlitterRGBA(&info);
-        return 1;
-    }
-
-    return (0);
-}
-
-/*!
-\brief Blitter for RGBA->RGBA blits with alpha adjustment.
-
-Verifies the input 'src' and 'dst' surfaces and rectangles and performs blit.
-The destination clip rectangle is honored.
-
-\param src The source surface.
-\param srcrect The source rectangle.
-\param dst The destination surface.
-\param dstrect The destination rectangle.
-
-\returns Returns 1 if blit was performed, 0 otherwise, or -1 if an error occured.
-*/
-int SDL_gfxBlitRGBA(SDL_Surface *src, SDL_Rect *srcrect, SDL_Surface *dst, SDL_Rect *dstrect) {
-    SDL_Rect sr, dr;
-    int srcx, srcy, w, h;
-
-    /*
-    * Make sure the surfaces aren't locked
-    */
-    if (!src || !dst) {
-        SDL_SetError("SDL_UpperBlit: passed a NULL surface");
-        return (-1);
-    }
-    if ((src->locked) || (dst->locked)) {
-        SDL_SetError("Surfaces must not be locked during blit");
-        return (-1);
-    }
-
-    /*
-    * If the destination rectangle is NULL, use the entire dest surface
-    */
-    if (dstrect == NULL) {
-        dr.x = dr.y = 0;
-        dr.w = dst->w;
-        dr.h = dst->h;
-    } else {
-        dr = *dstrect;
-    }
-
-    /*
-    * Clip the source rectangle to the source surface
-    */
-    if (srcrect) {
-        int maxw, maxh;
-
-        srcx = srcrect->x;
-        w = srcrect->w;
-        if (srcx < 0) {
-            w += srcx;
-            dr.x -= srcx;
-            srcx = 0;
-        }
-        maxw = src->w - srcx;
-        if (maxw < w)
-            w = maxw;
-
-        srcy = srcrect->y;
-        h = srcrect->h;
-        if (srcy < 0) {
-            h += srcy;
-            dr.y -= srcy;
-            srcy = 0;
-        }
-        maxh = src->h - srcy;
-        if (maxh < h)
-            h = maxh;
-
-    } else {
-        srcx = srcy = 0;
-        w = src->w;
-        h = src->h;
-    }
-
-    /*
-    * Clip the destination rectangle against the clip rectangle
-    */
-    {
-        SDL_Rect *clip = &dst->clip_rect;
-        int dx, dy;
-
-        dx = clip->x - dr.x;
-        if (dx > 0) {
-            w -= dx;
-            dr.x += dx;
-            srcx += dx;
-        }
-        dx = dr.x + w - clip->x - clip->w;
-        if (dx > 0)
-            w -= dx;
-
-        dy = clip->y - dr.y;
-        if (dy > 0) {
-            h -= dy;
-            dr.y += dy;
-            srcy += dy;
-        }
-        dy = dr.y + h - clip->y - clip->h;
-        if (dy > 0)
-            h -= dy;
-    }
-
-    if (w > 0 && h > 0) {
-        sr.x = srcx;
-        sr.y = srcy;
-        sr.w = dr.w = w;
-        sr.h = dr.h = h;
-        return (_SDL_gfxBlitRGBACall(src, &sr, dst, &dr));
-    }
-
-    return 0;
-}
-
-/*!
-\brief Sets the alpha channel in a 32 bit surface.
-
-Helper function that sets the alpha channel in a 32 bit surface
-to a constant value.
-Only 32 bit surfaces can be used with this function.
-
-\param src Pointer to the target surface to change.
-\param a The alpha value to set.
-
-\return Returns 1 if alpha was changed, -1 otherwise.
-*/
-int SDL_gfxSetAlpha(SDL_Surface *src, Uint8 a) {
-#if SDL_BYTEORDER == SDL_BIG_ENDIAN
-    const int alpha_offset = 0;
-#else
-    const int alpha_offset = 3;
-#endif
-    int i, j, row_skip;
-    Uint8 *pixels;
-
-    /* Check if we have a 32bit surface */
-    if ((src == NULL) ||
-        (src->format == NULL) ||
-        (src->format->BytesPerPixel != 4)) {
-        SDL_SetError("SDL_gfxSetAlpha: Invalid input surface.");
-        return -1;
-    }
-
-    /*
-    * Lock the surface
-    */
-    if (SDL_MUSTLOCK(src)) {
-        if (SDL_LockSurface(src) < 0) {
-            return (-1);
-        }
-    }
-
-    /* Process */
-    pixels = (Uint8 *) src->pixels;
-    row_skip = (src->pitch - (4 * src->w));
-    pixels += alpha_offset;
-    for (i = 0; i < src->h; i++) {
-        for (j = 0; j < src->w; j++) {
-            *pixels = a;
-            pixels += 4;
-        }
-        pixels += row_skip;
-    }
-
-    /*
-    * Unlock surface
-    */
-    if (SDL_MUSTLOCK(src)) {
-        SDL_UnlockSurface(src);
-    }
-
-    return 1;
-}
-
-/*!
-\brief Multiply the alpha channel in a 32bit surface.
-
-Helper function that multiplies the alpha channel in a 32 bit surface
-with a constant value. The final alpha is always scaled to the range 
-0-255 (i.e. the factor is a/256).
-
-Only 32 bit surfaces can be used with this function.
-
-\param src Pointer to the target surface to change.
-\param a The alpha value to multiply with. When a is 255, this function is a NoOp.
-
-\return Returns 1 if alpha was changed, 0 otherwise. Returns -1 if input surface is invalid.
-*/
-int SDL_gfxMultiplyAlpha(SDL_Surface *src, Uint8 a) {
-#if SDL_BYTEORDER == SDL_BIG_ENDIAN
-    const int alpha_offset = 0;
-#else
-    const int alpha_offset = 3;
-#endif
-    int i, j, row_skip;
-    Uint8 *pixels;
-
-    /* Check if we have a 32bit surface */
-    if ((src == NULL) ||
-        (src->format == NULL) ||
-        (src->format->BytesPerPixel != 4)) {
-        SDL_SetError("SDL_gfxMultiplyAlpha: Invalid input surface.");
-        return -1;
-    }
-
-    /* Check if multiplication is needed */
-    if (a == 255) {
-        return 0;
-    }
-
-    /*
-    * Lock the surface
-    */
-    if (SDL_MUSTLOCK(src)) {
-        if (SDL_LockSurface(src) < 0) {
-            return (-1);
-        }
-    }
-
-    /* Process */
-    pixels = (Uint8 *) src->pixels;
-    row_skip = (src->pitch - (4 * src->w));
-    pixels += alpha_offset;
-    for (i = 0; i < src->h; i++) {
-        for (j = 0; j < src->w; j++) {
-            *pixels = (Uint8) (((int) (*pixels) * a) >> 8);
-            pixels += 4;
-        }
-        pixels += row_skip;
-    }
-
-    /*
-    * Unlock surface
-    */
-    if (SDL_MUSTLOCK(src)) {
-        SDL_UnlockSurface(src);
-    }
-
-    return 1;
-}

SDL_GFX/SDL_gfxBlitFunc.h

@@ -1,168 +0,0 @@
-/* 
-
-SDL_gfxBlitFunc.h: custom blitters
-
-Copyright (C) 2001-2012  Andreas Schiffler
-
-This software is provided 'as-is', without any express or implied
-warranty. In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-claim that you wrote the original software. If you use this software
-in a product, an acknowledgment in the product documentation would be
-appreciated but is not required.
-
-2. Altered source versions must be plainly marked as such, and must not be
-misrepresented as being the original software.
-
-3. This notice may not be removed or altered from any source
-distribution.
-
-Andreas Schiffler -- aschiffler at ferzkopp dot net
-
-*/
-
-#ifndef _SDL_gfxBlitFunc_h
-#define _SDL_gfxBlitFunc_h
-
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern    "C" {
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "SDL.h"
-#include "SDL_video.h"
-
-
-extern const unsigned int GFX_ALPHA_ADJUST_ARRAY[256];
-
-/* ---- Function Prototypes */
-
-#ifdef _MSC_VER
-#  if defined(DLL_EXPORT) && !defined(LIBSDL_GFX_DLL_IMPORT)
-#    define SDL_GFXBLITFUNC_SCOPE __declspec(dllexport)
-#  else
-#    ifdef LIBSDL_GFX_DLL_IMPORT
-#      define SDL_GFXBLITFUNC_SCOPE __declspec(dllimport)
-#    endif
-#  endif
-#endif
-#ifndef SDL_GFXBLITFUNC_SCOPE
-#  define SDL_GFXBLITFUNC_SCOPE extern
-#endif
-
-
-SDL_GFXBLITFUNC_SCOPE int SDL_gfxBlitRGBA(SDL_Surface *src, SDL_Rect *srcrect, SDL_Surface *dst, SDL_Rect *dstrect);
-
-SDL_GFXBLITFUNC_SCOPE int SDL_gfxSetAlpha(SDL_Surface *src, Uint8 a);
-
-SDL_GFXBLITFUNC_SCOPE int SDL_gfxMultiplyAlpha(SDL_Surface *src, Uint8 a);
-
-/* -------- Macros */
-
-/* Define SDL macros locally as a substitute for an #include "SDL_blit.h", */
-/* which doesn't work since the include file doesn't get installed.       */
-
-/*!
-\brief The structure passed to the low level blit functions.
-*/
-typedef struct {
-    Uint8 *s_pixels;
-    int s_width;
-    int s_height;
-    int s_skip;
-    Uint8 *d_pixels;
-    int d_width;
-    int d_height;
-    int d_skip;
-    void *aux_data;
-    SDL_PixelFormat *src;
-    Uint8 *table;
-    SDL_PixelFormat *dst;
-} SDL_gfxBlitInfo;
-
-/*!
-\brief Unwrap RGBA values from a pixel using mask, shift and loss for surface.
-*/
-#define GFX_RGBA_FROM_PIXEL(pixel, fmt, r, g, b, a)                \
-    {                                    \
-    r = ((pixel&fmt->Rmask)>>fmt->Rshift)<<fmt->Rloss;        \
-    g = ((pixel&fmt->Gmask)>>fmt->Gshift)<<fmt->Gloss;        \
-    b = ((pixel&fmt->Bmask)>>fmt->Bshift)<<fmt->Bloss;        \
-    a = ((pixel&fmt->Amask)>>fmt->Ashift)<<fmt->Aloss;        \
-    }
-
-/*!
-\brief Disassemble buffer pointer into a pixel and separate RGBA values.
-*/
-#define GFX_DISASSEMBLE_RGBA(buf, bpp, fmt, pixel, r, g, b, a)               \
-    do {                                       \
-    pixel = *((Uint32 *)(buf));                       \
-    GFX_RGBA_FROM_PIXEL(pixel, fmt, r, g, b, a);               \
-    pixel &= ~fmt->Amask;                           \
-    } while(0)
-
-/*!
-\brief Wrap a pixel from RGBA values using mask, shift and loss for surface.
-*/
-#define GFX_PIXEL_FROM_RGBA(pixel, fmt, r, g, b, a)                \
-    {                                    \
-    pixel = ((r>>fmt->Rloss)<<fmt->Rshift)|                \
-    ((g>>fmt->Gloss)<<fmt->Gshift)|                \
-    ((b>>fmt->Bloss)<<fmt->Bshift)|                \
-    ((a<<fmt->Aloss)<<fmt->Ashift);                \
-    }
-
-/*!
-\brief Assemble pixel into buffer pointer from separate RGBA values.
-*/
-#define GFX_ASSEMBLE_RGBA(buf, bpp, fmt, r, g, b, a)            \
-    {                                    \
-    Uint32 pixel;                    \
-    \
-    GFX_PIXEL_FROM_RGBA(pixel, fmt, r, g, b, a);    \
-    *((Uint32 *)(buf)) = pixel;            \
-    }
-
-/*!
-\brief Blend the RGB values of two pixels based on a source alpha value.
-*/
-#define GFX_ALPHA_BLEND(sR, sG, sB, A, dR, dG, dB)    \
-    do {                        \
-    dR = (((sR-dR)*(A))/255)+dR;        \
-    dG = (((sG-dG)*(A))/255)+dG;        \
-    dB = (((sB-dB)*(A))/255)+dB;        \
-    } while(0)
-
-/*!
-\brief 4-times unrolled DUFFs loop.
-
-This is a very useful loop for optimizing blitters.
-*/
-#define GFX_DUFFS_LOOP4(pixel_copy_increment, width)            \
-    { int n = (width+3)/4;                            \
-    switch (width & 3) {                        \
-    case 0: do {    pixel_copy_increment;                \
-    case 3:        pixel_copy_increment;                \
-    case 2:        pixel_copy_increment;                \
-    case 1:        pixel_copy_increment;                \
-    } while ( --n > 0 );                    \
-    }                                \
-    }
-
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _SDL_gfxBlitFunc_h */

SDL_GFX/SDL_gfxPrimitives.h

@@ -1,304 +0,0 @@
-/* 
-
-SDL_gfxPrimitives.h: graphics primitives for SDL
-
-Copyright (C) 2001-2012  Andreas Schiffler
-
-This software is provided 'as-is', without any express or implied
-warranty. In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-claim that you wrote the original software. If you use this software
-in a product, an acknowledgment in the product documentation would be
-appreciated but is not required.
-
-2. Altered source versions must be plainly marked as such, and must not be
-misrepresented as being the original software.
-
-3. This notice may not be removed or altered from any source
-distribution.
-
-Andreas Schiffler -- aschiffler at ferzkopp dot net
-
-*/
-
-#ifndef _SDL_gfxPrimitives_h
-#define _SDL_gfxPrimitives_h
-
-#include <math.h>
-
-#ifndef M_PI
-#define M_PI	3.1415926535897932384626433832795
-#endif
-
-#include "SDL.h"
-
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* ----- Versioning */
-
-#define SDL_GFXPRIMITIVES_MAJOR    2
-#define SDL_GFXPRIMITIVES_MINOR    0
-#define SDL_GFXPRIMITIVES_MICRO    25
-
-
-/* ---- Function Prototypes */
-
-#ifdef _MSC_VER
-#  if defined(DLL_EXPORT) && !defined(LIBSDL_GFX_DLL_IMPORT)
-#    define SDL_GFXPRIMITIVES_SCOPE __declspec(dllexport)
-#  else
-#    ifdef LIBSDL_GFX_DLL_IMPORT
-#      define SDL_GFXPRIMITIVES_SCOPE __declspec(dllimport)
-#    endif
-#  endif
-#endif
-#ifndef SDL_GFXPRIMITIVES_SCOPE
-#  define SDL_GFXPRIMITIVES_SCOPE extern
-#endif
-
-/* Note: all ___Color routines expect the color to be in format 0xRRGGBBAA */
-
-/* Pixel */
-
-SDL_GFXPRIMITIVES_SCOPE int pixelColor(SDL_Surface *dst, Sint16 x, Sint16 y, Uint32 color);
-
-SDL_GFXPRIMITIVES_SCOPE int pixelRGBA(SDL_Surface *dst, Sint16 x, Sint16 y, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
-
-/* Horizontal line */
-
-SDL_GFXPRIMITIVES_SCOPE int hlineColor(SDL_Surface *dst, Sint16 x1, Sint16 x2, Sint16 y, Uint32 color);
-
-SDL_GFXPRIMITIVES_SCOPE int
-hlineRGBA(SDL_Surface *dst, Sint16 x1, Sint16 x2, Sint16 y, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
-
-/* Vertical line */
-
-SDL_GFXPRIMITIVES_SCOPE int vlineColor(SDL_Surface *dst, Sint16 x, Sint16 y1, Sint16 y2, Uint32 color);
-
-SDL_GFXPRIMITIVES_SCOPE int
-vlineRGBA(SDL_Surface *dst, Sint16 x, Sint16 y1, Sint16 y2, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
-
-/* Rectangle */
-
-SDL_GFXPRIMITIVES_SCOPE int rectangleColor(SDL_Surface *dst, Sint16 x1, Sint16 y1, Sint16 x2, Sint16 y2, Uint32 color);
-
-SDL_GFXPRIMITIVES_SCOPE int rectangleRGBA(SDL_Surface *dst, Sint16 x1, Sint16 y1,
-                                          Sint16 x2, Sint16 y2, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
-
-/* Rounded-Corner Rectangle */
-
-SDL_GFXPRIMITIVES_SCOPE int
-roundedRectangleColor(SDL_Surface *dst, Sint16 x1, Sint16 y1, Sint16 x2, Sint16 y2, Sint16 rad, Uint32 color);
-
-SDL_GFXPRIMITIVES_SCOPE int roundedRectangleRGBA(SDL_Surface *dst, Sint16 x1, Sint16 y1,
-                                                 Sint16 x2, Sint16 y2, Sint16 rad, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
-
-/* Filled rectangle (Box) */
-
-SDL_GFXPRIMITIVES_SCOPE int boxColor(SDL_Surface *dst, Sint16 x1, Sint16 y1, Sint16 x2, Sint16 y2, Uint32 color);
-
-SDL_GFXPRIMITIVES_SCOPE int boxRGBA(SDL_Surface *dst, Sint16 x1, Sint16 y1, Sint16 x2,
-                                    Sint16 y2, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
-
-/* Rounded-Corner Filled rectangle (Box) */
-
-SDL_GFXPRIMITIVES_SCOPE int
-roundedBoxColor(SDL_Surface *dst, Sint16 x1, Sint16 y1, Sint16 x2, Sint16 y2, Sint16 rad, Uint32 color);
-
-SDL_GFXPRIMITIVES_SCOPE int roundedBoxRGBA(SDL_Surface *dst, Sint16 x1, Sint16 y1, Sint16 x2,
-                                           Sint16 y2, Sint16 rad, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
-
-/* Line */
-
-SDL_GFXPRIMITIVES_SCOPE int lineColor(SDL_Surface *dst, Sint16 x1, Sint16 y1, Sint16 x2, Sint16 y2, Uint32 color);
-
-SDL_GFXPRIMITIVES_SCOPE int lineRGBA(SDL_Surface *dst, Sint16 x1, Sint16 y1,
-                                     Sint16 x2, Sint16 y2, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
-
-/* AA Line */
-
-SDL_GFXPRIMITIVES_SCOPE int aalineColor(SDL_Surface *dst, Sint16 x1, Sint16 y1, Sint16 x2, Sint16 y2, Uint32 color);
-
-SDL_GFXPRIMITIVES_SCOPE int aalineRGBA(SDL_Surface *dst, Sint16 x1, Sint16 y1,
-                                       Sint16 x2, Sint16 y2, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
-
-/* Thick Line */
-SDL_GFXPRIMITIVES_SCOPE int thickLineColor(SDL_Surface *dst, Sint16 x1, Sint16 y1, Sint16 x2, Sint16 y2,
-                                           Uint8 width, Uint32 color);
-
-SDL_GFXPRIMITIVES_SCOPE int thickLineRGBA(SDL_Surface *dst, Sint16 x1, Sint16 y1, Sint16 x2, Sint16 y2,
-                                          Uint8 width, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
-
-/* Circle */
-
-SDL_GFXPRIMITIVES_SCOPE int circleColor(SDL_Surface *dst, Sint16 x, Sint16 y, Sint16 rad, Uint32 color);
-
-SDL_GFXPRIMITIVES_SCOPE int
-circleRGBA(SDL_Surface *dst, Sint16 x, Sint16 y, Sint16 rad, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
-
-/* Arc */
-
-SDL_GFXPRIMITIVES_SCOPE int
-arcColor(SDL_Surface *dst, Sint16 x, Sint16 y, Sint16 rad, Sint16 start, Sint16 end, Uint32 color);
-
-SDL_GFXPRIMITIVES_SCOPE int arcRGBA(SDL_Surface *dst, Sint16 x, Sint16 y, Sint16 rad, Sint16 start, Sint16 end,
-                                    Uint8 r, Uint8 g, Uint8 b, Uint8 a);
-
-/* AA Circle */
-
-SDL_GFXPRIMITIVES_SCOPE int aacircleColor(SDL_Surface *dst, Sint16 x, Sint16 y, Sint16 rad, Uint32 color);
-
-SDL_GFXPRIMITIVES_SCOPE int aacircleRGBA(SDL_Surface *dst, Sint16 x, Sint16 y,
-                                         Sint16 rad, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
-
-/* Filled Circle */
-
-SDL_GFXPRIMITIVES_SCOPE int filledCircleColor(SDL_Surface *dst, Sint16 x, Sint16 y, Sint16 r, Uint32 color);
-
-SDL_GFXPRIMITIVES_SCOPE int filledCircleRGBA(SDL_Surface *dst, Sint16 x, Sint16 y,
-                                             Sint16 rad, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
-
-/* Ellipse */
-
-SDL_GFXPRIMITIVES_SCOPE int ellipseColor(SDL_Surface *dst, Sint16 x, Sint16 y, Sint16 rx, Sint16 ry, Uint32 color);
-
-SDL_GFXPRIMITIVES_SCOPE int ellipseRGBA(SDL_Surface *dst, Sint16 x, Sint16 y,
-                                        Sint16 rx, Sint16 ry, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
-
-/* AA Ellipse */
-
-SDL_GFXPRIMITIVES_SCOPE int aaellipseColor(SDL_Surface *dst, Sint16 x, Sint16 y, Sint16 rx, Sint16 ry, Uint32 color);
-
-SDL_GFXPRIMITIVES_SCOPE int aaellipseRGBA(SDL_Surface *dst, Sint16 x, Sint16 y,
-                                          Sint16 rx, Sint16 ry, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
-
-/* Filled Ellipse */
-
-SDL_GFXPRIMITIVES_SCOPE int
-filledEllipseColor(SDL_Surface *dst, Sint16 x, Sint16 y, Sint16 rx, Sint16 ry, Uint32 color);
-
-SDL_GFXPRIMITIVES_SCOPE int filledEllipseRGBA(SDL_Surface *dst, Sint16 x, Sint16 y,
-                                              Sint16 rx, Sint16 ry, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
-
-/* Pie */
-
-SDL_GFXPRIMITIVES_SCOPE int pieColor(SDL_Surface *dst, Sint16 x, Sint16 y, Sint16 rad,
-                                     Sint16 start, Sint16 end, Uint32 color);
-
-SDL_GFXPRIMITIVES_SCOPE int pieRGBA(SDL_Surface *dst, Sint16 x, Sint16 y, Sint16 rad,
-                                    Sint16 start, Sint16 end, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
-
-/* Filled Pie */
-
-SDL_GFXPRIMITIVES_SCOPE int filledPieColor(SDL_Surface *dst, Sint16 x, Sint16 y, Sint16 rad,
-                                           Sint16 start, Sint16 end, Uint32 color);
-
-SDL_GFXPRIMITIVES_SCOPE int filledPieRGBA(SDL_Surface *dst, Sint16 x, Sint16 y, Sint16 rad,
-                                          Sint16 start, Sint16 end, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
-
-/* Trigon */
-
-SDL_GFXPRIMITIVES_SCOPE int
-trigonColor(SDL_Surface *dst, Sint16 x1, Sint16 y1, Sint16 x2, Sint16 y2, Sint16 x3, Sint16 y3, Uint32 color);
-
-SDL_GFXPRIMITIVES_SCOPE int
-trigonRGBA(SDL_Surface *dst, Sint16 x1, Sint16 y1, Sint16 x2, Sint16 y2, Sint16 x3, Sint16 y3,
-           Uint8 r, Uint8 g, Uint8 b, Uint8 a);
-
-/* AA-Trigon */
-
-SDL_GFXPRIMITIVES_SCOPE int
-aatrigonColor(SDL_Surface *dst, Sint16 x1, Sint16 y1, Sint16 x2, Sint16 y2, Sint16 x3, Sint16 y3, Uint32 color);
-
-SDL_GFXPRIMITIVES_SCOPE int
-aatrigonRGBA(SDL_Surface *dst, Sint16 x1, Sint16 y1, Sint16 x2, Sint16 y2, Sint16 x3, Sint16 y3,
-             Uint8 r, Uint8 g, Uint8 b, Uint8 a);
-
-/* Filled Trigon */
-
-SDL_GFXPRIMITIVES_SCOPE int
-filledTrigonColor(SDL_Surface *dst, Sint16 x1, Sint16 y1, Sint16 x2, Sint16 y2, Sint16 x3, Sint16 y3, Uint32 color);
-
-SDL_GFXPRIMITIVES_SCOPE int
-filledTrigonRGBA(SDL_Surface *dst, Sint16 x1, Sint16 y1, Sint16 x2, Sint16 y2, Sint16 x3, Sint16 y3,
-                 Uint8 r, Uint8 g, Uint8 b, Uint8 a);
-
-/* Polygon */
-
-SDL_GFXPRIMITIVES_SCOPE int polygonColor(SDL_Surface *dst, const Sint16 *vx, const Sint16 *vy, int n, Uint32 color);
-
-SDL_GFXPRIMITIVES_SCOPE int polygonRGBA(SDL_Surface *dst, const Sint16 *vx, const Sint16 *vy,
-                                        int n, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
-
-/* AA-Polygon */
-
-SDL_GFXPRIMITIVES_SCOPE int aapolygonColor(SDL_Surface *dst, const Sint16 *vx, const Sint16 *vy, int n, Uint32 color);
-
-SDL_GFXPRIMITIVES_SCOPE int aapolygonRGBA(SDL_Surface *dst, const Sint16 *vx, const Sint16 *vy,
-                                          int n, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
-
-/* Filled Polygon */
-
-SDL_GFXPRIMITIVES_SCOPE int
-filledPolygonColor(SDL_Surface *dst, const Sint16 *vx, const Sint16 *vy, int n, Uint32 color);
-
-SDL_GFXPRIMITIVES_SCOPE int filledPolygonRGBA(SDL_Surface *dst, const Sint16 *vx,
-                                              const Sint16 *vy, int n, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
-
-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);
-
-/* (Note: These MT versions are required for multi-threaded operation.) */
-
-SDL_GFXPRIMITIVES_SCOPE int
-filledPolygonColorMT(SDL_Surface *dst, const Sint16 *vx, const Sint16 *vy, int n, Uint32 color, int **polyInts,
-                     int *polyAllocated);
-
-SDL_GFXPRIMITIVES_SCOPE int filledPolygonRGBAMT(SDL_Surface *dst, const Sint16 *vx,
-                                                const Sint16 *vy, int n, Uint8 r, Uint8 g, Uint8 b, Uint8 a,
-                                                int **polyInts, int *polyAllocated);
-
-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);
-
-/* Bezier */
-
-SDL_GFXPRIMITIVES_SCOPE int
-bezierColor(SDL_Surface *dst, const Sint16 *vx, const Sint16 *vy, int n, int s, Uint32 color);
-
-SDL_GFXPRIMITIVES_SCOPE int bezierRGBA(SDL_Surface *dst, const Sint16 *vx, const Sint16 *vy,
-                                       int n, int s, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
-
-/* Characters/Strings */
-
-SDL_GFXPRIMITIVES_SCOPE void gfxPrimitivesSetFont(const void *fontdata, Uint32 cw, Uint32 ch);
-
-SDL_GFXPRIMITIVES_SCOPE void gfxPrimitivesSetFontRotation(Uint32 rotation);
-
-SDL_GFXPRIMITIVES_SCOPE int characterColor(SDL_Surface *dst, Sint16 x, Sint16 y, char c, Uint32 color);
-
-SDL_GFXPRIMITIVES_SCOPE int
-characterRGBA(SDL_Surface *dst, Sint16 x, Sint16 y, char c, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
-
-SDL_GFXPRIMITIVES_SCOPE int stringColor(SDL_Surface *dst, Sint16 x, Sint16 y, const char *s, Uint32 color);
-
-SDL_GFXPRIMITIVES_SCOPE int
-stringRGBA(SDL_Surface *dst, Sint16 x, Sint16 y, const char *s, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-
-#endif                /* _SDL_gfxPrimitives_h */

SDL_GFX/SDL_rotozoom.h

@@ -1,124 +0,0 @@
-/*  
-
-SDL_rotozoom.c: rotozoomer, zoomer and shrinker for 32bit or 8bit surfaces
-
-Copyright (C) 2001-2012  Andreas Schiffler
-
-This software is provided 'as-is', without any express or implied
-warranty. In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-claim that you wrote the original software. If you use this software
-in a product, an acknowledgment in the product documentation would be
-appreciated but is not required.
-
-2. Altered source versions must be plainly marked as such, and must not be
-misrepresented as being the original software.
-
-3. This notice may not be removed or altered from any source
-distribution.
-
-Andreas Schiffler -- aschiffler at ferzkopp dot net
-
-*/
-
-#ifndef _SDL_rotozoom_h
-#define _SDL_rotozoom_h
-
-#include <math.h>
-
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef M_PI
-#define M_PI	3.141592654
-#endif
-
-#include "SDL.h"
-
-/* ---- Defines */
-
-/*!
-\brief Disable anti-aliasing (no smoothing).
-*/
-#define SMOOTHING_OFF        0
-
-/*!
-\brief Enable anti-aliasing (smoothing).
-*/
-#define SMOOTHING_ON        1
-
-/* ---- Function Prototypes */
-
-#ifdef _MSC_VER
-#  if defined(DLL_EXPORT) && !defined(LIBSDL_GFX_DLL_IMPORT)
-#    define SDL_ROTOZOOM_SCOPE __declspec(dllexport)
-#  else
-#    ifdef LIBSDL_GFX_DLL_IMPORT
-#      define SDL_ROTOZOOM_SCOPE __declspec(dllimport)
-#    endif
-#  endif
-#endif
-#ifndef SDL_ROTOZOOM_SCOPE
-#  define SDL_ROTOZOOM_SCOPE extern
-#endif
-
-/*
-
-Rotozoom functions
-
-*/
-
-SDL_ROTOZOOM_SCOPE SDL_Surface *rotozoomSurface(SDL_Surface *src, double angle, double zoom, int smooth);
-
-SDL_ROTOZOOM_SCOPE SDL_Surface *rotozoomSurfaceXY
-        (SDL_Surface *src, double angle, double zoomx, double zoomy, int smooth);
-
-
-SDL_ROTOZOOM_SCOPE void rotozoomSurfaceSize(int width, int height, double angle, double zoom, int *dstwidth,
-                                            int *dstheight);
-
-SDL_ROTOZOOM_SCOPE void rotozoomSurfaceSizeXY
-        (int width, int height, double angle, double zoomx, double zoomy,
-         int *dstwidth, int *dstheight);
-
-/*
-
-Zooming functions
-
-*/
-
-SDL_ROTOZOOM_SCOPE SDL_Surface *zoomSurface(SDL_Surface *src, double zoomx, double zoomy, int smooth);
-
-SDL_ROTOZOOM_SCOPE void
-zoomSurfaceSize(int width, int height, double zoomx, double zoomy, int *dstwidth, int *dstheight);
-
-/*
-
-Shrinking functions
-
-*/
-
-SDL_ROTOZOOM_SCOPE SDL_Surface *shrinkSurface(SDL_Surface *src, int factorx, int factory);
-
-/*
-
-Specialized rotation functions
-
-*/
-
-SDL_ROTOZOOM_SCOPE SDL_Surface *rotateSurface90Degrees(SDL_Surface *src, int numClockwiseTurns);
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-
-#endif                /* _SDL_rotozoom_h */

Shot.h

@@ -8,7 +8,7 @@
 #include <SDL.h>
 #undef main
 
-#include "SDL_GFX/SDL_gfxPrimitives.h"
+#include <SDL/SDL_gfxPrimitives.h>
 
 /**
 Jovian Hersemeule