Revert some changes to PDF Type 3 generation to make text placement exactly the same as in Matplotlib 1.0.x

mdboom · mdboom · commit af0f269d540f · 2011-02-25T11:38:45.000-05:00
diff --git a/lib/matplotlib/backends/backend_pdf.py b/lib/matplotlib/backends/backend_pdf.py
@@ -809,6 +809,13 @@ def get_char_width(charcode):
                     charprocDict['Type'] = Name('XObject')
                     charprocDict['Subtype'] = Name('Form')
                     charprocDict['BBox'] = bbox
+                    # Each glyph includes bounding box information,
+                    # but xpdf and ghostscript can't handle it in a
+                    # Form XObject (they segfault!!!), so we remove it
+                    # from the stream here.  It's not needed anyway,
+                    # since the Form XObject includes it in its BBox
+                    # value.
+                    stream = stream[stream.find(b"d1") + 2:]
                 charprocObject = self.reserveObject('charProc')
                 self.beginStream(charprocObject.id, None, charprocDict)
                 self.currentstream.write(stream)
diff --git a/src/_ttconv.cpp b/src/_ttconv.cpp
@@ -179,27 +179,10 @@ class PythonDictionaryCallback : public TTDictionaryCallback
 
     virtual void add_pair(const char* a, const char* b)
     {
-        const char *p;
-
-        /* Each glyph includes bounding box information, but xpdf and
-           ghostscript can't handle it in a Form XObject (they
-           segfault!!!), so we remove it from the stream here.  It's
-           not needed anyway, since the Form XObject includes it in
-           its BBox value. */
-        p = b;
-        for (p = b; *p != 0; ++p) {
-            if (*p == 'd') {
-                if (*(p + 1) == '1') {
-                    p += 2;
-                    break;
-                }
-            }
-        }
-
         #if PY3K
-        PyObject* value = PyBytes_FromString(p);
+        PyObject* value = PyBytes_FromString(b);
         #else
-        PyObject* value = PyString_FromString(p);
+        PyObject* value = PyString_FromString(b);
         #endif
         if (value)
         {
