Removed all references to Quartz driver files from library headers in Xcode. Works in Xcode.

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

1 files changed, 0 insertions, 93 deletions

diff --git a/src/Fl_Image.cxx b/src/Fl_Image.cxx
index da049386a..b4f6ddb9a 100644
--- a/src/Fl_Image.cxx
+++ b/src/Fl_Image.cxx
@@ -629,22 +629,6 @@ void Fl_RGB_Image::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_RGB_Image *img, int XP, int YP, int WP, int HP, int w, int h, int &cx, int &cy, 
-		 int &X, int &Y, int &W, int &H)
-{
-  // 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;
-}
-
 /** Draws an Fl_Image scaled to width \p W & height \p H with top-left corner at \em X,Y
  \return zero when the graphics driver doesn't implement scaled drawing, non-zero if it does implement it.
  */
@@ -653,83 +637,6 @@ int Fl_Graphics_Driver::draw_scaled(Fl_Image *img, int X, int Y, int W, int H) {
 }
 
 #ifdef __APPLE__
-static void imgProviderReleaseData (void *info, const void *data, size_t size)
-{
-  if (!info || *(bool*)info) delete[] (unsigned char *)data;
-  delete (bool*)info;
-}
-
-void Fl_Quartz_Graphics_Driver::draw(Fl_RGB_Image *img, int XP, int YP, int WP, int HP, int cx, int cy) {
-  int X, Y, W, H;
-  // Don't draw an empty image...
-  if (!img->d() || !img->array) {
-    img->draw_empty(XP, YP);
-    return;
-  }
-  if (start(img, XP, YP, WP, HP, img->w(), img->h(), cx, cy, X, Y, W, H)) {
-    return;
-  }
-  if (!img->id_) {
-    CGColorSpaceRef lut = img->d()<=2 ? CGColorSpaceCreateDeviceGray() : CGColorSpaceCreateDeviceRGB();
-    int ld = img->ld();
-    if (!ld) ld = img->w() * img->d();
-    // If img->alloc_array == 0, the CGImage data provider must not release the image data.
-    // If img->alloc_array != 0, the CGImage data provider will take responsibilty of deleting RGB image data after use:
-    // when the CGImage is deallocated, the release callback of its data provider
-    // (imgProviderReleaseData) is called and can delete the RGB image data.
-    // If the CGImage is printed, it is not deallocated until after the end of the page,
-    // therefore, with img->alloc_array != 0, the RGB image can be safely deleted any time after return from this function.
-    // The previously unused mask_ member allows to make sure the RGB image data is not deleted by Fl_RGB_Image::uncache().
-    if (img->alloc_array) img->mask_ = new bool(true);
-    CGDataProviderRef src = CGDataProviderCreateWithData(img->mask_, img->array, ld * img->h(),
-                                                         img->alloc_array?imgProviderReleaseData:NULL);
-    img->id_ = CGImageCreate(img->w(), img->h(), 8, img->d()*8, ld,
-                             lut, (img->d()&1)?kCGImageAlphaNone:kCGImageAlphaLast,
-                             src, 0L, false, kCGRenderingIntentDefault);
-    CGColorSpaceRelease(lut);
-    CGDataProviderRelease(src);
-  }
-  if (img->id_ && fl_gc) {
-    if (!img->alloc_array && has_feature(PRINTER) && !CGImageGetShouldInterpolate((CGImageRef)img->id_)) {
-      // When printing, the image data is used when the page is completed, that is, after return from this function.
-      // If the image has alloc_array = 0, we must protect against image data being freed before it is used:
-      // we duplicate the image data and have it deleted after use by the release-callback of the CGImage data provider
-      Fl_RGB_Image* img2 = (Fl_RGB_Image*)img->copy();
-      img2->alloc_array = 0;
-      const uchar *img_bytes = img2->array;
-      int ld = img2->ld();
-      if (!ld) ld = img2->w() * img2->d();
-      delete img2;
-      img->uncache();
-      CGColorSpaceRef lut = img->d()<=2 ? CGColorSpaceCreateDeviceGray() : CGColorSpaceCreateDeviceRGB();
-      CGDataProviderRef src = CGDataProviderCreateWithData( NULL, img_bytes, ld * img->h(), imgProviderReleaseData);
-      img->id_ = CGImageCreate(img->w(), img->h(), 8, img->d()*8, ld,
-                               lut, (img->d()&1)?kCGImageAlphaNone:kCGImageAlphaLast,
-                               src, 0L, true, kCGRenderingIntentDefault);
-      CGColorSpaceRelease(lut);
-      CGDataProviderRelease(src);
-    }
-    CGRect rect = CGRectMake(X, Y, W, H);
-    Fl_X::q_begin_image(rect, cx, cy, img->w(), img->h());
-    CGContextDrawImage(fl_gc, rect, (CGImageRef)img->id_);
-    Fl_X::q_end_image();
-  }
-}
-
-int Fl_Quartz_Graphics_Driver::draw_scaled(Fl_Image *img, int XP, int YP, int WP, int HP) {
-  int X, Y, W, H;
-  fl_clip_box(XP,YP,WP,HP,X,Y,W,H); // X,Y,W,H will give the unclipped area of XP,YP,WP,HP
-  if (W == 0 || H == 0) return 1;
-  fl_push_no_clip(); // remove the FLTK clip that can't be rescaled
-  CGContextSaveGState(fl_gc);
-  CGContextClipToRect(fl_gc, CGRectMake(X, Y, W, H)); // this clip path will be rescaled & translated
-  CGContextTranslateCTM(fl_gc, XP, YP);
-  CGContextScaleCTM(fl_gc, float(WP)/img->w(), float(HP)/img->h());
-  img->draw(0, 0, img->w(), img->h(), 0, 0);
-  CGContextRestoreGState(fl_gc);
-  fl_pop_clip(); // restore FLTK's clip
-  return 1;
-}
 
 #elif defined(WIN32)
 static Fl_Offscreen build_id(Fl_RGB_Image *img, void **pmask)