Merge branch 'pygame-community:main' into transform.pixelate

Author: oddbookworm

src_c/_pygame.h

@@ -670,7 +670,6 @@ typedef enum {
 #define PYGAMEAPI_RWOBJECT_NUMSLOTS 5
 #define PYGAMEAPI_PIXELARRAY_NUMSLOTS 2
 #define PYGAMEAPI_COLOR_NUMSLOTS 5
-#define PYGAMEAPI_MATH_NUMSLOTS 2
 #define PYGAMEAPI_BASE_NUMSLOTS 30
 #define PYGAMEAPI_EVENT_NUMSLOTS 10
 #define PYGAMEAPI_WINDOW_NUMSLOTS 1

src_c/include/_pygame.h

@@ -509,26 +509,10 @@ typedef struct pgColorObject pgColorObject;
 #endif /* PYGAMEAPI_COLOR_INTERNAL */
 
 /*
- * Math module
+ * Geometry module
  */
-#ifndef PYGAMEAPI_MATH_INTERNAL
-#define pgVector2_Check(x) \
-    ((x)->ob_type == (PyTypeObject *)PYGAMEAPI_GET_SLOT(math, 0))
-
-#define pgVector3_Check(x) \
-    ((x)->ob_type == (PyTypeObject *)PYGAMEAPI_GET_SLOT(math, 1))
-/*
-#define pgVector2_New                                             \
-    (*(PyObject*(*))  \
-        PYGAMEAPI_GET_SLOT(PyGAME_C_API, 1))
-*/
-#define import_pygame_math() IMPORT_PYGAME_MODULE(math)
-#endif /* PYGAMEAPI_MATH_INTERNAL */
-
 #ifndef PYGAMEAPI_GEOMETRY_INTERNAL
-
 #define import_pygame_geometry() IMPORT_PYGAME_MODULE(geometry)
-
 #endif /* ~PYGAMEAPI_GEOMETRY_INTERNAL */
 
 /*

src_c/math.c

@@ -4625,9 +4625,7 @@ MODINIT_DEFINE(pg_math)
 MODINIT_DEFINE(math)
 #endif
 {
-    PyObject *module, *apiobj;
-    static void *c_api[PYGAMEAPI_MATH_NUMSLOTS];
-
+    PyObject *module;
     static struct PyModuleDef _module = {PyModuleDef_HEAD_INIT,
                                          "math",
                                          DOC_MATH,
@@ -4638,14 +4636,6 @@ MODINIT_DEFINE(math)
                                          NULL,
                                          NULL};
 
-    /* initialize the extension types */
-    if ((PyType_Ready(&pgVector2_Type) < 0) ||
-        (PyType_Ready(&pgVector3_Type) < 0) ||
-        (PyType_Ready(&pgVectorIter_Type) < 0) ||
-        (PyType_Ready(&pgVectorElementwiseProxy_Type) < 0)) {
-        return NULL;
-    }
-
     /* initialize the module */
     module = PyModule_Create(&_module);
 
@@ -4654,29 +4644,10 @@ MODINIT_DEFINE(math)
     }
 
     /* add extension types to module */
-    if ((PyModule_AddObjectRef(module, "Vector2",
-                               (PyObject *)&pgVector2_Type) < 0) ||
-        (PyModule_AddObjectRef(module, "Vector3",
-                               (PyObject *)&pgVector3_Type) < 0) ||
-        (PyModule_AddObjectRef(module, "VectorElementwiseProxy",
-                               (PyObject *)&pgVectorElementwiseProxy_Type) <
-         0) ||
-        (PyModule_AddObjectRef(module, "VectorIterator",
-                               (PyObject *)&pgVectorIter_Type) < 0)) {
-        Py_DECREF(module);
-        return NULL;
-    }
-
-    /* export the C api */
-    c_api[0] = &pgVector2_Type;
-    c_api[1] = &pgVector3_Type;
-    /*
-    c_api[2] = pgVector_NEW;
-    c_api[3] = pgVectorCompatible_Check;
-    */
-    apiobj = encapsulate_api(c_api, "math");
-    if (PyModule_AddObject(module, PYGAMEAPI_LOCAL_ENTRY, apiobj)) {
-        Py_XDECREF(apiobj);
+    if ((PyModule_AddType(module, &pgVector2_Type) < 0) ||
+        (PyModule_AddType(module, &pgVector3_Type) < 0) ||
+        (PyModule_AddType(module, &pgVectorElementwiseProxy_Type) < 0) ||
+        (PyModule_AddType(module, &pgVectorIter_Type) < 0)) {
         Py_DECREF(module);
         return NULL;
     }

src_c/transform.c

@@ -137,7 +137,7 @@ newsurf_fromsurf(SDL_Surface *surf, int width, int height)
     /* Copy palette, colorkey, etc info */
     if (SDL_ISPIXELFORMAT_INDEXED(PG_SURF_FORMATENUM(surf))) {
         SDL_Palette *newsurf_palette = PG_GetSurfacePalette(newsurf);
-        SDL_Palette *surf_palette = PG_GetSurfacePalette(newsurf);
+        SDL_Palette *surf_palette = PG_GetSurfacePalette(surf);
 
         if (newsurf_palette == NULL) {
             PyErr_SetString(
@@ -2704,7 +2704,7 @@ modify_hsl(SDL_Surface *surf, PG_PixelFormat *fmt, SDL_Surface *dst,
     Uint8 *srcp8 = (Uint8 *)surf->pixels;
     Uint8 *dstp8 = (Uint8 *)dst->pixels;
     SDL_Palette *surf_palette = PG_GetSurfacePalette(surf);
-    SDL_Palette *dst_palette = PG_GetSurfacePalette(surf);
+    SDL_Palette *dst_palette = PG_GetSurfacePalette(dst);
 
     if (PG_FORMAT_BytesPerPixel(fmt) == 4 ||
         PG_FORMAT_BytesPerPixel(fmt) == 3) {

test/transform_test.py

@@ -1461,6 +1461,39 @@ def test_rotate__lossless_at_90_degrees(self):
         for pt, color in gradient:
             self.assertTrue(s.get_at(pt) == color)
 
+    def test_rotate_after_convert_regression(self):
+        # Tests a regression found from https://github.com/pygame-community/pygame-ce/pull/3314
+        # Reported in https://github.com/pygame-community/pygame-ce/issues/3463
+
+        pygame.display.set_mode((1, 1))
+
+        output1 = pygame.transform.rotate(
+            pygame.image.load(
+                os.path.join(
+                    os.path.abspath(os.path.dirname(__file__)),
+                    "../examples/data/alien1.png",
+                )
+            ).convert_alpha(),
+            180,
+        )
+        output2 = pygame.transform.rotate(
+            pygame.image.load(
+                os.path.join(
+                    os.path.abspath(os.path.dirname(__file__)),
+                    "../examples/data/alien1.png",
+                )
+            ),
+            180,
+        ).convert_alpha()
+
+        for x in range(50):
+            for y in range(50):
+                color1 = pygame.Color(output1.get_at((x, y)))
+                color2 = pygame.Color(output2.get_at((x, y)))
+                self.assertEqual(color1, color2)
+
+        pygame.quit()
+
     def test_scale2x(self):
         # __doc__ (as of 2008-06-25) for pygame.transform.scale2x: