[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master c5b6f16 1/3: struct image_type layout is private to
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] master c5b6f16 1/3: struct image_type layout is private to image.c |
Date: |
Thu, 6 Dec 2018 13:48:11 -0500 (EST) |
branch: master
commit c5b6f1672bc62d9ffdd3c7200074727a4608af03
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>
struct image_type layout is private to image.c
* src/dispextern.h (struct image_type): Move from here ...
* src/image.c (struct image_type): ... to here.
---
src/dispextern.h | 28 ----------------------------
src/image.c | 27 +++++++++++++++++++++++++++
2 files changed, 27 insertions(+), 28 deletions(-)
diff --git a/src/dispextern.h b/src/dispextern.h
index 776d140..4cd0176 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -2935,34 +2935,6 @@ struct redisplay_interface
#ifdef HAVE_WINDOW_SYSTEM
-/* Each image format (JPEG, TIFF, ...) supported is described by
- a structure of the type below. */
-
-struct image_type
-{
- /* Index of a symbol uniquely identifying the image type, e.g., 'jpeg'. */
- int type;
-
- /* Check that SPEC is a valid image specification for the given
- image type. Value is true if SPEC is valid. */
- bool (* valid_p) (Lisp_Object spec);
-
- /* Load IMG which is used on frame F from information contained in
- IMG->spec. Value is true if successful. */
- bool (* load) (struct frame *f, struct image *img);
-
- /* Free resources of image IMG which is used on frame F. */
- void (* free) (struct frame *f, struct image *img);
-
- /* Initialization function (used for dynamic loading of image
- libraries on Windows), or NULL if none. */
- bool (* init) (void);
-
- /* Next in list of all supported image types. */
- struct image_type *next;
-};
-
-
/* Structure describing an image. Specific image formats like XBM are
converted into this form, so that display only has to deal with
this type of image. */
diff --git a/src/image.c b/src/image.c
index ad4f95b..633d66e 100644
--- a/src/image.c
+++ b/src/image.c
@@ -525,6 +525,33 @@ x_create_bitmap_mask (struct frame *f, ptrdiff_t id)
Image types
***********************************************************************/
+/* Each image format (JPEG, TIFF, ...) supported is described by
+ a structure of the type below. */
+
+struct image_type
+{
+ /* Index of a symbol uniquely identifying the image type, e.g., 'jpeg'. */
+ int type;
+
+ /* Check that SPEC is a valid image specification for the given
+ image type. Value is true if SPEC is valid. */
+ bool (*valid_p) (Lisp_Object spec);
+
+ /* Load IMG which is used on frame F from information contained in
+ IMG->spec. Value is true if successful. */
+ bool (*load) (struct frame *f, struct image *img);
+
+ /* Free resources of image IMG which is used on frame F. */
+ void (*free) (struct frame *f, struct image *img);
+
+ /* Initialization function (used for dynamic loading of image
+ libraries on Windows), or NULL if none. */
+ bool (*init) (void);
+
+ /* Next in list of all supported image types. */
+ struct image_type *next;
+};
+
/* List of supported image types. Use define_image_type to add new
types. Use lookup_image_type to find a type for a given symbol. */