Merge pull request #3550 from pygame-community/ankith26-fix-img-and-rwops

Fix rwops and some image stuff on SDL3

Author: ankith26

src_c/image.c

@@ -197,10 +197,14 @@ image_save(PyObject *self, PyObject *arg, PyObject *kwarg)
             SDL_RWops *rw = pgRWops_FromFileObject(obj);
             if (rw != NULL) {
                 if (!strcasecmp(ext, "bmp")) {
+#if SDL_VERSION_ATLEAST(3, 0, 0)
+                    result = (SDL_SaveBMP_IO(surf, rw, 0) ? 0 : -1);
+#else
                     /* The SDL documentation didn't specify which negative
                      * number is returned upon error. We want to be sure that
                      * result is either 0 or -1: */
                     result = (SDL_SaveBMP_RW(surf, rw, 0) == 0 ? 0 : -1);
+#endif
                 }
                 else {
                     result = SaveTGA_RW(surf, rw, 1);
@@ -213,10 +217,14 @@ image_save(PyObject *self, PyObject *arg, PyObject *kwarg)
         else {
             if (!strcasecmp(ext, "bmp")) {
                 Py_BEGIN_ALLOW_THREADS;
+#if SDL_VERSION_ATLEAST(3, 0, 0)
+                result = (SDL_SaveBMP(surf, name) ? 0 : -1);
+#else
                 /* The SDL documentation didn't specify which negative number
                  * is returned upon error. We want to be sure that result is
                  * either 0 or -1: */
                 result = (SDL_SaveBMP(surf, name) == 0 ? 0 : -1);
+#endif
                 Py_END_ALLOW_THREADS;
             }
             else {

src_c/imageext.c

@@ -333,26 +333,34 @@ image_save_ext(PyObject *self, PyObject *arg, PyObject *kwarg)
         if (!strcasecmp(ext, "jpeg") || !strcasecmp(ext, "jpg")) {
             if (rw != NULL) {
 #if SDL_VERSION_ATLEAST(3, 0, 0)
-                result = IMG_SaveJPG_IO(surf, rw, 0, JPEG_QUALITY);
+                result = IMG_SaveJPG_IO(surf, rw, 0, JPEG_QUALITY) ? 0 : -1;
 #else
                 result = IMG_SaveJPG_RW(surf, rw, 0, JPEG_QUALITY);
 #endif
             }
             else {
+#if SDL_VERSION_ATLEAST(3, 0, 0)
+                result = IMG_SaveJPG(surf, name, JPEG_QUALITY) ? 0 : -1;
+#else
                 result = IMG_SaveJPG(surf, name, JPEG_QUALITY);
+#endif
             }
         }
         else if (!strcasecmp(ext, "png")) {
             /*Py_BEGIN_ALLOW_THREADS; */
             if (rw != NULL) {
 #if SDL_VERSION_ATLEAST(3, 0, 0)
-                result = IMG_SavePNG_IO(surf, rw, 0);
+                result = IMG_SavePNG_IO(surf, rw, 0) ? 0 : -1;
 #else
                 result = IMG_SavePNG_RW(surf, rw, 0);
 #endif
             }
             else {
+#if SDL_VERSION_ATLEAST(3, 0, 0)
+                result = IMG_SavePNG(surf, name) ? 0 : -1;
+#else
                 result = IMG_SavePNG(surf, name);
+#endif
             }
             /*Py_END_ALLOW_THREADS; */
         }

src_c/rwobject.c

@@ -500,6 +500,7 @@ pgRWops_FromFileObject(PyObject *obj)
 
 #if SDL_VERSION_ATLEAST(3, 0, 0)
     SDL_IOStreamInterface iface;
+    SDL_INIT_INTERFACE(&iface);
     iface.size = _pg_rw_size;
     iface.seek = _pg_rw_seek;
     iface.read = _pg_rw_read;
@@ -513,24 +514,26 @@ pgRWops_FromFileObject(PyObject *obj)
     rw = SDL_OpenIO(&iface, helper);
     if (rw == NULL) {
         iface.close(helper);
-        PyMem_Free(helper);
         return (SDL_RWops *)RAISE(PyExc_IOError, SDL_GetError());
     }
 
     SDL_PropertiesID props = SDL_GetIOProperties(rw);
     if (!props) {
-        PyMem_Free(helper);
+        iface.close(helper);
         return (SDL_RWops *)RAISE(PyExc_IOError, SDL_GetError());
     }
 
     if (!SDL_SetBooleanProperty(props, "_pygame_is_file_object", 1)) {
-        PyMem_Free(helper);
+        iface.close(helper);
         return (SDL_RWops *)RAISE(PyExc_IOError, SDL_GetError());
     }
 
 #else
     rw = SDL_AllocRW();
     if (rw == NULL) {
+        /* TODO: here member attributes of helper are getting leaked and close
+         * isn't being called. Refactor to use _pg_rw_close logic on helper
+         * here */
         PyMem_Free(helper);
         return (SDL_RWops *)PyErr_NoMemory();
     }