From 329b4127f6801d04ca0cdfadaf60f1265e8268c6 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Wed, 19 Dec 2001 18:15:34 +0000 Subject: Multiple bug fixes from Sebastien: - Fl_GIF_Image and Fl_PNG_Image didn't close the file before calling Fl::error(). - Fl_Help_View didn't clear the line array in Fl_Help_Block, and Fl_Help_Block::font and ::size were not used. - Fl_Shared_Image::get() didn't return NULL if the image could not be loaded. - Switched to more efficient code for Fl_Tiled_Image::color_average() and ::desaturate(). - Don't delete children in Fl_Text_Display since the group will do it. - Fixes to filename_isdir(), filename_absolute(), and filename_relative(). - Was using numbers instead of define constants for some OpenGL stuff under WIN32. - Wasn't exporting threading functions under WIN32. - The Fl_Widget destructor now removes from the parent to avoid a Purify error since the old widget would be referenced by the parent when it was destroyed; this has no apparent performance impact since Fl_Group::clear() sets children_ to 0, making Fl_Group::remove() very fast... - WIN32 font enumeration datatype fixes... git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1878 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/Fl_Tiled_Image.cxx | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) (limited to 'src/Fl_Tiled_Image.cxx') diff --git a/src/Fl_Tiled_Image.cxx b/src/Fl_Tiled_Image.cxx index c331265bd..119801cc6 100644 --- a/src/Fl_Tiled_Image.cxx +++ b/src/Fl_Tiled_Image.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Tiled_Image.cxx,v 1.1.2.3 2001/12/11 16:03:12 easysw Exp $" +// "$Id: Fl_Tiled_Image.cxx,v 1.1.2.4 2001/12/19 18:15:34 easysw Exp $" // // Tiled image code for the Fast Light Tool Kit (FLTK). // @@ -74,15 +74,12 @@ Fl_Tiled_Image::copy(int W, // I - New width void Fl_Tiled_Image::color_average(Fl_Color c, // I - Color to blend with float i) { // I - Blend fraction - if (alloc_image_) image_->color_average(c, i); - else { - Fl_Image *temp = image_->copy(); - - temp->color_average(c, i); - - image_ = temp; + if (!alloc_image_) { + image_ = image_->copy(); alloc_image_ = 1; } + + image_->color_average(c, i); } @@ -92,15 +89,12 @@ Fl_Tiled_Image::color_average(Fl_Color c, // I - Color to blend with void Fl_Tiled_Image::desaturate() { - if (alloc_image_) image_->desaturate(); - else { - Fl_Image *temp = image_->copy(); - - temp->desaturate(); - - image_ = temp; + if (!alloc_image_) { + image_ = image_->copy(); alloc_image_ = 1; } + + image_->desaturate(); } @@ -139,5 +133,5 @@ Fl_Tiled_Image::draw(int X, // I - Starting X position // -// End of "$Id: Fl_Tiled_Image.cxx,v 1.1.2.3 2001/12/11 16:03:12 easysw Exp $". +// End of "$Id: Fl_Tiled_Image.cxx,v 1.1.2.4 2001/12/19 18:15:34 easysw Exp $". // -- cgit v1.2.3