summaryrefslogtreecommitdiff
path: root/src/Fl_Tiled_Image.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'src/Fl_Tiled_Image.cxx')
-rw-r--r--src/Fl_Tiled_Image.cxx26
1 files changed, 10 insertions, 16 deletions
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 $".
//