diff options
Diffstat (limited to 'src/Image.hh')
-rw-r--r-- | src/Image.hh | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/src/Image.hh b/src/Image.hh index 1a9579b..94aa6b0 100644 --- a/src/Image.hh +++ b/src/Image.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: Image.hh,v 1.8 2002/07/19 20:33:15 fluxgen Exp $ | 25 | // $Id: Image.hh,v 1.9 2002/07/22 22:33:45 fluxgen Exp $ |
26 | 26 | ||
27 | #ifndef IMAGE_HH | 27 | #ifndef IMAGE_HH |
28 | #define IMAGE_HH | 28 | #define IMAGE_HH |
@@ -177,26 +177,26 @@ public: | |||
177 | unsigned long color(const char *colorname); | 177 | unsigned long color(const char *colorname); |
178 | unsigned long color(const char *, unsigned char *, unsigned char *, | 178 | unsigned long color(const char *, unsigned char *, unsigned char *, |
179 | unsigned char *); | 179 | unsigned char *); |
180 | unsigned long getSqrt(unsigned int); | 180 | unsigned long getSqrt(unsigned int val); |
181 | 181 | ||
182 | Pixmap renderImage(unsigned int, unsigned int, BTexture *); | 182 | Pixmap renderImage(unsigned int, unsigned int, BTexture *); |
183 | 183 | ||
184 | void installRootColormap(); | 184 | void installRootColormap(); |
185 | void removeImage(Pixmap thepix); | 185 | void removeImage(Pixmap thepix); |
186 | void colorTables(unsigned char **, unsigned char **, unsigned char **, | 186 | void colorTables(unsigned char **, unsigned char **, unsigned char **, |
187 | int *, int *, int *, int *, int *, int *); | 187 | int *, int *, int *, int *, int *, int *); |
188 | void getXColorTable(XColor **, int *); | 188 | void getXColorTable(XColor **, int *); |
189 | void getGradientBuffers(unsigned int, unsigned int, | 189 | void getGradientBuffers(unsigned int, unsigned int, |
190 | unsigned int **, unsigned int **); | 190 | unsigned int **, unsigned int **); |
191 | void setDither(Bool d) { dither = d; } | 191 | void setDither(bool d) { dither = d; } |
192 | void setColorsPerChannel(int); | 192 | void setColorsPerChannel(int cpc); |
193 | void parseTexture(BTexture *, char *); | 193 | void parseTexture(BTexture *ret_texture, char *sval); |
194 | void parseColor(BColor *, char * = 0); | 194 | void parseColor(BColor *ret_color, char *sval = 0); |
195 | 195 | ||
196 | virtual void timeout(void); | 196 | virtual void timeout(); |
197 | 197 | ||
198 | private: | 198 | private: |
199 | Bool dither; | 199 | bool dither; |
200 | BaseDisplay *basedisplay; | 200 | BaseDisplay *basedisplay; |
201 | ScreenInfo *screeninfo; | 201 | ScreenInfo *screeninfo; |
202 | #ifdef TIMEDCACHE | 202 | #ifdef TIMEDCACHE |
@@ -214,7 +214,8 @@ private: | |||
214 | blue_color_table[256]; | 214 | blue_color_table[256]; |
215 | unsigned int *grad_xbuffer, *grad_ybuffer, grad_buffer_width, | 215 | unsigned int *grad_xbuffer, *grad_ybuffer, grad_buffer_width, |
216 | grad_buffer_height; | 216 | grad_buffer_height; |
217 | unsigned long *sqrt_table, cache_max; | 217 | static unsigned long *sqrt_table; |
218 | unsigned long cache_max; | ||
218 | 219 | ||
219 | typedef struct Cache { | 220 | typedef struct Cache { |
220 | Pixmap pixmap; | 221 | Pixmap pixmap; |