From aae13f6e1a9764f28b4f2e8d03ad4ac7f616f2a3 Mon Sep 17 00:00:00 2001 From: cristy Date: Thu, 15 Aug 2013 14:41:32 +0000 Subject: [PATCH] --- MagickCore/attribute.c | 6 +++--- MagickCore/coder.c | 4 ++-- MagickCore/color.c | 4 ++-- MagickCore/configure.c | 4 ++-- MagickCore/delegate.c | 4 ++-- MagickCore/enhance.c | 20 ++++++++++---------- MagickCore/locale.c | 6 +++--- MagickCore/log.c | 6 +++--- MagickCore/magic.c | 4 ++-- MagickCore/mime.c | 4 ++-- MagickCore/policy.c | 4 ++-- MagickCore/property.c | 8 ++++---- MagickCore/threshold.c | 2 +- MagickCore/transform.c | 8 ++++---- MagickCore/type.c | 6 +++--- 15 files changed, 45 insertions(+), 45 deletions(-) diff --git a/MagickCore/attribute.c b/MagickCore/attribute.c index 110ce274a..ee0949d98 100644 --- a/MagickCore/attribute.c +++ b/MagickCore/attribute.c @@ -331,15 +331,15 @@ MagickExport size_t GetImageDepth(const Image *image,ExceptionInfo *exception) status=0; range=GetQuantumRange(current_depth[id]); if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0) - status|=ClampToQuantum(image->colormap[i].red) != + status&=ClampToQuantum(image->colormap[i].red) != ScaleAnyToQuantum(ScaleQuantumToAny(ClampToQuantum( image->colormap[i].red),range),range); if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0) - status|=ClampToQuantum(image->colormap[i].green) != + status&=ClampToQuantum(image->colormap[i].green) != ScaleAnyToQuantum(ScaleQuantumToAny(ClampToQuantum( image->colormap[i].green),range),range); if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0) - status|=ClampToQuantum(image->colormap[i].blue) != + status&=ClampToQuantum(image->colormap[i].blue) != ScaleAnyToQuantum(ScaleQuantumToAny(ClampToQuantum( image->colormap[i].blue),range),range); if (status == 0) diff --git a/MagickCore/coder.c b/MagickCore/coder.c index f272b5ee7..f0d39a35b 100644 --- a/MagickCore/coder.c +++ b/MagickCore/coder.c @@ -913,7 +913,7 @@ static MagickBooleanType LoadCoderLists(const char *filename, option=(const StringInfo *) GetNextValueInLinkedList(options); while (option != (const StringInfo *) NULL) { - status|=LoadCoderList((const char *) GetStringInfoDatum(option), + status&=LoadCoderList((const char *) GetStringInfoDatum(option), GetStringInfoPath(option),0,exception); option=(const StringInfo *) GetNextValueInLinkedList(options); } @@ -943,7 +943,7 @@ static MagickBooleanType LoadCoderLists(const char *filename, coder_info->name=(char *) p->name; coder_info->exempt=MagickTrue; coder_info->signature=MagickSignature; - status|=AddValueToSplayTree(coder_list,ConstantString(coder_info->magick), + status&=AddValueToSplayTree(coder_list,ConstantString(coder_info->magick), coder_info); if (status == MagickFalse) (void) ThrowMagickException(exception,GetMagickModule(), diff --git a/MagickCore/color.c b/MagickCore/color.c index d24af8c65..95284e315 100644 --- a/MagickCore/color.c +++ b/MagickCore/color.c @@ -2073,7 +2073,7 @@ static MagickBooleanType LoadColorLists(const char *filename, option=(const StringInfo *) GetNextValueInLinkedList(options); while (option != (const StringInfo *) NULL) { - status|=LoadColorList((const char *) GetStringInfoDatum(option), + status&=LoadColorList((const char *) GetStringInfoDatum(option), GetStringInfoPath(option),0,exception); option=(const StringInfo *) GetNextValueInLinkedList(options); } @@ -2108,7 +2108,7 @@ static MagickBooleanType LoadColorLists(const char *filename, color_info->compliance=(ComplianceType) p->compliance; color_info->exempt=MagickTrue; color_info->signature=MagickSignature; - status|=AppendValueToLinkedList(color_list,color_info); + status&=AppendValueToLinkedList(color_list,color_info); if (IfMagickFalse(status)) (void) ThrowMagickException(exception,GetMagickModule(), ResourceLimitError,"MemoryAllocationFailed","`%s'",color_info->name); diff --git a/MagickCore/configure.c b/MagickCore/configure.c index 110d4b0a8..790170058 100644 --- a/MagickCore/configure.c +++ b/MagickCore/configure.c @@ -1269,7 +1269,7 @@ static MagickBooleanType LoadConfigureLists(const char *filename, option=(const StringInfo *) GetNextValueInLinkedList(options); while (option != (const StringInfo *) NULL) { - status|=LoadConfigureList((const char *) GetStringInfoDatum(option), + status&=LoadConfigureList((const char *) GetStringInfoDatum(option), GetStringInfoPath(option),0,exception); option=(const StringInfo *) GetNextValueInLinkedList(options); } @@ -1301,7 +1301,7 @@ static MagickBooleanType LoadConfigureLists(const char *filename, configure_info->value=(char *) p->value; configure_info->exempt=MagickTrue; configure_info->signature=MagickSignature; - status|=AppendValueToLinkedList(configure_list,configure_info); + status&=AppendValueToLinkedList(configure_list,configure_info); if (status == MagickFalse) (void) ThrowMagickException(exception,GetMagickModule(), ResourceLimitError,"MemoryAllocationFailed","`%s'", diff --git a/MagickCore/delegate.c b/MagickCore/delegate.c index b601a8b8c..44da45b26 100644 --- a/MagickCore/delegate.c +++ b/MagickCore/delegate.c @@ -1497,14 +1497,14 @@ static MagickBooleanType LoadDelegateLists(const char *filename, option=(const StringInfo *) GetNextValueInLinkedList(options); while (option != (const StringInfo *) NULL) { - status|=LoadDelegateList((const char *) GetStringInfoDatum(option), + status&=LoadDelegateList((const char *) GetStringInfoDatum(option), GetStringInfoPath(option),0,exception); option=(const StringInfo *) GetNextValueInLinkedList(options); } options=DestroyConfigureOptions(options); if ((delegate_list == (LinkedListInfo *) NULL) || (IfMagickTrue(IsLinkedListEmpty(delegate_list)))) - status|=LoadDelegateList(DelegateMap,"built-in",0,exception); + status&=LoadDelegateList(DelegateMap,"built-in",0,exception); return(IsMagickTrue(status!=0)); #endif } diff --git a/MagickCore/enhance.c b/MagickCore/enhance.c index c5fd1945f..999732234 100644 --- a/MagickCore/enhance.c +++ b/MagickCore/enhance.c @@ -2714,21 +2714,21 @@ MagickExport MagickBooleanType LevelImageColors(Image *image, if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0) { channel_mask=SetImageChannelMask(image,RedChannel); - status|=LevelImage(image,black_color->red,white_color->red,1.0, + status&=LevelImage(image,black_color->red,white_color->red,1.0, exception); (void) SetImageChannelMask(image,channel_mask); } if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0) { channel_mask=SetImageChannelMask(image,GreenChannel); - status|=LevelImage(image,black_color->green,white_color->green,1.0, + status&=LevelImage(image,black_color->green,white_color->green,1.0, exception); (void) SetImageChannelMask(image,channel_mask); } if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0) { channel_mask=SetImageChannelMask(image,BlueChannel); - status|=LevelImage(image,black_color->blue,white_color->blue,1.0, + status&=LevelImage(image,black_color->blue,white_color->blue,1.0, exception); (void) SetImageChannelMask(image,channel_mask); } @@ -2736,7 +2736,7 @@ MagickExport MagickBooleanType LevelImageColors(Image *image, (image->colorspace == CMYKColorspace)) { channel_mask=SetImageChannelMask(image,BlackChannel); - status|=LevelImage(image,black_color->black,white_color->black,1.0, + status&=LevelImage(image,black_color->black,white_color->black,1.0, exception); (void) SetImageChannelMask(image,channel_mask); } @@ -2744,7 +2744,7 @@ MagickExport MagickBooleanType LevelImageColors(Image *image, (image->alpha_trait == BlendPixelTrait)) { channel_mask=SetImageChannelMask(image,AlphaChannel); - status|=LevelImage(image,black_color->alpha,white_color->alpha,1.0, + status&=LevelImage(image,black_color->alpha,white_color->alpha,1.0, exception); (void) SetImageChannelMask(image,channel_mask); } @@ -2754,21 +2754,21 @@ MagickExport MagickBooleanType LevelImageColors(Image *image, if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0) { channel_mask=SetImageChannelMask(image,RedChannel); - status|=LevelizeImage(image,black_color->red,white_color->red,1.0, + status&=LevelizeImage(image,black_color->red,white_color->red,1.0, exception); (void) SetImageChannelMask(image,channel_mask); } if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0) { channel_mask=SetImageChannelMask(image,GreenChannel); - status|=LevelizeImage(image,black_color->green,white_color->green,1.0, + status&=LevelizeImage(image,black_color->green,white_color->green,1.0, exception); (void) SetImageChannelMask(image,channel_mask); } if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0) { channel_mask=SetImageChannelMask(image,BlueChannel); - status|=LevelizeImage(image,black_color->blue,white_color->blue,1.0, + status&=LevelizeImage(image,black_color->blue,white_color->blue,1.0, exception); (void) SetImageChannelMask(image,channel_mask); } @@ -2776,7 +2776,7 @@ MagickExport MagickBooleanType LevelImageColors(Image *image, (image->colorspace == CMYKColorspace)) { channel_mask=SetImageChannelMask(image,BlackChannel); - status|=LevelizeImage(image,black_color->black,white_color->black,1.0, + status&=LevelizeImage(image,black_color->black,white_color->black,1.0, exception); (void) SetImageChannelMask(image,channel_mask); } @@ -2784,7 +2784,7 @@ MagickExport MagickBooleanType LevelImageColors(Image *image, (image->alpha_trait == BlendPixelTrait)) { channel_mask=SetImageChannelMask(image,AlphaChannel); - status|=LevelizeImage(image,black_color->alpha,white_color->alpha,1.0, + status&=LevelizeImage(image,black_color->alpha,white_color->alpha,1.0, exception); (void) SetImageChannelMask(image,channel_mask); } diff --git a/MagickCore/locale.c b/MagickCore/locale.c index 1a7915e69..af0284ea0 100644 --- a/MagickCore/locale.c +++ b/MagickCore/locale.c @@ -1347,7 +1347,7 @@ static MagickBooleanType LoadLocaleLists(const char *filename, option=(const StringInfo *) GetNextValueInLinkedList(options); while (option != (const StringInfo *) NULL) { - status|=LoadLocaleList((const char *) GetStringInfoDatum(option), + status&=LoadLocaleList((const char *) GetStringInfoDatum(option), GetStringInfoPath(option),locale,0,exception); option=(const StringInfo *) GetNextValueInLinkedList(options); } @@ -1359,7 +1359,7 @@ static MagickBooleanType LoadLocaleLists(const char *filename, option=(const StringInfo *) GetNextValueInLinkedList(options); while (option != (const StringInfo *) NULL) { - status|=LoadLocaleList((const char *) GetStringInfoDatum(option), + status&=LoadLocaleList((const char *) GetStringInfoDatum(option), GetStringInfoPath(option),locale,0,exception); option=(const StringInfo *) GetNextValueInLinkedList(options); } @@ -1367,7 +1367,7 @@ static MagickBooleanType LoadLocaleLists(const char *filename, } if ((locale_list == (SplayTreeInfo *) NULL) || (GetNumberOfNodesInSplayTree(locale_list) == 0)) - status|=LoadLocaleList(LocaleMap,"built-in",locale,0,exception); + status&=LoadLocaleList(LocaleMap,"built-in",locale,0,exception); return(status != 0 ? MagickTrue : MagickFalse); #endif } diff --git a/MagickCore/log.c b/MagickCore/log.c index ea98f954e..0a7d16e05 100644 --- a/MagickCore/log.c +++ b/MagickCore/log.c @@ -1387,7 +1387,7 @@ static MagickBooleanType LoadLogList(const char *xml,const char *filename, xml=FileToString(path,~0,exception); if (xml != (char *) NULL) { - status|=LoadLogList(xml,path,depth+1,exception); + status&=LoadLogList(xml,path,depth+1,exception); xml=DestroyString(xml); } } @@ -1569,7 +1569,7 @@ static MagickBooleanType LoadLogLists(const char *filename, option=(const StringInfo *) GetNextValueInLinkedList(options); while (option != (const StringInfo *) NULL) { - status|=LoadLogList((const char *) GetStringInfoDatum(option), + status&=LoadLogList((const char *) GetStringInfoDatum(option), GetStringInfoPath(option),0,exception); option=(const StringInfo *) GetNextValueInLinkedList(options); } @@ -1602,7 +1602,7 @@ static MagickBooleanType LoadLogLists(const char *filename, log_info->format=ConstantString(p->format); log_info->exempt=MagickTrue; log_info->signature=MagickSignature; - status|=AppendValueToLinkedList(log_list,log_info); + status&=AppendValueToLinkedList(log_list,log_info); if (status == MagickFalse) (void) ThrowMagickException(exception,GetMagickModule(), ResourceLimitError,"MemoryAllocationFailed","`%s'",log_info->name); diff --git a/MagickCore/magic.c b/MagickCore/magic.c index b78761b26..b706bdc6f 100644 --- a/MagickCore/magic.c +++ b/MagickCore/magic.c @@ -961,7 +961,7 @@ static MagickBooleanType LoadMagicLists(const char *filename, while (option != (const StringInfo *) NULL) { (void) CopyMagickString(path,GetStringInfoPath(option),MaxTextExtent); - status|=LoadMagicList((const char *) GetStringInfoDatum(option), + status&=LoadMagicList((const char *) GetStringInfoDatum(option), GetStringInfoPath(option),0,exception); option=(const StringInfo *) GetNextValueInLinkedList(options); } @@ -994,7 +994,7 @@ static MagickBooleanType LoadMagicLists(const char *filename, magic_info->length=p->length; magic_info->exempt=MagickTrue; magic_info->signature=MagickSignature; - status|=AppendValueToLinkedList(magic_list,magic_info); + status&=AppendValueToLinkedList(magic_list,magic_info); if (status == MagickFalse) (void) ThrowMagickException(exception,GetMagickModule(), ResourceLimitError,"MemoryAllocationFailed","`%s'",magic_info->name); diff --git a/MagickCore/mime.c b/MagickCore/mime.c index 57d20ed8b..0ce4cdc17 100644 --- a/MagickCore/mime.c +++ b/MagickCore/mime.c @@ -973,14 +973,14 @@ MagickExport MagickBooleanType LoadMimeLists(const char *filename, option=(const StringInfo *) GetNextValueInLinkedList(options); while (option != (const StringInfo *) NULL) { - status|=LoadMimeList((const char *) GetStringInfoDatum(option), + status&=LoadMimeList((const char *) GetStringInfoDatum(option), GetStringInfoPath(option),0,exception); option=(const StringInfo *) GetNextValueInLinkedList(options); } options=DestroyConfigureOptions(options); if ((mime_list == (LinkedListInfo *) NULL) || (IsLinkedListEmpty(mime_list) != MagickFalse)) - status|=LoadMimeList(MimeMap,"built-in",0,exception); + status&=LoadMimeList(MimeMap,"built-in",0,exception); else ClearMagickException(exception); return(status != 0 ? MagickTrue : MagickFalse); diff --git a/MagickCore/policy.c b/MagickCore/policy.c index 7a818615d..14ee24b5b 100644 --- a/MagickCore/policy.c +++ b/MagickCore/policy.c @@ -907,7 +907,7 @@ static MagickBooleanType LoadPolicyLists(const char *filename, option=(const StringInfo *) GetNextValueInLinkedList(options); while (option != (const StringInfo *) NULL) { - status|=LoadPolicyList((const char *) GetStringInfoDatum(option), + status&=LoadPolicyList((const char *) GetStringInfoDatum(option), GetStringInfoPath(option),0,exception); option=(const StringInfo *) GetNextValueInLinkedList(options); } @@ -940,7 +940,7 @@ static MagickBooleanType LoadPolicyLists(const char *filename, policy_info->value=(char *) p->value; policy_info->exempt=MagickTrue; policy_info->signature=MagickSignature; - status|=AppendValueToLinkedList(policy_list,policy_info); + status&=AppendValueToLinkedList(policy_list,policy_info); if (status == MagickFalse) (void) ThrowMagickException(exception,GetMagickModule(), ResourceLimitError,"MemoryAllocationFailed","`%s'",policy_info->name); diff --git a/MagickCore/property.c b/MagickCore/property.c index 1a13aa32c..4e547044f 100644 --- a/MagickCore/property.c +++ b/MagickCore/property.c @@ -3289,19 +3289,19 @@ MagickExport char *InterpretImageProperties(ImageInfo *image_info, status=FxEvaluateChannelExpression(fx_info,RedPixelChannel,0,0, &value,exception); pixel.red=(double) QuantumRange*value; - status|=FxEvaluateChannelExpression(fx_info,GreenPixelChannel,0,0, + status&=FxEvaluateChannelExpression(fx_info,GreenPixelChannel,0,0, &value,exception); pixel.green=(double) QuantumRange*value; - status|=FxEvaluateChannelExpression(fx_info,BluePixelChannel,0,0, + status&=FxEvaluateChannelExpression(fx_info,BluePixelChannel,0,0, &value,exception); pixel.blue=(double) QuantumRange*value; if (image->colorspace == CMYKColorspace) { - status|=FxEvaluateChannelExpression(fx_info,BlackPixelChannel,0,0, + status&=FxEvaluateChannelExpression(fx_info,BlackPixelChannel,0,0, &value,exception); pixel.black=(double) QuantumRange*value; } - status|=FxEvaluateChannelExpression(fx_info,AlphaPixelChannel,0,0, + status&=FxEvaluateChannelExpression(fx_info,AlphaPixelChannel,0,0, &value,exception); pixel.alpha=(double) QuantumRange*value; fx_info=DestroyFxInfo(fx_info); diff --git a/MagickCore/threshold.c b/MagickCore/threshold.c index e17b8eafe..05bbb6e80 100644 --- a/MagickCore/threshold.c +++ b/MagickCore/threshold.c @@ -1233,7 +1233,7 @@ MagickExport MagickBooleanType ListThresholdMaps(FILE *file, while (option != (const StringInfo *) NULL) { (void) FormatLocaleFile(file,"\nPath: %s\n\n",GetStringInfoPath(option)); - status|=ListThresholdMapFile(file,(const char *) GetStringInfoDatum(option), + status&=ListThresholdMapFile(file,(const char *) GetStringInfoDatum(option), GetStringInfoPath(option),exception); option=(const StringInfo *) GetNextValueInLinkedList(options); } diff --git a/MagickCore/transform.c b/MagickCore/transform.c index 092f7943a..0b950f24a 100644 --- a/MagickCore/transform.c +++ b/MagickCore/transform.c @@ -1591,14 +1591,14 @@ MagickExport Image *RollImage(const Image *image,const ssize_t x_offset, (size_t) offset.y,(ssize_t) image->columns-offset.x,(ssize_t) image->rows- offset.y,0,0,exception); (void) SetImageProgress(image,RollImageTag,0,3); - status|=CopyImageRegion(roll_image,image,image->columns-offset.x, + status&=CopyImageRegion(roll_image,image,image->columns-offset.x, (size_t) offset.y,0,(ssize_t) image->rows-offset.y,offset.x,0, exception); (void) SetImageProgress(image,RollImageTag,1,3); - status|=CopyImageRegion(roll_image,image,(size_t) offset.x,image->rows- + status&=CopyImageRegion(roll_image,image,(size_t) offset.x,image->rows- offset.y,(ssize_t) image->columns-offset.x,0,0,offset.y,exception); (void) SetImageProgress(image,RollImageTag,2,3); - status|=CopyImageRegion(roll_image,image,image->columns-offset.x,image->rows- + status&=CopyImageRegion(roll_image,image,image->columns-offset.x,image->rows- offset.y,0,0,offset.x,offset.y,exception); (void) SetImageProgress(image,RollImageTag,3,3); roll_image->type=image->type; @@ -2163,7 +2163,7 @@ MagickExport MagickBooleanType TransformImages(Image **images, for (i=0; image_list[i] != (Image *) NULL; i++) { image=image_list[i]; - status|=TransformImage(&image,crop_geometry,image_geometry,exception); + status&=TransformImage(&image,crop_geometry,image_geometry,exception); AppendImageToList(&transform_images,image); } *images=transform_images; diff --git a/MagickCore/type.c b/MagickCore/type.c index 66c382a40..8a854f326 100644 --- a/MagickCore/type.c +++ b/MagickCore/type.c @@ -1313,7 +1313,7 @@ static MagickBooleanType LoadTypeLists(const char *filename, while (option != (const StringInfo *) NULL) { (void) CopyMagickString(path,GetStringInfoPath(option),MaxTextExtent); - status|=LoadTypeList((const char *) GetStringInfoDatum(option), + status&=LoadTypeList((const char *) GetStringInfoDatum(option), GetStringInfoPath(option),0,exception); option=(const StringInfo *) GetNextValueInLinkedList(options); } @@ -1332,14 +1332,14 @@ static MagickBooleanType LoadTypeLists(const char *filename, option=FileToString(path,~0,exception); if (option != (void *) NULL) { - status|=LoadTypeList(option,path,0,exception); + status&=LoadTypeList(option,path,0,exception); option=DestroyString(option); } font_path=DestroyString(font_path); } if ((type_list == (SplayTreeInfo *) NULL) || (GetNumberOfNodesInSplayTree(type_list) == 0)) - status|=LoadTypeList(TypeMap,"built-in",0,exception); + status&=LoadTypeList(TypeMap,"built-in",0,exception); return(status != 0 ? MagickTrue : MagickFalse); #endif } -- 2.40.0