From 4f1722eb55c69a36555187e9bc0ed214630366d3 Mon Sep 17 00:00:00 2001 From: Matthias Melcher Date: Mon, 29 Mar 2010 14:37:02 +0000 Subject: STR #2330: offscreen bitmap cliping was flipped in OS X git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7358 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- CHANGES | 1 + src/fl_rect.cxx | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index b73b4d0e9..ab62388f7 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,6 @@ CHANGES IN FLTK 1.3.0 + - Fixed clipping for offscreen rendering (OSX, STR #2330) - Added printing support (Fl_Printer class and friends) for native printing on Windows and Mac OS X, PostScript printing on X11 with CUPS or lp, and PostScript file output on all platforms diff --git a/src/fl_rect.cxx b/src/fl_rect.cxx index c0cc1d974..df8cbef9a 100644 --- a/src/fl_rect.cxx +++ b/src/fl_rect.cxx @@ -424,15 +424,15 @@ void fl_restore_clip() { Fl_X::q_clear_clipping(); Fl_X::q_fill_context();//flip coords if bitmap context //apply program clip - if(r) { + if (r) { CGContextClipToRects(fl_gc, r->rects, r->count); } } else if (fl_gc) { // clipping for an offscreen drawing world (CGBitmap) Fl_X::q_clear_clipping(); + Fl_X::q_fill_context(); if (r) { CGContextClipToRects(fl_gc, r->rects, r->count); - } - Fl_X::q_fill_context(); + } } #else # error unsupported platform -- cgit v1.2.3