b8c227a8f2
Conflicting demands arise in the implementation of class Fl_Xlib_Graphics_Driver for drawing images with the XRender library : 1) Issue #163 leads to use a bilinear filter to draw-and-scale images. 2) This tends to blur the edges of drawn areas which is bad for tiled images (that is because the edges get alpha values, even for an opaque source image). This commit resolves the conflict adding a means to detect whether the library is busy drawing a tiled image. If so, the bilinear filter is not applied, drawn areas don't have blurred edges, resulting in a nice tiling. With this commit, these test apps perform correctly: - tiled_image is correct at all scaling factor values also when modified to use a depth-3 or a depth-4 Fl_RGB_Image as tile; - unittests - Drawing Images is correct at all scaling factor values; - pixmap_browser scales correctly up and down JPEG and PNG images.
59 lines
1.7 KiB
C++
59 lines
1.7 KiB
C++
//
|
|
// Tiled image header file for the Fast Light Tool Kit (FLTK).
|
|
//
|
|
// Copyright 1998-2015 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
|
|
// file is missing or damaged, see the license at:
|
|
//
|
|
// https://www.fltk.org/COPYING.php
|
|
//
|
|
// Please see the following page on how to report bugs and issues:
|
|
//
|
|
// https://www.fltk.org/bugs.php
|
|
//
|
|
|
|
/* \file
|
|
Fl_Tiled_Image widget . */
|
|
|
|
#ifndef Fl_Tiled_Image_H
|
|
# define Fl_Tiled_Image_H
|
|
|
|
# include "Fl_Image.H"
|
|
|
|
|
|
/**
|
|
This class supports tiling of images over a specified area.
|
|
|
|
The source (tile) image is \b not copied unless you call the
|
|
color_average(), desaturate(), or inactive() methods.
|
|
*/
|
|
class FL_EXPORT Fl_Tiled_Image : public Fl_Image {
|
|
private:
|
|
static bool drawing_tiled_image_;
|
|
protected:
|
|
|
|
Fl_Image *image_; // The image that is tiled
|
|
int alloc_image_; // Did we allocate this image?
|
|
|
|
public:
|
|
/** Returns true when the FLTK library is currently drawing an Fl_Tiled_Image object. */
|
|
static inline bool drawing_tiled_image() { return drawing_tiled_image_;};
|
|
Fl_Tiled_Image(Fl_Image *i, int W = 0, int H = 0);
|
|
virtual ~Fl_Tiled_Image();
|
|
|
|
virtual Fl_Image *copy(int W, int H) const;
|
|
Fl_Image *copy() const {
|
|
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);
|
|
void draw(int X, int Y) { draw(X, Y, w(), h(), 0, 0); }
|
|
/** Gets The image that is tiled */
|
|
Fl_Image *image() { return image_; }
|
|
};
|
|
|
|
#endif // !Fl_Tiled_Image_H
|