From: Cristy <mikayla-grace@urban-warrior.org>
Date: Mon, 4 Mar 2019 11:08:16 +0000 (-0500)
Subject: ...
X-Git-Tag: 7.0.8-31~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3122a669d2e0dd2fefd9b5f4ed825f26f1906781;p=imagemagick

...
---

diff --git a/ChangeLog b/ChangeLog
index c59cd0a14..d433d7487 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2019-03-04  7.0.8-31 Cristy  <quetzlzacatenango@image...>
+  * -trim is no longer sensitive to the image virtual canvas.
+
 2019-03-03  7.0.8-30 Cristy  <quetzlzacatenango@image...>
   * Release ImageMagick version 7.0.8-30, GIT revision 15376:16d2b4e6a:20190303
 
diff --git a/MagickCore/attribute.c b/MagickCore/attribute.c
index 9df01437d..13dd0d430 100644
--- a/MagickCore/attribute.c
+++ b/MagickCore/attribute.c
@@ -241,7 +241,7 @@ MagickExport RectangleInfo GetImageBoundingBox(const Image *image,
   ExceptionInfo *exception)
 {
   CacheView
-    *image_view;
+    *edge_view;
 
   const char
     *artifact;
@@ -254,6 +254,9 @@ MagickExport RectangleInfo GetImageBoundingBox(const Image *image,
     edge,
     vertex;
 
+  Image
+    *edge_image;
+
   RectangleInfo
     bounds;
 
@@ -265,18 +268,22 @@ MagickExport RectangleInfo GetImageBoundingBox(const Image *image,
   if (image->debug != MagickFalse)
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
   SetGeometry(image,&bounds);
+  edge_image=CloneImage(image,0,0,MagickTrue,exception);
+  if (edge_image == (Image *) NULL)
+    return(bounds);
+  (void) ParseAbsoluteGeometry("0x0+0+0",&edge_image->page);
   memset(&vertex,0,sizeof(vertex));
-  image_view=AcquireVirtualCacheView(image,exception);
-  edge.left=GetEdgeBackgroundFactor(image,image_view,WestGravity,1,0,0,0,
-    exception);
-  edge.right=GetEdgeBackgroundFactor(image,image_view,EastGravity,1,0,0,0,
-    exception);
-  edge.top=GetEdgeBackgroundFactor(image,image_view,NorthGravity,0,1,0,0,
-    exception);
-  edge.bottom=GetEdgeBackgroundFactor(image,image_view,SouthGravity,0,1,0,0,
-    exception);
+  edge_view=AcquireVirtualCacheView(edge_image,exception);
+  edge.left=GetEdgeBackgroundFactor(edge_image,edge_view,WestGravity,
+    1,0,0,0,exception);
+  edge.right=GetEdgeBackgroundFactor(edge_image,edge_view,EastGravity,
+    1,0,0,0,exception);
+  edge.top=GetEdgeBackgroundFactor(edge_image,edge_view,NorthGravity,
+    0,1,0,0,exception);
+  edge.bottom=GetEdgeBackgroundFactor(edge_image,edge_view,SouthGravity,
+    0,1,0,0,exception);
   percent_background=1.0;
-  artifact=GetImageArtifact(image,"trim:percent-background");
+  artifact=GetImageArtifact(edge_image,"trim:percent-background");
   if (artifact != (const char *) NULL)
     percent_background=StringToDouble(artifact,(char **) NULL)/100.0;
   percent_background=MagickMin(MagickMax(1.0-percent_background,MagickEpsilon),
@@ -294,13 +301,15 @@ MagickExport RectangleInfo GetImageBoundingBox(const Image *image,
         */
         vertex.left++;
         bounds.width--;
-        edge.left=GetEdgeBackgroundFactor(image,image_view,NorthWestGravity,
-          1,bounds.height,(ssize_t) vertex.left,(ssize_t) vertex.top,exception);
-        edge.top=GetEdgeBackgroundFactor(image,image_view,NorthWestGravity,
-          bounds.width,1,(ssize_t) vertex.left,(ssize_t) vertex.top,exception);
-        edge.bottom=GetEdgeBackgroundFactor(image,image_view,SouthWestGravity,
-          bounds.width,1,(ssize_t) vertex.left,(ssize_t) vertex.bottom,
-          exception);
+        edge.left=GetEdgeBackgroundFactor(edge_image,edge_view,
+          NorthWestGravity,1,bounds.height,(ssize_t) vertex.left,(ssize_t)
+          vertex.top,exception);
+        edge.top=GetEdgeBackgroundFactor(edge_image,edge_view,
+          NorthWestGravity,bounds.width,1,(ssize_t) vertex.left,(ssize_t)
+          vertex.top,exception);
+        edge.bottom=GetEdgeBackgroundFactor(edge_image,edge_view,
+          SouthWestGravity,bounds.width,1,(ssize_t) vertex.left,(ssize_t)
+          vertex.bottom,exception);
         continue;
       }
     if (fabs(edge.right-background_factor) < MagickEpsilon)
@@ -310,14 +319,15 @@ MagickExport RectangleInfo GetImageBoundingBox(const Image *image,
         */
         vertex.right++;
         bounds.width--;
-        edge.right=GetEdgeBackgroundFactor(image,image_view,NorthEastGravity,
-          1,bounds.height,(ssize_t) vertex.right,(ssize_t) vertex.top,
-          exception);
-        edge.top=GetEdgeBackgroundFactor(image,image_view,NorthWestGravity,
-          bounds.width,1,(ssize_t) vertex.left,(ssize_t) vertex.top,exception);
-        edge.bottom=GetEdgeBackgroundFactor(image,image_view,SouthWestGravity,
-          bounds.width,1,(ssize_t) vertex.left,(ssize_t) vertex.bottom,
-          exception);
+        edge.right=GetEdgeBackgroundFactor(edge_image,edge_view,
+          NorthEastGravity,1,bounds.height,(ssize_t) vertex.right,(ssize_t)
+          vertex.top,exception);
+        edge.top=GetEdgeBackgroundFactor(edge_image,edge_view,
+          NorthWestGravity,bounds.width,1,(ssize_t) vertex.left,(ssize_t)
+          vertex.top,exception);
+        edge.bottom=GetEdgeBackgroundFactor(edge_image,edge_view,
+          SouthWestGravity,bounds.width,1,(ssize_t) vertex.left,(ssize_t)
+          vertex.bottom,exception);
         continue;
       }
     if (fabs(edge.top-background_factor) < MagickEpsilon)
@@ -327,13 +337,15 @@ MagickExport RectangleInfo GetImageBoundingBox(const Image *image,
         */
         vertex.top++;
         bounds.height--;
-        edge.left=GetEdgeBackgroundFactor(image,image_view,NorthWestGravity,
-          1,bounds.height,(ssize_t) vertex.left,(ssize_t) vertex.top,exception);
-        edge.right=GetEdgeBackgroundFactor(image,image_view,NorthEastGravity,
-          1,bounds.height,(ssize_t) vertex.right,(ssize_t) vertex.top,
-          exception);
-        edge.top=GetEdgeBackgroundFactor(image,image_view,NorthWestGravity,
-          bounds.width,1,(ssize_t) vertex.left,(ssize_t) vertex.top,exception);
+        edge.left=GetEdgeBackgroundFactor(edge_image,edge_view,
+          NorthWestGravity,1,bounds.height,(ssize_t) vertex.left,(ssize_t)
+          vertex.top,exception);
+        edge.right=GetEdgeBackgroundFactor(edge_image,edge_view,
+          NorthEastGravity,1,bounds.height,(ssize_t) vertex.right,(ssize_t)
+          vertex.top,exception);
+        edge.top=GetEdgeBackgroundFactor(edge_image,edge_view,
+          NorthWestGravity,bounds.width,1,(ssize_t) vertex.left,(ssize_t)
+          vertex.top,exception);
         continue;
       }
     if (fabs(edge.bottom-background_factor) < MagickEpsilon)
@@ -343,18 +355,20 @@ MagickExport RectangleInfo GetImageBoundingBox(const Image *image,
         */
         vertex.bottom++;
         bounds.height--;
-        edge.left=GetEdgeBackgroundFactor(image,image_view,NorthWestGravity,
-          1,bounds.height,(ssize_t) vertex.left,(ssize_t) vertex.top,exception);
-        edge.right=GetEdgeBackgroundFactor(image,image_view,NorthEastGravity,
-          1,bounds.height,(ssize_t) vertex.right,(ssize_t) vertex.top,
-          exception);
-        edge.bottom=GetEdgeBackgroundFactor(image,image_view,SouthWestGravity,
-          bounds.width,1,(ssize_t) vertex.left,(ssize_t) vertex.bottom,
-          exception);
+        edge.left=GetEdgeBackgroundFactor(edge_image,edge_view,
+          NorthWestGravity,1,bounds.height,(ssize_t) vertex.left,(ssize_t)
+          vertex.top,exception);
+        edge.right=GetEdgeBackgroundFactor(edge_image,edge_view,
+          NorthEastGravity,1,bounds.height,(ssize_t) vertex.right,(ssize_t)
+          vertex.top,exception);
+        edge.bottom=GetEdgeBackgroundFactor(edge_image,edge_view,
+          SouthWestGravity,bounds.width,1,(ssize_t) vertex.left,(ssize_t)
+          vertex.bottom,exception);
         continue;
       }
   }
-  image_view=DestroyCacheView(image_view);
+  edge_view=DestroyCacheView(edge_view);
+  edge_image=DestroyImage(edge_image);
   bounds.x=(ssize_t) vertex.left;
   bounds.y=(ssize_t) vertex.top;
   if ((bounds.width == 0) || (bounds.height == 0))