[Emacs-diffs] trunk r118256: * nsimage.m (ImageList, imageListNext, imageListSetNext:)

[Jan D.]

------------------------------------------------------------
revno: 118256
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/18918
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Sun 2014-11-02 19:43:22 +0100
message:
  * nsimage.m (ImageList, imageListNext, imageListSetNext:)
  (reference): Remove.
  (allocInitFromFile:): Remove searching ImageList and calling
  reference.
  (dealloc): Remove handling if ImageList.
  
  * nsterm.h (EmacsImage): Remove imageListNext, refCount, reference,
  imageListSetNext, imageListNext.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/nsimage.m                  nsimage.m-20091113204419-o5vbwnq5f7feedwu-8743
  src/nsterm.h                   nsterm.h-20091113204419-o5vbwnq5f7feedwu-8746

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-11-02 17:02:32 +0000
+++ b/src/ChangeLog     2014-11-02 18:43:22 +0000
@@ -1,3 +1,14 @@
+2014-11-02  Jan Djärv  <address@hidden>
+
+       * nsterm.h (EmacsImage): Remove imageListNext, refCount, reference,
+       imageListSetNext, imageListNext.
+
+       * nsimage.m (ImageList, imageListNext, imageListSetNext:)
+       (reference): Remove.
+       (allocInitFromFile:): Remove searching ImageList and calling
+       reference (Bug#18918).
+       (dealloc): Remove handling if ImageList.
+
 2014-11-02  Andreas Schwab  <address@hidden>
 
        * process.c (catch_child_signal): Fix incorrect assertion.

=== modified file 'src/nsimage.m'
--- a/src/nsimage.m     2014-10-12 08:35:50 +0000
+++ b/src/nsimage.m     2014-11-02 18:43:22 +0000
@@ -160,25 +160,11 @@
 
 @implementation EmacsImage
 
-static EmacsImage *ImageList = nil;
-
 + allocInitFromFile: (Lisp_Object)file
 {
-  EmacsImage *image = ImageList;
   NSImageRep *imgRep;
   Lisp_Object found;
-
-  /* look for an existing image of the same name */
-  while (image != nil &&
-         [[image name] compare: [NSString stringWithUTF8String: SSDATA (file)]]
-             != NSOrderedSame)
-    image = [image imageListNext];
-
-  if (image != nil)
-    {
-      [image reference];
-      return image;
-    }
+  EmacsImage *image;
 
   /* Search bitmap-file-path for the file, if appropriate.  */
   found = x_find_image_file (file);
@@ -205,54 +191,14 @@
   [image setSize: NSMakeSize([imgRep pixelsWide], [imgRep pixelsHigh])];
 
   [image setName: [NSString stringWithUTF8String: SSDATA (file)]];
-  [image reference];
-  ImageList = [image imageListSetNext: ImageList];
 
   return image;
 }
 
 
-- reference
-{
-  refCount++;
-  return self;
-}
-
-
-- imageListSetNext: (id)arg
-{
-  imageListNext = arg;
-  return self;
-}
-
-
-- imageListNext
-{
-  return imageListNext;
-}
-
-
 - (void)dealloc
 {
-  id list = ImageList;
-
-  if (refCount > 1)
-    {
-      refCount--;
-      return;
-    }
-
   [stippleMask release];
-
-  if (list == self)
-    ImageList = imageListNext;
-  else
-    {
-      while (list != nil && [list imageListNext] != self)
-        list = [list imageListNext];
-      [list imageListSetNext: imageListNext];
-    }
-
   [super dealloc];
 }
 

=== modified file 'src/nsterm.h'
--- a/src/nsterm.h      2014-11-01 18:05:30 +0000
+++ b/src/nsterm.h      2014-11-02 18:43:22 +0000
@@ -338,16 +338,11 @@
 
 @interface EmacsImage : NSImage
 {
-  id imageListNext;
-  int refCount;
   NSBitmapImageRep *bmRep; /* used for accessing pixel data */
   unsigned char *pixmapData[5]; /* shortcut to access pixel data */
   NSColor *stippleMask;
 }
 + allocInitFromFile: (Lisp_Object)file;
-- reference;
-- imageListSetNext: (id)arg;
-- imageListNext;
 - (void)dealloc;
 - initFromXBM: (unsigned char *)bits width: (int)w height: (int)h
          flip: (BOOL)flip;