summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/Fl_GIF_Image.cxx709
-rw-r--r--src/Fl_Image.cxx58
-rw-r--r--src/Fl_Pixmap.cxx103
3 files changed, 312 insertions, 558 deletions
diff --git a/src/Fl_GIF_Image.cxx b/src/Fl_GIF_Image.cxx
index 7005363f3..ce4580e74 100644
--- a/src/Fl_GIF_Image.cxx
+++ b/src/Fl_GIF_Image.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: Fl_GIF_Image.cxx,v 1.1.2.1 2001/11/19 01:06:45 easysw Exp $"
+// "$Id: Fl_GIF_Image.cxx,v 1.1.2.2 2001/11/20 05:13:23 easysw Exp $"
//
// Fl_GIF_Image routines.
//
@@ -31,480 +31,335 @@
// Include necessary header files...
//
+#include <FL/Fl.H>
#include <FL/Fl_GIF_Image.H>
#include "config.h"
#include <stdio.h>
#include <stdlib.h>
-#include <ctype.h>
#include <string.h>
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif /* HAVE_STRINGS_H */
-#include <errno.h>
-
-#if defined(WIN32) && ! defined(__CYGWIN__)
-# include <io.h>
-# include <direct.h>
-# define strcasecmp(s,t) stricmp((s), (t))
-# define strncasecmp(s,t,n) strnicmp((s), (t), (n))
-#elif defined(__EMX__)
-# define strcasecmp(s,t) stricmp((s), (t))
-# define strncasecmp(s,t,n) strnicmp((s), (t), (n))
-#else
-# include <unistd.h>
-#endif // WIN32
-
-//
-// GIF definitions...
-//
-
-#define GIF_INTERLACE 0x40
-#define GIF_COLORMAP 0x80
-
-typedef unsigned char gif_cmap_t[256][3];
-
-
-//
-// Local functions...
-//
-
-#if 0
-static int gif_read_cmap(FILE *fp, int ncolors, gif_cmap_t cmap);
-static int gif_get_block(FILE *fp, unsigned char *buffer);
-static int gif_get_code (FILE *fp, int code_size, int first_time);
-static int gif_read_lzw(FILE *fp, int first_time, int input_code_size);
-static int gif_read_image(FILE *fp, Fl_Help_Image *img, gif_cmap_t cmap,
- int interlace);
-
-
-//
-// 'Fl_Help_View::load_gif()' - Load a GIF image file...
-//
-
-int // O - 0 = success, -1 = fail
-Fl_Help_View::load_gif(Fl_Help_Image *img,// I - Image pointer
- FILE *fp)// I - File to load from
-{
- unsigned char buf[1024]; // Input buffer
- gif_cmap_t cmap; // Colormap
- int ncolors, // Bits per pixel
- transparent; // Transparent color index
-
-
- // Read the header; we already know it is a GIF file...
- fread(buf, 13, 1, fp);
-
- img->w = (buf[7] << 8) | buf[6];
- img->h = (buf[9] << 8) | buf[8];
- ncolors = 2 << (buf[10] & 0x07);
-
- if (buf[10] & GIF_COLORMAP)
- if (!gif_read_cmap(fp, ncolors, cmap))
- return (0);
-
- transparent = -1;
-
- for (;;)
- {
- switch (getc(fp))
- {
- case ';' : // End of image
- return (0); // Early end of file
-
- case '!' : // Extension record
- buf[0] = getc(fp);
- if (buf[0] == 0xf9) // Graphic Control Extension
- {
- gif_get_block(fp, buf);
- if (buf[0] & 1) // Get transparent color index
- transparent = buf[3];
- }
-
- while (gif_get_block(fp, buf) != 0);
- break;
-
- case ',' : // Image data
- fread(buf, 9, 1, fp);
-
- if (buf[8] & GIF_COLORMAP)
- {
- ncolors = 2 << (buf[8] & 0x07);
-
- if (!gif_read_cmap(fp, ncolors, cmap))
- return (0);
- }
-
- if (transparent >= 0)
- {
- unsigned rgba = fltk_colors[bgcolor_];
-
-
- // Map transparent color to background color...
- cmap[transparent][0] = rgba >> 24;
- cmap[transparent][1] = rgba >> 16;
- cmap[transparent][2] = rgba >> 8;
- }
-
- img->w = (buf[5] << 8) | buf[4];
- img->h = (buf[7] << 8) | buf[6];
- img->d = 3;
- img->data = (unsigned char *)malloc(img->w * img->h * img->d);
- if (img->data == NULL)
- return (0);
-
- return (gif_read_image(fp, img, cmap, buf[8] & GIF_INTERLACE));
- }
+// Read a .gif file and convert it to a "xpm" format (actually my
+// modified one with compressed colormaps).
+
+// Extensively modified from original code for gif2ras by
+// Patrick J. Naughton of Sun Microsystems. The original
+// copyright notice follows:
+
+/* gif2ras.c - Converts from a Compuserve GIF (tm) image to a Sun Raster image.
+ *
+ * Copyright (c) 1988 by Patrick J. Naughton
+ *
+ * Author: Patrick J. Naughton
+ * naughton@wind.sun.com
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose and without fee is hereby granted,
+ * provided that the above copyright notice appear in all copies and that
+ * both that copyright notice and this permission notice appear in
+ * supporting documentation.
+ *
+ * This file is provided AS IS with no warranties of any kind. The author
+ * shall have no liability with respect to the infringement of copyrights,
+ * trade secrets or any patents by this file or any part thereof. In no
+ * event will the author be liable for any lost revenue or profits or
+ * other special, indirect and consequential damages.
+ *
+ * Comments and additions should be sent to the author:
+ *
+ * Patrick J. Naughton
+ * Sun Microsystems, Inc.
+ * 2550 Garcia Ave, MS 14-40
+ * Mountain View, CA 94043
+ * (415) 336-1080
+ */
+
+typedef unsigned char uchar;
+
+#define NEXTBYTE getc(GifFile)
+#define GETSHORT(var) var = NEXTBYTE; var += NEXTBYTE << 8
+
+Fl_GIF_Image::Fl_GIF_Image(const char *infname) : Fl_Pixmap((char *const*)0) {
+ FILE *GifFile; // file to read
+
+ if ((GifFile = fopen(infname, "rb")) == NULL) {
+ Fl::error("Unable to open %s!", infname);
+ return;
}
-}
-
-
-//
-// 'gif_read_cmap()' - Read the colormap from a GIF file...
-//
-static int // O - -1 = error, 0 = success
-gif_read_cmap(FILE *fp, // I - File to read from
- int ncolors, // I - Number of colors
- gif_cmap_t cmap) // O - Colormap
-{
- // Read the colormap...
- if (fread(cmap, 3, ncolors, fp) < (size_t)ncolors)
- return (0);
-
- return (1);
-}
-
-
-//
-// 'gif_get_block()' - Read a GIF data block...
-//
-
-static int // O - Number characters read
-gif_get_block(FILE *fp, // I - File to read from
- unsigned char *buf) // I - Input buffer
-{
- int count; // Number of character to read
-
-
- // Read the count byte followed by the data from the file...
- if ((count = getc(fp)) == EOF)
- {
- gif_eof = 1;
- return (-1);
+ {char b[6];
+ if (fread(b,1,6,GifFile)<6) return; /* quit on eof */
+ if (b[0]!='G' || b[1]!='I' || b[2] != 'F') {
+ Fl::error("%s is not a GIF file.\n", infname); return;}
+ if (b[3]!='8' || b[4]>'9' || b[5]!= 'a')
+ Fl::warning("%s is version %c%c%c.",infname,b[3],b[4],b[5]);
}
- else if (count == 0)
- gif_eof = 1;
- else if (fread(buf, 1, count, fp) < (size_t)count)
- {
- gif_eof = 1;
- return (-1);
- }
- else
- gif_eof = 0;
- return (count);
-}
-
-
-//
-// 'gif_get_code()' - Get a LZW code from the file...
-//
-
-static int // O - LZW code
-gif_get_code(FILE *fp, // I - File to read from
- int code_size, // I - Size of code in bits
- int first_time) // I - 1 = first time, 0 = not first time
-{
- unsigned i, j, // Looping vars
- ret; // Return value
- int count; // Number of bytes read
- static unsigned char buf[280]; // Input buffer
- static unsigned curbit, // Current bit
- lastbit, // Last bit in buffer
- done, // Done with this buffer?
- last_byte; // Last byte in buffer
- static unsigned bits[8] = // Bit masks for codes
- {
- 0x01, 0x02, 0x04, 0x08,
- 0x10, 0x20, 0x40, 0x80
- };
-
-
- if (first_time)
- {
- // Just initialize the input buffer...
- curbit = 0;
- lastbit = 0;
- done = 0;
-
- return (0);
+ int Width; GETSHORT(Width);
+ int Height; GETSHORT(Height);
+
+ uchar ch = NEXTBYTE;
+ char HasColormap = ((ch & 0x80) != 0);
+ int BitsPerPixel = (ch & 7) + 1;
+ int ColorMapSize = 1 << BitsPerPixel;
+ // int OriginalResolution = ((ch>>4)&7)+1;
+ // int SortedTable = (ch&8)!=0;
+ NEXTBYTE; // Background Color index
+ NEXTBYTE; // Aspect ratio is N/64
+
+ // Read in global colormap:
+ uchar transparent_pixel = 0;
+ char has_transparent = 0;
+ uchar Red[256], Green[256], Blue[256]; /* color map */
+ if (HasColormap) {
+ for (int i=0; i < ColorMapSize; i++) {
+ Red[i] = NEXTBYTE;
+ Green[i] = NEXTBYTE;
+ Blue[i] = NEXTBYTE;
+ }
+ } else {
+ Fl::warning("%s does not have a colormap.", infname);
+ for (int i = 0; i < ColorMapSize; i++)
+ Red[i] = Green[i] = Blue[i] = 255 * i / (ColorMapSize-1);
}
+ int CodeSize; /* Code size, init from GIF header, increases... */
+ char Interlace;
- if ((curbit + code_size) >= lastbit)
- {
- // Don't have enough bits to hold the code...
- if (done)
- return (-1); // Sorry, no more...
+ for (;;) {
- // Move last two bytes to front of buffer...
- if (last_byte > 1)
- {
- buf[0] = buf[last_byte - 2];
- buf[1] = buf[last_byte - 1];
- last_byte = 2;
- }
- else if (last_byte == 1)
- {
- buf[0] = buf[last_byte - 1];
- last_byte = 1;
- }
+ int i = NEXTBYTE;
+ if (i<0) {Fl::error("%s: unexpected EOF",infname); return;}
+ int blocklen;
- // Read in another buffer...
- if ((count = gif_get_block (fp, buf + last_byte)) <= 0)
- {
- // Whoops, no more data!
- done = 1;
- return (-1);
- }
+ // if (i == 0x3B) return 0; eof code
- // Update buffer state...
- curbit = (curbit - lastbit) + 8 * last_byte;
- last_byte += count;
- lastbit = last_byte * 8;
- }
+ if (i == 0x21) { // a "gif extension"
- ret = 0;
- for (ret = 0, i = curbit + code_size - 1, j = code_size;
- j > 0;
- i --, j --)
- ret = (ret << 1) | ((buf[i / 8] & bits[i & 7]) != 0);
+ ch = NEXTBYTE;
+ blocklen = NEXTBYTE;
- curbit += code_size;
+ if (ch==0xF9 && blocklen==4) { // Netscape animation extension
- return ret;
-}
+ char bits;
+ bits = NEXTBYTE;
+ NEXTBYTE; NEXTBYTE; // GETSHORT(delay);
+ transparent_pixel = NEXTBYTE;
+ if (bits & 1) has_transparent = 1;
+ blocklen = NEXTBYTE;
+ } else if (ch == 0xFF) { // Netscape repeat count
+ ;
-//
-// 'gif_read_lzw()' - Read a byte from the LZW stream...
-//
+ } else if (ch != 0xFE) { //Gif Comment
+ Fl::warning("%s: unknown gif extension 0x%02x.", infname, ch);
+ }
+ } else if (i == 0x2c) { // an image
+
+ NEXTBYTE; NEXTBYTE; // GETSHORT(x_position);
+ NEXTBYTE; NEXTBYTE; // GETSHORT(y_position);
+ GETSHORT(Width);
+ GETSHORT(Height);
+ ch = NEXTBYTE;
+ Interlace = ((ch & 0x40) != 0);
+ if (ch&0x80) {
+ // read local color map
+ int n = 1<<((ch&7)+1); // does this replace ColorMapSize ??
+ for (i=0; i < n; i++) {
+ Red[i] = NEXTBYTE;
+ Green[i] = NEXTBYTE;
+ Blue[i] = NEXTBYTE;
+ }
+ }
+ CodeSize = NEXTBYTE+1;
-static int // I - Byte from stream
-gif_read_lzw(FILE *fp, // I - File to read from
- int first_time, // I - 1 = first time, 0 = not first time
- int input_code_size) // I - Code size in bits
-{
- int i, // Looping var
- code, // Current code
- incode; // Input code
- static short fresh = 0, // 1 = empty buffers
- code_size, // Current code size
- set_code_size, // Initial code size set
- max_code, // Maximum code used
- max_code_size, // Maximum code size
- firstcode, // First code read
- oldcode, // Last code read
- clear_code, // Clear code for LZW input
- end_code, // End code for LZW input
- table[2][4096], // String table
- stack[8192], // Output stack
- *sp; // Current stack pointer
-
-
- if (first_time)
- {
- // Setup LZW state...
- set_code_size = input_code_size;
- code_size = set_code_size + 1;
- clear_code = 1 << set_code_size;
- end_code = clear_code + 1;
- max_code_size = 2 * clear_code;
- max_code = clear_code + 2;
-
- // Initialize input buffers...
- gif_get_code(fp, 0, 1);
-
- // Wipe the decompressor table...
- fresh = 1;
-
- for (i = 0; i < clear_code; i ++)
- {
- table[0][i] = 0;
- table[1][i] = i;
+ break; // okay, this is the image we want
+ } else {
+ Fl::warning("%s: unknown gif code 0x%02x", infname, i);
+ blocklen = 0;
}
- for (; i < 4096; i ++)
- table[0][i] = table[1][0] = 0;
-
- sp = stack;
-
- return (0);
+ // skip the data:
+ while (blocklen>0) {while (blocklen--) {NEXTBYTE;} blocklen=NEXTBYTE;}
}
- else if (fresh)
- {
- fresh = 0;
-
- do
- firstcode = oldcode = gif_get_code(fp, code_size, 0);
- while (firstcode == clear_code);
- return (firstcode);
+ uchar *Image = new uchar[Width*Height];
+ if (!Image) {
+ Fl::fatal("Insufficient memory for %s.", infname);
+ return;
}
- if (sp > stack)
- return (*--sp);
-
- while ((code = gif_get_code (fp, code_size, 0)) >= 0)
- {
- if (code == clear_code)
- {
- for (i = 0; i < clear_code; i ++)
- {
- table[0][i] = 0;
- table[1][i] = i;
+ int YC = 0, Pass = 0; /* Used to de-interlace the picture */
+ uchar *p = Image;
+ uchar *eol = p+Width;
+
+ int InitCodeSize = CodeSize;
+ int ClearCode = (1 << (CodeSize-1));
+ int EOFCode = ClearCode + 1;
+ int FirstFree = ClearCode + 2;
+ int FinChar = 0;
+ int ReadMask = (1<<CodeSize) - 1;
+ int FreeCode = FirstFree;
+ int OldCode = ClearCode;
+
+ // tables used by LZW decompresser:
+ short int Prefix[4096];
+ uchar Suffix[4096];
+
+ int blocklen = NEXTBYTE;
+ uchar thisbyte = NEXTBYTE; blocklen--;
+ int frombit = 0;
+
+ for (;;) {
+
+/* Fetch the next code from the raster data stream. The codes can be
+ * any length from 3 to 12 bits, packed into 8-bit bytes, so we have to
+ * maintain our location as a pointer and a bit offset.
+ * In addition, gif adds totally useless and annoying block counts
+ * that must be correctly skipped over. */
+ int CurCode = thisbyte;
+ if (frombit+CodeSize > 7) {
+ if (blocklen <= 0) {
+ blocklen = NEXTBYTE;
+ if (blocklen <= 0) break;
}
-
- for (; i < 4096; i ++)
- table[0][i] = table[1][i] = 0;
-
- code_size = set_code_size + 1;
- max_code_size = 2 * clear_code;
- max_code = clear_code + 2;
-
- sp = stack;
-
- firstcode = oldcode = gif_get_code(fp, code_size, 0);
-
- return (firstcode);
+ thisbyte = NEXTBYTE; blocklen--;
+ CurCode |= thisbyte<<8;
}
- else if (code == end_code)
- {
- unsigned char buf[260];
-
-
- if (!gif_eof)
- while (gif_get_block(fp, buf) > 0);
-
- return (-2);
+ if (frombit+CodeSize > 15) {
+ if (blocklen <= 0) {
+ blocklen = NEXTBYTE;
+ if (blocklen <= 0) break;
+ }
+ thisbyte = NEXTBYTE; blocklen--;
+ CurCode |= thisbyte<<16;
}
-
- incode = code;
-
- if (code >= max_code)
- {
- *sp++ = firstcode;
- code = oldcode;
+ CurCode = (CurCode>>frombit)&ReadMask;
+ frombit = (frombit+CodeSize)%8;
+
+ if (CurCode == ClearCode) {
+ CodeSize = InitCodeSize;
+ ReadMask = (1<<CodeSize) - 1;
+ FreeCode = FirstFree;
+ OldCode = ClearCode;
+ continue;
}
- while (code >= clear_code)
- {
- *sp++ = table[1][code];
- if (code == table[0][code])
- return (255);
-
- code = table[0][code];
+ if (CurCode == EOFCode) break;
+
+ uchar OutCode[1025]; // temporary array for reversing codes
+ uchar *tp = OutCode;
+ int i;
+ if (CurCode < FreeCode) i = CurCode;
+ else if (CurCode == FreeCode) {*tp++ = FinChar; i = OldCode;}
+ else {fprintf(stderr,"%s : LZW Barf!\n",infname); break;}
+
+ while (i >= ColorMapSize) {*tp++ = Suffix[i]; i = Prefix[i];}
+ *tp++ = FinChar = i;
+ while (tp > OutCode) {
+ *p++ = *--tp;
+ if (p >= eol) {
+ if (!Interlace) YC++;
+ else switch (Pass) {
+ case 0: YC += 8; if (YC >= Height) {Pass++; YC = 4;} break;
+ case 1: YC += 8; if (YC >= Height) {Pass++; YC = 2;} break;
+ case 2: YC += 4; if (YC >= Height) {Pass++; YC = 1;} break;
+ case 3: YC += 2; break;
+ }
+ if (YC>=Height) YC=0; /* cheap bug fix when excess data */
+ p = Image + YC*Width;
+ eol = p+Width;
+ }
}
- *sp++ = firstcode = table[1][code];
- code = max_code;
-
- if (code < 4096)
- {
- table[0][code] = oldcode;
- table[1][code] = firstcode;
- max_code ++;
-
- if (max_code >= max_code_size && max_code_size < 4096)
- {
- max_code_size *= 2;
- code_size ++;
+ if (OldCode != ClearCode) {
+ Prefix[FreeCode] = OldCode;
+ Suffix[FreeCode] = FinChar;
+ FreeCode++;
+ if (FreeCode > ReadMask) {
+ if (CodeSize < 12) {
+ CodeSize++;
+ ReadMask = (1 << CodeSize) - 1;
+ }
+ else FreeCode--;
}
}
-
- oldcode = incode;
-
- if (sp > stack)
- return (*--sp);
+ OldCode = CurCode;
}
- return (code);
-}
-
-
-//
-// 'gif_read_image()' - Read a GIF image stream...
-//
-
-static int // I - 0 = success, -1 = failure
-gif_read_image(FILE *fp, // I - Input file
- Fl_Help_Image *img, // I - Image pointer
- gif_cmap_t cmap, // I - Colormap
- int interlace) // I - Non-zero = interlaced image
-{
- unsigned char code_size, // Code size
- *temp; // Current pixel
- int xpos, // Current X position
- ypos, // Current Y position
- pass; // Current pass
- int pixel; // Current pixel
- static int xpasses[4] = { 8, 8, 4, 2 },
- ypasses[5] = { 0, 4, 2, 1, 999999 };
-
-
- xpos = 0;
- ypos = 0;
- pass = 0;
- code_size = getc(fp);
-
- if (gif_read_lzw(fp, 1, code_size) < 0)
- return (0);
-
- temp = img->data;
-
- while ((pixel = gif_read_lzw(fp, 0, code_size)) >= 0)
- {
- temp[0] = cmap[pixel][0];
-
- if (img->d > 1)
- {
- temp[1] = cmap[pixel][1];
- temp[2] = cmap[pixel][2];
+ // We are done reading the file, now convert to xpm:
+
+ // allocate line pointer arrays:
+ w(Width);
+ h(Height);
+ alloc_data = 1;
+ data = new char*[Height+2];
+
+ // transparent pixel must be zero, swap if it isn't:
+ if (has_transparent && transparent_pixel != 0) {
+ // swap transparent pixel with zero
+ p = Image+Width*Height;
+ while (p-- > Image) {
+ if (*p==transparent_pixel) *p = 0;
+ else if (!*p) *p = transparent_pixel;
}
+ uchar t;
+ t = Red[0];
+ Red[0] = Red[transparent_pixel];
+ Red[transparent_pixel] = t;
+
+ t = Green[0];
+ Green[0] = Green[transparent_pixel];
+ Green[transparent_pixel] = t;
+
+ t = Blue[0];
+ Blue[0] = Blue[transparent_pixel];
+ Blue[transparent_pixel] = t;
+ }
- xpos ++;
- temp += img->d;
- if (xpos == img->w)
- {
- xpos = 0;
-
- if (interlace)
- {
- ypos += xpasses[pass];
- temp += (xpasses[pass] - 1) * img->w * img->d;
+ // find out what colors are actually used:
+ uchar used[256]; uchar remap[256];
+ int i;
+ for (i = 0; i < ColorMapSize; i++) used[i] = 0;
+ p = Image+Width*Height;
+ while (p-- > Image) used[*p] = 1;
+
+ // remap them to start with printing characters:
+ int base = has_transparent && used[0] ? ' ' : ' '+1;
+ int numcolors = 0;
+ for (i = 0; i < ColorMapSize; i++) if (used[i]) {
+ remap[i] = base++;
+ numcolors++;
+ }
- if (ypos >= img->h)
- {
- pass ++;
+ // write the first line of xpm data (use suffix as temp array):
+ int length = sprintf((char*)(Suffix),
+ "%d %d %d %d",Width,Height,-numcolors,1);
+ ((char **)data)[0] = new char[length+1];
+ strcpy(((char **)data)[0], (char*)Suffix);
+
+ // write the colormap
+ ((char **)data)[1] = (char*)(p = new uchar[4*numcolors]);
+ for (i = 0; i < ColorMapSize; i++) if (used[i]) {
+ *p++ = remap[i];
+ *p++ = Red[i];
+ *p++ = Green[i];
+ *p++ = Blue[i];
+ }
- ypos = ypasses[pass];
- temp = img->data + ypos * img->w * img->d;
- }
- }
- else
- ypos ++;
- }
+ // remap the image data:
+ p = Image+Width*Height;
+ while (p-- > Image) *p = remap[*p];
- if (ypos >= img->h)
- break;
+ // split the image data into lines:
+ for (i=0; i<Height; i++) {
+ ((char **)data)[i+2] = new char[Width];
+ memcpy(((char **)data)[i + 2], (char*)(Image + i*Width), Width);
}
- return (1);
+ delete[] Image;
}
-#endif
//
-// End of "$Id: Fl_GIF_Image.cxx,v 1.1.2.1 2001/11/19 01:06:45 easysw Exp $".
+// End of "$Id: Fl_GIF_Image.cxx,v 1.1.2.2 2001/11/20 05:13:23 easysw Exp $".
//
diff --git a/src/Fl_Image.cxx b/src/Fl_Image.cxx
index 3359f5057..35d24818a 100644
--- a/src/Fl_Image.cxx
+++ b/src/Fl_Image.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: Fl_Image.cxx,v 1.5.2.3.2.4 2001/11/19 20:59:59 easysw Exp $"
+// "$Id: Fl_Image.cxx,v 1.5.2.3.2.5 2001/11/20 05:13:23 easysw Exp $"
//
// Image drawing code for the Fast Light Tool Kit (FLTK).
//
@@ -294,60 +294,6 @@ void Fl_RGB_Image::draw(int XP, int YP, int WP, int HP, int cx, int cy) {
}
}
-#if 0 // MRS: Don't think this is necessary; try using new fl_create_bitmask code...
-#ifdef WIN32 // Matt: mask done
- // this won't work ehen the user changes display mode during run or
- // has two screens with differnet depths
- static uchar hiNibble[16] =
- { 0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0,
- 0x10, 0x90, 0x50, 0xd0, 0x30, 0xb0, 0x70, 0xf0 };
- static uchar loNibble[16] =
- { 0x00, 0x08, 0x04, 0x0c, 0x02, 0x0a, 0x06, 0x0e,
- 0x01, 0x09, 0x05, 0x0d, 0x03, 0x0b, 0x07, 0x0f };
- int np = GetDeviceCaps(fl_gc, PLANES); //: was always one on sample machines
- int bpp = GetDeviceCaps(fl_gc, BITSPIXEL);//: 1,4,8,16,24,32 and more odd stuff?
- int Bpr = (bpp*w()+7)/8; //: bytes per row
- int pad = Bpr&1, w1 = (w()+7)/8, shr = ((w()-1)&7)+1;
- if (bpp==4) shr = (shr+1)/2;
- uchar *newarray = new uchar[(Bpr+pad)*h()], *dst = newarray, *src = bitmap;
- for (int i=0; i<h(); i++) {
- //: this is slooow, but we do it only once per pixmap
- for (int j=w1; j>0; j--) {
- uchar b = *src++;
- if (bpp==1) {
- *dst++ = ( hiNibble[b&15] ) | ( loNibble[(b>>4)&15] );
- } else if (bpp==4) {
- for (int k=(j==1)?shr:4; k>0; k--) {
- *dst++ = "\377\360\017\000"[b&3];
- b = b >> 2;
- }
- } else {
- for (int k=(j==1)?shr:8; k>0; k--) {
- if (b&1) {
- *dst++=0;
- if (bpp>8) *dst++=0;
- if (bpp>16) *dst++=0;
- if (bpp>24) *dst++=0;
- } else {
- *dst++=0xff;
- if (bpp>8) *dst++=0xff;
- if (bpp>16) *dst++=0xff;
- if (bpp>24) *dst++=0xff;
- }
- b = b >> 1;
- }
- }
- }
- dst += pad;
- }
- mask = (ulong)CreateBitmap(w(), h(), np, bpp, newarray);
- delete[] newarray;
-#else
- mask = XCreateBitmapFromData(fl_display, fl_window,
- (const char*)bitmap, (w()+7)&-8, h());
-#endif
-#endif // 0
-
mask = fl_create_bitmask(w(), h(), bitmap);
delete[] bitmap;
}
@@ -394,5 +340,5 @@ void Fl_RGB_Image::label(Fl_Menu_Item* m) {
//
-// End of "$Id: Fl_Image.cxx,v 1.5.2.3.2.4 2001/11/19 20:59:59 easysw Exp $".
+// End of "$Id: Fl_Image.cxx,v 1.5.2.3.2.5 2001/11/20 05:13:23 easysw Exp $".
//
diff --git a/src/Fl_Pixmap.cxx b/src/Fl_Pixmap.cxx
index 0b3717f45..06565782a 100644
--- a/src/Fl_Pixmap.cxx
+++ b/src/Fl_Pixmap.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: Fl_Pixmap.cxx,v 1.9.2.4.2.5 2001/11/19 20:59:59 easysw Exp $"
+// "$Id: Fl_Pixmap.cxx,v 1.9.2.4.2.6 2001/11/20 05:13:23 easysw Exp $"
//
// Pixmap drawing code for the Fast Light Tool Kit (FLTK).
//
@@ -48,7 +48,7 @@ void Fl_Pixmap::measure() {
int W, H;
// ignore empty or bad pixmap data:
- if (w()<0) {
+ if (w()<0 && data) {
fl_measure_pixmap(data, W, H);
w(W); h(H);
}
@@ -56,6 +56,7 @@ void Fl_Pixmap::measure() {
void Fl_Pixmap::draw(int XP, int YP, int WP, int HP, int cx, int cy) {
// ignore empty or bad pixmap data:
+ if (!data) return;
if (w()<0) {
measure();
if (WP==-1) { WP = w(); HP = h(); }
@@ -80,59 +81,6 @@ void Fl_Pixmap::draw(int XP, int YP, int WP, int HP, int cx, int cy) {
fl_mask_bitmap = 0;
if (bitmap) {
mask = fl_create_bitmask(w(), h(), bitmap);
-#if 0 // Don't think this is needed; try using fl_create_bitmask()...
-#ifdef WIN32 // Matt: mask done
- // this won't work when the user changes display mode during run or
- // has two screens with differnet depths
- static uchar hiNibble[16] =
- { 0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0,
- 0x10, 0x90, 0x50, 0xd0, 0x30, 0xb0, 0x70, 0xf0 };
- static uchar loNibble[16] =
- { 0x00, 0x08, 0x04, 0x0c, 0x02, 0x0a, 0x06, 0x0e,
- 0x01, 0x09, 0x05, 0x0d, 0x03, 0x0b, 0x07, 0x0f };
- int np = GetDeviceCaps(fl_gc, PLANES); //: was always one on sample machines
- int bpp = GetDeviceCaps(fl_gc, BITSPIXEL);//: 1,4,8,16,24,32 and more odd stuff?
- int Bpr = (bpp*w()+7)/8; //: bytes per row
- int pad = Bpr&1, w1 = (w()+7)/8, shr = ((w()-1)&7)+1;
- if (bpp==4) shr = (shr+1)/2;
- uchar *newarray = new uchar[(Bpr+pad)*h()], *dst = newarray, *src = bitmap;
- for (int i=0; i<h(); i++) {
- //: this is slooow, but we do it only once per pixmap
- for (int j=w1; j>0; j--) {
- uchar b = *src++;
- if (bpp==1) {
- *dst++ = ( hiNibble[b&15] ) | ( loNibble[(b>>4)&15] );
- } else if (bpp==4) {
- for (int k=(j==1)?shr:4; k>0; k--) {
- *dst++ = "\377\360\017\000"[b&3];
- b = b >> 2;
- }
- } else {
- for (int k=(j==1)?shr:8; k>0; k--) {
- if (b&1) {
- *dst++=0;
- if (bpp>8) *dst++=0;
- if (bpp>16) *dst++=0;
- if (bpp>24) *dst++=0;
- } else {
- *dst++=0xff;
- if (bpp>8) *dst++=0xff;
- if (bpp>16) *dst++=0xff;
- if (bpp>24) *dst++=0xff;
- }
- b = b >> 1;
- }
- }
- }
- dst += pad;
- }
- mask = (ulong)CreateBitmap(w(), h(), np, bpp, newarray);
- delete[] newarray;
-#else
- mask = XCreateBitmapFromData(fl_display, fl_window,
- (const char*)bitmap, (w()+7)&-8, h());
-#endif
-#endif // 0
delete[] bitmap;
}
@@ -199,7 +147,9 @@ void Fl_Pixmap::copy_data() {
chars_per_line = chars_per_pixel * w() + 1;
// Allocate memory for the new array...
- new_data = new char *[h() + ncolors + 1];
+ if (ncolors < 0) new_data = new char *[h() + 2];
+ else new_data = new char *[h() + ncolors + 1];
+
new_data[0] = new char[strlen(data[0]) + 1];
strcpy(new_data[0], data[0]);
@@ -207,10 +157,11 @@ void Fl_Pixmap::copy_data() {
if (ncolors < 0) {
// Copy FLTK colormap values...
ncolors = -ncolors;
- for (i = 0, new_row = new_data + 1; i < ncolors; i ++, new_row ++) {
- *new_row = new char[4];
- memcpy(*new_row, data[i + 1], 4);
- }
+ new_row = new_data + 1;
+ *new_row = new char[ncolors * 4];
+ memcpy(*new_row, data[1], ncolors * 4);
+ ncolors = 1;
+ new_row ++;
} else {
// Copy standard XPM colormap values...
for (i = 0, new_row = new_data + 1; i < ncolors; i ++, new_row ++) {
@@ -265,7 +216,8 @@ Fl_Image *Fl_Pixmap::copy(int W, int H) {
ystep = h() / H;
// Allocate memory for the new array...
- new_data = new char *[H + ncolors + 1];
+ if (ncolors < 0) new_data = new char *[H + 2];
+ else new_data = new char *[H + ncolors + 1];
new_data[0] = new char[strlen(new_info) + 1];
strcpy(new_data[0], new_info);
@@ -273,10 +225,11 @@ Fl_Image *Fl_Pixmap::copy(int W, int H) {
if (ncolors < 0) {
// Copy FLTK colormap values...
ncolors = -ncolors;
- for (i = 0, new_row = new_data + 1; i < ncolors; i ++, new_row ++) {
- *new_row = new char[4];
- memcpy(*new_row, data[i + 1], 4);
- }
+ new_row = new_data + 1;
+ *new_row = new char[ncolors * 4];
+ memcpy(*new_row, data[1], ncolors * 4);
+ ncolors = 1;
+ new_row ++;
} else {
// Copy standard XPM colormap values...
for (i = 0, new_row = new_data + 1; i < ncolors; i ++, new_row ++) {
@@ -364,10 +317,11 @@ void Fl_Pixmap::color_average(Fl_Color c, float i) {
if (ncolors < 0) {
// Update FLTK colormap...
ncolors = -ncolors;
- for (color = 0; color < ncolors; color ++) {
- ((char *)data[color + 1])[1] = (ia * data[color + 1][1] + ir) >> 8;
- ((char *)data[color + 1])[2] = (ia * data[color + 1][2] + ig) >> 8;
- ((char *)data[color + 1])[3] = (ia * data[color + 1][3] + ib) >> 8;
+ uchar *cmap = (uchar *)(data[1]);
+ for (color = 0; color < ncolors; color ++, cmap += 4) {
+ cmap[1] = (ia * cmap[1] + ir) >> 8;
+ cmap[2] = (ia * cmap[2] + ig) >> 8;
+ cmap[3] = (ia * cmap[3] + ib) >> 8;
}
} else {
// Update standard XPM colormap...
@@ -447,11 +401,10 @@ void Fl_Pixmap::desaturate() {
if (ncolors < 0) {
// Update FLTK colormap...
ncolors = -ncolors;
- for (i = 0; i < ncolors; i ++) {
- g = (data[i + 1][1] * 31 + data[i + 1][2] * 61 + data[i + 1][3] * 8) / 100;
- ((char *)data[i + 1])[1] =
- ((char *)data[i + 1])[2] =
- ((char *)data[i + 1])[3] = g;
+ uchar *cmap = (uchar *)(data[1]);
+ for (i = 0; i < ncolors; i ++, cmap += 4) {
+ g = (cmap[1] * 31 + cmap[2] * 61 + cmap[3] * 8) / 100;
+ cmap[1] = cmap[2] = cmap[3] = g;
}
} else {
// Update standard XPM colormap...
@@ -495,5 +448,5 @@ void Fl_Pixmap::desaturate() {
}
//
-// End of "$Id: Fl_Pixmap.cxx,v 1.9.2.4.2.5 2001/11/19 20:59:59 easysw Exp $".
+// End of "$Id: Fl_Pixmap.cxx,v 1.9.2.4.2.6 2001/11/20 05:13:23 easysw Exp $".
//
generated by cgit v1.2.3 (git 2.25.1) at 2026-02-08 14:06:09 +0000