From 3e583ddddbf183c5d2333fc72b157f262726b848 Mon Sep 17 00:00:00 2001 From: cristy Date: Sun, 19 Jan 2014 14:11:51 +0000 Subject: [PATCH] --- coders/json.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/coders/json.c b/coders/json.c index 334e85641..927e99b3d 100644 --- a/coders/json.c +++ b/coders/json.c @@ -541,6 +541,8 @@ static MagickBooleanType EncodeImageAttributes(Image *image,FILE *file, if (file == (FILE *) NULL) file=stdout; locate=GetImageArtifact(image,"identify:locate"); + if (locate == (const char *) NULL) + locate=GetImageArtifact(image,"json:locate"); if (locate != (const char *) NULL) { const char @@ -558,6 +560,8 @@ static MagickBooleanType EncodeImageAttributes(Image *image,FILE *file, type=(StatisticType) ParseCommandOption(MagickStatisticOptions, MagickFalse,locate); limit=GetImageArtifact(image,"identify:limit"); + if (limit == (const char *) NULL) + limit=GetImageArtifact(image,"json:limit"); max_locations=0; if (limit != (const char *) NULL) max_locations=StringToUnsignedLong(limit); @@ -682,9 +686,13 @@ static MagickBooleanType EncodeImageAttributes(Image *image,FILE *file, if (channel_statistics == (ChannelStatistics *) NULL) return(MagickFalse); artifact=GetImageArtifact(image,"identify:moments"); + if (artifact == (const char *) NULL) + artifact=GetImageArtifact(image,"json:moments"); if (artifact != (const char *) NULL) - channel_moments=GetImageMoments(image,exception); + channel_moments=GetImageMoments(image,exception); artifact=GetImageArtifact(image,"identify:features"); + if (artifact == (const char *) NULL) + artifact=GetImageArtifact(image,"json:features"); if (artifact != (const char *) NULL) { distance=StringToUnsignedLong(artifact); @@ -925,6 +933,8 @@ static MagickBooleanType EncodeImageAttributes(Image *image,FILE *file, else { artifact=GetImageArtifact(image,"identify:unique-colors"); + if (artifact == (const char *) NULL) + artifact=GetImageArtifact(image,"json:unique-colors"); if (IfMagickTrue(IsStringTrue(artifact))) (void) FormatLocaleFile(file," Colors: %.20g\n",(double) GetNumberColors(image,(FILE *) NULL,exception)); -- 2.40.0