From b83e0e3eef62f085b7b12e2de856fe3315638484 Mon Sep 17 00:00:00 2001
From: dirk <dirk@git.imagemagick.org>
Date: Sat, 26 Mar 2016 12:39:40 +0100
Subject: [PATCH] Removed group from ImageInfo.

---
 MagickCore/display.c  | 21 +++++++++++++++++----
 MagickCore/image.c    |  1 -
 MagickCore/image.h    |  3 ---
 MagickCore/property.c |  7 -------
 4 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/MagickCore/display.c b/MagickCore/display.c
index 7ea9f28c2..1e5a73087 100644
--- a/MagickCore/display.c
+++ b/MagickCore/display.c
@@ -9062,7 +9062,8 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info,
     case ShowPreviewCommand:
     {
       char
-        **previews;
+        **previews,
+        value[MagickPathExtent];
 
       Image
         *preview_image;
@@ -9089,7 +9090,9 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info,
       XCheckRefreshWindows(display,windows);
       image_info->preview_type=(PreviewType)
         ParseCommandOption(MagickPreviewOptions,MagickFalse,preview_type);
-      image_info->group=(ssize_t) windows->image.id;
+      (void) FormatLocaleString(value,MaxTextExtent,"%.20g",(double)
+        windows->image.id);
+      (void) SetImageProperty(*image,"group",value,exception);
       (void) DeleteImageProperty(*image,"label");
       (void) SetImageProperty(*image,"label","Preview",exception);
       (void) AcquireUniqueFilename(filename);
@@ -9114,6 +9117,9 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info,
     }
     case ShowHistogramCommand:
     {
+      char
+        value[MagickPathExtent];
+
       Image
         *histogram_image;
 
@@ -9122,7 +9128,9 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info,
       */
       XSetCursorState(display,windows,MagickTrue);
       XCheckRefreshWindows(display,windows);
-      image_info->group=(ssize_t) windows->image.id;
+      (void) FormatLocaleString(value,MaxTextExtent,"%.20g",(double)
+        windows->image.id);
+      (void) SetImageProperty(*image,"group",value,exception);
       (void) DeleteImageProperty(*image,"label");
       (void) SetImageProperty(*image,"label","Histogram",exception);
       (void) AcquireUniqueFilename(filename);
@@ -9147,6 +9155,9 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info,
     }
     case ShowMatteCommand:
     {
+      char
+        value[MagickPathExtent];
+
       Image
         *matte_image;
 
@@ -9161,7 +9172,9 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info,
       */
       XSetCursorState(display,windows,MagickTrue);
       XCheckRefreshWindows(display,windows);
-      image_info->group=(ssize_t) windows->image.id;
+      (void) FormatLocaleString(value,MaxTextExtent,"%.20g",(double)
+        windows->image.id);
+      (void) SetImageProperty(*image,"group",value,exception);
       (void) DeleteImageProperty(*image,"label");
       (void) SetImageProperty(*image,"label","Matte",exception);
       (void) AcquireUniqueFilename(filename);
diff --git a/MagickCore/image.c b/MagickCore/image.c
index ae6d589e6..282645e46 100644
--- a/MagickCore/image.c
+++ b/MagickCore/image.c
@@ -972,7 +972,6 @@ MagickExport ImageInfo *CloneImageInfo(const ImageInfo *image_info)
   clone_info->type=image_info->type;
   clone_info->orientation=image_info->orientation;
   clone_info->preview_type=image_info->preview_type;
-  clone_info->group=image_info->group;
   clone_info->ping=image_info->ping;
   clone_info->verbose=image_info->verbose;
   clone_info->progress_monitor=image_info->progress_monitor;
diff --git a/MagickCore/image.h b/MagickCore/image.h
index b9c996065..41fecb5d5 100644
--- a/MagickCore/image.h
+++ b/MagickCore/image.h
@@ -435,9 +435,6 @@ struct _ImageInfo
   PreviewType
     preview_type;
 
-  ssize_t
-    group;
-
   MagickBooleanType
     ping,                    /* fast read image attributes, not image data */
     verbose;                 /* verbose output enable/disable */
diff --git a/MagickCore/property.c b/MagickCore/property.c
index a1d4fc82d..5a079d9c7 100644
--- a/MagickCore/property.c
+++ b/MagickCore/property.c
@@ -2747,13 +2747,6 @@ MagickExport const char *GetMagickProperty(ImageInfo *image_info,
             GetMagickPrecision(),image->gamma);
           break;
         }
-      if (LocaleCompare("group",property) == 0)
-        {
-          WarnNoImageInfoReturn("\"%%[%s]\"",property);
-          (void) FormatLocaleString(value,MagickPathExtent,"0x%lx",(unsigned long)
-            image_info->group);
-          break;
-        }
       break;
     }
     case 'h':
-- 
2.40.0