Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Use exact types for Py_BuildValue.#7853

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.

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

Already on GitHub?Sign in to your account

Merged
efiring merged 2 commits intomatplotlib:masterfromQuLogic:Py_BuildValue-types
Feb 25, 2018
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
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
4 changes: 2 additions & 2 deletionssrc/ft2font.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,8 +18,8 @@ extern "C" {
/*
By definition, FT_FIXED as 2 16bit values stored in a single long.
*/
#define FIXED_MAJOR(val) (long)((val &0xffff000) >> 16)
#define FIXED_MINOR(val) (long)(val & 0xffff)
#define FIXED_MAJOR(val) (signed short)((val &0xffff0000) >> 16)
#define FIXED_MINOR(val) (unsigned short)(val & 0xffff)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

Should also cause a type change in the version and fontrevision fields of converting TT_Header no?

Copy link
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

As inhere?

anntzer reacted with thumbs up emoji

// the FreeType string rendered into a width, height buffer
class FT2Image
Expand Down
113 changes: 58 additions & 55 deletionssrc/ft2font_wrapper.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -276,7 +276,7 @@ static void PyGlyph_dealloc(PyGlyph *self)
static PyObject *PyGlyph_get_bbox(PyGlyph *self, void *closure)
{
return Py_BuildValue(
"iiii", self->bbox.xMin, self->bbox.yMin, self->bbox.xMax, self->bbox.yMax);
"llll", self->bbox.xMin, self->bbox.yMin, self->bbox.xMax, self->bbox.yMax);
}

static PyTypeObject *PyGlyph_init_type(PyObject *m, PyTypeObject *type)
Expand DownExpand Up@@ -1025,7 +1025,7 @@ static PyObject *PyFT2Font_get_sfnt(PyFT2Font *self, PyObject *args, PyObject *k
}

