diff options
| author | Juanma Barranquero | 2007-10-04 16:57:53 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2007-10-04 16:57:53 +0000 |
| commit | bbe6f2aa1141fe2d2d45a8b79e4eaa646bcd7c4f (patch) | |
| tree | 8fee66307ec152747e6b86d49f760ac6d83a303b /src | |
| parent | b138403dca9c93a83e6a5fd91c1623bbe6d00f94 (diff) | |
| download | emacs-bbe6f2aa1141fe2d2d45a8b79e4eaa646bcd7c4f.tar.gz emacs-bbe6f2aa1141fe2d2d45a8b79e4eaa646bcd7c4f.zip | |
(syms_of_image) <image-types>: Fix typo in docstring.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/image.c | 28 |
2 files changed, 18 insertions, 14 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 1efa2ca302a..b9ff2fafbe2 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2007-10-04 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * image.c (syms_of_image) <image-types>: Fix typo in docstring. | ||
| 4 | |||
| 1 | 2007-10-03 Stefan Monnier <monnier@iro.umontreal.ca> | 5 | 2007-10-03 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 6 | ||
| 3 | * frame.h (struct frame): Don't try to GC-mark menu_bar_items_used. | 7 | * frame.h (struct frame): Don't try to GC-mark menu_bar_items_used. |
diff --git a/src/image.c b/src/image.c index 0fd042643ee..c708bf0374f 100644 --- a/src/image.c +++ b/src/image.c | |||
| @@ -1710,9 +1710,9 @@ free_image_cache (f) | |||
| 1710 | /* Clear image cache of frame F. FORCE_P non-zero means free all | 1710 | /* Clear image cache of frame F. FORCE_P non-zero means free all |
| 1711 | images. FORCE_P zero means clear only images that haven't been | 1711 | images. FORCE_P zero means clear only images that haven't been |
| 1712 | displayed for some time. Should be called from time to time to | 1712 | displayed for some time. Should be called from time to time to |
| 1713 | reduce the number of loaded images. If image-eviction-seconds is | 1713 | reduce the number of loaded images. If image-cache-eviction-delay |
| 1714 | non-nil, this frees images in the cache which weren't displayed for | 1714 | is non-nil, this frees images in the cache which weren't displayed |
| 1715 | at least that many seconds. */ | 1715 | for at least that many seconds. */ |
| 1716 | 1716 | ||
| 1717 | void | 1717 | void |
| 1718 | clear_image_cache (f, force_p) | 1718 | clear_image_cache (f, force_p) |
| @@ -2886,7 +2886,7 @@ enum xbm_token | |||
| 2886 | 3. a vector of strings or bool-vectors, one for each line of the | 2886 | 3. a vector of strings or bool-vectors, one for each line of the |
| 2887 | bitmap. | 2887 | bitmap. |
| 2888 | 2888 | ||
| 2889 | 4. A string containing an in-memory XBM file. WIDTH and HEIGHT | 2889 | 4. a string containing an in-memory XBM file. WIDTH and HEIGHT |
| 2890 | may not be specified in this case because they are defined in the | 2890 | may not be specified in this case because they are defined in the |
| 2891 | XBM file. | 2891 | XBM file. |
| 2892 | 2892 | ||
| @@ -4283,7 +4283,7 @@ xpm_scan (s, end, beg, len) | |||
| 4283 | return XPM_TK_EOF; | 4283 | return XPM_TK_EOF; |
| 4284 | } | 4284 | } |
| 4285 | 4285 | ||
| 4286 | /* Functions for color table lookup in XPM data. A Key is a string | 4286 | /* Functions for color table lookup in XPM data. A key is a string |
| 4287 | specifying the color of each pixel in XPM data. A value is either | 4287 | specifying the color of each pixel in XPM data. A value is either |
| 4288 | an integer that specifies a pixel color, Qt that specifies | 4288 | an integer that specifies a pixel color, Qt that specifies |
| 4289 | transparency, or Qnil for the unspecified color. If the length of | 4289 | transparency, or Qnil for the unspecified color. If the length of |
| @@ -8442,16 +8442,16 @@ svg_load (f, img) | |||
| 8442 | return success_p; | 8442 | return success_p; |
| 8443 | } | 8443 | } |
| 8444 | 8444 | ||
| 8445 | /* svg_load_image is a helper function for svg_load, which does the actual | 8445 | /* svg_load_image is a helper function for svg_load, which does the |
| 8446 | loading given contents and size, apart from frame and image | 8446 | actual loading given contents and size, apart from frame and image |
| 8447 | structures, passed from svg_load. | 8447 | structures, passed from svg_load. |
| 8448 | 8448 | ||
| 8449 | Uses librsvg to do most of the image processing. | 8449 | Uses librsvg to do most of the image processing. |
| 8450 | 8450 | ||
| 8451 | Returns non-zero when sucessful. */ | 8451 | Returns non-zero when successful. */ |
| 8452 | static int | 8452 | static int |
| 8453 | svg_load_image (f, img, contents, size) | 8453 | svg_load_image (f, img, contents, size) |
| 8454 | /* Pointer to emacs frame sturcture. */ | 8454 | /* Pointer to emacs frame structure. */ |
| 8455 | struct frame *f; | 8455 | struct frame *f; |
| 8456 | /* Pointer to emacs image structure. */ | 8456 | /* Pointer to emacs image structure. */ |
| 8457 | struct image *img; | 8457 | struct image *img; |
| @@ -8561,8 +8561,8 @@ svg_load_image (f, img, contents, size) | |||
| 8561 | 8561 | ||
| 8562 | /* This loop handles opacity values, since Emacs assumes | 8562 | /* This loop handles opacity values, since Emacs assumes |
| 8563 | non-transparent images. Each pixel must be "flattened" by | 8563 | non-transparent images. Each pixel must be "flattened" by |
| 8564 | calculating he resulting color, given the transparency of the | 8564 | calculating the resulting color, given the transparency of the |
| 8565 | pixel, and the image background color. */ | 8565 | pixel, and the image background color. */ |
| 8566 | for (y = 0; y < height; ++y) | 8566 | for (y = 0; y < height; ++y) |
| 8567 | { | 8567 | { |
| 8568 | for (x = 0; x < width; ++x) | 8568 | for (x = 0; x < width; ++x) |
| @@ -9045,7 +9045,7 @@ syms_of_image () | |||
| 9045 | defining the supported image types. */ | 9045 | defining the supported image types. */ |
| 9046 | DEFVAR_LISP ("image-types", &Vimage_types, | 9046 | DEFVAR_LISP ("image-types", &Vimage_types, |
| 9047 | doc: /* List of potentially supported image types. | 9047 | doc: /* List of potentially supported image types. |
| 9048 | Each element of the list is a symbol for a image type, like 'jpeg or 'png. | 9048 | Each element of the list is a symbol for an image type, like 'jpeg or 'png. |
| 9049 | To check whether it is really supported, use `image-type-available-p'. */); | 9049 | To check whether it is really supported, use `image-type-available-p'. */); |
| 9050 | Vimage_types = Qnil; | 9050 | Vimage_types = Qnil; |
| 9051 | 9051 | ||