/* Functions for image support on window system.
Copyright (C) 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
- 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+ 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
Free Software Foundation, Inc.
This file is part of GNU Emacs.
#include <unistd.h>
#endif
+#ifdef HAVE_PNG
+#if defined HAVE_LIBPNG_PNG_H
+# include <libpng/png.h>
+#else
+# include <png.h>
+#endif
+#endif
+
+#include <setjmp.h>
+
/* This makes the fields of a Display accessible, in Xlib header files. */
#define XLIB_ILLEGAL_ACCESS
without modifying lots of files). */
extern void x_query_colors (struct frame *f, XColor *colors, int ncolors);
extern void x_query_color (struct frame *f, XColor *color);
+
+/* Version of libpng that we were compiled with, or -1 if no PNG
+ support was compiled in. This is tested by w32-win.el to correctly
+ set up the alist used to search for PNG libraries. */
+Lisp_Object Qlibpng_version;
#endif /* HAVE_NTGUI */
#ifdef HAVE_NS
the bitmaps yourself. That is, creating a bitmap from the same
data more than once will not be caught. */
-#ifdef MAC_OS
-
-static XImagePtr
-XGetImage (display, pixmap, x, y, width, height, plane_mask, format)
- Display *display; /* not used */
- Pixmap pixmap;
- int x, y; /* not used */
- unsigned int width, height; /* not used */
- unsigned long plane_mask; /* not used */
- int format; /* not used */
-{
-#if !USE_MAC_IMAGE_IO
-#if GLYPH_DEBUG
- xassert (x == 0 && y == 0);
- {
- Rect ri, rp;
- SetRect (&ri, 0, 0, width, height);
- xassert (EqualRect (&ri, GetPixBounds (GetGWorldPixMap (pixmap), &rp)));
- }
- xassert (! (pixelsLocked & GetPixelsState (GetGWorldPixMap (pixmap))));
-#endif
-
- LockPixels (GetGWorldPixMap (pixmap));
-#endif
-
- return pixmap;
-}
-
-static void
-XPutPixel (ximage, x, y, pixel)
- XImagePtr ximage;
- int x, y;
- unsigned long pixel;
-{
-#if USE_MAC_IMAGE_IO
- if (ximage->bits_per_pixel == 32)
- ((unsigned int *)(ximage->data + y * ximage->bytes_per_line))[x] = pixel;
- else
- ((unsigned char *)(ximage->data + y * ximage->bytes_per_line))[x] = pixel;
-#else
- PixMapHandle pixmap = GetGWorldPixMap (ximage);
- short depth = GetPixDepth (pixmap);
-
-#if defined (WORDS_BIG_ENDIAN) || !USE_CG_DRAWING
- if (depth == 32)
- {
- char *base_addr = GetPixBaseAddr (pixmap);
- short row_bytes = GetPixRowBytes (pixmap);
-
- ((unsigned long *) (base_addr + y * row_bytes))[x] = 0xff000000 | pixel;
- }
- else
-#endif
- if (depth == 1)
- {
- char *base_addr = GetPixBaseAddr (pixmap);
- short row_bytes = GetPixRowBytes (pixmap);
-
- if (pixel == PIX_MASK_DRAW)
- base_addr[y * row_bytes + x / 8] |= (1 << 7) >> (x & 7);
- else
- base_addr[y * row_bytes + x / 8] &= ~((1 << 7) >> (x & 7));
- }
- else
- {
- CGrafPtr old_port;
- GDHandle old_gdh;
- RGBColor color;
-
- GetGWorld (&old_port, &old_gdh);
- SetGWorld (ximage, NULL);
-
- color.red = RED16_FROM_ULONG (pixel);
- color.green = GREEN16_FROM_ULONG (pixel);
- color.blue = BLUE16_FROM_ULONG (pixel);
-
- SetCPixel (x, y, &color);
-
- SetGWorld (old_port, old_gdh);
- }
-#endif
-}
-
-static unsigned long
-XGetPixel (ximage, x, y)
- XImagePtr ximage;
- int x, y;
-{
-#if USE_MAC_IMAGE_IO
- if (ximage->bits_per_pixel == 32)
- return ((unsigned int *)(ximage->data + y * ximage->bytes_per_line))[x];
- else
- return ((unsigned char *)(ximage->data + y * ximage->bytes_per_line))[x];
-#else
- PixMapHandle pixmap = GetGWorldPixMap (ximage);
- short depth = GetPixDepth (pixmap);
-
-#if defined (WORDS_BIG_ENDIAN) || !USE_CG_DRAWING
- if (depth == 32)
- {
- char *base_addr = GetPixBaseAddr (pixmap);
- short row_bytes = GetPixRowBytes (pixmap);
-
- return ((unsigned long *) (base_addr + y * row_bytes))[x] & 0x00ffffff;
- }
- else
-#endif
- if (depth == 1)
- {
- char *base_addr = GetPixBaseAddr (pixmap);
- short row_bytes = GetPixRowBytes (pixmap);
-
- if (base_addr[y * row_bytes + x / 8] & (1 << (~x & 7)))
- return PIX_MASK_DRAW;
- else
- return PIX_MASK_RETAIN;
- }
- else
- {
- CGrafPtr old_port;
- GDHandle old_gdh;
- RGBColor color;
-
- GetGWorld (&old_port, &old_gdh);
- SetGWorld (ximage, NULL);
-
- GetCPixel (x, y, &color);
-
- SetGWorld (old_port, old_gdh);
- return RGB_TO_ULONG (color.red >> 8, color.green >> 8, color.blue >> 8);
- }
-#endif
-}
-
-static void
-XDestroyImage (ximg)
- XImagePtr ximg;
-{
-#if !USE_MAC_IMAGE_IO
- UnlockPixels (GetGWorldPixMap (ximg));
-#endif
-}
-
-#if USE_CG_DRAWING
-#if USE_MAC_IMAGE_IO
-void
-mac_data_provider_release_data (info, data, size)
- void *info;
- const void *data;
- size_t size;
-{
- xfree ((void *)data);
-}
-#endif
-
-static CGImageRef
-mac_create_cg_image_from_image (f, img)
- struct frame *f;
- struct image *img;
-{
-#if USE_MAC_IMAGE_IO
- XImagePtr ximg = img->pixmap;
- CGDataProviderRef provider;
- CGImageRef result;
-
- if (img->mask)
- {
- int x, y;
- unsigned long color, alpha;
-
- for (y = 0; y < ximg->height; y++)
- for (x = 0; x < ximg->width; x++)
- {
- color = XGetPixel (ximg, x, y);
- alpha = XGetPixel (img->mask, x, y);
- XPutPixel (ximg, x, y,
- ARGB_TO_ULONG (alpha,
- RED_FROM_ULONG (color)
- * alpha / PIX_MASK_DRAW,
- GREEN_FROM_ULONG (color)
- * alpha / PIX_MASK_DRAW,
- BLUE_FROM_ULONG (color)
- * alpha / PIX_MASK_DRAW));
- }
- xfree (img->mask->data);
- img->mask->data = NULL;
- }
- BLOCK_INPUT;
- provider = CGDataProviderCreateWithData (NULL, ximg->data,
- ximg->bytes_per_line * ximg->height,
- mac_data_provider_release_data);
- ximg->data = NULL;
- result = CGImageCreate (ximg->width, ximg->height, 8, 32,
- ximg->bytes_per_line, mac_cg_color_space_rgb,
- ((img->mask ? kCGImageAlphaPremultipliedFirst
- : kCGImageAlphaNoneSkipFirst)
- | kCGBitmapByteOrder32Host),
- provider, NULL, 0, kCGRenderingIntentDefault);
- CGDataProviderRelease (provider);
- UNBLOCK_INPUT;
-
- return result;
-#else
- Pixmap mask;
- CGImageRef result = NULL;
-
- BLOCK_INPUT;
- if (img->mask)
- mask = img->mask;
- else
- {
- mask = XCreatePixmap (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
- img->width, img->height, 1);
- if (mask)
- {
- CGrafPtr old_port;
- GDHandle old_gdh;
- Rect r;
-
- GetGWorld (&old_port, &old_gdh);
- SetGWorld (mask, NULL);
- BackColor (blackColor); /* Don't mask. */
- SetRect (&r, 0, 0, img->width, img->height);
- EraseRect (&r);
- SetGWorld (old_port, old_gdh);
- }
- }
- if (mask)
- {
- CreateCGImageFromPixMaps (GetGWorldPixMap (img->pixmap),
- GetGWorldPixMap (mask), &result);
- if (mask != img->mask)
- XFreePixmap (FRAME_X_DISPLAY (f), mask);
- }
- UNBLOCK_INPUT;
-
- return result;
-#endif
-}
-#endif /* USE_CG_DRAWING */
-#endif /* MAC_OS */
-
#ifdef HAVE_NS
XImagePtr
XGetImage (Display *display, Pixmap pixmap, int x, int y,
{
struct image *img = search_image_cache (f, spec, sxhash (spec, 0));
if (img)
- free_image (f, img);
+ {
+ free_image (f, img);
+ /* As display glyphs may still be referring to the image ID, we
+ must garbage the frame (Bug#6426). */
+ SET_FRAME_GARBAGED (f);
+ }
}
static int xbm_image_p P_ ((Lisp_Object object));
static int xbm_read_bitmap_data P_ ((struct frame *f,
unsigned char *, unsigned char *,
- int *, int *, unsigned char **));
+ int *, int *, unsigned char **, int));
static int xbm_file_p P_ ((Lisp_Object));
/* Vector of image_keyword structures describing the format
of valid XBM image specifications. */
-static struct image_keyword xbm_format[XBM_LAST] =
+static const struct image_keyword xbm_format[XBM_LAST] =
{
{":type", IMAGE_SYMBOL_VALUE, 1},
{":file", IMAGE_STRING_VALUE, 0},
buffer's end. Set *WIDTH and *HEIGHT to the width and height of
the image. Return in *DATA the bitmap data allocated with xmalloc.
Value is non-zero if successful. DATA null means just test if
- CONTENTS looks like an in-memory XBM file. */
+ CONTENTS looks like an in-memory XBM file. If INHIBIT_IMAGE_ERROR
+ is non-zero, inhibit the call to image_error when the image size is
+ invalid (the bitmap remains unread). */
static int
-xbm_read_bitmap_data (f, contents, end, width, height, data)
+xbm_read_bitmap_data (f, contents, end, width, height, data, inhibit_image_error)
struct frame *f;
unsigned char *contents, *end;
int *width, *height;
unsigned char **data;
+ int inhibit_image_error;
{
unsigned char *s = contents;
char buffer[BUFSIZ];
}
if (!check_image_size (f, *width, *height))
- goto failure;
+ {
+ if (!inhibit_image_error)
+ image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil);
+ goto failure;
+ }
else if (data == NULL)
goto success;
unsigned char *data;
int success_p = 0;
- rc = xbm_read_bitmap_data (f, contents, end, &img->width, &img->height, &data);
+ rc = xbm_read_bitmap_data (f, contents, end, &img->width, &img->height,
+ &data, 0);
if (rc)
{
unsigned long foreground = FRAME_FOREGROUND_PIXEL (f);
int w, h;
return (STRINGP (data)
&& xbm_read_bitmap_data (NULL, SDATA (data),
- (SDATA (data)
- + SBYTES (data)),
- &w, &h, NULL));
+ (SDATA (data) + SBYTES (data)),
+ &w, &h, NULL, 1));
}
int nbytes, i;
/* Windows mono bitmaps are reversed compared with X. */
invertedBits = bits;
- nbytes = (img->width + BITS_PER_CHAR - 1) / BITS_PER_CHAR
+ nbytes = (img->width + BITS_PER_CHAR - 1) / BITS_PER_CHAR
* img->height;
bits = (char *) alloca(nbytes);
for (i = 0; i < nbytes; i++)
/* Vector of image_keyword structures describing the format
of valid XPM image specifications. */
-static struct image_keyword xpm_format[XPM_LAST] =
+static const struct image_keyword xpm_format[XPM_LAST] =
{
{":type", IMAGE_SYMBOL_VALUE, 1},
{":file", IMAGE_STRING_VALUE, 0},
if (!check_image_size (f, width, height))
{
- image_error ("Invalid image size", Qnil, Qnil);
+ image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil);
goto failure;
}
Display *dpy = FRAME_X_DISPLAY (f);
GC gc;
-#ifndef HAVE_NS //TODO: NS support, however this not needed for toolbars
+#ifndef HAVE_NS /* TODO: NS support, however this not needed for toolbars */
#define MaskForeground(f) WHITE_PIX_DEFAULT (f)
/* Vector of image_keyword structures describing the format
of valid user-defined image specifications. */
-static struct image_keyword pbm_format[PBM_LAST] =
+static const struct image_keyword pbm_format[PBM_LAST] =
{
{":type", IMAGE_SYMBOL_VALUE, 1},
{":file", IMAGE_STRING_VALUE, 0},
if (!check_image_size (f, width, height))
{
- image_error ("Invalid image size", Qnil, Qnil);
+ image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil);
goto error;
}
/* Vector of image_keyword structures describing the format
of valid user-defined image specifications. */
-static struct image_keyword png_format[PNG_LAST] =
+static const struct image_keyword png_format[PNG_LAST] =
{
{":type", IMAGE_SYMBOL_VALUE, 1},
{":data", IMAGE_STRING_VALUE, 0},
#ifdef HAVE_PNG
-#if defined HAVE_LIBPNG_PNG_H
-# include <libpng/png.h>
-#else
-# include <png.h>
-#endif
-
#ifdef HAVE_NTGUI
/* PNG library details. */
DEF_IMGLIB_FN (png_get_io_ptr);
-DEF_IMGLIB_FN (png_check_sig);
+DEF_IMGLIB_FN (png_sig_cmp);
DEF_IMGLIB_FN (png_create_read_struct);
DEF_IMGLIB_FN (png_create_info_struct);
DEF_IMGLIB_FN (png_destroy_read_struct);
return 0;
LOAD_IMGLIB_FN (library, png_get_io_ptr);
- LOAD_IMGLIB_FN (library, png_check_sig);
+ LOAD_IMGLIB_FN (library, png_sig_cmp);
LOAD_IMGLIB_FN (library, png_create_read_struct);
LOAD_IMGLIB_FN (library, png_create_info_struct);
LOAD_IMGLIB_FN (library, png_destroy_read_struct);
#else
#define fn_png_get_io_ptr png_get_io_ptr
-#define fn_png_check_sig png_check_sig
+#define fn_png_sig_cmp png_sig_cmp
#define fn_png_create_read_struct png_create_read_struct
#define fn_png_create_info_struct png_create_info_struct
#define fn_png_destroy_read_struct png_destroy_read_struct
char *msg;
{
xassert (png_ptr != NULL);
+ /* Avoid compiler warning about deprecated direct access to
+ png_ptr's fields in libpng versions 1.4.x. */
image_error ("PNG error: %s", build_string (msg), Qnil);
+#if PNG_LIBPNG_VER_MAJOR > 1 \
+ || (PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 4)
+ longjmp (png_jmpbuf (png_ptr), 1);
+#else
longjmp (png_ptr->jmpbuf, 1);
+#endif
}
/* Check PNG signature. */
if (fread (sig, 1, sizeof sig, fp) != sizeof sig
- || !fn_png_check_sig (sig, sizeof sig))
+ || fn_png_sig_cmp (sig, 0, sizeof sig))
{
image_error ("Not a PNG file: `%s'", file, Qnil);
UNGCPRO;
/* Check PNG signature. */
if (tbr.len < sizeof sig
- || !fn_png_check_sig (tbr.bytes, sizeof sig))
+ || fn_png_sig_cmp (tbr.bytes, 0, sizeof sig))
{
image_error ("Not a PNG image: `%s'", img->spec, Qnil);
UNGCPRO;
return 0;
}
+ /* Avoid compiler warning about deprecated direct access to
+ png_ptr's fields in libpng versions 1.4.x. */
+#if PNG_LIBPNG_VER_MAJOR > 1 \
+ || (PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 4)
/* Set error jump-back. We come back here when the PNG library
detects an error. */
+ if (setjmp (png_jmpbuf (png_ptr)))
+#else
if (setjmp (png_ptr->jmpbuf))
+#endif
{
error:
if (png_ptr)
&interlace_type, NULL, NULL);
if (!check_image_size (f, width, height))
- goto error;
-
+ {
+ image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil);
+ goto error;
+ }
/* If image contains simply transparency data, we prefer to
construct a clipping mask. */
if (fn_png_get_valid (png_ptr, info_ptr, PNG_INFO_tRNS))
/* Vector of image_keyword structures describing the format
of valid user-defined image specifications. */
-static struct image_keyword jpeg_format[JPEG_LAST] =
+static const struct image_keyword jpeg_format[JPEG_LAST] =
{
{":type", IMAGE_SYMBOL_VALUE, 1},
{":data", IMAGE_STRING_VALUE, 0},
#include <jpeglib.h>
#include <jerror.h>
-#include <setjmp.h>
#ifdef HAVE_STLIB_H_1
#define HAVE_STDLIB_H 1
if (!check_image_size (f, width, height))
{
- image_error ("Invalid image size", Qnil, Qnil);
+ image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil);
longjmp (mgr.setjmp_buffer, 2);
}
/* Vector of image_keyword structures describing the format
of valid user-defined image specifications. */
-static struct image_keyword tiff_format[TIFF_LAST] =
+static const struct image_keyword tiff_format[TIFF_LAST] =
{
{":type", IMAGE_SYMBOL_VALUE, 1},
{":data", IMAGE_STRING_VALUE, 0},
if (!check_image_size (f, width, height))
{
- image_error ("Invalid image size", Qnil, Qnil);
+ image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil);
fn_TIFFClose (tiff);
UNGCPRO;
return 0;
/* Vector of image_keyword structures describing the format
of valid user-defined image specifications. */
-static struct image_keyword gif_format[GIF_LAST] =
+static const struct image_keyword gif_format[GIF_LAST] =
{
{":type", IMAGE_SYMBOL_VALUE, 1},
{":data", IMAGE_STRING_VALUE, 0},
/* Load GIF image IMG for use on frame F. Value is non-zero if
successful. */
-static int interlace_start[] = {0, 4, 2, 1};
-static int interlace_increment[] = {8, 8, 4, 2};
+static const int interlace_start[] = {0, 4, 2, 1};
+static const int interlace_increment[] = {8, 8, 4, 2};
static int
gif_load (f, img)
/* Before reading entire contents, check the declared image size. */
if (!check_image_size (f, gif->SWidth, gif->SHeight))
{
- image_error ("Invalid image size", Qnil, Qnil);
+ image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil);
fn_DGifCloseFile (gif);
UNGCPRO;
return 0;
if (!check_image_size (f, width, height))
{
- image_error ("Invalid image size", Qnil, Qnil);
+ image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil);
fn_DGifCloseFile (gif);
UNGCPRO;
return 0;
/* Vector of image_keyword structures describing the format
of valid user-defined image specifications. */
-static struct image_keyword svg_format[SVG_LAST] =
+static const struct image_keyword svg_format[SVG_LAST] =
{
{":type", IMAGE_SYMBOL_VALUE, 1},
{":data", IMAGE_STRING_VALUE, 0},
fn_rsvg_handle_get_dimensions (rsvg_handle, &dimension_data);
if (! check_image_size (f, dimension_data.width, dimension_data.height))
- goto rsvg_error;
+ {
+ image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil);
+ goto rsvg_error;
+ }
/* We can now get a valid pixel buffer from the svg file, if all
went ok. */
/* Vector of image_keyword structures describing the format
of valid user-defined image specifications. */
-static struct image_keyword gs_format[GS_LAST] =
+static const struct image_keyword gs_format[GS_LAST] =
{
{":type", IMAGE_SYMBOL_VALUE, 1},
{":pt-width", IMAGE_POSITIVE_INTEGER_VALUE, 1},
if (!check_image_size (f, img->width, img->height))
{
- image_error ("Invalid image size", Qnil, Qnil);
+ image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil);
return 0;
}
support the image type. Types 'pbm and 'xbm don't need to be
listed; they are always supported. */);
Vimage_library_alist = Qnil;
- Fput (intern ("image-library-alist"), Qrisky_local_variable, Qt);
+ Fput (intern_c_string ("image-library-alist"), Qrisky_local_variable, Qt);
DEFVAR_LISP ("max-image-size", &Vmax_image_size,
doc: /* Maximum size of images.
Vimage_type_cache = Qnil;
staticpro (&Vimage_type_cache);
- Qpbm = intern ("pbm");
+ Qpbm = intern_c_string ("pbm");
staticpro (&Qpbm);
ADD_IMAGE_TYPE (Qpbm);
- Qxbm = intern ("xbm");
+ Qxbm = intern_c_string ("xbm");
staticpro (&Qxbm);
ADD_IMAGE_TYPE (Qxbm);
define_image_type (&xbm_type, 1);
define_image_type (&pbm_type, 1);
- Qcount = intern ("count");
+ Qcount = intern_c_string ("count");
staticpro (&Qcount);
- QCascent = intern (":ascent");
+ QCascent = intern_c_string (":ascent");
staticpro (&QCascent);
- QCmargin = intern (":margin");
+ QCmargin = intern_c_string (":margin");
staticpro (&QCmargin);
- QCrelief = intern (":relief");
+ QCrelief = intern_c_string (":relief");
staticpro (&QCrelief);
- QCconversion = intern (":conversion");
+ QCconversion = intern_c_string (":conversion");
staticpro (&QCconversion);
- QCcolor_symbols = intern (":color-symbols");
+ QCcolor_symbols = intern_c_string (":color-symbols");
staticpro (&QCcolor_symbols);
- QCheuristic_mask = intern (":heuristic-mask");
+ QCheuristic_mask = intern_c_string (":heuristic-mask");
staticpro (&QCheuristic_mask);
- QCindex = intern (":index");
+ QCindex = intern_c_string (":index");
staticpro (&QCindex);
- QCmatrix = intern (":matrix");
+ QCmatrix = intern_c_string (":matrix");
staticpro (&QCmatrix);
- QCcolor_adjustment = intern (":color-adjustment");
+ QCcolor_adjustment = intern_c_string (":color-adjustment");
staticpro (&QCcolor_adjustment);
- QCmask = intern (":mask");
+ QCmask = intern_c_string (":mask");
staticpro (&QCmask);
- Qlaplace = intern ("laplace");
+ Qlaplace = intern_c_string ("laplace");
staticpro (&Qlaplace);
- Qemboss = intern ("emboss");
+ Qemboss = intern_c_string ("emboss");
staticpro (&Qemboss);
- Qedge_detection = intern ("edge-detection");
+ Qedge_detection = intern_c_string ("edge-detection");
staticpro (&Qedge_detection);
- Qheuristic = intern ("heuristic");
+ Qheuristic = intern_c_string ("heuristic");
staticpro (&Qheuristic);
- Qpostscript = intern ("postscript");
+ Qpostscript = intern_c_string ("postscript");
staticpro (&Qpostscript);
#ifdef HAVE_GHOSTSCRIPT
ADD_IMAGE_TYPE (Qpostscript);
- QCloader = intern (":loader");
+ QCloader = intern_c_string (":loader");
staticpro (&QCloader);
- QCbounding_box = intern (":bounding-box");
+ QCbounding_box = intern_c_string (":bounding-box");
staticpro (&QCbounding_box);
- QCpt_width = intern (":pt-width");
+ QCpt_width = intern_c_string (":pt-width");
staticpro (&QCpt_width);
- QCpt_height = intern (":pt-height");
+ QCpt_height = intern_c_string (":pt-height");
staticpro (&QCpt_height);
#endif /* HAVE_GHOSTSCRIPT */
+#ifdef HAVE_NTGUI
+ Qlibpng_version = intern_c_string ("libpng-version");
+ staticpro (&Qlibpng_version);
+#if HAVE_PNG
+ SET_SYMBOL_VAL (XSYMBOL (Qlibpng_version), make_number (PNG_LIBPNG_VER));
+#else
+ SET_SYMBOL_VAL (XSYMBOL (Qlibpng_version), make_number (-1));
+#endif
+#endif
+
#if defined (HAVE_XPM) || defined (HAVE_NS)
- Qxpm = intern ("xpm");
+ Qxpm = intern_c_string ("xpm");
staticpro (&Qxpm);
ADD_IMAGE_TYPE (Qxpm);
#endif
#if defined (HAVE_JPEG) || defined (HAVE_NS)
- Qjpeg = intern ("jpeg");
+ Qjpeg = intern_c_string ("jpeg");
staticpro (&Qjpeg);
ADD_IMAGE_TYPE (Qjpeg);
#endif
#if defined (HAVE_TIFF) || defined (HAVE_NS)
- Qtiff = intern ("tiff");
+ Qtiff = intern_c_string ("tiff");
staticpro (&Qtiff);
ADD_IMAGE_TYPE (Qtiff);
#endif
#if defined (HAVE_GIF) || defined (HAVE_NS)
- Qgif = intern ("gif");
+ Qgif = intern_c_string ("gif");
staticpro (&Qgif);
ADD_IMAGE_TYPE (Qgif);
#endif
#if defined (HAVE_PNG) || defined (HAVE_NS)
- Qpng = intern ("png");
+ Qpng = intern_c_string ("png");
staticpro (&Qpng);
ADD_IMAGE_TYPE (Qpng);
#endif
#if defined (HAVE_RSVG)
- Qsvg = intern ("svg");
+ Qsvg = intern_c_string ("svg");
staticpro (&Qsvg);
ADD_IMAGE_TYPE (Qsvg);
#ifdef HAVE_NTGUI
/* Other libraries used directly by svg code. */
- Qgdk_pixbuf = intern ("gdk-pixbuf");
+ Qgdk_pixbuf = intern_c_string ("gdk-pixbuf");
staticpro (&Qgdk_pixbuf);
- Qglib = intern ("glib");
+ Qglib = intern_c_string ("glib");
staticpro (&Qglib);
- Qgobject = intern ("gobject");
+ Qgobject = intern_c_string ("gobject");
staticpro (&Qgobject);
#endif /* HAVE_NTGUI */
#endif /* HAVE_RSVG */
HCoop / bpt / emacs.git / blobdiff