X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Ftruerendercontrol.hh;h=a1bc47dcc2e8c467d0113da2e6f9780a5f5f106b;hb=555facb9c737be20cd923abc15875af0281a8927;hp=e733a148f7ac4ea3186a3d24326deeeb74757c5d;hpb=e6bfddf849009bef7bbb75be5147b4a533fa1ad2;p=chaz%2Fopenbox diff --git a/otk/truerendercontrol.hh b/otk/truerendercontrol.hh index e733a148..a1bc47dc 100644 --- a/otk/truerendercontrol.hh +++ b/otk/truerendercontrol.hh @@ -4,42 +4,10 @@ #include "rendercontrol.hh" -extern "C" { - -#ifdef HAVE_STDINT_H -# include -#else -# ifdef HAVE_SYS_TYPES_H -# include -# endif -#endif - -} - #include namespace otk { -#ifdef HAVE_STDINT_H -typedef uint32_t pixel32; -typedef uint16_t pixel16; -#else -typedef u_int32_t pixel32; -typedef u_int16_t pixel16; -#endif /* HAVE_STDINT_H */ - -#ifdef WORDS_BIGENDIAN -const int default_red_shift=0; -const int default_green_shift=8; -const int default_blue_shift=16; -const int endian=MSBFirst; -#else -const int default_red_shift=16; -const int default_green_shift=8; -const int default_blue_shift=0; -const int endian=LSBFirst; -#endif /* WORDS_BIGENDIAN */ - class TrueRenderControl : public RenderControl { private: // the number of bits to shift a color value (from 0-255) to the right, to @@ -54,13 +22,10 @@ private: int _blue_offset; inline void highlight(pixel32 *x, pixel32 *y, bool raised) const; - void reduceDepth(XImage *im, pixel32 *data) const; - void verticalGradient(Surface &sf, const RenderTexture &texture, - pixel32 *data) const; - void diagonalGradient(Surface &sf, const RenderTexture &texture, - pixel32 *data) const; - void crossDiagonalGradient(Surface &sf, const RenderTexture &texture, - pixel32 *data) const; + void reduceDepth(Surface &sf, XImage *im) const; + void verticalGradient(Surface &sf, const RenderTexture &texture) const; + void diagonalGradient(Surface &sf, const RenderTexture &texture) const; + void crossDiagonalGradient(Surface &sf, const RenderTexture &texture) const; virtual void drawGradientBackground(Surface &sf, const RenderTexture &texture) const;