From: cristy Date: Sun, 27 Apr 2014 13:34:21 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~2405 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=20f90428960e75e335cd31e9a92ed31ff610117d;p=imagemagick --- diff --git a/MagickWand/mogrify.c b/MagickWand/mogrify.c index 7939dc87c..cf8b94bb2 100644 --- a/MagickWand/mogrify.c +++ b/MagickWand/mogrify.c @@ -1806,6 +1806,8 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, flags=ParseGeometry(argv[i+1],&geometry_info); if ((flags & SigmaValue) == 0) geometry_info.sigma=geometry_info.rho; + if ((flags & XiValue) == 0) + geometry_info.xi=40; mogrify_image=HoughLineImage(*image,(size_t) geometry_info.rho, (size_t) geometry_info.sigma,(size_t) geometry_info.xi,exception); break; diff --git a/MagickWand/operation.c b/MagickWand/operation.c index 54dc38261..6489ad8f0 100644 --- a/MagickWand/operation.c +++ b/MagickWand/operation.c @@ -2498,11 +2498,9 @@ static MagickBooleanType CLISimpleOperatorImage(MagickCLI *cli_wand, if ((flags & SigmaValue) == 0) geometry_info.sigma=1.0; if ((flags & XiValue) == 0) - geometry_info.xi=3; - if ((flags & PsiValue) == 0) - geometry_info.psi10030; - new_image=HoughLineImage(_image,geometry_info.rho, - geometry_info.sigma,geometry_info.xi,geometry_info.psi,_exception); + geometry_info.xi=40; + new_image=HoughLineImage(_image,(size_t) geometry_info.rho, + (size_t) geometry_info.sigma,(size_t) geometry_info.xi,_exception); break; } CLIWandExceptionBreak(OptionError,"UnrecognizedOption",option); diff --git a/PerlMagick/Magick.xs b/PerlMagick/Magick.xs index d488219fb..d9b0e0221 100644 --- a/PerlMagick/Magick.xs +++ b/PerlMagick/Magick.xs @@ -11150,6 +11150,8 @@ Mogrify(ref,...) &geometry_info); if ((flags & SigmaValue) == 0) geometry_info.sigma=geometry_info.rho; + if ((flags & XiValue) == 0) + geometry_info.xi=40; } if (attribute_flag[1] != 0) geometry_info.rho=(double) argument_list[1].integer_reference; diff --git a/PerlMagick/quantum/quantum.xs.in b/PerlMagick/quantum/quantum.xs.in index 4c4c19849..7657c07f0 100644 --- a/PerlMagick/quantum/quantum.xs.in +++ b/PerlMagick/quantum/quantum.xs.in @@ -11150,6 +11150,8 @@ Mogrify(ref,...) &geometry_info); if ((flags & SigmaValue) == 0) geometry_info.sigma=geometry_info.rho; + if ((flags & XiValue) == 0) + geometry_info.xi=40; } if (attribute_flag[1] != 0) geometry_info.rho=(double) argument_list[1].integer_reference;