From: cristy Date: Sun, 28 Jun 2015 12:38:15 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~835 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e024637ce65f11ae6e83bfc913b601c26ba6b350;p=imagemagick --- diff --git a/MagickWand/operation.c b/MagickWand/operation.c index c721b85c3..44b4c4477 100644 --- a/MagickWand/operation.c +++ b/MagickWand/operation.c @@ -4384,27 +4384,29 @@ WandPrivate MagickBooleanType CLIListOperatorImages(MagickCLI *cli_wand, new_images=SimilarityImage(base_image,compare_image,metric,0.0, &offset,&similarity,_exception); - if ( new_images != (Image *) NULL ) { - char - result[MagickPathExtent]; - - (void) FormatLocaleString(result,MagickPathExtent,"%lf",similarity); - (void) SetImageProperty(new_images,"subimage:similarity",result, - _exception); - (void) FormatLocaleString(result,MagickPathExtent,"%+ld", - (long) offset.x); - (void) SetImageProperty(new_images,"subimage:x",result, - _exception); - (void) FormatLocaleString(result,MagickPathExtent,"%+ld", - (long) offset.y); - (void) SetImageProperty(new_images,"subimage:y",result, - _exception); - (void) FormatLocaleString(result,MagickPathExtent,"%lux%lu%+ld%+ld", - (unsigned long) offset.width,(unsigned long) offset.height, - (long) offset.x,(long) offset.y); - (void) SetImageProperty(new_images,"subimage:offset",result, - _exception); - } + if (new_images != (Image *) NULL) + { + char + result[MagickPathExtent]; + + (void) FormatLocaleString(result,MagickPathExtent,"%lf", + similarity); + (void) SetImageProperty(new_images,"subimage:similarity",result, + _exception); + (void) FormatLocaleString(result,MagickPathExtent,"%+ld",(long) + offset.x); + (void) SetImageProperty(new_images,"subimage:x",result, + _exception); + (void) FormatLocaleString(result,MagickPathExtent,"%+ld",(long) + offset.y); + (void) SetImageProperty(new_images,"subimage:y",result, + _exception); + (void) FormatLocaleString(result,MagickPathExtent, + "%lux%lu%+ld%+ld",(unsigned long) offset.width,(unsigned long) + offset.height,(long) offset.x,(long) offset.y); + (void) SetImageProperty(new_images,"subimage:offset",result, + _exception); + } break; } if (LocaleCompare("swap",option+1) == 0) diff --git a/www/api/magick-geometry.html b/www/api/magick-geometry.html new file mode 100644 index 000000000..cd98c57ed --- /dev/null +++ b/www/api/magick-geometry.html @@ -0,0 +1,91 @@ + + + + + + + ImageMagick: MagickWand, C API for ImageMagick: Image Methods + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+ +
+ +
+
+
+
+
+ +
+ + + + +
+ +