From 9f9631e6856f56d9439ae5f91ed94dda0f19b568 Mon Sep 17 00:00:00 2001 From: Manolo Gouy Date: Thu, 22 Mar 2018 16:38:38 +0000 Subject: Rename Fl_Image::pixel_w() and pixel_h() to Fl_Image::data_w() and data_h(). The docs of class Fl_Image and of Fl_Image::scale() are beefed up. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12784 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/Fl_Pixmap.cxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/Fl_Pixmap.cxx') diff --git a/src/Fl_Pixmap.cxx b/src/Fl_Pixmap.cxx index 21d9e87a3..ca76362de 100644 --- a/src/Fl_Pixmap.cxx +++ b/src/Fl_Pixmap.cxx @@ -153,7 +153,7 @@ Fl_Image *Fl_Pixmap::copy(int W, int H) { return new Fl_Pixmap((char *const*)0); } // Optimize the simple copy where the width and height are the same... - if (W == pixel_w() && H == pixel_h()) { + if (W == data_w() && H == data_h()) { // Make an exact copy of the image and return it... new_image = new Fl_Pixmap(data()); new_image->copy_data(); @@ -185,10 +185,10 @@ Fl_Image *Fl_Pixmap::copy(int W, int H) { sprintf(new_info, "%d %d %d %d", W, H, ncolors, chars_per_pixel); // Figure out Bresenham step/modulus values... - xmod = pixel_w() % W; - xstep = (pixel_w() / W) * chars_per_pixel; - ymod = pixel_h() % H; - ystep = pixel_h() / H; + xmod = data_w() % W; + xstep = (data_w() / W) * chars_per_pixel; + ymod = data_h() % H; + ystep = data_h() / H; // Allocate memory for the new array... if (ncolors < 0) new_data = new char *[H + 2]; -- cgit v1.2.3