Dec 16, 2022 · Nov 15, 2022 · Nov 16, 2022 · Nov 22, 2022 · Dec 11, 2022 · Dec 11, 2022
diff --git a/src_c/_freetype.c b/src_c/_freetype.c
    }

    if (linked) {
        /*
         * The FreeType library is being initialized here separately from the
         * initialization of the `pygame.freetype` module so that the linked
         * version can always be obtained. This does not affect the
         * initialization state of `pygame.freetype` itself.
         *
         * The reason this is needed is because if freetype has not been
         * initialized, then a segmentation fault can happen. The alternative
         * would be to return something predefined to mean something akin to
         * "Unknown", but as this function is meant for debugging purposes, it
         * seems like a good idea to always be able to retrieve the linked
         * FreeType version.
         */
        FT_Library lib;
        int err = FT_Init_FreeType(&lib);
        if (err) {
            PyErr_SetString(PyExc_RuntimeError,
                            "FreeType could not be initialized");

            FT_Done_FreeType(lib);

            return NULL;
        }
        FT_Int major, minor, patch;
        FT_Library_Version(inst->library, &major, &minor, &patch);
        FT_Library_Version(lib, &major, &minor, &patch);

        FT_Done_FreeType(lib);

        return Py_BuildValue("iii", major, minor, patch);
    }
    else {
diff --git a/src_c/freetype/ft_wrap.c b/src_c/freetype/ft_wrap.c
 * Library (de)initialization
 *
 *********************************************************/
 FreeTypeInstance *inst = 0;
 int
 _PGFT_Init(FreeTypeInstance **_instance, int cache_size)
 {
    FreeTypeInstance *inst = 0;
    int error;

    inst = _PGFT_malloc(sizeof(FreeTypeInstance));
diff --git a/src_c/freetype/ft_wrap.h b/src_c/freetype/ft_wrap.h
 * Internal API
 **********************************************************/

 extern FreeTypeInstance *inst;

 /**************************************** General functions ******************/
 const char *
 _PGFT_GetError(FreeTypeInstance *);
diff --git a/test/freetype_test.py b/test/freetype_test.py

        self.assertIsNone(error_msg)

    def test_get_version(self):
        # Test that get_version() can be called before init()
        # Also tests get_version
        ft.quit()

        # asserting not None just to have a test case
        # there is no real fail condition other than
        # raising an exception or a segfault, so a tuple of ints
        # should be returned in all cases
        self.assertIsNotNone(ft.get_version(linked=False))
        self.assertIsNotNone(ft.get_version(linked=True))


 if __name__ == "__main__":
    unittest.main()
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2046,8 +2046,34 @@ _ft_get_version(PyObject self, PyObject args, PyObject *kwargs)
		}

		if (linked) {
Starbuck5 marked this conversation as resolved. Show resolvedHide resolved
		/*
		* The FreeType library is being initialized here separately from the
		* initialization of the `pygame.freetype` module so that the linked
		* version can always be obtained. This does not affect the
		* initialization state of `pygame.freetype` itself.
		*
		* The reason this is needed is because if freetype has not been
		* initialized, then a segmentation fault can happen. The alternative
		* would be to return something predefined to mean something akin to
		* "Unknown", but as this function is meant for debugging purposes, it
		* seems like a good idea to always be able to retrieve the linked
		* FreeType version.
		*/
		FT_Library lib;
		int err = FT_Init_FreeType(&lib);
		if (err) {
		PyErr_SetString(PyExc_RuntimeError,
		"FreeType could not be initialized");

		FT_Done_FreeType(lib);

		return NULL;
		}
		FT_Int major, minor, patch;
		FT_Library_Version(inst->library, &major, &minor, &patch);
		FT_Library_Version(lib, &major, &minor, &patch);

		FT_Done_FreeType(lib);

		return Py_BuildValue("iii", major, minor, patch);
		}
		else {
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -534,10 +534,10 @@ _PGFT_UnloadFont(FreeTypeInstance ft, pgFontObject fontobj)
		* Library (de)initialization
		*
		*********************************************************/
		FreeTypeInstance *inst = 0;
		int
		_PGFT_Init(FreeTypeInstance **_instance, int cache_size)
		{
		FreeTypeInstance *inst = 0;
		int error;

		inst = _PGFT_malloc(sizeof(FreeTypeInstance));
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -253,8 +253,6 @@ extern _FreeTypeState _modstate;
		* Internal API
		**********************************************************/

		extern FreeTypeInstance *inst;

		/************************************** General functions ****************/
		const char *
		_PGFT_GetError(FreeTypeInstance *);
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1794,6 +1794,18 @@ def test_get_error(self):

		self.assertIsNone(error_msg)

		def test_get_version(self):
		# Test that get_version() can be called before init()
		# Also tests get_version
		ft.quit()

		# asserting not None just to have a test case
		# there is no real fail condition other than
		# raising an exception or a segfault, so a tuple of ints
		# should be returned in all cases
		self.assertIsNotNone(ft.get_version(linked=False))
		self.assertIsNotNone(ft.get_version(linked=True))


		if __name__ == "__main__":
		unittest.main()