From 76c990ed010635a2b4b948ff5966dcda5ad66164 Mon Sep 17 00:00:00 2001 From: cristy Date: Sat, 1 Nov 2014 20:31:49 +0000 Subject: [PATCH] --- MagickCore/vision.c | 56 --------------------------------------------- 1 file changed, 56 deletions(-) diff --git a/MagickCore/vision.c b/MagickCore/vision.c index ce40d9045..57feb5eb5 100644 --- a/MagickCore/vision.c +++ b/MagickCore/vision.c @@ -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) -- 2.40.0