Backport 98ee4e9 to v1.1.x branch

mdboom · mdboom · commit bbc5e667ee67 · 2011-12-06T13:46:51.000-05:00
diff --git a/src/ft2font.cpp b/src/ft2font.cpp
@@ -831,28 +831,24 @@ FT2Font::FT2Font(std::string facefile) :
     {
         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());
     }
 
@@ -869,7 +865,6 @@ FT2Font::FT2Font(std::string facefile) :
     {
         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
`@@ -831,28 +831,24 @@ FT2Font::FT2Font(std::string facefile) :`
`831`	`831`	`{`
`832`	`832`	`std::ostringstream s;`
`833`	`833`	`s << "Could not load facefile " << facefile << "; Unknown_File_Format" << std::endl;`
`834`		`- ob_refcnt--;`
`835`	`834`	`throw Py::RuntimeError(s.str());`
`836`	`835`	`}`
`837`	`836`	`else if (error == FT_Err_Cannot_Open_Resource)`
`838`	`837`	`{`
`839`	`838`	`std::ostringstream s;`
`840`	`839`	`s << "Could not open facefile " << facefile << "; Cannot_Open_Resource" << std::endl;`
`841`		`- ob_refcnt--;`
`842`	`840`	`throw Py::RuntimeError(s.str());`
`843`	`841`	`}`
`844`	`842`	`else if (error == FT_Err_Invalid_File_Format)`
`845`	`843`	`{`
`846`	`844`	`std::ostringstream s;`
`847`	`845`	`s << "Could not open facefile " << facefile << "; Invalid_File_Format" << std::endl;`
`848`		`- ob_refcnt--;`
`849`	`846`	`throw Py::RuntimeError(s.str());`
`850`	`847`	`}`
`851`	`848`	`else if (error)`
`852`	`849`	`{`
`853`	`850`	`std::ostringstream s;`
`854`	`851`	`s << "Could not open facefile " << facefile << "; freetype error code " << error << std::endl;`
`855`		`- ob_refcnt--;`
`856`	`852`	`throw Py::RuntimeError(s.str());`
`857`	`853`	`}`
`858`	`854`
`@@ -869,7 +865,6 @@ FT2Font::FT2Font(std::string facefile) :`
`869`	`865`	`{`
`870`	`866`	`std::ostringstream s;`
`871`	`867`	`s << "Could not set the fontsize for facefile " << facefile << std::endl;`
`872`		`- ob_refcnt--;`
`873`	`868`	`throw Py::RuntimeError(s.str());`
`874`	`869`	`}`
`875`	`870`