Commit 6db423a9 authored by Ken Brown's avatar Ken Brown
Browse files

Fix return type of image_background (Bug#13981)

* src/dispextern.h (RGB_PIXEL_COLOR): Move here from image.c.  Use it
as return type of image_background.  (Bug#13981)
* src/image.c (RGB_PIXEL_COLOR): Move to dispextern.h.
parent 9c44569e
2013-03-17 Ken Brown <kbrown@cornell.edu>
* dispextern.h (RGB_PIXEL_COLOR): Move here from image.c. Use it
as return type of image_background. (Bug#13981)
* image.c (RGB_PIXEL_COLOR): Move to dispextern.h.
2013-03-16 Jan Djärv <jan.h.d@swipnet.se>
* nsterm.m (updateFrameSize:): Change resize increments if needed.
......
......@@ -3186,7 +3186,15 @@ bool valid_image_p (Lisp_Object);
void prepare_image_for_display (struct frame *, struct image *);
ptrdiff_t lookup_image (struct frame *, Lisp_Object);
unsigned long image_background (struct image *, struct frame *,
#if defined (HAVE_X_WINDOWS) || defined (HAVE_NS)
#define RGB_PIXEL_COLOR unsigned long
#endif
#ifdef HAVE_NTGUI
#define RGB_PIXEL_COLOR COLORREF
#endif
RGB_PIXEL_COLOR image_background (struct image *, struct frame *,
XImagePtr_or_DC ximg);
int image_background_transparent (struct image *, struct frame *,
XImagePtr_or_DC mask);
......
......@@ -68,8 +68,6 @@ typedef struct x_bitmap_record Bitmap_Record;
#define GET_PIXEL(ximg, x, y) XGetPixel (ximg, x, y)
#define NO_PIXMAP None
#define RGB_PIXEL_COLOR unsigned long
#define PIX_MASK_RETAIN 0
#define PIX_MASK_DRAW 1
#endif /* HAVE_X_WINDOWS */
......@@ -88,8 +86,6 @@ typedef struct w32_bitmap_record Bitmap_Record;
#define GET_PIXEL(ximg, x, y) GetPixel (ximg, x, y)
#define NO_PIXMAP 0
#define RGB_PIXEL_COLOR COLORREF
#define PIX_MASK_RETAIN 0
#define PIX_MASK_DRAW 1
......@@ -110,7 +106,6 @@ typedef struct ns_bitmap_record Bitmap_Record;
#define GET_PIXEL(ximg, x, y) XGetPixel (ximg, x, y)
#define NO_PIXMAP 0
#define RGB_PIXEL_COLOR unsigned long
#define ZPixmap 0
#define PIX_MASK_RETAIN 0
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment