Removed checks for SDL_TTF < 2.0.12 in outline code.

We depend on SDL_TTF >= 2.0.15, so this is not needed.

Author: cherez

src_c/font.c

@@ -908,14 +908,8 @@ font_getter_outline(PyObject *self, void *closure)
         return RAISE_FONT_QUIT_ERROR();
     }
 
-#if SDL_TTF_VERSION_ATLEAST(2, 0, 12)
     TTF_Font *font = PyFont_AsFont(self);
     return PyLong_FromLong(TTF_GetFontOutline(font));
-#else
-    return RAISE(pgExc_SDLError,
-                 "pygame.font not compiled with a new enough SDL_ttf version. "
-                 "Needs SDL_ttf 2.0.12 or above.");
-#endif
 }
 
 static int
@@ -924,15 +918,10 @@ font_setter_outline(PyObject *self, PyObject *value, void *closure)
     if (!PgFont_GenerationCheck(self)) {
         RAISE_FONT_QUIT_ERROR_RETURN(-1);
     }
-#if SDL_TTF_VERSION_ATLEAST(2, 0, 12)
     TTF_Font *font = PyFont_AsFont(self);
 
     DEL_ATTR_NOT_SUPPORTED_CHECK("outline", value);
 
-    if (!PyLong_Check(value)) {
-        PyErr_SetString(PyExc_TypeError, "outline must be an integer");
-        return -1;
-    }
     long val = PyLong_AsLong(value);
     if (val == -1 && PyErr_Occurred()) {
         return -1;
@@ -941,15 +930,16 @@ font_setter_outline(PyObject *self, PyObject *value, void *closure)
         PyErr_SetString(PyExc_ValueError, "outline must be >= 0");
         return -1;
     }
-    TTF_SetFontOutline(font, (int)val);
-    return 0;
+
+#if SDL_TTF_VERSION_ATLEAST(3, 0, 0)
+    if (!TTF_SetFontOutline(font, (int)val)) {
+        PyErr_SetString(pgExc_SDLError, SDL_GetError());
+        return -1;
+    }
 #else
-    PyErr_SetString(
-        pgExc_SDLError,
-        "pygame.font not compiled with a new enough SDL_ttf version. Needs "
-        "SDL_ttf 2.0.12 or above.");
-    return -1;
+    TTF_SetFontOutline(font, (int)val);
 #endif
+    return 0;
 }
 
 static PyObject *

test/font_test.py

@@ -685,10 +685,6 @@ def test_point_size_method(self):
         self.assertRaises(ValueError, f.set_point_size, -500)
         self.assertRaises(TypeError, f.set_point_size, "15")
 
-    @unittest.skipIf(
-        pygame.font.get_sdl_ttf_version() < (2, 0, 12),
-        "outlines were added in SDL_TTF 2.0.12",
-    )
     def test_outline_property(self):
         if pygame_font.__name__ == "pygame.ftfont":
             return  # not a pygame.ftfont feature
@@ -720,25 +716,6 @@ def test_incorrect_type():
         self.assertRaises(ValueError, test_neg)
         self.assertRaises(TypeError, test_incorrect_type)
 
-    @unittest.skipIf(
-        pygame.font.get_sdl_ttf_version() >= (2, 0, 12),
-        "outlines were added in SDL_TTF 2.0.12",
-    )
-    def test_outline_property_stub(self):
-        if pygame_font.__name__ == "pygame.ftfont":
-            return  # not a pygame.ftfont feature
-
-        pygame_font.init()
-        font_path = os.path.join(
-            os.path.split(pygame.__file__)[0], pygame_font.get_default_font()
-        )
-        f = pygame_font.Font(pathlib.Path(font_path), 25)
-
-        with self.assertRaises(pygame.error):
-            f.outline = 0
-        with self.assertRaises(pygame.error):
-            _ = f.outline
-
     def test_font_name(self):
         f = pygame_font.Font(None, 20)
         self.assertEqual(f.name, "FreeSans")
@@ -1075,6 +1052,7 @@ def test_font_property_should_raise_exception_after_quit(self):
                 ("italic", True),
                 ("underline", True),
                 ("strikethrough", True),
+                ("outline", 1),
             ]
             skip_properties = set()
             version = pygame.font.get_sdl_ttf_version()
@@ -1087,11 +1065,6 @@ def test_font_property_should_raise_exception_after_quit(self):
             else:
                 skip_properties.add("point_size")
 
-            if version >= (2, 0, 12):
-                properties.append(("outline", 1))
-            else:
-                skip_properties.add("outline")
-
         font = pygame_font.Font(None, 10)
         actual_names = []
 
@@ -1188,17 +1161,15 @@ def query(
         f.set_italic(italic)
         f.set_underline(underline)
         f.set_strikethrough(strikethrough)
-        if pygame.font.get_sdl_ttf_version() >= (2, 0, 12):
-            f.outline = outline
+        f.outline = outline
         s = f.render(text, antialiase, (0, 0, 0))
         screen.blit(s, (offset, y))
         y += s.get_size()[1] + spacing
         f.set_bold(False)
         f.set_italic(False)
         f.set_underline(False)
         f.set_strikethrough(False)
-        if pygame.font.get_sdl_ttf_version() >= (2, 0, 12):
-            f.outline = 0
+        f.outline = 0
         s = f.render("(some comparison text)", False, (0, 0, 0))
         screen.blit(s, (offset, y))
         pygame.display.flip()
@@ -1240,10 +1211,6 @@ def test_italic_underline(self):
     def test_bold_strikethrough(self):
         self.assertTrue(self.query(bold=True, strikethrough=True))
 
-    @unittest.skipIf(
-        pygame.font.get_sdl_ttf_version() < (2, 0, 12),
-        "outlines were added in SDL_TTF 2.0.12",
-    )
     def test_outline(self):
         self.assertTrue(self.query(outline=1))