Merge pull request #1532 from mdboom/ob_refcnt_fix

mdboom · mdboom · commit e64fb8c6616e · 2012-12-17T12:12:43.000-08:00
CXX/Python2/cxx_extensions.cxx:1320: Assertion `ob_refcnt == 0'
diff --git a/src/ft2font.cpp b/src/ft2font.cpp
@@ -852,28 +852,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());
     }
 
@@ -891,7 +887,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
`@@ -852,28 +852,24 @@ 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--;`
`856`	`855`	`throw Py::RuntimeError(s.str());`
`857`	`856`	`}`
`858`	`857`	`else if (error == FT_Err_Cannot_Open_Resource)`
`859`	`858`	`{`
`860`	`859`	`std::ostringstream s;`
`861`	`860`	`s << "Could not open facefile " << facefile << "; Cannot_Open_Resource" << std::endl;`
`862`		`- ob_refcnt--;`
`863`	`861`	`throw Py::RuntimeError(s.str());`
`864`	`862`	`}`
`865`	`863`	`else if (error == FT_Err_Invalid_File_Format)`
`866`	`864`	`{`
`867`	`865`	`std::ostringstream s;`
`868`	`866`	`s << "Could not open facefile " << facefile << "; Invalid_File_Format" << std::endl;`
`869`		`- ob_refcnt--;`
`870`	`867`	`throw Py::RuntimeError(s.str());`
`871`	`868`	`}`
`872`	`869`	`else if (error)`
`873`	`870`	`{`
`874`	`871`	`std::ostringstream s;`
`875`	`872`	`s << "Could not open facefile " << facefile << "; freetype error code " << error << std::endl;`
`876`		`- ob_refcnt--;`
`877`	`873`	`throw Py::RuntimeError(s.str());`
`878`	`874`	`}`
`879`	`875`
`@@ -891,7 +887,6 @@ FT2Font::FT2Font(Py::PythonClassInstance *self, Py::Tuple &args, Py::Dict &kwds)`
`891`	`887`	`{`
`892`	`888`	`std::ostringstream s;`
`893`	`889`	`s << "Could not set the fontsize for facefile " << facefile << std::endl;`
`894`		`- ob_refcnt--;`
`895`	`890`	`throw Py::RuntimeError(s.str());`
`896`	`891`	`}`
`897`	`892`