From a43a097ddc238727e1ed6ecc7b3b15fb32e0cfaa Mon Sep 17 00:00:00 2001 From: Michael Droettboom Date: Thu, 29 Oct 2015 14:43:40 -0400 Subject: [PATCH 01/13] Add Travis-CI support --- .travis.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..760fc31 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,13 @@ +sudo: false + +language: python +python: + - "2.7" + - "3.3" + - "3.4" + - "3.5" + - "3.5-dev" # 3.5 development branch +# command to install dependencies +install: "pip install ." +# command to run tests +script: nosetests \ No newline at end of file From 43801de361b091224999c58075d1551ccbc0bbcd Mon Sep 17 00:00:00 2001 From: Michael Droettboom Date: Thu, 29 Oct 2015 15:21:40 -0400 Subject: [PATCH 02/13] Fix Travis script --- .travis.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 760fc31..29db443 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,11 @@ python: - "3.4" - "3.5" - "3.5-dev" # 3.5 development branch + # command to install dependencies install: "pip install ." # command to run tests -script: nosetests \ No newline at end of file +script: | + mkdir test + cd test + nosetests freetypy.tests \ No newline at end of file From dac9da12504da8a3f6c6a6778bad377902f38158 Mon Sep 17 00:00:00 2001 From: Michael Droettboom Date: Thu, 29 Oct 2015 15:25:17 -0400 Subject: [PATCH 03/13] Remove no longer used _state --- src/freetypy.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/freetypy.c b/src/freetypy.c index c303bfe..dca3e24 100644 --- a/src/freetypy.c +++ b/src/freetypy.c @@ -115,7 +115,6 @@ static PyMethodDef module_methods[] = { m = Py_InitModule3( "_freetypy", module_methods, "Freetype bindings"); - _state.dummy = 0; #endif if (m == NULL) { From f72b3dbfd4fbd24415a1232f5295e2c9264be843 Mon Sep 17 00:00:00 2001 From: Michael Droettboom Date: Thu, 29 Oct 2015 15:26:18 -0400 Subject: [PATCH 04/13] Remove error types that are too new --- src/freetypy_error.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/freetypy_error.c b/src/freetypy_error.c index 5a03438..b2fb394 100644 --- a/src/freetypy_error.c +++ b/src/freetypy_error.c @@ -78,8 +78,8 @@ int setup_errors(void) { DEF_ERROR(FT_Err_Invalid_Table, 0x08, "broken table", PyExc_ValueError); DEF_ERROR(FT_Err_Invalid_Offset, 0x09, "broken offset within table", PyExc_ValueError); DEF_ERROR(FT_Err_Array_Too_Large, 0x0A, "array allocation size too large", PyExc_MemoryError); - DEF_ERROR(FT_Err_Missing_Module, 0x0B, "missing module", PyExc_RuntimeError); - DEF_ERROR(FT_Err_Missing_Property, 0x0C, "missing property", PyExc_KeyError); + /* DEF_ERROR(FT_Err_Missing_Module, 0x0B, "missing module", PyExc_RuntimeError); */ + /* DEF_ERROR(FT_Err_Missing_Property, 0x0C, "missing property", PyExc_KeyError); */ /* glyph/character errors */ @@ -173,7 +173,7 @@ int setup_errors(void) { DEF_ERROR(FT_Err_Stack_Underflow, 0xA1, "argument stack underflow", PyExc_ValueError); DEF_ERROR(FT_Err_Ignore, 0xA2, "ignore", PyExc_ValueError); DEF_ERROR(FT_Err_No_Unicode_Glyph_Name, 0xA3, "no Unicode glyph name found", PyExc_ValueError); - DEF_ERROR(FT_Err_Glyph_Too_Big, 0xA4, "glyph to big for hinting", PyExc_ValueError); + /* DEF_ERROR(FT_Err_Glyph_Too_Big, 0xA4, "glyph to big for hinting", PyExc_ValueError); */ /* BDF errors */ From 2fc39a00cc1e720499b33637ff91220b0107d064 Mon Sep 17 00:00:00 2001 From: Michael Droettboom Date: Thu, 29 Oct 2015 15:29:50 -0400 Subject: [PATCH 05/13] Fix test --- lib/freetypy/tests/test_face.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/freetypy/tests/test_face.py b/lib/freetypy/tests/test_face.py index 06b4601..1f58b56 100644 --- a/lib/freetypy/tests/test_face.py +++ b/lib/freetypy/tests/test_face.py @@ -102,7 +102,7 @@ def test_face_set_transform(): face.set_transform([[2, 0], [0, 2]], [20, 20]) face.set_char_size(12, 12, 300, 300) - glyph = face.load_char(65, ft.LOAD.RENDER) + glyph = face.load_char(65, 0) assert glyph.advance == (4352, 0) assert glyph.advance.x == 4352 From 18d4646d0e21275ab8afa9f2fbd5d77b5c0148ca Mon Sep 17 00:00:00 2001 From: Michael Droettboom Date: Thu, 29 Oct 2015 15:30:46 -0400 Subject: [PATCH 06/13] Add absolute import --- lib/freetypy/__init__.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/freetypy/__init__.py b/lib/freetypy/__init__.py index 030b4f3..517d940 100644 --- a/lib/freetypy/__init__.py +++ b/lib/freetypy/__init__.py @@ -31,6 +31,8 @@ # as representing official policies, either expressed or implied, of # the FreeBSD Project. +from __future__ import absolute_import + from . import codecs from ._freetypy import * From 69aea42bdf870997c5fb65a85c7f8d3adc640ef5 Mon Sep 17 00:00:00 2001 From: Michael Droettboom Date: Fri, 30 Oct 2015 11:41:27 -0400 Subject: [PATCH 07/13] Add __freetype_version__ --- src/freetypy.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/freetypy.c b/src/freetypy.c index dca3e24..8d0d6e8 100644 --- a/src/freetypy.c +++ b/src/freetypy.c @@ -121,6 +121,17 @@ static PyMethodDef module_methods[] = { INITERROR; } + { + FT_Int major, minor, patch; + char version_string[64]; + + FT_Library_Version(_ft2Library, &major, &minor, &patch); + sprintf(version_string, "%d.%d.%d", major, minor, patch); + if (PyModule_AddStringConstant(m, "__freetype_version__", version_string)) { + INITERROR; + } + } + if (setup_pyutil(m) || setup_constants(m) || setup_version(m) || From 2584a02d06af45fba5817582498df66ab108c204 Mon Sep 17 00:00:00 2001 From: Michael Droettboom Date: Fri, 30 Oct 2015 11:41:49 -0400 Subject: [PATCH 08/13] Remove embolden_xy --- src/outline.c | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/src/outline.c b/src/outline.c index 6afe74f..51dbada 100644 --- a/src/outline.c +++ b/src/outline.c @@ -549,29 +549,6 @@ Py_Outline_embolden(Py_Outline* self, PyObject* args, PyObject* kwds) }; -static PyObject* -Py_Outline_embolden_xy(Py_Outline* self, PyObject* args, PyObject* kwds) { - double xstrength; - double ystrength; - - const char* keywords[] = {"xstrength", "ystrength", NULL}; - - if (!PyArg_ParseTupleAndKeywords( - args, kwds, "d:embolden", (char **)keywords, - &xstrength, &ystrength)) { - return NULL; - } - - if (ftpy_exc( - FT_Outline_EmboldenXY(&self->x, - TO_F26DOT6(xstrength), TO_F26DOT6(ystrength)))) { - return NULL; - } - - Py_RETURN_NONE; -}; - - static PyObject* Py_Outline_get_bbox(Py_Outline* self, PyObject* args, PyObject* kwds) { @@ -730,7 +707,6 @@ static PyMethodDef Py_Outline_methods[] = { OUTLINE_METHOD_NOARGS(check), OUTLINE_METHOD(decompose), OUTLINE_METHOD(embolden), - OUTLINE_METHOD(embolden_xy), OUTLINE_METHOD_NOARGS(get_bbox), OUTLINE_METHOD_NOARGS(get_cbox), OUTLINE_METHOD_NOARGS(get_orientation), From 200685afa5c659b6d3475a243a7bd543f7cbb00e Mon Sep 17 00:00:00 2001 From: Michael Droettboom Date: Fri, 30 Oct 2015 11:43:24 -0400 Subject: [PATCH 09/13] Fix copy-and-paste error --- src/freetypy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/freetypy.c b/src/freetypy.c index 8d0d6e8..14e0065 100644 --- a/src/freetypy.c +++ b/src/freetypy.c @@ -125,7 +125,7 @@ static PyMethodDef module_methods[] = { FT_Int major, minor, patch; char version_string[64]; - FT_Library_Version(_ft2Library, &major, &minor, &patch); + FT_Library_Version(ft_library, &major, &minor, &patch); sprintf(version_string, "%d.%d.%d", major, minor, patch); if (PyModule_AddStringConstant(m, "__freetype_version__", version_string)) { INITERROR; From 5000b3e678b3f704625f5020c9eb96453bda6537 Mon Sep 17 00:00:00 2001 From: Michael Droettboom Date: Fri, 30 Oct 2015 13:32:18 -0400 Subject: [PATCH 10/13] Git info from tests --- lib/freetypy/tests/test_layout.py | 2 ++ lib/freetypy/tests/test_size.py | 1 + 2 files changed, 3 insertions(+) diff --git a/lib/freetypy/tests/test_layout.py b/lib/freetypy/tests/test_layout.py index 8898341..278877d 100644 --- a/lib/freetypy/tests/test_layout.py +++ b/lib/freetypy/tests/test_layout.py @@ -45,6 +45,8 @@ def test_layout(): assert layout.ink_bbox.ascent == 18.0 assert layout.ink_bbox.depth == -5.0 + print(ft.__freetype_version__) + print(tuple(layout.layout_bbox)) assert tuple(layout.layout_bbox) == (0.0, -6.0, 555.984375, 22.0) assert layout.glyph_indices.to_list() == [ diff --git a/lib/freetypy/tests/test_size.py b/lib/freetypy/tests/test_size.py index b5df96d..b4bd617 100644 --- a/lib/freetypy/tests/test_size.py +++ b/lib/freetypy/tests/test_size.py @@ -44,6 +44,7 @@ def test_size(): assert face.size.metrics.y_ppem == 50 assert face.size.metrics.x_scale == 1.5625 assert face.size.metrics.y_scale == 1.5625 + print(face.size.metrics.ascender) assert face.size.metrics.ascender == 46.0 assert face.size.metrics.descender == -12.0 assert face.size.metrics.max_advance == 67.0 From 52f4722bbfbafd6af84f9c4d09f151453831d930 Mon Sep 17 00:00:00 2001 From: Michael Droettboom Date: Fri, 30 Oct 2015 14:05:43 -0400 Subject: [PATCH 11/13] Import __freetype_version__ --- lib/freetypy/__init__.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/freetypy/__init__.py b/lib/freetypy/__init__.py index 517d940..1e1807c 100644 --- a/lib/freetypy/__init__.py +++ b/lib/freetypy/__init__.py @@ -37,4 +37,6 @@ from ._freetypy import * +from ._freetypy import __freetype_version__ + from . import util From 0200cdd33fed1b4f63adbbfb23cede7b3c036dca Mon Sep 17 00:00:00 2001 From: Michael Droettboom Date: Fri, 30 Oct 2015 14:33:42 -0400 Subject: [PATCH 12/13] Loosen tests --- lib/freetypy/tests/test_layout.py | 4 +--- lib/freetypy/tests/test_size.py | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/freetypy/tests/test_layout.py b/lib/freetypy/tests/test_layout.py index 278877d..f07fe70 100644 --- a/lib/freetypy/tests/test_layout.py +++ b/lib/freetypy/tests/test_layout.py @@ -45,9 +45,7 @@ def test_layout(): assert layout.ink_bbox.ascent == 18.0 assert layout.ink_bbox.depth == -5.0 - print(ft.__freetype_version__) - print(tuple(layout.layout_bbox)) - assert tuple(layout.layout_bbox) == (0.0, -6.0, 555.984375, 22.0) + assert tuple(layout.layout_bbox)[:3] == (0.0, -6.0, 555.984375) assert layout.glyph_indices.to_list() == [ 55, 75, 72, 3, 84, 88, 76, 70, 78, 3, 69, 85, 82, 90, 81, 3, diff --git a/lib/freetypy/tests/test_size.py b/lib/freetypy/tests/test_size.py index b4bd617..6832708 100644 --- a/lib/freetypy/tests/test_size.py +++ b/lib/freetypy/tests/test_size.py @@ -44,7 +44,6 @@ def test_size(): assert face.size.metrics.y_ppem == 50 assert face.size.metrics.x_scale == 1.5625 assert face.size.metrics.y_scale == 1.5625 - print(face.size.metrics.ascender) - assert face.size.metrics.ascender == 46.0 + assert 46.0 <= face.size.metrics.ascender <= 47.0 assert face.size.metrics.descender == -12.0 assert face.size.metrics.max_advance == 67.0 From b7ba3140fb4284d2630c755927074dce2b7453dc Mon Sep 17 00:00:00 2001 From: Michael Droettboom Date: Fri, 30 Oct 2015 14:47:20 -0400 Subject: [PATCH 13/13] Fix for Python 3.5 --- src/face.c | 74 +++++++++++++++++++++++++++++++++--------------------- 1 file changed, 46 insertions(+), 28 deletions(-) diff --git a/src/face.c b/src/face.c index 093c767..994b7a3 100644 --- a/src/face.c +++ b/src/face.c @@ -130,6 +130,7 @@ static int _py_file_to_open_args( py_file_def *stream_info = NULL; long file_size; void *new_memory; + PyObject *read_string = NULL; int result = -1; @@ -169,40 +170,57 @@ static int _py_file_to_open_args( open_args->flags = FT_OPEN_STREAM; open_args->stream = &face->stream; - } else { - if (PyObject_HasAttrString(py_file_arg, "read") && - (data = PyObject_CallMethod(py_file_arg, "read", ""))) { - if (PyBytes_AsStringAndSize(data, &data_ptr, &data_len)) { - goto exit; - } - - if (face->mem) { - free(face->mem); - } - face->mem = PyMem_Malloc(face->mem_size + data_len); - if (face->mem == NULL) { - goto exit; - } - new_memory = face->mem + face->mem_size; - face->mem_size += data_len; - - memcpy(new_memory, data_ptr, data_len); - open_args->flags = FT_OPEN_MEMORY; - open_args->memory_base = new_memory; - open_args->memory_size = data_len; - open_args->stream = NULL; - } else { - PyErr_SetString( - PyExc_TypeError, - "First argument must be a path or file object reading bytes"); + + result = 0; + goto exit; + } + + PyErr_Clear(); + + read_string = PyUnicode_FromString("read"); + if (read_string == NULL) { + goto exit; + } + + if (PyObject_HasAttrString(py_file_arg, "read")) { + data = PyObject_CallMethodObjArgs(py_file_arg, read_string, NULL); + if (data == NULL) { goto exit; } - } - result = 0; + if (PyBytes_AsStringAndSize(data, &data_ptr, &data_len)) { + goto exit; + } + + if (face->mem) { + free(face->mem); + } + face->mem = PyMem_Malloc(face->mem_size + data_len); + if (face->mem == NULL) { + goto exit; + } + new_memory = face->mem + face->mem_size; + face->mem_size += data_len; + + memcpy(new_memory, data_ptr, data_len); + open_args->flags = FT_OPEN_MEMORY; + open_args->memory_base = new_memory; + open_args->memory_size = data_len; + open_args->stream = NULL; + + result = 0; + goto exit; + } exit: + if (result && !PyErr_Occurred()) { + PyErr_SetString( + PyExc_TypeError, + "First argument must be a path or file object reading bytes"); + } + + Py_XDECREF(read_string); Py_XDECREF(py_file); Py_XDECREF(data);