From b8a50851fd1bc77fb910bdfdac0eab106a430e6b Mon Sep 17 00:00:00 2001
From: Manolo Gouy <Manolo>
Date: Fri, 23 Mar 2018 17:03:24 +0000
Subject: Fix Fl_Image::copy() and its versions for derived image classes
 following the introduction of Fl_Image::scale()

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12786 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 FL/Fl_Image.H | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'FL/Fl_Image.H')

diff --git a/FL/Fl_Image.H b/FL/Fl_Image.H
index 7b6024b65..beb22f719 100644
--- a/FL/Fl_Image.H
+++ b/FL/Fl_Image.H
@@ -164,13 +164,11 @@ public:
   virtual ~Fl_Image();
   virtual Fl_Image *copy(int W, int H);
   /**
-   The copy() method creates a copy of the specified
-   image. If the width and height are provided, the image is
-   resized to the specified size. The image should be deleted (or in
-   the case of Fl_Shared_Image, released) when you are done
-   with it.
+   Creates a copy of the specified image.
+   The image should be deleted (or in the case of Fl_Shared_Image, released)
+   when you are done with it.
    */
-  Fl_Image *copy() { return copy(w(), h()); }
+  Fl_Image *copy() { Fl_Image *img = copy(data_w(), data_h()); img->scale(w(), h(), 0, 1); return img;}
   virtual void color_average(Fl_Color c, float i);
   /**
    The inactive() method calls
@@ -268,7 +266,7 @@ public:
   Fl_RGB_Image(const Fl_Pixmap *pxm, Fl_Color bg=FL_GRAY);
   virtual ~Fl_RGB_Image();
   virtual Fl_Image *copy(int W, int H);
-  Fl_Image *copy() { return copy(w(), h()); }
+  Fl_Image *copy() { return Fl_Image::copy(); }
   virtual void color_average(Fl_Color c, float i);
   virtual void desaturate();
   virtual void draw(int X, int Y, int W, int H, int cx=0, int cy=0);
-- 
cgit v1.2.3