make reduceDepth set the im->data member, with newly allocated data, so the pixelData...

[chaz/openbox] / otk / rendercontrol.cc

diff --git a/otk/rendercontrol.cc b/otk/rendercontrol.cc
index 90f99632426efb8db566ce2c58252ae45beeb1ae..a4de270a3ab6abe857fc43349624f8c1bb7185b2 100644 (file)
--- a/otk/rendercontrol.cc
+++ b/otk/rendercontrol.cc
@@ -285,12 +285,7 @@ void RenderControl::drawGradientBackground(
   }
 
   reduceDepth(sf, im);
-
-  im->data = (char*) data;
-
   sf.setPixmap(im);
-
-  im->data = NULL;
   XDestroyImage(im);
 }
 
@@ -451,7 +446,7 @@ void RenderControl::drawImage(Surface &sf, int w, int h,
   if (x < 0) x = 0;
   if (y < 0) y = 0;
 
-  // XXX SCALING!@!&*(@! to make it fit on the surface
+  // Reduce the image size if its too big to make it fit on the surface
   int oldw = w, oldh = h;
   unsigned long *olddata = data;
   if (w > sfw) w = sfw;
@@ -507,12 +502,7 @@ void RenderControl::drawImage(Surface &sf, int w, int h,
   im->byte_order = endian;
 
   reduceDepth(sf, im);
-
-  im->data = (char*) bg;
-
   sf.setPixmap(im);
-
-  im->data = NULL;
   XDestroyImage(im);
 }