From: Cristy <mikayla-grace@urban-warrior.org>
Date: Sat, 4 May 2019 00:36:06 +0000 (-0400)
Subject: https://github.com/ImageMagick/ImageMagick6/issues/47
X-Git-Tag: 7.0.8-44~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=41f47759ac3c084f25bd832302066dbedaaa2b7b;p=imagemagick

https://github.com/ImageMagick/ImageMagick6/issues/47
---

diff --git a/MagickCore/attribute.c b/MagickCore/attribute.c
index 13dd0d430..ae9f72f75 100644
--- a/MagickCore/attribute.c
+++ b/MagickCore/attribute.c
@@ -237,7 +237,7 @@ static inline double GetMinEdgeBackgroundFactor(const EdgeInfo *edge)
   return(factor);
 }
 
-MagickExport RectangleInfo GetImageBoundingBox(const Image *image,
+static RectangleInfo GetEdgeBoundingBox(const Image *image,
   ExceptionInfo *exception)
 {
   CacheView
@@ -376,6 +376,137 @@ MagickExport RectangleInfo GetImageBoundingBox(const Image *image,
       "GeometryDoesNotContainImage","`%s'",image->filename);
   return(bounds);
 }
+
+MagickExport RectangleInfo GetImageBoundingBox(const Image *image,
+  ExceptionInfo *exception)
+{
+  CacheView
+    *image_view;
+
+  const char
+    *artifact;
+
+  MagickBooleanType
+    status;
+
+  PixelInfo
+    target[3],
+    zero;
+
+  RectangleInfo
+    bounds;
+
+  register const Quantum
+    *p;
+
+  ssize_t
+    y;
+
+  assert(image != (Image *) NULL);
+  assert(image->signature == MagickCoreSignature);
+  if (image->debug != MagickFalse)
+    (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
+  artifact=GetImageArtifact(image,"trim:percent-background");
+  if (artifact != (const char *) NULL)
+    return(GetEdgeBoundingBox(image,exception));
+  bounds.width=0;
+  bounds.height=0;
+  bounds.x=(ssize_t) image->columns;
+  bounds.y=(ssize_t) image->rows;
+  GetPixelInfo(image,&target[0]);
+  image_view=AcquireVirtualCacheView(image,exception);
+  p=GetCacheViewVirtualPixels(image_view,0,0,1,1,exception);
+  if (p == (const Quantum *) NULL)
+    {
+      image_view=DestroyCacheView(image_view);
+      return(bounds);
+    }
+  GetPixelInfoPixel(image,p,&target[0]);
+  GetPixelInfo(image,&target[1]);
+  p=GetCacheViewVirtualPixels(image_view,(ssize_t) image->columns-1,0,1,1,
+    exception);
+  if (p != (const Quantum *) NULL)
+    GetPixelInfoPixel(image,p,&target[1]);
+  GetPixelInfo(image,&target[2]);
+  p=GetCacheViewVirtualPixels(image_view,0,(ssize_t) image->rows-1,1,1,
+    exception);
+  if (p != (const Quantum *) NULL)
+    GetPixelInfoPixel(image,p,&target[2]);
+  status=MagickTrue;
+  GetPixelInfo(image,&zero);
+#if defined(MAGICKCORE_OPENMP_SUPPORT)
+  #pragma omp parallel for schedule(static) shared(status) \
+    magick_number_threads(image,image,image->rows,1)
+#endif
+  for (y=0; y < (ssize_t) image->rows; y++)
+  {
+    PixelInfo
+      pixel;
+
+    RectangleInfo
+      bounding_box;
+
+    register const Quantum
+      *magick_restrict p;
+
+    register ssize_t
+      x;
+
+    if (status == MagickFalse)
+      continue;
+#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#  pragma omp critical (MagickCore_GetImageBoundingBox)
+#endif
+    bounding_box=bounds;
+    p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception);
+    if (p == (const Quantum *) NULL)
+      {
+        status=MagickFalse;
+        continue;
+      }
+    pixel=zero;
+    for (x=0; x < (ssize_t) image->columns; x++)
+    {
+      GetPixelInfoPixel(image,p,&pixel);
+      if ((x < bounding_box.x) &&
+          (IsFuzzyEquivalencePixelInfo(&pixel,&target[0]) == MagickFalse))
+        bounding_box.x=x;
+      if ((x > (ssize_t) bounding_box.width) &&
+          (IsFuzzyEquivalencePixelInfo(&pixel,&target[1]) == MagickFalse))
+        bounding_box.width=(size_t) x;
+      if ((y < bounding_box.y) &&
+          (IsFuzzyEquivalencePixelInfo(&pixel,&target[0]) == MagickFalse))
+        bounding_box.y=y;
+      if ((y > (ssize_t) bounding_box.height) &&
+          (IsFuzzyEquivalencePixelInfo(&pixel,&target[2]) == MagickFalse))
+        bounding_box.height=(size_t) y;
+      p+=GetPixelChannels(image);
+    }
+#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#  pragma omp critical (MagickCore_GetImageBoundingBox)
+#endif
+    {
+      if (bounding_box.x < bounds.x)
+        bounds.x=bounding_box.x;
+      if (bounding_box.y < bounds.y)
+        bounds.y=bounding_box.y;
+      if (bounding_box.width > bounds.width)
+        bounds.width=bounding_box.width;
+      if (bounding_box.height > bounds.height)
+        bounds.height=bounding_box.height;
+    }
+  }
+  image_view=DestroyCacheView(image_view);
+  if ((bounds.width == 0) || (bounds.height == 0))
+    (void) ThrowMagickException(exception,GetMagickModule(),OptionWarning,
+      "GeometryDoesNotContainImage","`%s'",image->filename);
+  else
+    {
+      bounds.width-=(bounds.x-1);
+      bounds.height-=(bounds.y-1);
+    }
+  return(bounds);
+}
 
 /*
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%