Port Get|SetSurfaceAlphaMod int->bool return

Author: Starbuck5

src_c/_pygame.h

@@ -134,6 +134,8 @@ PG_GetSurfaceFormat(SDL_Surface *surf)
 #define PG_SetPaletteColors SDL_SetPaletteColors
 #define PG_SetSurfaceBlendMode SDL_SetSurfaceBlendMode
 #define PG_GetSurfaceBlendMode SDL_GetSurfaceBlendMode
+#define PG_GetSurfaceAlphaMod SDL_GetSurfaceAlphaMod
+#define PG_SetSurfaceAlphaMod SDL_SetSurfaceAlphaMod
 
 #define PG_GetRGBA SDL_GetRGBA
 #define PG_GetRGB SDL_GetRGB
@@ -255,6 +257,18 @@ PG_GetSurfaceBlendMode(SDL_Surface *surface, SDL_BlendMode *blendMode)
     return SDL_GetSurfaceBlendMode(surface, blendMode) == 0;
 }
 
+static inline bool
+PG_GetSurfaceAlphaMod(SDL_Surface *surface, Uint8 *alpha)
+{
+    return SDL_GetSurfaceAlphaMod(surface, alpha) == 0;
+}
+
+static inline bool
+PG_SetSurfaceAlphaMod(SDL_Surface *surface, Uint8 alpha)
+{
+    return SDL_SetSurfaceAlphaMod(surface, alpha) == 0;
+}
+
 // NOTE:
 // palette is part of the format in SDL2, so these functions below have it
 // as a separate parameter to be consistent with the SDL3 signature.

src_c/surface.c

@@ -1562,11 +1562,11 @@ surf_set_alpha(pgSurfaceObject *self, PyObject *args)
     }
     /* HACK HACK HACK */
     if (result == 0) {
-        result = SDL_SetSurfaceAlphaMod(surf, alpha);
+        result = !PG_SetSurfaceAlphaMod(surf, alpha);
     }
     pgSurface_Unprep(self);
 
-    if (result == -1) {
+    if (result != 0) {
         return RAISE(pgExc_SDLError, SDL_GetError());
     }
 
@@ -1590,7 +1590,7 @@ surf_get_alpha(pgSurfaceObject *self, PyObject *_null)
         Py_RETURN_NONE;
     }
 
-    if (SDL_GetSurfaceAlphaMod(surf, &alpha) != 0) {
+    if (!PG_GetSurfaceAlphaMod(surf, &alpha)) {
         return RAISE(pgExc_SDLError, SDL_GetError());
     }
 
@@ -3245,13 +3245,13 @@ surf_subsurface(PyObject *self, PyObject *args)
         }
         SDL_FreePalette(pal);
     }
-    if (SDL_GetSurfaceAlphaMod(surf, &alpha) != 0) {
+    if (!PG_GetSurfaceAlphaMod(surf, &alpha)) {
         PyErr_SetString(pgExc_SDLError, SDL_GetError());
         SDL_FreeSurface(sub);
         return NULL;
     }
     if (alpha != 255) {
-        if (SDL_SetSurfaceAlphaMod(sub, alpha) != 0) {
+        if (!PG_SetSurfaceAlphaMod(sub, alpha)) {
             PyErr_SetString(pgExc_SDLError, SDL_GetError());
             SDL_FreeSurface(sub);
             return NULL;
@@ -4515,7 +4515,7 @@ pgSurface_Blit(pgSurfaceObject *dstobj, pgSurfaceObject *srcobj,
     /* can't blit alpha to 8bit, crashes SDL */
     else if (PG_SURF_BytesPerPixel(dst) == 1 &&
              (SDL_ISPIXELFORMAT_ALPHA(PG_SURF_FORMATENUM(src)) ||
-              ((SDL_GetSurfaceAlphaMod(src, &alpha) == 0 && alpha != 255)))) {
+              ((PG_GetSurfaceAlphaMod(src, &alpha) && alpha != 255)))) {
         /* Py_BEGIN_ALLOW_THREADS */
         if (PG_SURF_BytesPerPixel(src) == 1) {
             result = pygame_Blit(src, srcrect, dst, dstrect, 0);

src_c/transform.c

@@ -104,7 +104,7 @@ _PgSurface_SrcAlpha(SDL_Surface *surf)
     }
     else {
         Uint8 color = SDL_ALPHA_OPAQUE;
-        if (SDL_GetSurfaceAlphaMod(surf, &color) != 0) {
+        if (!PG_GetSurfaceAlphaMod(surf, &color)) {
             return -1;
         }
         if (color != SDL_ALPHA_OPAQUE) {
@@ -161,13 +161,13 @@ newsurf_fromsurf(SDL_Surface *surf, int width, int height)
         }
     }
 
-    if (SDL_GetSurfaceAlphaMod(surf, &alpha) != 0) {
+    if (!PG_GetSurfaceAlphaMod(surf, &alpha)) {
         PyErr_SetString(pgExc_SDLError, SDL_GetError());
         SDL_FreeSurface(newsurf);
         return NULL;
     }
     if (alpha != 255) {
-        if (SDL_SetSurfaceAlphaMod(newsurf, alpha) != 0) {
+        if (!PG_SetSurfaceAlphaMod(newsurf, alpha)) {
             PyErr_SetString(pgExc_SDLError, SDL_GetError());
             SDL_FreeSurface(newsurf);
             return NULL;