diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2007-01-18 15:25:09 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2007-01-18 15:25:09 +0000 |
| commit | fbd01308b987713ed7487014f15abb99dd5ae2d2 (patch) | |
| tree | 2fba41b68759b32c428e2b4bb31552c2a6df63a7 /src/fl_draw_image_mac.cxx | |
| parent | 32a8df787c76d7bd542b5903af86867d8704b8bb (diff) | |
Fixed Quartz image drawing and screen reading
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5614 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/fl_draw_image_mac.cxx')
| -rw-r--r-- | src/fl_draw_image_mac.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/fl_draw_image_mac.cxx b/src/fl_draw_image_mac.cxx index f70d180c0..fb493b487 100644 --- a/src/fl_draw_image_mac.cxx +++ b/src/fl_draw_image_mac.cxx @@ -175,7 +175,7 @@ static void innards(const uchar *buf, int X, int Y, int W, int H, cb(userdata, 0, i, W, tmpBuf+i*W*delta); } array = (void*)tmpBuf; - linedelta = W; + linedelta = W*delta; } // create an image context CGColorSpaceRef lut = 0; @@ -183,8 +183,8 @@ static void innards(const uchar *buf, int X, int Y, int W, int H, lut = CGColorSpaceCreateDeviceGray(); else lut = CGColorSpaceCreateDeviceRGB(); - CGDataProviderRef src = CGDataProviderCreateWithData( 0L, array, linedelta*H*delta, 0L); - CGImageRef img = CGImageCreate( W, H, 8, 8*delta, linedelta*delta, + CGDataProviderRef src = CGDataProviderCreateWithData( 0L, array, linedelta*H, 0L); + CGImageRef img = CGImageCreate( W, H, 8, 8*delta, linedelta, lut, delta&1?kCGImageAlphaNone:kCGImageAlphaNoneSkipLast, src, 0L, false, kCGRenderingIntentDefault); // draw the image into the destination context |