Various minor cleanups to FT2Font

mdboom · mdboom · commit 148025bd2906 · 2011-03-03T11:29:49.000-05:00
diff --git a/src/ft2font.cpp b/src/ft2font.cpp
@@ -77,7 +77,6 @@ FT2Image::~FT2Image() {
     _buffer = NULL;
 }
 
-
 Py::PythonClassObject<FT2Image> FT2Image::factory(int width, int height)
 {
     Py::Callable class_type(type());
@@ -90,16 +89,6 @@ Py::PythonClassObject<FT2Image> FT2Image::factory(int width, int height)
     return o;
 }
 
-
-// FT2Image::~FT2Image()
-// {
-//     _VERBOSE("FT2Image::~FT2Image");
-//     delete [] _buffer;
-//     _buffer = NULL;
-//     delete _rgbCopy;
-//     delete _rgbaCopy;
-// }
-
 void
 FT2Image::resize(long width, long height)
 {
@@ -209,7 +198,7 @@ PYCXX_VARARGS_METHOD_DECL(FT2Image, py_write_bitmap)
 
 void
 FT2Image::draw_rect(unsigned long x0, unsigned long y0,
-                        unsigned long x1, unsigned long y1)
+                    unsigned long x1, unsigned long y1)
 {
     if (x0 > _width || x1 > _width ||
         y0 > _height || y1 > _height)
@@ -260,7 +249,7 @@ PYCXX_VARARGS_METHOD_DECL(FT2Image, py_draw_rect)
 
 void
 FT2Image::draw_rect_filled(unsigned long x0, unsigned long y0,
-                               unsigned long x1, unsigned long y1)
+                           unsigned long x1, unsigned long y1)
 {
     x0 = std::min(x0, _width);
     y0 = std::min(y0, _height);
@@ -356,7 +345,7 @@ FT2Image::makeRgbCopy()
         return;
     }
 
-    if (!_rgbCopy.ptr())
+    if (_rgbCopy.isNone())
     {
         _rgbCopy = factory(_width * 3, _height);
         rgbCopy = Py::PythonClassObject<FT2Image>(_rgbCopy).getCxxObject();
@@ -407,7 +396,7 @@ void FT2Image::makeRgbaCopy()
         return;
     }
 
-    if (_rgbaCopy.ptr())
+    if (_rgbaCopy.isNone())
     {
         _rgbaCopy = factory(_width * 4, _height);
         rgbaCopy = Py::PythonClassObject<FT2Image>(_rgbaCopy).getCxxObject();
diff --git a/src/ft2font.h b/src/ft2font.h
@@ -98,9 +98,6 @@ class Glyph : public Py::PythonClass<Glyph>
 private:
     Py::Dict __dict__;
     static char get_path__doc__[];
-
-    Py::Tuple _empty_tuple;
-    Py::Dict _empty_dict;
 };
 
 class FT2Font : public Py::PythonClass<FT2Font>

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,6 @@ FT2Image::~FT2Image() {`
`77`	`77`	`_buffer = NULL;`
`78`	`78`	`}`
`79`	`79`
`80`		`-`
`81`	`80`	`Py::PythonClassObject<FT2Image> FT2Image::factory(int width, int height)`
`82`	`81`	`{`
`83`	`82`	`Py::Callable class_type(type());`
`@@ -90,16 +89,6 @@ Py::PythonClassObject<FT2Image> FT2Image::factory(int width, int height)`
`90`	`89`	`return o;`
`91`	`90`	`}`
`92`	`91`
`93`		`-`
`94`		`-// FT2Image::~FT2Image()`
`95`		`-// {`
`96`		`-// _VERBOSE("FT2Image::~FT2Image");`
`97`		`-// delete [] _buffer;`
`98`		`-// _buffer = NULL;`
`99`		`-// delete _rgbCopy;`
`100`		`-// delete _rgbaCopy;`
`101`		`-// }`
`102`		`-`
`103`	`92`	`void`
`104`	`93`	`FT2Image::resize(long width, long height)`
`105`	`94`	`{`
`@@ -209,7 +198,7 @@ PYCXX_VARARGS_METHOD_DECL(FT2Image, py_write_bitmap)`
`209`	`198`
`210`	`199`	`void`
`211`	`200`	`FT2Image::draw_rect(unsigned long x0, unsigned long y0,`
`212`		`- unsigned long x1, unsigned long y1)`
	`201`	`+ unsigned long x1, unsigned long y1)`
`213`	`202`	`{`
`214`	`203`	`if (x0 > _width \|\| x1 > _width \|\|`
`215`	`204`	`y0 > _height \|\| y1 > _height)`
`@@ -260,7 +249,7 @@ PYCXX_VARARGS_METHOD_DECL(FT2Image, py_draw_rect)`
`260`	`249`
`261`	`250`	`void`
`262`	`251`	`FT2Image::draw_rect_filled(unsigned long x0, unsigned long y0,`
`263`		`- unsigned long x1, unsigned long y1)`
	`252`	`+ unsigned long x1, unsigned long y1)`
`264`	`253`	`{`
`265`	`254`	`x0 = std::min(x0, _width);`
`266`	`255`	`y0 = std::min(y0, _height);`
`@@ -356,7 +345,7 @@ FT2Image::makeRgbCopy()`
`356`	`345`	`return;`
`357`	`346`	`}`
`358`	`347`
`359`		`- if (!_rgbCopy.ptr())`
	`348`	`+ if (_rgbCopy.isNone())`
`360`	`349`	`{`
`361`	`350`	`_rgbCopy = factory(_width * 3, _height);`
`362`	`351`	`rgbCopy = Py::PythonClassObject<FT2Image>(_rgbCopy).getCxxObject();`
`@@ -407,7 +396,7 @@ void FT2Image::makeRgbaCopy()`
`407`	`396`	`return;`
`408`	`397`	`}`
`409`	`398`
`410`		`- if (_rgbaCopy.ptr())`
	`399`	`+ if (_rgbaCopy.isNone())`
`411`	`400`	`{`
`412`	`401`	`_rgbaCopy = factory(_width * 4, _height);`
`413`	`402`	`rgbaCopy = Py::PythonClassObject<FT2Image>(_rgbaCopy).getCxxObject();`