* nsterm.h (struct ns_display_info): Remove set-but-unused

member image_cache (image caches are per-terminal anyway).
(FRAME_X_IMAGE_CACHE): Remove.
* nsterm.m (ns_initialize_display_info): Adjust user.

diff --git a/src/ChangeLog b/src/ChangeLog
index 0349cc8b9b0a6d0be2c0ba45e17175f1f6360491..e3d42d093e58c615bf2d66ffd1c2ce166795bf59 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2013-10-15  Dmitry Antipov  <dmantipov@yandex.ru>
+
+       * nsterm.h (struct ns_display_info): Remove set-but-unused
+       member image_cache (image caches are per-terminal anyway).
+       (FRAME_X_IMAGE_CACHE): Remove.
+       * nsterm.m (ns_initialize_display_info): Adjust user.
+
 2013-10-14  Eli Zaretskii  <eliz@gnu.org>
 
        * w32proc.c: Include mingw_time.h.

diff --git a/src/nsterm.h b/src/nsterm.h
index 263b85d6cf1379cade7bcb47a74a0c41e81434aa..a4e9519daaec037fd77446564217a9cdb88108bd 100644 (file)
--- a/src/nsterm.h
+++ b/src/nsterm.h
@@ -569,8 +569,6 @@ struct ns_display_info
   ptrdiff_t bitmaps_size;
   ptrdiff_t bitmaps_last;
 
-  struct image_cache *image_cache;
-
   struct ns_color_table *color_table;
 
   /* DPI resolution of this screen */
@@ -714,8 +712,6 @@ struct x_output
 #define FRAME_FOREGROUND_COLOR(f) ((f)->output_data.ns->foreground_color)
 #define FRAME_BACKGROUND_COLOR(f) ((f)->output_data.ns->background_color)
 
-#define FRAME_X_IMAGE_CACHE(F) FRAME_DISPLAY_INFO ((F))->image_cache
-
 #define NS_FACE_FOREGROUND(f) ((f)->foreground)
 #define NS_FACE_BACKGROUND(f) ((f)->background)
 #define FRAME_NS_TITLEBAR_HEIGHT(f) ((f)->output_data.ns->titlebar_height)

diff --git a/src/nsterm.m b/src/nsterm.m
index b0067d85eaeecb1851a05ed1cb04127d8af7c2ec..5b48ff2cee625d0a94cf59291918a71ce81a0e0e 100644 (file)
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -3975,7 +3975,6 @@ ns_initialize_display_info (struct ns_display_info *dpyinfo)
                 && ![NSCalibratedWhiteColorSpace isEqualToString:
                                                  NSColorSpaceFromDepth (depth)];
     dpyinfo->n_planes = NSBitsPerPixelFromDepth (depth);
-    dpyinfo->image_cache = make_image_cache ();
     dpyinfo->color_table = xmalloc (sizeof *dpyinfo->color_table);
     dpyinfo->color_table->colors = NULL;
     dpyinfo->root_window = 42; /* a placeholder.. */