Reinstate the manual reference counting as discovered in #1054.

mdboom · mdboom · commit 84524ebf5b53 · 2012-08-03T15:07:43.000-04:00
diff --git a/src/ft2font.cpp b/src/ft2font.cpp
@@ -852,24 +852,28 @@ FT2Font::FT2Font(Py::PythonClassInstance *self, Py::Tuple &args, Py::Dict &kwds)
     {
         std::ostringstream s;
         s << "Could not load facefile " << facefile << "; Unknown_File_Format" << std::endl;
+        ob_refcnt--;
         throw Py::RuntimeError(s.str());
     }
     else if (error == FT_Err_Cannot_Open_Resource)
     {
         std::ostringstream s;
         s << "Could not open facefile " << facefile << "; Cannot_Open_Resource" << std::endl;
+        ob_refcnt--;
         throw Py::RuntimeError(s.str());
     }
     else if (error == FT_Err_Invalid_File_Format)
     {
         std::ostringstream s;
         s << "Could not open facefile " << facefile << "; Invalid_File_Format" << std::endl;
+        ob_refcnt--;
         throw Py::RuntimeError(s.str());
     }
     else if (error)
     {
         std::ostringstream s;
         s << "Could not open facefile " << facefile << "; freetype error code " << error << std::endl;
+        ob_refcnt--;
         throw Py::RuntimeError(s.str());
     }
 
@@ -887,6 +891,7 @@ FT2Font::FT2Font(Py::PythonClassInstance *self, Py::Tuple &args, Py::Dict &kwds)
     {
         std::ostringstream s;
         s << "Could not set the fontsize for facefile  " << facefile << std::endl;
+        ob_refcnt--;
         throw Py::RuntimeError(s.str());
     }
 

Original file line number	Diff line number	Diff line change
`@@ -852,24 +852,28 @@ FT2Font::FT2Font(Py::PythonClassInstance *self, Py::Tuple &args, Py::Dict &kwds)`
`852`	`852`	`{`
`853`	`853`	`std::ostringstream s;`
`854`	`854`	`s << "Could not load facefile " << facefile << "; Unknown_File_Format" << std::endl;`
	`855`	`+ ob_refcnt--;`
`855`	`856`	`throw Py::RuntimeError(s.str());`
`856`	`857`	`}`
`857`	`858`	`else if (error == FT_Err_Cannot_Open_Resource)`
`858`	`859`	`{`
`859`	`860`	`std::ostringstream s;`
`860`	`861`	`s << "Could not open facefile " << facefile << "; Cannot_Open_Resource" << std::endl;`
	`862`	`+ ob_refcnt--;`
`861`	`863`	`throw Py::RuntimeError(s.str());`
`862`	`864`	`}`
`863`	`865`	`else if (error == FT_Err_Invalid_File_Format)`
`864`	`866`	`{`
`865`	`867`	`std::ostringstream s;`
`866`	`868`	`s << "Could not open facefile " << facefile << "; Invalid_File_Format" << std::endl;`
	`869`	`+ ob_refcnt--;`
`867`	`870`	`throw Py::RuntimeError(s.str());`
`868`	`871`	`}`
`869`	`872`	`else if (error)`
`870`	`873`	`{`
`871`	`874`	`std::ostringstream s;`
`872`	`875`	`s << "Could not open facefile " << facefile << "; freetype error code " << error << std::endl;`
	`876`	`+ ob_refcnt--;`
`873`	`877`	`throw Py::RuntimeError(s.str());`
`874`	`878`	`}`
`875`	`879`
`@@ -887,6 +891,7 @@ FT2Font::FT2Font(Py::PythonClassInstance *self, Py::Tuple &args, Py::Dict &kwds)`
`887`	`891`	`{`
`888`	`892`	`std::ostringstream s;`
`889`	`893`	`s << "Could not set the fontsize for facefile " << facefile << std::endl;`
	`894`	`+ ob_refcnt--;`
`890`	`895`	`throw Py::RuntimeError(s.str());`
`891`	`896`	`}`
`892`	`897`