X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fsurface.cc;h=aabbf85af8bc4d9042734367f6e8d666cbc6fc06;hb=5adb8c82d19a4a7fbd740e24acf2260ed7ab519c;hp=70acf70ac5f16289897bcdad0be7c99f94c94928;hpb=68a6fce53badb38ba3dc387c4b5c86c02801f657;p=chaz%2Fopenbox

diff --git a/otk/surface.cc b/otk/surface.cc
index 70acf70a..aabbf85a 100644
--- a/otk/surface.cc
+++ b/otk/surface.cc
@@ -15,7 +15,7 @@ extern "C" {
 
 namespace otk {
 
-Surface::Surface(int screen, const Point &size)
+Surface::Surface(int screen, const Size &size)
   : _screen(screen),
     _size(size),
     _pixmap(None),
@@ -34,19 +34,19 @@ void Surface::setPixmap(const RenderColor &color)
     createObjects();
 
   XFillRectangle(**display, _pixmap, color.gc(), 0, 0,
-                 _size.x(), _size.y());
+                 _size.width(), _size.height());
 }
 
 void Surface::setPixmap(XImage *image)
 {
-  assert(image->width == _size.x());
-  assert(image->height == _size.y());
+  assert((unsigned)image->width == _size.width());
+  assert((unsigned)image->height == _size.height());
   
   if (_pixmap == None)
     createObjects();
 
   XPutImage(**display, _pixmap, DefaultGC(**display, _screen),
-            image, 0, 0, 0, 0, _size.x(), _size.y());
+            image, 0, 0, 0, 0, _size.width(), _size.height());
 }
 
 void Surface::createObjects()
@@ -56,10 +56,12 @@ void Surface::createObjects()
   const ScreenInfo *info = display->screenInfo(_screen);
   
   _pixmap = XCreatePixmap(**display, info->rootWindow(),
-                          _size.x(), _size.y(), info->depth());
+                          _size.width(), _size.height(), info->depth());
+  assert(_pixmap != None);
     
   _xftdraw = XftDrawCreate(**display, _pixmap,
                            info->visual(), info->colormap());
+  assert(_xftdraw);
 }
 
 void Surface::destroyObjects()