Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Compiler warnings #2

Merged
merged 1 commit into from
Oct 29, 2015
Merged

Compiler warnings #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/bitmap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ Py_Bitmap_new(PyTypeObject *type, PyObject *args, PyObject *kwds)


static int
Py_Bitmap_init()
Py_Bitmap_init(void)
{
PyErr_SetString(
PyExc_RuntimeError,
Expand Down
14 changes: 2 additions & 12 deletions src/freetypy.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,16 +66,11 @@ FT_Library get_ft_library()
return ft_library;
}


static PyMethodDef module_methods[] = {
{NULL} /* Sentinel */
};


struct freetypy_module_state {
int dummy;
};

/* TODO: Hide all exported symbols in the shared library except this one */

#if PY3K
Expand All @@ -85,18 +80,16 @@ struct freetypy_module_state {
FT_Done_FreeType(ft_library);
}

#define GET_MODULE_STATE(m) ((struct freetypy_module_state*)PyModule_GetState((m)))

static struct PyModuleDef moduledef = {
PyModuleDef_HEAD_INIT,
"_freetypy",
NULL,
sizeof(struct freetypy_module_state),
0,
module_methods,
NULL,
NULL,
NULL,
freetypy_module_dealloc
(freefunc)freetypy_module_dealloc
};

#define INITERROR return NULL
Expand All @@ -106,9 +99,6 @@ struct freetypy_module_state {
#else
#define INITERROR return

#define GET_MODULE_STATE(m) (&_state)
static struct freetypy_module_state _state;

PyMODINIT_FUNC
init_freetypy(void)
#endif
Expand Down
2 changes: 1 addition & 1 deletion src/freetypy.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ either expressed or implied, of the FreeBSD Project.
#include FT_FREETYPE_H


FT_Library get_ft_library();
FT_Library get_ft_library(void);


#include "freetypy_error.h"
Expand Down
240 changes: 131 additions & 109 deletions src/freetypy_error.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,33 +38,16 @@ typedef struct
} error_def;


static error_def errors[83];
static const unsigned int nerrors = 83;


static int error_finder(const void *key, const void *member)
{
FT_Error err = *((FT_Error *)key);
error_def *entry = (error_def *)member;

if (entry->code == err) {
return 0;
} else if (entry->code < err) {
return 1;
} else {
return -1;
}
}
static error_def errors[256];


int ftpy_exc(FT_Error error)
{
error_def *entry;

if (error) {
entry = (error_def *)bsearch(
&error, errors, nerrors, sizeof(error_def), error_finder);
if (entry == NULL) {
entry = &errors[error];
if (entry->code == 0) {
PyErr_Format(
PyExc_RuntimeError, "unknown freetype exception %x", error);
return 1;
Expand All @@ -77,95 +60,134 @@ int ftpy_exc(FT_Error error)
return 0;
}

#define DEF_ERROR(c, m, x) \
errors[i].code = c; errors[i].msg = m; errors[i].cls = x; ++i;

int setup_errors() {
unsigned int i = 0;

DEF_ERROR(0x00, "no error", PyExc_Exception);
DEF_ERROR(0x01, "cannot open resource", PyExc_IOError);
DEF_ERROR(0x02, "unknown file format", PyExc_ValueError);
DEF_ERROR(0x03, "broken file", PyExc_IOError);
DEF_ERROR(0x04, "invalid FreeType version", PyExc_RuntimeError);
DEF_ERROR(0x05, "module version is too low", PyExc_RuntimeError);
DEF_ERROR(0x06, "invalid argument", PyExc_ValueError);
DEF_ERROR(0x07, "unimplemented feature", PyExc_NotImplementedError);
DEF_ERROR(0x08, "broken table", PyExc_ValueError);
DEF_ERROR(0x09, "broken offset within table", PyExc_ValueError);
DEF_ERROR(0x10, "invalid glyph index", PyExc_IndexError);
DEF_ERROR(0x11, "invalid character code", PyExc_ValueError);
DEF_ERROR(0x12, "unsupported glyph image format", PyExc_ValueError);
DEF_ERROR(0x13, "cannot render this glyph format", PyExc_NotImplementedError);
DEF_ERROR(0x14, "invalid outline", PyExc_ValueError);
DEF_ERROR(0x15, "invalid composite glyph", PyExc_ValueError);
DEF_ERROR(0x16, "too many hints", PyExc_ValueError);
DEF_ERROR(0x17, "invalid pixel size", PyExc_ValueError);
DEF_ERROR(0x20, "invalid object handle", PyExc_ValueError);
DEF_ERROR(0x21, "invalid library handle", PyExc_ValueError);
DEF_ERROR(0x22, "invalid module handle", PyExc_ValueError);
DEF_ERROR(0x23, "invalid face handle", PyExc_ValueError);
DEF_ERROR(0x24, "invalid size handle", PyExc_ValueError);
DEF_ERROR(0x25, "invalid glyph slot handle", PyExc_ValueError);
DEF_ERROR(0x26, "invalid charmap handle", PyExc_ValueError);
DEF_ERROR(0x27, "invalid cache manager handle", PyExc_ValueError);
DEF_ERROR(0x28, "invalid stream handle", PyExc_ValueError);
DEF_ERROR(0x30, "too many modules", PyExc_MemoryError);
DEF_ERROR(0x31, "too many extensions", PyExc_MemoryError);
DEF_ERROR(0x40, "out of memory", PyExc_MemoryError);
DEF_ERROR(0x41, "unlisted object", PyExc_KeyError);
DEF_ERROR(0x51, "cannot open stream", PyExc_IOError);
DEF_ERROR(0x52, "invalid stream seek", PyExc_IOError);
DEF_ERROR(0x53, "invalid stream skip", PyExc_IOError);
DEF_ERROR(0x54, "invalid stream read", PyExc_IOError);
DEF_ERROR(0x55, "invalid stream operation", PyExc_IOError);
DEF_ERROR(0x56, "invalid frame operation", PyExc_IOError);
DEF_ERROR(0x57, "nested frame access", PyExc_IOError);
DEF_ERROR(0x58, "invalid frame read", PyExc_IOError);
DEF_ERROR(0x60, "raster uninitialized", PyExc_ValueError);
DEF_ERROR(0x61, "raster corrupted", PyExc_ValueError);
DEF_ERROR(0x62, "raster overflow", PyExc_OverflowError);
DEF_ERROR(0x63, "negative height while rastering", PyExc_ValueError);
DEF_ERROR(0x70, "too many registered caches", PyExc_MemoryError);
DEF_ERROR(0x80, "invalid opcode", PyExc_ValueError);
DEF_ERROR(0x81, "too few arguments", PyExc_TypeError);
DEF_ERROR(0x82, "stack overflow", PyExc_RuntimeError);
DEF_ERROR(0x83, "code overflow", PyExc_OverflowError);
DEF_ERROR(0x84, "bad argument", PyExc_TypeError);
DEF_ERROR(0x85, "division by zero", PyExc_ZeroDivisionError);
DEF_ERROR(0x86, "invalid reference", PyExc_ValueError);
DEF_ERROR(0x87, "found debug opcode", PyExc_SyntaxError);
DEF_ERROR(0x88, "found ENDF opcode in execution stream", PyExc_SyntaxError);
DEF_ERROR(0x89, "nested DEFS", PyExc_SyntaxError);
DEF_ERROR(0x8A, "invalid code range", PyExc_ValueError);
DEF_ERROR(0x8B, "execution context too long", PyExc_RuntimeError);
DEF_ERROR(0x8C, "too many function definitions", PyExc_MemoryError);
DEF_ERROR(0x8D, "too many instruction definitions", PyExc_MemoryError);
DEF_ERROR(0x8E, "SFNT font table missing", PyExc_AttributeError);
DEF_ERROR(0x8F, "horizontal header (hhea) table missing", PyExc_AttributeError);
DEF_ERROR(0x90, "locations (loca) table missing", PyExc_AttributeError);
DEF_ERROR(0x91, "name table missing", PyExc_AttributeError);
DEF_ERROR(0x92, "character map (cmap) table missing", PyExc_AttributeError);
DEF_ERROR(0x93, "horizontal metrics (hmtx) table missing", PyExc_AttributeError);
DEF_ERROR(0x94, "PostScript (post) table missing", PyExc_AttributeError);
DEF_ERROR(0x95, "invalid horizontal metrics", PyExc_ValueError);
DEF_ERROR(0x96, "invalid character map (cmap) format", PyExc_ValueError);
DEF_ERROR(0x97, "invalid ppem value", PyExc_ValueError);
DEF_ERROR(0x98, "invalid vertical metrics", PyExc_ValueError);
DEF_ERROR(0x99, "could not find context", PyExc_AttributeError);
DEF_ERROR(0x9A, "invalid PostScript (post, table format", PyExc_ValueError);
DEF_ERROR(0x9B, "invalid PostScript (post, table", PyExc_ValueError);
DEF_ERROR(0xA0, "opcode syntax error", PyExc_SyntaxError);
DEF_ERROR(0xA1, "argument stack underflow", PyExc_RuntimeError);
DEF_ERROR(0xA2, "ignore", PyExc_Exception);
DEF_ERROR(0xB0, "`STARTFONT` field missing", PyExc_KeyError);
DEF_ERROR(0xB1, "`FONT` field missing", PyExc_KeyError);
DEF_ERROR(0xB2, "`SIZE` field missing", PyExc_KeyError);
DEF_ERROR(0xB3, "`CHARS` field missing", PyExc_KeyError);
DEF_ERROR(0xB4, "`STARTCHAR` field missing", PyExc_KeyError);
DEF_ERROR(0xB5, "`ENCODING` field missing", PyExc_KeyError);
DEF_ERROR(0xB6, "`BBX` field missing", PyExc_KeyError);
DEF_ERROR(0xB7, "`BBX` too big", PyExc_MemoryError);
#define DEF_ERROR(c, ignored, m, x) \
errors[c].code = c; errors[c].msg = m; errors[c].cls = x;

int setup_errors(void) {
memset(errors, 0, sizeof(error_def) * 256);

DEF_ERROR(FT_Err_Ok, 0x00, "no error", PyExc_Exception);

DEF_ERROR(FT_Err_Cannot_Open_Resource, 0x01, "cannot open resource", PyExc_IOError);
DEF_ERROR(FT_Err_Unknown_File_Format, 0x02, "unknown file format", PyExc_ValueError);
DEF_ERROR(FT_Err_Invalid_File_Format, 0x03, "broken file", PyExc_IOError);
DEF_ERROR(FT_Err_Invalid_Version, 0x04, "invalid FreeType version", PyExc_RuntimeError);
DEF_ERROR(FT_Err_Lower_Module_Version, 0x05, "module version is too low", PyExc_RuntimeError);
DEF_ERROR(FT_Err_Invalid_Argument, 0x06, "invalid argument", PyExc_ValueError);
DEF_ERROR(FT_Err_Unimplemented_Feature, 0x07, "unimplemented feature", PyExc_NotImplementedError);
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);

/* glyph/character errors */

DEF_ERROR(FT_Err_Invalid_Glyph_Index, 0x10, "invalid glyph index", PyExc_IndexError);
DEF_ERROR(FT_Err_Invalid_Character_Code, 0x11, "invalid character code", PyExc_ValueError);
DEF_ERROR(FT_Err_Invalid_Glyph_Format, 0x12, "unsupported glyph image format", PyExc_ValueError);
DEF_ERROR(FT_Err_Cannot_Render_Glyph, 0x13, "cannot render this glyph format", PyExc_RuntimeError);
DEF_ERROR(FT_Err_Invalid_Outline, 0x14, "invalid outline", PyExc_ValueError);
DEF_ERROR(FT_Err_Invalid_Composite, 0x15, "invalid composite glyph", PyExc_ValueError);
DEF_ERROR(FT_Err_Too_Many_Hints, 0x16, "too many hints", PyExc_ValueError);
DEF_ERROR(FT_Err_Invalid_Pixel_Size, 0x17, "invalid pixel size", PyExc_ValueError);

/* handle errors */

DEF_ERROR(FT_Err_Invalid_Handle, 0x20, "invalid object handle", PyExc_ValueError);
DEF_ERROR(FT_Err_Invalid_Library_Handle, 0x21, "invalid library handle", PyExc_ValueError);
DEF_ERROR(FT_Err_Invalid_Driver_Handle, 0x22, "invalid module handle", PyExc_ValueError);
DEF_ERROR(FT_Err_Invalid_Face_Handle, 0x23, "invalid face handle", PyExc_ValueError);
DEF_ERROR(FT_Err_Invalid_Size_Handle, 0x24, "invalid size handle", PyExc_ValueError);
DEF_ERROR(FT_Err_Invalid_Slot_Handle, 0x25, "invalid glyph slot handle", PyExc_ValueError);
DEF_ERROR(FT_Err_Invalid_CharMap_Handle, 0x26, "invalid charmap handle", PyExc_ValueError);
DEF_ERROR(FT_Err_Invalid_Cache_Handle, 0x27, "invalid cache manager handle", PyExc_ValueError);
DEF_ERROR(FT_Err_Invalid_Stream_Handle, 0x28, "invalid stream handle", PyExc_ValueError);

/* driver errors */

DEF_ERROR(FT_Err_Too_Many_Drivers, 0x30, "too many modules", PyExc_ValueError);
DEF_ERROR(FT_Err_Too_Many_Extensions, 0x31, "too many extensions", PyExc_ValueError);

/* memory errors */

DEF_ERROR(FT_Err_Out_Of_Memory, 0x40, "out of memory", PyExc_MemoryError);
DEF_ERROR(FT_Err_Unlisted_Object, 0x41, "unlisted object", PyExc_MemoryError);

/* stream errors */

DEF_ERROR(FT_Err_Cannot_Open_Stream, 0x51, "cannot open stream", PyExc_IOError);
DEF_ERROR(FT_Err_Invalid_Stream_Seek, 0x52, "invalid stream seek", PyExc_IOError);
DEF_ERROR(FT_Err_Invalid_Stream_Skip, 0x53, "invalid stream skip", PyExc_IOError);
DEF_ERROR(FT_Err_Invalid_Stream_Read, 0x54, "invalid stream read", PyExc_IOError);
DEF_ERROR(FT_Err_Invalid_Stream_Operation, 0x55, "invalid stream operation", PyExc_IOError);
DEF_ERROR(FT_Err_Invalid_Frame_Operation, 0x56, "invalid frame operation", PyExc_IOError);
DEF_ERROR(FT_Err_Nested_Frame_Access, 0x57, "nested frame access", PyExc_IOError);
DEF_ERROR(FT_Err_Invalid_Frame_Read, 0x58, "invalid frame read", PyExc_IOError);

/* raster errors */

DEF_ERROR(FT_Err_Raster_Uninitialized, 0x60, "raster uninitialized", PyExc_ValueError);
DEF_ERROR(FT_Err_Raster_Corrupted, 0x61, "raster corrupted", PyExc_ValueError);
DEF_ERROR(FT_Err_Raster_Overflow, 0x62, "raster overflow", PyExc_ValueError);
DEF_ERROR(FT_Err_Raster_Negative_Height, 0x63, "negative height while rastering", PyExc_ValueError);

/* cache errors */

DEF_ERROR(FT_Err_Too_Many_Caches, 0x70, "too many registered caches", PyExc_MemoryError);

/* TrueType and SFNT errors */

DEF_ERROR(FT_Err_Invalid_Opcode, 0x80, "invalid opcode", PyExc_ValueError);
DEF_ERROR(FT_Err_Too_Few_Arguments, 0x81, "too few arguments", PyExc_ValueError);
DEF_ERROR(FT_Err_Stack_Overflow, 0x82, "stack overflow", PyExc_ValueError);
DEF_ERROR(FT_Err_Code_Overflow, 0x83, "code overflow", PyExc_ValueError);
DEF_ERROR(FT_Err_Bad_Argument, 0x84, "bad argument", PyExc_ValueError);
DEF_ERROR(FT_Err_Divide_By_Zero, 0x85, "division by zero", PyExc_ValueError);
DEF_ERROR(FT_Err_Invalid_Reference, 0x86, "invalid reference", PyExc_ValueError);
DEF_ERROR(FT_Err_Debug_OpCode, 0x87, "found debug opcode", PyExc_ValueError);
DEF_ERROR(FT_Err_ENDF_In_Exec_Stream, 0x88, "found ENDF opcode in execution stream", PyExc_ValueError);
DEF_ERROR(FT_Err_Nested_DEFS, 0x89, "nested DEFS", PyExc_ValueError);
DEF_ERROR(FT_Err_Invalid_CodeRange, 0x8A, "invalid code range", PyExc_ValueError);
DEF_ERROR(FT_Err_Execution_Too_Long, 0x8B, "execution context too long", PyExc_ValueError);
DEF_ERROR(FT_Err_Too_Many_Function_Defs, 0x8C, "too many function definitions", PyExc_ValueError);
DEF_ERROR(FT_Err_Too_Many_Instruction_Defs, 0x8D, "too many instruction definitions", PyExc_ValueError);
DEF_ERROR(FT_Err_Table_Missing, 0x8E, "SFNT font table missing", PyExc_ValueError);
DEF_ERROR(FT_Err_Horiz_Header_Missing, 0x8F, "horizontal header (FT_Err_hhea) table missing", PyExc_ValueError);
DEF_ERROR(FT_Err_Locations_Missing, 0x90, "locations (FT_Err_loca) table missing", PyExc_ValueError);
DEF_ERROR(FT_Err_Name_Table_Missing, 0x91, "name table missing", PyExc_ValueError);
DEF_ERROR(FT_Err_CMap_Table_Missing, 0x92, "character map (FT_Err_cmap) table missing", PyExc_ValueError);
DEF_ERROR(FT_Err_Hmtx_Table_Missing, 0x93, "horizontal metrics (FT_Err_hmtx) table missing", PyExc_ValueError);
DEF_ERROR(FT_Err_Post_Table_Missing, 0x94, "PostScript (FT_Err_post) table missing", PyExc_ValueError);
DEF_ERROR(FT_Err_Invalid_Horiz_Metrics, 0x95, "invalid horizontal metrics", PyExc_ValueError);
DEF_ERROR(FT_Err_Invalid_CharMap_Format, 0x96, "invalid character map (FT_Err_cmap) format", PyExc_ValueError);
DEF_ERROR(FT_Err_Invalid_PPem, 0x97, "invalid ppem value", PyExc_ValueError);
DEF_ERROR(FT_Err_Invalid_Vert_Metrics, 0x98, "invalid vertical metrics", PyExc_ValueError);
DEF_ERROR(FT_Err_Could_Not_Find_Context, 0x99, "could not find context", PyExc_ValueError);
DEF_ERROR(FT_Err_Invalid_Post_Table_Format, 0x9A, "invalid PostScript (FT_Err_post) table format", PyExc_ValueError);
DEF_ERROR(FT_Err_Invalid_Post_Table, 0x9B, "invalid PostScript (FT_Err_post) table", PyExc_ValueError);

/* CFF, CID, and Type 1 errors */

DEF_ERROR(FT_Err_Syntax_Error, 0xA0, "opcode syntax error", PyExc_ValueError);
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);

/* BDF errors */

DEF_ERROR(FT_Err_Missing_Startfont_Field, 0xB0, "`STARTFONT' field missing", PyExc_ValueError);
DEF_ERROR(FT_Err_Missing_Font_Field, 0xB1, "`FONT' field missing", PyExc_ValueError);
DEF_ERROR(FT_Err_Missing_Size_Field, 0xB2, "`SIZE' field missing", PyExc_ValueError);
DEF_ERROR(FT_Err_Missing_Fontboundingbox_Field, 0xB3, "`FONTBOUNDINGBOX' field missing", PyExc_ValueError);
DEF_ERROR(FT_Err_Missing_Chars_Field, 0xB4, "`CHARS' field missing", PyExc_ValueError);
DEF_ERROR(FT_Err_Missing_Startchar_Field, 0xB5, "`STARTCHAR' field missing", PyExc_ValueError);
DEF_ERROR(FT_Err_Missing_Encoding_Field, 0xB6, "`ENCODING' field missing", PyExc_ValueError);
DEF_ERROR(FT_Err_Missing_Bbx_Field, 0xB7, "`BBX' field missing", PyExc_ValueError);
DEF_ERROR(FT_Err_Bbx_Too_Big, 0xB8, "`BBX' too big", PyExc_ValueError);
DEF_ERROR(FT_Err_Corrupted_Font_Header, 0xB9, "Font header corrupted or missing fields", PyExc_ValueError);
DEF_ERROR(FT_Err_Corrupted_Font_Glyphs, 0xBA, "Font glyphs corrupted or missing !fields", PyExc_ValueError);

return 0;
}
2 changes: 1 addition & 1 deletion src/freetypy_error.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ either expressed or implied, of the FreeBSD Project.

int ftpy_exc(FT_Error error);

int setup_errors();
int setup_errors(void);

#endif
4 changes: 2 additions & 2 deletions src/glyph.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ static PyObject *metrics_get(Py_Glyph *self, PyObject *closure)
static PyObject *linear_hori_advance_get(Py_Glyph *self, PyObject *closure)
{
if (self->load_flags & FT_LOAD_LINEAR_DESIGN) {
return PyInt_FromLong(self->x->linearHoriAdvance);
return PyLong_FromLong(self->x->linearHoriAdvance);
} else {
return ftpy_PyFloat_FromFT_FIXED(self->x->linearHoriAdvance);
}
Expand All @@ -153,7 +153,7 @@ static PyObject *linear_hori_advance_get(Py_Glyph *self, PyObject *closure)
static PyObject *linear_vert_advance_get(Py_Glyph *self, PyObject *closure)
{
if (self->load_flags & FT_LOAD_LINEAR_DESIGN) {
return PyInt_FromLong(self->x->linearVertAdvance);
return PyLong_FromLong(self->x->linearVertAdvance);
} else {
return ftpy_PyFloat_FromFT_FIXED(self->x->linearVertAdvance);
}
Expand Down
10 changes: 9 additions & 1 deletion src/tt_pclt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,15 @@ static PyObject *type_face_get(Py_TT_Pclt *self, PyObject *closure)

static PyObject *character_complement_get(Py_TT_Pclt *self, PyObject *closure)
{
return PyLong_FromUnsignedLong(*((long unsigned *)&self->x->CharacterComplement));
unsigned long result;
int i;

result = 0;
for (i = 0; i < 8; ++i) {
result |= (self->x->CharacterComplement[i] << (CHAR_BIT * i));
}

return PyLong_FromUnsignedLong(result);
}


Expand Down