Quartz port of 1.1:

- changed 'innards' function to work the right way. Much faster now (see
  color_chooser for a test)
I won't be able to continue on the Quartz port for now. Please let me know
of issues not mentioned in previous commits and I will try to find the
time for fixes and improvements.

Matthias


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

1 files changed, 33 insertions, 3 deletions

diff --git a/src/fl_draw_image_mac.cxx b/src/fl_draw_image_mac.cxx
index adc2ce645..12491654c 100644
--- a/src/fl_draw_image_mac.cxx
+++ b/src/fl_draw_image_mac.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: fl_draw_image_mac.cxx,v 1.1.2.9 2004/08/31 22:00:48 matthiaswm Exp $"
+// "$Id: fl_draw_image_mac.cxx,v 1.1.2.10 2004/09/09 23:43:40 matthiaswm Exp $"
 //
 // MacOS image drawing code for the Fast Light Tool Kit (FLTK).
 //
@@ -165,7 +165,37 @@ static void innards(const uchar *buf, int X, int Y, int W, int H,
     }
   }
 #elif defined(__APPLE_QUARTZ__)
-#warning : quartz - this function is *terribly* slow. Please replace!!!!
+  if (delta>=1||delta<=4) {
+    void *array = buf;
+    uchar *tmpBuf;
+    if (cb) {
+      tmpBuf = new uchar[ H*W*delta ];
+      for (int i=0; i<H; i++) {
+        cb(userdata, 0, i, W, tmpBuf+i*W*delta);
+      }
+      array = (void*)tmpBuf;
+      linedelta = W;
+    }
+    // create an image context
+    CGColorSpaceRef   lut = CGColorSpaceCreateDeviceRGB();
+    CGDataProviderRef src = CGDataProviderCreateWithData( 0L, array, linedelta*H*delta, 0L);
+    CGImageRef        img = CGImageCreate( W, H, 8, 8*delta, linedelta*delta,
+                              lut, kCGImageAlphaNone,
+                              src, 0L, false, kCGRenderingIntentDefault);
+    // draw the image into the destination context
+    CGRect rect = { X, Y, W, H };
+    Fl_X::q_begin_image(rect, 0, 0, W, H);
+    CGContextDrawImage(fl_gc, rect, img);
+    Fl_X::q_end_image();
+    // release all allocated resources
+    CGImageRelease(img);
+    CGColorSpaceRelease(lut);
+    CGDataProviderRelease(src);
+    if (cb) {
+      delete[] tmpBuf;
+    }
+    return;
+  }
   // following the very save (and very slow) way to write the image into the give port
   CGContextSetShouldAntialias(fl_gc, false);
   if ( cb )
@@ -234,5 +264,5 @@ void fl_rectf(int x, int y, int w, int h, uchar r, uchar g, uchar b) {
 }
 
 //
-// End of "$Id: fl_draw_image_mac.cxx,v 1.1.2.9 2004/08/31 22:00:48 matthiaswm Exp $".
+// End of "$Id: fl_draw_image_mac.cxx,v 1.1.2.10 2004/09/09 23:43:40 matthiaswm Exp $".
 //