From 5bb4e853c7c80fa16e568f47c49c2282d197a19c Mon Sep 17 00:00:00 2001
From: Manolo Gouy <Manolo>
Date: Wed, 30 Nov 2016 07:09:48 +0000
Subject: Remove Fl_Image_Surface::end_current() to be called after usage of
 the drawing surface.

This ensures API compatibility with FLTK 1.3 where Fl_Surface_Device->set_current()
is used to change the current drawing surface.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12125 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 src/drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx')

diff --git a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx
index 543e2ba7f..7ecb5471e 100644
--- a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx
+++ b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx
@@ -714,9 +714,10 @@ void Fl_Xlib_Graphics_Driver::draw(Fl_RGB_Image *img, int XP, int YP, int WP, in
       depth |= FL_IMAGE_WITH_ALPHA;
     }
     if (surface) {
+      Fl_Surface_Device *old_surf = Fl_Surface_Device::surface();
       surface->set_current();
       fl_draw_image(img->array, 0, 0, img->w(), img->h(), depth, img->ld());
-      surface->end_current();
+      old_surf->set_current();
       *Fl_Graphics_Driver::id(img) = surface->get_offscreen_before_delete();
       delete surface;
     }
-- 
cgit v1.2.3