PyObject *key = Py_BuildValue(
"iiii", sfnt.platform_id, sfnt.encoding_id, sfnt.language_id, sfnt.name_id);
"HHHH", sfnt.platform_id, sfnt.encoding_id, sfnt.language_id, sfnt.name_id);
if (key == NULL) {
Py_DECREF(names);
return NULL;
Expand DownExpand Up@@ -1089,7 +1089,7 @@ static PyObject *PyFT2Font_get_ps_font_info(PyFT2Font *self, PyObject *args, PyO
return NULL;
}

return Py_BuildValue("sssssliii",
return Py_BuildValue("ssssslbhH",
fontinfo.version ? fontinfo.version : "",
fontinfo.notice ? fontinfo.notice : "",
fontinfo.full_name ? fontinfo.full_name : "",
Expand DownExpand Up@@ -1134,8 +1134,8 @@ static PyObject *PyFT2Font_get_sfnt_table(PyFT2Font *self, PyObject *args, PyObj
switch (tag) {
case 0: {
char head_dict[] =
"{s:(h,h), s:(h,h), s:l, s:l, s:i, s:i,"
"s:(l,l), s:(l,l), s:h, s:h, s:h, s:h, s:i, s:i, s:h, s:h, s:h}";
"{s:(h,H), s:(h,H), s:l, s:l, s:H, s:H,"
"s:(l,l), s:(l,l), s:h, s:h, s:h, s:h, s:H, s:H, s:h, s:h, s:h}";
TT_Header *t = (TT_Header *)table;
return Py_BuildValue(head_dict,
"version",
Expand All@@ -1149,9 +1149,9 @@ static PyObject *PyFT2Font_get_sfnt_table(PyFT2Font *self, PyObject *args, PyObj
"magicNumber",
t->Magic_Number,
"flags",
(unsigned)t->Flags,
t->Flags,
"unitsPerEm",
(unsigned)t->Units_Per_EM,
t->Units_Per_EM,
"created",
t->Created[0],
t->Created[1],
Expand All@@ -1167,9 +1167,9 @@ static PyObject *PyFT2Font_get_sfnt_table(PyFT2Font *self, PyObject *args, PyObj
"yMax",
t->yMax,
"macStyle",
(unsigned)t->Mac_Style,
t->Mac_Style,
"lowestRecPPEM",
(unsigned)t->Lowest_Rec_PPEM,
t->Lowest_Rec_PPEM,
"fontDirectionHint",
t->Font_Direction,
"indexToLocFormat",
Expand All@@ -1179,64 +1179,64 @@ static PyObject *PyFT2Font_get_sfnt_table(PyFT2Font *self, PyObject *args, PyObj
}
case 1: {
char maxp_dict[] =
"{s:(h,h), s:i, s:i, s:i, s:i, s:i, s:i,"
"s:i, s:i, s:i, s:i, s:i, s:i, s:i, s:i}";
"{s:(h,H), s:H, s:H, s:H, s:H, s:H, s:H,"
"s:H, s:H, s:H, s:H, s:H, s:H, s:H, s:H}";
TT_MaxProfile *t = (TT_MaxProfile *)table;
return Py_BuildValue(maxp_dict,
"version",
FIXED_MAJOR(t->version),
FIXED_MINOR(t->version),
"numGlyphs",
(unsigned)t->numGlyphs,
t->numGlyphs,
"maxPoints",
(unsigned)t->maxPoints,
t->maxPoints,
"maxContours",
(unsigned)t->maxContours,
t->maxContours,
"maxComponentPoints",
(unsigned)t->maxCompositePoints,
t->maxCompositePoints,
"maxComponentContours",
(unsigned)t->maxCompositeContours,
t->maxCompositeContours,
"maxZones",
(unsigned)t->maxZones,
t->maxZones,
"maxTwilightPoints",
(unsigned)t->maxTwilightPoints,
t->maxTwilightPoints,
"maxStorage",
(unsigned)t->maxStorage,
t->maxStorage,
"maxFunctionDefs",
(unsigned)t->maxFunctionDefs,
t->maxFunctionDefs,
"maxInstructionDefs",
(unsigned)t->maxInstructionDefs,
t->maxInstructionDefs,
"maxStackElements",
(unsigned)t->maxStackElements,
t->maxStackElements,
"maxSizeOfInstructions",
(unsigned)t->maxSizeOfInstructions,
t->maxSizeOfInstructions,
"maxComponentElements",
(unsigned)t->maxComponentElements,
t->maxComponentElements,
"maxComponentDepth",
(unsigned)t->maxComponentDepth);
t->maxComponentDepth);
}
case 2: {
#if PY3K
char os_2_dict[] =
"{s:h, s:h, s:h, s:h, s:h, s:h, s:h, s:h,"
"s:h, s:h, s:h, s:h, s:h, s:h, s:h, s:h, s:y#, s:(llll),"
"s:y#, s:h, s:h, s:h}";
"{s:H, s:h, s:H, s:H, s:H, s:h, s:h, s:h,"
"s:h, s:h, s:h, s:h, s:h, s:h, s:h, s:h, s:y#, s:(kkkk),"
"s:y#, s:H, s:H, s:H}";
#else
char os_2_dict[] =
"{s:h, s:h, s:h, s:h, s:h, s:h, s:h, s:h,"
"s:h, s:h, s:h, s:h, s:h, s:h, s:h, s:h, s:s#, s:(llll),"
"s:s#, s:h, s:h, s:h}";
"{s:H, s:h, s:H, s:H, s:H, s:h, s:h, s:h,"
"s:h, s:h, s:h, s:h, s:h, s:h, s:h, s:h, s:s#, s:(kkkk),"
"s:s#, s:H, s:H, s:H}";
#endif
TT_OS2 *t = (TT_OS2 *)table;
return Py_BuildValue(os_2_dict,
"version",
(unsigned)t->version,
t->version,
"xAvgCharWidth",
t->xAvgCharWidth,
"usWeightClass",
(unsigned)t->usWeightClass,
t->usWeightClass,
"usWidthClass",
(unsigned)t->usWidthClass,
t->usWidthClass,
"fsType",
t->fsType,
"ySubscriptXSize",
Expand DownExpand Up@@ -1265,24 +1265,24 @@ static PyObject *PyFT2Font_get_sfnt_table(PyFT2Font *self, PyObject *args, PyObj
t->panose,
10,
"ulCharRange",
(unsigned long)t->ulUnicodeRange1,
(unsigned long)t->ulUnicodeRange2,
(unsigned long)t->ulUnicodeRange3,
(unsigned long)t->ulUnicodeRange4,
t->ulUnicodeRange1,
t->ulUnicodeRange2,
t->ulUnicodeRange3,
t->ulUnicodeRange4,
"achVendID",
t->achVendID,
4,
"fsSelection",
(unsigned)t->fsSelection,
t->fsSelection,
"fsFirstCharIndex",
(unsigned)t->usFirstCharIndex,
t->usFirstCharIndex,
"fsLastCharIndex",
(unsigned)t->usLastCharIndex);
t->usLastCharIndex);
}
case 3: {
char hhea_dict[] =
"{s:(h,h), s:h, s:h, s:h, s:i, s:h, s:h, s:h,"
"s:h, s:h, s:h, s:h, s:i}";
"{s:(h,H), s:h, s:h, s:h, s:H, s:h, s:h, s:h,"
"s:h, s:h, s:h, s:h, s:H}";
TT_HoriHeader *t = (TT_HoriHeader *)table;
return Py_BuildValue(hhea_dict,
"version",
Expand All@@ -1295,7 +1295,7 @@ static PyObject *PyFT2Font_get_sfnt_table(PyFT2Font *self, PyObject *args, PyObj
"lineGap",
t->Line_Gap,
"advanceWidthMax",
(unsigned)t->advance_Width_Max,
t->advance_Width_Max,
"minLeftBearing",
t->min_Left_Side_Bearing,
"minRightBearing",
Expand All@@ -1311,12 +1311,12 @@ static PyObject *PyFT2Font_get_sfnt_table(PyFT2Font *self, PyObject *args, PyObj
"metricDataFormat",
t->metric_Data_Format,
"numOfLongHorMetrics",
(unsigned)t->number_Of_HMetrics);
t->number_Of_HMetrics);
}
case 4: {
char vhea_dict[] =
"{s:(h,h), s:h, s:h, s:h, s:i, s:h, s:h, s:h,"
"s:h, s:h, s:h, s:h, s:i}";
"{s:(h,H), s:h, s:h, s:h, s:H, s:h, s:h, s:h,"
"s:h, s:h, s:h, s:h, s:H}";
TT_VertHeader *t = (TT_VertHeader *)table;
return Py_BuildValue(vhea_dict,
"version",
Expand All@@ -1329,7 +1329,7 @@ static PyObject *PyFT2Font_get_sfnt_table(PyFT2Font *self, PyObject *args, PyObj
"vertTypoLineGap",
t->Line_Gap,
"advanceHeightMax",
(unsigned)t->advance_Height_Max,
t->advance_Height_Max,
"minTopSideBearing",
t->min_Top_Side_Bearing,
"minBottomSizeBearing",
Expand All@@ -1345,10 +1345,10 @@ static PyObject *PyFT2Font_get_sfnt_table(PyFT2Font *self, PyObject *args, PyObj
"metricDataFormat",
t->metric_Data_Format,
"numOfLongVerMetrics",
(unsigned)t->number_Of_VMetrics);
t->number_Of_VMetrics);
}
case 5: {
char post_dict[] = "{s:(h,h), s:(h,h), s:h, s:h, s:k, s:k, s:k, s:k, s:k}";
char post_dict[] = "{s:(h,H), s:(h,H), s:h, s:h, s:k, s:k, s:k, s:k, s:k}";
TT_Postscript *t = (TT_Postscript *)table;
return Py_BuildValue(post_dict,
"format",
Expand All@@ -1375,12 +1375,12 @@ static PyObject *PyFT2Font_get_sfnt_table(PyFT2Font *self, PyObject *args, PyObj
case 6: {
#if PY3K
char pclt_dict[] =
"{s:(h,h), s:k, s:H, s:H, s:H, s:H, s:H, s:H, s:y, s:y, s:b, s:b, "
"s:b}";
"{s:(h,H), s:k, s:H, s:H, s:H, s:H, s:H, s:H, s:y#, s:y#, s:b, "
"s:b, s:b}";
#else
char pclt_dict[] =
"{s:(h,h), s:k, s:H, s:H, s:H, s:H, s:H, s:H, s:s, s:s, s:b, s:b, "
"s:b}";
"{s:(h,H), s:k, s:H, s:H, s:H, s:H, s:H, s:H, s:s#, s:s#, s:b, "
"s:b, s:b}";
#endif
TT_PCLT *t = (TT_PCLT *)table;
return Py_BuildValue(pclt_dict,
Expand All@@ -1403,8 +1403,10 @@ static PyObject *PyFT2Font_get_sfnt_table(PyFT2Font *self, PyObject *args, PyObj
t->SymbolSet,
"typeFace",
t->TypeFace,
16,
"characterComplement",
t->CharacterComplement,
8,
"strokeWeight",
t->StrokeWeight,
"widthType",
Expand DownExpand Up@@ -1527,7 +1529,8 @@ static PyObject *PyFT2Font_get_bbox(PyFT2Font *self, void *closure)
{
FT_BBox *bbox = &(self->x->get_face()->bbox);

return Py_BuildValue("iiii", bbox->xMin, bbox->yMin, bbox->xMax, bbox->yMax);
return Py_BuildValue("llll",
bbox->xMin, bbox->yMin, bbox->xMax, bbox->yMax);
}

static PyObject *PyFT2Font_ascender(PyFT2Font *self, void *closure)
Expand Down

[8]ページ先頭

©2009-2025 Movatter.jp