Implementation of Fl_Shared_Image::scale(width, height) for scaled image drawing - cont'd

Shorter implementation based on Fl_Graphics_Driver::draw_scaled(Fl_Image *,...).

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10616 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

1 files changed, 2 insertions, 13 deletions

diff --git a/src/Fl_Shared_Image.cxx b/src/Fl_Shared_Image.cxx
index 4a05a46ef..3c2aa4b85 100644
--- a/src/Fl_Shared_Image.cxx
+++ b/src/Fl_Shared_Image.cxx
@@ -338,19 +338,8 @@ void Fl_Shared_Image::draw(int X, int Y, int W, int H, int cx, int cy) {
     return;
   }
   fl_push_clip(X, Y, W, H);
-  int use_scaled_image = 0, done;
-  if (image_->d() == 0) { // handles Fl_Bitmap
-    use_scaled_image = 1;
-  }
-  else if (image_->count() >= 2) { // handles Fl_Pixmap
-    done = fl_graphics_driver->draw_scaled((Fl_Pixmap*)image_, X-cx, Y-cy, w(), h());
-    if (done == 0) use_scaled_image = 1;
-  }
-  else { // handles Fl_RGB_Image
-    done = fl_graphics_driver->draw_scaled((Fl_RGB_Image*)image_, X-cx, Y-cy, w(), h());
-    if (done == 0) use_scaled_image = 1;
-  }
-  if (use_scaled_image) {
+  int done = fl_graphics_driver->draw_scaled(image_, X-cx, Y-cy, w(), h());
+  if (!done) {
     if (scaled_image_ && (scaled_image_->w() != w() || scaled_image_->h() != h())) {
       delete scaled_image_;
       scaled_image_ = NULL;