Port SDL_SetSurfaceRLE

Author: Starbuck5

src_c/_pygame.h

@@ -82,6 +82,7 @@
 #define PG_PixelFormatEnum SDL_PixelFormat
 
 #define PG_SurfaceHasRLE SDL_SurfaceHasRLE
+#define PG_SetSurfaceRLE SDL_SetSurfaceRLE
 
 #define PG_SoftStretchNearest(src, srcrect, dst, dstrect) \
     SDL_StretchSurface(src, srcrect, dst, dstrect, SDL_SCALEMODE_NEAREST)
@@ -350,6 +351,12 @@ PG_InitSubSystem(Uint32 flags)
 
 #define PG_SurfaceHasRLE SDL_HasSurfaceRLE
 
+static inline bool
+PG_SetSurfaceRLE(SDL_Surface *surface, bool enabled)
+{
+    return SDL_SetSurfaceRLE(surface, enabled) == 0;
+}
+
 static inline bool
 PG_GetSurfaceClipRect(SDL_Surface *surface, SDL_Rect *rect)
 {

src_c/rotozoom.c

@@ -593,8 +593,7 @@ rotozoomSurface(SDL_Surface *src, double angle, double zoom, int smooth)
                 SDL_FreeSurface(rz_dst);
                 return NULL;
             }
-            if (PG_SurfaceHasRLE(src) &&
-                SDL_SetSurfaceRLE(rz_dst, SDL_TRUE) != 0) {
+            if (PG_SurfaceHasRLE(src) && !PG_SetSurfaceRLE(rz_dst, SDL_TRUE)) {
                 SDL_FreeSurface(rz_dst);
                 return NULL;
             }
@@ -653,8 +652,7 @@ rotozoomSurface(SDL_Surface *src, double angle, double zoom, int smooth)
                 SDL_FreeSurface(rz_dst);
                 return NULL;
             }
-            if (PG_SurfaceHasRLE(src) &&
-                SDL_SetSurfaceRLE(rz_dst, SDL_TRUE) != 0) {
+            if (PG_SurfaceHasRLE(src) && !PG_SetSurfaceRLE(rz_dst, SDL_TRUE)) {
                 SDL_FreeSurface(rz_dst);
                 return NULL;
             }

src_c/surface.c

@@ -1442,9 +1442,8 @@ surf_set_colorkey(pgSurfaceObject *self, PyObject *args)
         success = PG_SetSurfaceColorKey(surf, SDL_FALSE, color);
     }
     if (success && hascolor) {
-        success =
-            SDL_SetSurfaceRLE(
-                surf, (flags & PGS_RLEACCEL) ? SDL_TRUE : SDL_FALSE) == 0;
+        success = PG_SetSurfaceRLE(
+            surf, (flags & PGS_RLEACCEL) ? SDL_TRUE : SDL_FALSE);
     }
     if (success) {
         success = PG_SetSurfaceColorKey(surf, hascolor, color);
@@ -1496,7 +1495,7 @@ surf_set_alpha(pgSurfaceObject *self, PyObject *args)
     Uint32 flags = 0;
     PyObject *alpha_obj = NULL, *intobj = NULL;
     Uint8 alpha;
-    int result, alphaval = 255;
+    int alphaval = 255;
     SDL_Rect sdlrect;
     SDL_Surface *surface;
 
@@ -1544,8 +1543,8 @@ surf_set_alpha(pgSurfaceObject *self, PyObject *args)
         }
     }
     pgSurface_Prep(self);
-    result =
-        SDL_SetSurfaceRLE(surf, (flags & PGS_RLEACCEL) ? SDL_TRUE : SDL_FALSE);
+    bool success =
+        PG_SetSurfaceRLE(surf, (flags & PGS_RLEACCEL) ? SDL_TRUE : SDL_FALSE);
     /* HACK HACK HACK */
     if ((surf->flags & SDL_RLEACCEL) && (!(flags & PGS_RLEACCEL))) {
         /* hack to strip SDL_RLEACCEL flag off surface immediately when
@@ -1561,12 +1560,12 @@ surf_set_alpha(pgSurfaceObject *self, PyObject *args)
         SDL_FreeSurface(surface);
     }
     /* HACK HACK HACK */
-    if (result == 0) {
-        result = !PG_SetSurfaceAlphaMod(surf, alpha);
+    if (success) {
+        success = PG_SetSurfaceAlphaMod(surf, alpha);
     }
     pgSurface_Unprep(self);
 
-    if (result != 0) {
+    if (!success) {
         return RAISE(pgExc_SDLError, SDL_GetError());
     }
 

src_c/transform.c

@@ -202,8 +202,7 @@ newsurf_fromsurf(SDL_Surface *surf, int width, int height)
             SDL_FreeSurface(newsurf);
             return NULL;
         }
-        if (PG_SurfaceHasRLE(surf) &&
-            SDL_SetSurfaceRLE(newsurf, SDL_TRUE) != 0) {
+        if (PG_SurfaceHasRLE(surf) && !PG_SetSurfaceRLE(newsurf, SDL_TRUE)) {
             PyErr_SetString(pgExc_SDLError, SDL_GetError());
             SDL_FreeSurface(newsurf);
             return NULL;