]> granicus.if.org Git - imagemagick/commitdiff
(no commit message)
authorcristy <urban-warrior@git.imagemagick.org>
Sat, 1 Nov 2014 20:31:49 +0000 (20:31 +0000)
committercristy <urban-warrior@git.imagemagick.org>
Sat, 1 Nov 2014 20:31:49 +0000 (20:31 +0000)
MagickCore/vision.c

index ce40d904545ad1b35f989b2c909f2a0dc3da0b29..57feb5eb5ce292318b5f1a4668516a424bdf5bba 100644 (file)
@@ -138,59 +138,6 @@ static int CCObjectCompare(const void *x,const void *y)
   return((int) (q->area-(ssize_t) p->area));
 }
 
-static MagickBooleanType GrayscaleConnectedComponents(Image *image,
-  const size_t number_objects,ExceptionInfo *exception)
-{
-  CacheView
-    *image_view;
-
-  MagickBooleanType
-    status;
-
-  ssize_t
-    y;
-
-  /*
-    Grayscale image.
-  */
-  if (number_objects > 255)
-    ThrowBinaryException(ResourceLimitError,"TooManyObjects",image->filename);
-  status=MagickTrue;
-  image_view=AcquireAuthenticCacheView(image,exception);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
-  #pragma omp parallel for schedule(static,4) shared(status) \
-    magick_threads(image,image,image->rows,1)
-#endif
-  for (y=0; y < (ssize_t) image->rows; y++)
-  {
-    register Quantum
-      *restrict q;
-
-    register ssize_t
-      x;
-
-    if (status == MagickFalse)
-      continue;
-    q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
-    if (q == (Quantum *) NULL)
-      {
-        status=MagickFalse;
-        continue;
-      }
-    for (x=0; x < (ssize_t) image->columns; x++)
-    {
-      SetPixelRed(image,ScaleCharToQuantum(GetPixelRed(image,q)),q);
-      SetPixelGreen(image,ScaleCharToQuantum(GetPixelGreen(image,q)),q);
-      SetPixelBlue(image,ScaleCharToQuantum(GetPixelBlue(image,q)),q);
-      q+=GetPixelChannels(image);
-    }
-    if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
-      status=MagickFalse;
-  }
-  image_view=DestroyCacheView(image_view);
-  return(status);
-}
-
 static MagickBooleanType MergeConnectedComponents(Image *image,
   const size_t number_objects,const double area_threshold,
   ExceptionInfo *exception)
@@ -726,9 +673,6 @@ MagickExport Image *ConnectedComponentsImage(const Image *image,
       component_image=DestroyImage(component_image);
       ThrowImageException(ResourceLimitError,"TooManyObjects");
     }
-  artifact=GetImageArtifact(image,"connected-components:grayscale");
-  if (IsStringTrue(artifact) != MagickFalse)
-    status=GrayscaleConnectedComponents(component_image,n,exception);
   artifact=GetImageArtifact(image,"connected-components:area-threshold");
   area_threshold=0.0;
   if (artifact != (const char *) NULL)