Factorize repeated code across platform-specific graphics drivers and image types

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

1 files changed, 7 insertions, 29 deletions

diff --git a/src/Fl_Pixmap.cxx b/src/Fl_Pixmap.cxx
index 68a70f50c..1fc8fa76b 100644
--- a/src/Fl_Pixmap.cxx
+++ b/src/Fl_Pixmap.cxx
@@ -49,41 +49,19 @@ void Fl_Pixmap::draw(int XP, int YP, int WP, int HP, int cx, int cy) {
   fl_graphics_driver->draw(this, XP, YP, WP, HP, cx, cy);
 }
 
-static int start(Fl_Pixmap *pxm, int XP, int YP, int WP, int HP, int w, int h, int &cx, int &cy,
-		 int &X, int &Y, int &W, int &H)
-{
-  // ignore empty or bad pixmap data:
-  if (!pxm->data()) {
-    return 2;
-  }
-  if (WP == -1) {
-    WP = w;
-    HP = h;
-  }
-  if (!w) {
-    return 2;
-  }
-  // account for current clip region (faster on Irix):
-  fl_clip_box(XP,YP,WP,HP,X,Y,W,H);
-  cx += X-XP; cy += Y-YP;
-  // clip the box down to the size of image, quit if empty:
-  if (cx < 0) {W += cx; X -= cx; cx = 0;}
-  if (cx+W > w) W = w-cx;
-  if (W <= 0) return 1;
-  if (cy < 0) {H += cy; Y -= cy; cy = 0;}
-  if (cy+H > h) H = h-cy;
-  if (H <= 0) return 1;
-  return 0;
-}
 
 int Fl_Pixmap::prepare(int XP, int YP, int WP, int HP, int &cx, int &cy,
 			   int &X, int &Y, int &W, int &H) {
   if (w() < 0) measure();
-  int code = start(this, XP, YP, WP, HP, w(), h(), cx, cy, X, Y, W, H);
-  if (code) {
-    if (code == 2) draw_empty(XP, YP);
+  if (!data() || !w()) {
+    draw_empty(XP, YP);
     return 1;
   }
+  if (WP == -1) {
+    WP = w();
+    HP = h();
+  }
+  if ( fl_graphics_driver->start_image(XP,YP,WP,HP,w(),h(),cx,cy,X,Y,W,H) ) return 1;  
   if (!id_) {
     id_ = fl_graphics_driver->cache(this, w(), h(), data());
   }