From f33b45f1d30653fb5da4817089e38ff0a2413cfb Mon Sep 17 00:00:00 2001 From: Manolo Gouy Date: Thu, 18 Feb 2016 16:21:51 +0000 Subject: Remove all uses of the fl_gc global variable. Towards a clean driver model. fl_gc remains usable by the application as a hook into the system. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11189 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/fl_read_image_win32.cxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/fl_read_image_win32.cxx') diff --git a/src/fl_read_image_win32.cxx b/src/fl_read_image_win32.cxx index 28f83017a..738d43f49 100644 --- a/src/fl_read_image_win32.cxx +++ b/src/fl_read_image_win32.cxx @@ -3,7 +3,7 @@ // // WIN32 image reading routines for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2014 by Bill Spitzak and others. +// Copyright 1998-2016 by Bill Spitzak and others. // // This library is free software. Distribution and use rights are outlined in // the file "COPYING" which should have been included with this file. If this @@ -77,13 +77,13 @@ read_win_rectangle(uchar *p, // I - Pixel buffer or NULL to allocate bi.bmiHeader.biClrImportant = 0; // copy bitmap from original DC (Window, Fl_Offscreen, ...) - - HDC hdc = CreateCompatibleDC(fl_gc); - HBITMAP hbm = CreateCompatibleBitmap(fl_gc,w,h); + HDC gc = (HDC)fl_graphics_driver->get_gc(); + HDC hdc = CreateCompatibleDC(gc); + HBITMAP hbm = CreateCompatibleBitmap(gc,w,h); int save_dc = SaveDC(hdc); // save context for cleanup SelectObject(hdc,hbm); // select bitmap - BitBlt(hdc,0,0,w,h,fl_gc,X,Y,SRCCOPY); // copy image section to DDB + BitBlt(hdc,0,0,w,h,gc,X,Y,SRCCOPY); // copy image section to DDB // copy RGB image data to the allocated DIB -- cgit v1.2.3