Fix Python 2.x build

astropy-buildbot · astropy-buildbot · commit ac0cf852a912 · 2011-02-22T17:04:09.000-05:00
diff --git a/src/ft2font.cpp b/src/ft2font.cpp
@@ -1905,9 +1905,13 @@ FT2Font::get_sfnt_table(const Py::Tuple & args)
             pclt["typeFamily"]         = Py::Int((short) t->TypeFamily);
             pclt["capHeight"]          = Py::Int((short) t->CapHeight);
             pclt["symbolSet"]          = Py::Int((short) t->SymbolSet);
+            #if PY3K
             pclt["typeFace"]           = Py::String((char *) t->TypeFace, 16, "latin-1");
-            pclt["characterComplement"] = Py::Bytes((char *)
-                                                     t->CharacterComplement, 8);
+            pclt["characterComplement"] = Py::Bytes((char *) t->CharacterComplement, 8);
+            #else
+            pclt["typeFace"]           = Py::String((char *) t->TypeFace, 16);
+            pclt["characterComplement"] = Py::String((char *) t->CharacterComplement, 8);
+            #endif
             // pclt["filename"]           = Py::String((char *) t->FileName, 6);
             pclt["strokeWeight"]       = Py::Int((int) t->StrokeWeight);
             pclt["widthType"]          = Py::Int((int) t->WidthType);
