diff options
author | fluxgen <fluxgen> | 2002-09-14 15:05:00 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2002-09-14 15:05:00 (GMT) |
commit | afd7e5a6b7043812e472994dd2f49941094ee080 (patch) | |
tree | 1f56a5163d8fcfac160c11450d8b85518d4548ff | |
parent | 3dc5c4bf551155acad7a0173115496fd845c2417 (diff) | |
download | fluxbox-afd7e5a6b7043812e472994dd2f49941094ee080.zip fluxbox-afd7e5a6b7043812e472994dd2f49941094ee080.tar.bz2 |
removed color functions
-rw-r--r-- | src/Image.cc | 22 | ||||
-rw-r--r-- | src/Image.hh | 5 |
2 files changed, 2 insertions, 25 deletions
diff --git a/src/Image.cc b/src/Image.cc index 0387304..3d73374 100644 --- a/src/Image.cc +++ b/src/Image.cc | |||
@@ -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.cc,v 1.14 2002/09/14 13:52:08 fluxgen Exp $ | 25 | // $Id: Image.cc,v 1.15 2002/09/14 15:05:00 fluxgen Exp $ |
26 | 26 | ||
27 | //use GNU extensions | 27 | //use GNU extensions |
28 | #ifndef _GNU_SOURCE | 28 | #ifndef _GNU_SOURCE |
@@ -2309,26 +2309,6 @@ void BImageControl::removeImage(Pixmap pixmap) { | |||
2309 | } | 2309 | } |
2310 | 2310 | ||
2311 | 2311 | ||
2312 | |||
2313 | |||
2314 | unsigned long BImageControl::color(const char *colorname) { | ||
2315 | XColor color; | ||
2316 | color.pixel = 0; | ||
2317 | |||
2318 | if (! XParseColor(basedisplay->getXDisplay(), colormap(), colorname, &color)) | ||
2319 | fprintf(stderr, "BImageControl::color: color parse error: \"%s\"\n", | ||
2320 | colorname); | ||
2321 | else { | ||
2322 | if (! XAllocColor(basedisplay->getXDisplay(), colormap(), &color)) | ||
2323 | fprintf(stderr, "BImageControl::color: color alloc error: \"%s\"\n", | ||
2324 | colorname); | ||
2325 | else | ||
2326 | fprintf(stderr, "%s(%d) Allocated color:%s", __FILE__, __LINE__, colorname); | ||
2327 | } | ||
2328 | return color.pixel; | ||
2329 | } | ||
2330 | |||
2331 | |||
2332 | void BImageControl::colorTables(unsigned char **rmt, unsigned char **gmt, | 2312 | void BImageControl::colorTables(unsigned char **rmt, unsigned char **gmt, |
2333 | unsigned char **bmt, | 2313 | unsigned char **bmt, |
2334 | int *roff, int *goff, int *boff, | 2314 | int *roff, int *goff, int *boff, |
diff --git a/src/Image.hh b/src/Image.hh index 8df93fe..8ae8505 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.12 2002/09/14 13:50:38 fluxgen Exp $ | 25 | // $Id: Image.hh,v 1.13 2002/09/14 15:03:32 fluxgen Exp $ |
26 | 26 | ||
27 | #ifndef IMAGE_HH | 27 | #ifndef IMAGE_HH |
28 | #define IMAGE_HH | 28 | #define IMAGE_HH |
@@ -120,9 +120,6 @@ public: | |||
120 | inline int depth() const { return screen_depth; } | 120 | inline int depth() const { return screen_depth; } |
121 | inline int colorsPerChannel() const { return colors_per_channel; } | 121 | inline int colorsPerChannel() const { return colors_per_channel; } |
122 | 122 | ||
123 | unsigned long color(const char *colorname); | ||
124 | unsigned long color(const char *, unsigned char *, unsigned char *, | ||
125 | unsigned char *); | ||
126 | unsigned long getSqrt(unsigned int val); | 123 | unsigned long getSqrt(unsigned int val); |
127 | /** | 124 | /** |
128 | Render to pixmap | 125 | Render to pixmap |