Update ConnectedComponentsImage() signature

diff --git a/Magick++/lib/Image.cpp b/Magick++/lib/Image.cpp
index 972a6c1e199e9d1ed7800d5f8a93b1cac5ba88b5..6888f6144c33e93f9e84460ed43e539a52657950 100644 (file)
--- a/Magick++/lib/Image.cpp
+++ b/Magick++/lib/Image.cpp
@@ -2565,8 +2565,8 @@ void Magick::Image::connectedComponents(const size_t connectivity_)
     *newImage;
 
   GetPPException;
-  newImage=ConnectedComponentsImage(constImage(),stdout,connectivity_,
-    MagickFalse,(CCObjectInfo **) NULL,exceptionInfo);
+  newImage=ConnectedComponentsImage(constImage(),connectivity_,MagickFalse,
+    (CCObjectInfo **) NULL,exceptionInfo);
   replaceImage(newImage);
   ThrowImageException;
 }

diff --git a/MagickCore/vision.c b/MagickCore/vision.c
index 7b3dced890b846e78d2a2f2c9ab597aaec1f18dc..d8ad6fcac83ec02dce365d4a0df0a570214095f9 100644 (file)
--- a/MagickCore/vision.c
+++ b/MagickCore/vision.c
@@ -101,7 +101,7 @@
 %
 %  The format of the ConnectedComponentsImage method is:
 %
-%      Image *ConnectedComponentsImage(const Image *image,FILE *file,
+%      Image *ConnectedComponentsImage(const Image *image,
 %        const size_t connectivity,const MagickBooleanType verbose,
 %        CCObjectInfo **objects,ExceptionInfo *exception)
 %
@@ -109,8 +109,6 @@
 %
 %    o image: the image.
 %
-%    o file: the file, typically stdout.
-%
 %    o connectivity: how many neighbors to visit, choose from 4 or 8.
 %
 %    o verbose: A value other than zero prints more detailed information
@@ -133,7 +131,7 @@ static int CCObjectInfoCompare(const void *x,const void *y)
   return((int) (q->area-(ssize_t) p->area));
 }
 
-MagickExport Image *ConnectedComponentsImage(const Image *image,FILE *file,
+MagickExport Image *ConnectedComponentsImage(const Image *image,
   const size_t connectivity,const MagickBooleanType verbose,
   CCObjectInfo **objects,ExceptionInfo *exception)
 {
@@ -678,7 +676,7 @@ MagickExport Image *ConnectedComponentsImage(const Image *image,FILE *file,
       component_view=DestroyCacheView(component_view);
       qsort((void *) object,component_image->colors,sizeof(*object),
         CCObjectInfoCompare);
-      (void) fprintf(file,
+      (void) fprintf(stdout,
         "Objects (id: bounding-box centroid area mean-color):\n");
       for (i=0; i < (ssize_t) component_image->colors; i++)
       {
@@ -690,7 +688,7 @@ MagickExport Image *ConnectedComponentsImage(const Image *image,FILE *file,
         if (object[i].area < MagickEpsilon)
           continue;
         GetColorTuple(&object[i].color,MagickFalse,mean_color);
-        (void) fprintf(file,
+        (void) fprintf(stdout,
           "  %.20g: %.20gx%.20g%+.20g%+.20g %.1f,%.1f %.20g %s\n",(double)
           object[i].id,(double) object[i].bounding_box.width,(double)
           object[i].bounding_box.height,(double) object[i].bounding_box.x,

diff --git a/MagickCore/vision.h b/MagickCore/vision.h
index 3556f30f5bcedff3dee10b73bdc6eb73d0fb5d81..31754b9c85a7c15ba58572e989f43201ee4dc5fe 100644 (file)
--- a/MagickCore/vision.h
+++ b/MagickCore/vision.h
@@ -42,8 +42,8 @@ typedef struct _CCObjectInfo
 } CCObjectInfo;
 
 extern MagickExport Image
-  *ConnectedComponentsImage(const Image *,FILE *,const size_t,
-    const MagickBooleanType,CCObjectInfo **,ExceptionInfo *);
+  *ConnectedComponentsImage(const Image *,const size_t,const MagickBooleanType,
+    CCObjectInfo **,ExceptionInfo *);
 
 #if defined(__cplusplus) || defined(c_plusplus)
 }

diff --git a/MagickWand/mogrify.c b/MagickWand/mogrify.c
index 5c19922f43b5849ce93b3344160206fcdee9cda5..bef2588bc5a177614dbd8575743a6209d75b1188 100644 (file)
--- a/MagickWand/mogrify.c
+++ b/MagickWand/mogrify.c
@@ -1194,8 +1194,8 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc,
         if (LocaleCompare("connected-component",option+1) == 0)
           {
             (void) SyncImageSettings(mogrify_info,*image,exception);
-            mogrify_image=ConnectedComponentsImage(*image,stdout,
-              (size_t) StringToInteger(argv[i+1]),mogrify_info->verbose,
+            mogrify_image=ConnectedComponentsImage(*image,(size_t)
+              StringToInteger(argv[i+1]),mogrify_info->verbose,
               (CCObjectInfo **) NULL,exception);
             break;
           }

diff --git a/MagickWand/operation.c b/MagickWand/operation.c
index 486a50bbbb5e66f0033a49040728034e999cfe15..3312280714681a39fc84db56c1dd0abf79934454 100644 (file)
--- a/MagickWand/operation.c
+++ b/MagickWand/operation.c
@@ -2102,7 +2102,7 @@ static MagickBooleanType CLISimpleOperatorImage(MagickCLI *cli_wand,
         {
           if (IfMagickFalse(IsGeometry(arg1)))
             CLIWandExceptArgBreak(OptionError,"InvalidArgument",option,arg1);
-          new_image=ConnectedComponentsImage(_image,stdout,(size_t)
+          new_image=ConnectedComponentsImage(_image,(size_t)
             StringToInteger(arg1),_image_info->verbose,(CCObjectInfo **) NULL,
             _exception);
           break;

diff --git a/PerlMagick/Magick.xs b/PerlMagick/Magick.xs
index 556203f0d8b1b5e4205d7525a6573d237acc765a..4308b1fc2aa9698b76fcdcf8939525505f5ba78b 100644 (file)
--- a/PerlMagick/Magick.xs
+++ b/PerlMagick/Magick.xs
@@ -11270,7 +11270,7 @@ Mogrify(ref,...)
           if (attribute_flag[1] != 0)
             verbose=argument_list[1].integer_reference != 0 ?
               MagickTrue : MagickFalse;
-          image=ConnectedComponentsImage(image,stdout,connectivity,verbose,
+          image=ConnectedComponentsImage(image,connectivity,verbose,
             (CCObjectInfo **) NULLexception);
           break;
         }

diff --git a/PerlMagick/quantum/quantum.xs.in b/PerlMagick/quantum/quantum.xs.in
index 0c458fdb858c666248cee8ebe1e9418f6704b42f..66cec46752630065ff4df7f9b90664f92995d015 100644 (file)
--- a/PerlMagick/quantum/quantum.xs.in
+++ b/PerlMagick/quantum/quantum.xs.in
@@ -11268,7 +11268,7 @@ Mogrify(ref,...)
           if (attribute_flag[1] != 0)
             verbose=argument_list[1].integer_reference != 0 ?
               MagickTrue : MagickFalse;
-          image=ConnectedComponentsImage(image,stdout,connectivity,verbose,
+          image=ConnectedComponentsImage(image,connectivity,verbose,
             (CCObjectInfo **) NULL,exception);
           break;
         }