aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJuanma Barranquero2007-08-24 13:46:24 +0000
committerJuanma Barranquero2007-08-24 13:46:24 +0000
commit3046a84b5e0c60f5947f8dfcc9d7962accb8a610 (patch)
treeff8069ca4041ca9e7b9bf203807de861f4e44bed /src
parentff8da4430313a389218af87b170e60351f89a7f9 (diff)
downloademacs-3046a84b5e0c60f5947f8dfcc9d7962accb8a610.tar.gz
emacs-3046a84b5e0c60f5947f8dfcc9d7962accb8a610.zip
(syms_of_image) <image-library-alist, cross-disabled-images>: Doc fixes.
Diffstat (limited to 'src')
-rw-r--r--src/image.c20
1 files changed, 11 insertions, 9 deletions
diff --git a/src/image.c b/src/image.c
index 48c6cdcd4de..54c01cf36b3 100644
--- a/src/image.c
+++ b/src/image.c
@@ -2096,7 +2096,7 @@ forall_images_in_image_cache (f, fn)
2096 2096
2097/* Load a DLL implementing an image type. 2097/* Load a DLL implementing an image type.
2098 The `image-library-alist' variable associates a symbol, 2098 The `image-library-alist' variable associates a symbol,
2099 identifying an image type, to a list of possible filenames. 2099 identifying an image type, to a list of possible filenames.
2100 The function returns NULL if no library could be loaded for 2100 The function returns NULL if no library could be loaded for
2101 the given image type, or if the library was previously loaded; 2101 the given image type, or if the library was previously loaded;
2102 else the handle of the DLL. */ 2102 else the handle of the DLL. */
@@ -3108,7 +3108,8 @@ w32_create_pixmap_from_bitmap_data (int width, int height, char *data)
3108 return bmp; 3108 return bmp;
3109} 3109}
3110 3110
3111static void convert_mono_to_color_image (f, img, foreground, background) 3111static void
3112convert_mono_to_color_image (f, img, foreground, background)
3112 struct frame *f; 3113 struct frame *f;
3113 struct image *img; 3114 struct image *img;
3114 COLORREF foreground, background; 3115 COLORREF foreground, background;
@@ -3151,7 +3152,7 @@ static void convert_mono_to_color_image (f, img, foreground, background)
3151 3152
3152 3153
3153static void 3154static void
3154Create_Pixmap_From_Bitmap_Data(f, img, data, fg, bg, non_default_colors) 3155Create_Pixmap_From_Bitmap_Data (f, img, data, fg, bg, non_default_colors)
3155 struct frame *f; 3156 struct frame *f;
3156 struct image *img; 3157 struct image *img;
3157 char *data; 3158 char *data;
@@ -5057,7 +5058,8 @@ x_to_xcolors (f, img, rgb_p)
5057 created with CreateDIBSection, with the pointer to the bit values 5058 created with CreateDIBSection, with the pointer to the bit values
5058 stored in ximg->data. */ 5059 stored in ximg->data. */
5059 5060
5060static void XPutPixel (ximg, x, y, color) 5061static void
5062XPutPixel (ximg, x, y, color)
5061 XImagePtr ximg; 5063 XImagePtr ximg;
5062 int x, y; 5064 int x, y;
5063 COLORREF color; 5065 COLORREF color;
@@ -8524,7 +8526,7 @@ svg_load_image (f, img, contents, size)
8524 x_query_color (f, &background); 8526 x_query_color (f, &background);
8525 8527
8526 /* SVG pixmaps specify transparency in the last byte, so right 8528 /* SVG pixmaps specify transparency in the last byte, so right
8527 shift 8 bits to get rid of it, since emacs doesnt support 8529 shift 8 bits to get rid of it, since emacs doesn't support
8528 transparency. */ 8530 transparency. */
8529 background.red >>= 8; 8531 background.red >>= 8;
8530 background.green >>= 8; 8532 background.green >>= 8;
@@ -8541,11 +8543,11 @@ svg_load_image (f, img, contents, size)
8541#endif 8543#endif
8542 8544
8543 /* SVG pixmaps specify transparency in the last byte, so right 8545 /* SVG pixmaps specify transparency in the last byte, so right
8544 shift 8 bits to get rid of it, since emacs doesnt support 8546 shift 8 bits to get rid of it, since emacs doesn't support
8545 transparency. */ 8547 transparency. */
8546 background.red >>= 8; 8548 background.red >>= 8;
8547 background.green >>= 8; 8549 background.green >>= 8;
8548 background.blue >>= 8; 8550 background.blue >>= 8;
8549#else /* not HAVE_X_WINDOWS && not MAC_OS*/ 8551#else /* not HAVE_X_WINDOWS && not MAC_OS*/
8550#error FIXME 8552#error FIXME
8551#endif 8553#endif
@@ -9051,7 +9053,7 @@ alternate filenames for the corresponding external libraries.
9051Emacs tries to load the libraries in the order they appear on the 9053Emacs tries to load the libraries in the order they appear on the
9052list; if none is loaded, the running session of Emacs won't 9054list; if none is loaded, the running session of Emacs won't
9053support the image type. Types 'pbm and 'xbm don't need to be 9055support the image type. Types 'pbm and 'xbm don't need to be
9054listed; they're always supported. */); 9056listed; they are always supported. */);
9055 Vimage_library_alist = Qnil; 9057 Vimage_library_alist = Qnil;
9056 Fput (intern ("image-library-alist"), Qrisky_local_variable, Qt); 9058 Fput (intern ("image-library-alist"), Qrisky_local_variable, Qt);
9057 9059
@@ -9181,7 +9183,7 @@ non-numeric, there is no explicit limit on the size of images. */);
9181 9183
9182 DEFVAR_BOOL ("cross-disabled-images", &cross_disabled_images, 9184 DEFVAR_BOOL ("cross-disabled-images", &cross_disabled_images,
9183 doc: /* Non-nil means always draw a cross over disabled images. 9185 doc: /* Non-nil means always draw a cross over disabled images.
9184Disabled images are those having an `:conversion disabled' property. 9186Disabled images are those having a `:conversion disabled' property.
9185A cross is always drawn on black & white displays. */); 9187A cross is always drawn on black & white displays. */);
9186 cross_disabled_images = 0; 9188 cross_disabled_images = 0;
9187 9189