Fix reference counting bug that was causing a memory leak in test_mathtext_font_* regression tests.

astropy-buildbot · astropy-buildbot · commit 98ee4e991ae1 · 2011-03-22T12:40:57.000-07:00
This fix supported by Sage Days 29.
diff --git a/src/ft2font.cpp b/src/ft2font.cpp
@@ -674,28 +674,24 @@ 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());
     }
 
@@ -712,7 +708,6 @@ 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
`@@ -674,28 +674,24 @@ FT2Font::FT2Font(Py::PythonClassInstance *self, Py::Tuple &args, Py::Dict &kwds)`
`674`	`674`	`{`
`675`	`675`	`std::ostringstream s;`
`676`	`676`	`s << "Could not load facefile " << facefile << "; Unknown_File_Format" << std::endl;`
`677`		`- ob_refcnt--;`
`678`	`677`	`throw Py::RuntimeError(s.str());`
`679`	`678`	`}`
`680`	`679`	`else if (error == FT_Err_Cannot_Open_Resource)`
`681`	`680`	`{`
`682`	`681`	`std::ostringstream s;`
`683`	`682`	`s << "Could not open facefile " << facefile << "; Cannot_Open_Resource" << std::endl;`
`684`		`- ob_refcnt--;`
`685`	`683`	`throw Py::RuntimeError(s.str());`
`686`	`684`	`}`
`687`	`685`	`else if (error == FT_Err_Invalid_File_Format)`
`688`	`686`	`{`
`689`	`687`	`std::ostringstream s;`
`690`	`688`	`s << "Could not open facefile " << facefile << "; Invalid_File_Format" << std::endl;`
`691`		`- ob_refcnt--;`
`692`	`689`	`throw Py::RuntimeError(s.str());`
`693`	`690`	`}`
`694`	`691`	`else if (error)`
`695`	`692`	`{`
`696`	`693`	`std::ostringstream s;`
`697`	`694`	`s << "Could not open facefile " << facefile << "; freetype error code " << error << std::endl;`
`698`		`- ob_refcnt--;`
`699`	`695`	`throw Py::RuntimeError(s.str());`
`700`	`696`	`}`
`701`	`697`
`@@ -712,7 +708,6 @@ FT2Font::FT2Font(Py::PythonClassInstance *self, Py::Tuple &args, Py::Dict &kwds)`
`712`	`708`	`{`
`713`	`709`	`std::ostringstream s;`
`714`	`710`	`s << "Could not set the fontsize for facefile " << facefile << std::endl;`
`715`		`- ob_refcnt--;`
`716`	`711`	`throw Py::RuntimeError(s.str());`
`717`	`712`	`}`
`718`	`713`