aboutsummaryrefslogtreecommitdiff
path: root/src/FbTk
diff options
context:
space:
mode:
Diffstat (limited to 'src/FbTk')
-rw-r--r--src/FbTk/ImageControl.hh6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/FbTk/ImageControl.hh b/src/FbTk/ImageControl.hh
index 2354fe0..0ccb928 100644
--- a/src/FbTk/ImageControl.hh
+++ b/src/FbTk/ImageControl.hh
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: ImageControl.hh,v 1.6 2003/12/16 17:06:51 fluxgen Exp $ 25// $Id: ImageControl.hh,v 1.7 2004/01/02 13:27:29 fluxgen Exp $
26 26
27#ifndef FBTK_IMAGECONTROL_HH 27#ifndef FBTK_IMAGECONTROL_HH
28#define FBTK_IMAGECONTROL_HH 28#define FBTK_IMAGECONTROL_HH
@@ -74,7 +74,6 @@ public:
74 void setColorsPerChannel(int cpc); 74 void setColorsPerChannel(int cpc);
75 75
76 void cleanCache(); 76 void cleanCache();
77
78private: 77private:
79 /** 78 /**
80 Search cache for a specific pixmap 79 Search cache for a specific pixmap
@@ -85,7 +84,6 @@ private:
85 84
86 void createColorTable(); 85 void createColorTable();
87 bool m_dither; 86 bool m_dither;
88
89 Timer m_timer; 87 Timer m_timer;
90 88
91 Colormap m_colormap; 89 Colormap m_colormap;
@@ -124,7 +122,7 @@ private:
124 (s1->width < s2->width || s1->width == s2->width && 122 (s1->width < s2->width || s1->width == s2->width &&
125 (s1->height < s2->height || s1->height == s2->height && 123 (s1->height < s2->height || s1->height == s2->height &&
126 (s1->texture < s2->texture || s1->texture == s2->texture && 124 (s1->texture < s2->texture || s1->texture == s2->texture &&
127 s1->pixel1 < s2->pixel1 || s1->pixel1 == s2->pixel2 && 125 s1->pixel1 < s2->pixel1 || s1->pixel1 == s2->pixel1 &&
128 (s1->texture & FbTk::Texture::GRADIENT) && 126 (s1->texture & FbTk::Texture::GRADIENT) &&
129 s1->pixel2 < s2->pixel2) 127 s1->pixel2 < s2->pixel2)
130 )); 128 ));