From cd8b331760407523f2a59cc65c1cd9c3d4422baf Mon Sep 17 00:00:00 2001 From: cristy Date: Sun, 22 Dec 2013 01:51:11 +0000 Subject: [PATCH] --- MagickCore/accelerate.c | 8 ++++---- MagickCore/blob.c | 2 +- MagickCore/constitute.c | 2 +- MagickCore/morphology.c | 4 ++-- MagickCore/opencl.c | 6 +++--- coders/dcm.c | 4 ++-- coders/dds.c | 6 +++--- coders/gif.c | 10 +++++----- coders/ipl.c | 2 +- coders/pix.c | 4 ++-- coders/png.c | 2 +- coders/psd.c | 2 +- coders/tiff.c | 6 +++--- coders/wmf.c | 2 +- 14 files changed, 30 insertions(+), 30 deletions(-) diff --git a/MagickCore/accelerate.c b/MagickCore/accelerate.c index fdab1cf29..34806e29d 100644 --- a/MagickCore/accelerate.c +++ b/MagickCore/accelerate.c @@ -98,7 +98,7 @@ static MagickBooleanType checkOpenCLEnvironment(ExceptionInfo* exception) GetMagickOpenCLEnvParam(clEnv, MAGICK_OPENCL_ENV_PARAM_OPENCL_DISABLED , sizeof(MagickBooleanType), &flag, exception); - if (flag == MagickTrue) + if (flag != MagickFalse) return MagickFalse; GetMagickOpenCLEnvParam(clEnv, MAGICK_OPENCL_ENV_PARAM_OPENCL_INITIALIZED @@ -110,7 +110,7 @@ static MagickBooleanType checkOpenCLEnvironment(ExceptionInfo* exception) GetMagickOpenCLEnvParam(clEnv, MAGICK_OPENCL_ENV_PARAM_OPENCL_DISABLED , sizeof(MagickBooleanType), &flag, exception); - if (flag == MagickTrue) + if (flag != MagickFalse) return MagickFalse; } @@ -648,10 +648,10 @@ MagickExport MagickBooleanType assert(exception != (ExceptionInfo *) NULL); status = checkOpenCLEnvironment(exception); - if (status == MagickTrue) + if (status != MagickFalse) { status = checkAccelerateCondition(image, channel); - if (status == MagickTrue) + if (status != MagickFalse) { status = ComputeFunctionImage(image, channel, function, number_parameters, parameters, exception); } diff --git a/MagickCore/blob.c b/MagickCore/blob.c index 82dcfff71..3b11d1b87 100644 --- a/MagickCore/blob.c +++ b/MagickCore/blob.c @@ -2452,7 +2452,7 @@ MagickExport MagickBooleanType OpenBlob(const ImageInfo *image_info, #endif status=GetPathAttributes(filename,&image->blob->properties); #if defined(S_ISFIFO) - if ((status == MagickTrue) && S_ISFIFO(image->blob->properties.st_mode)) + if ((status != MagickFalse) && S_ISFIFO(image->blob->properties.st_mode)) { image->blob->file_info.file=(FILE *) fopen_utf8(filename,type); if (image->blob->file_info.file == (FILE *) NULL) diff --git a/MagickCore/constitute.c b/MagickCore/constitute.c index cddcf1ffc..77a518b61 100644 --- a/MagickCore/constitute.c +++ b/MagickCore/constitute.c @@ -1230,7 +1230,7 @@ MagickExport MagickBooleanType WriteImage(const ImageInfo *image_info, if (GetBlobError(image) != MagickFalse) ThrowFileException(exception,FileOpenError, "AnErrorHasOccurredWritingToFile",image->filename); - if (temporary == MagickTrue) + if (temporary != MagickFalse) { /* Copy temporary image file to permanent. diff --git a/MagickCore/morphology.c b/MagickCore/morphology.c index 54ccbca59..ca3eaa707 100644 --- a/MagickCore/morphology.c +++ b/MagickCore/morphology.c @@ -2425,7 +2425,7 @@ DisableMSCWarning(4127) RestoreMSCWarning clone = CloneKernelInfo(last); RotateKernelInfo(clone, angle); - if ( SameKernelInfo(kernel, clone) == MagickTrue ) + if ( SameKernelInfo(kernel, clone) != MagickFalse ) break; LastKernelInfo(last)->next = clone; last = clone; @@ -3702,7 +3702,7 @@ MagickPrivate Image *MorphologyApply(const Image *image, /* Apply special methods with special requirments ** For example, single run only, or post-processing requirements */ - if ( special == MagickTrue ) + if ( special != MagickFalse ) { rslt_image=CloneImage(image,0,0,MagickTrue,exception); if (rslt_image == (Image *) NULL) diff --git a/MagickCore/opencl.c b/MagickCore/opencl.c index 2d94e20cc..d8184db37 100644 --- a/MagickCore/opencl.c +++ b/MagickCore/opencl.c @@ -966,7 +966,7 @@ cleanup: } static MagickBooleanType EnableOpenCLInternal(MagickCLEnv clEnv) { - if (clEnv->OpenCLInitialized == MagickTrue + if (clEnv->OpenCLInitialized != MagickFalse && clEnv->platform != NULL && clEnv->device != NULL) { clEnv->OpenCLDisabled = MagickFalse; @@ -1011,7 +1011,7 @@ MagickBooleanType InitOpenCLEnvInternal(MagickCLEnv clEnv, ExceptionInfo* except clEnv->OpenCLInitialized = MagickTrue; - if (clEnv->OpenCLDisabled == MagickTrue) + if (clEnv->OpenCLDisabled != MagickFalse) goto cleanup; clEnv->OpenCLDisabled = MagickTrue; @@ -2165,7 +2165,7 @@ static MagickBooleanType autoSelectDevice(MagickCLEnv clEnv, ExceptionInfo* exce ,GetOpenCLCachedFilesDirectory() ,DirectorySeparator,IMAGEMAGICK_PROFILE_FILE); - if (clEnv->regenerateProfile == MagickTrue) { + if (clEnv->regenerateProfile != MagickFalse) { profileType = DS_EVALUATE_ALL; } else { diff --git a/coders/dcm.c b/coders/dcm.c index 38f762c64..2eea8a939 100644 --- a/coders/dcm.c +++ b/coders/dcm.c @@ -3086,7 +3086,7 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception) continue; } - if (sequence == MagickTrue) + if (sequence != MagickFalse) continue; switch (group) @@ -3718,7 +3718,7 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception) tag=(ReadBlobLSBShort(image) << 16) | ReadBlobLSBShort(image); stream_info->remaining=(size_t) ReadBlobLSBLong(image); if ((tag != 0xFFFEE000) || (stream_info->remaining <= 64) || - (EOFBlob(image) == MagickTrue)) + (EOFBlob(image) != MagickFalse)) ThrowReaderException(CorruptImageError,"ImproperImageHeader"); stream_info->count=0; stream_info->segment_count=ReadBlobLSBLong(image); diff --git a/coders/dds.c b/coders/dds.c index 002cdf64e..7b6c4c3be 100644 --- a/coders/dds.c +++ b/coders/dds.c @@ -980,7 +980,7 @@ static void CalculateColors(unsigned short c0, unsigned short c1, c->g[1] = (unsigned char) C565_green(c1); c->b[1] = (unsigned char) C565_blue(c1); - if (ignoreAlpha == MagickTrue || c0 > c1) + if (ignoreAlpha != MagickFalse || c0 > c1) { c->r[2] = (unsigned char) ((2 * c->r[0] + c->r[1]) / 3); c->g[2] = (unsigned char) ((2 * c->g[0] + c->g[1]) / 3); @@ -1588,7 +1588,7 @@ static MagickBooleanType ConstructOrdering(const size_t count, } } - if (same == MagickTrue) + if (same != MagickFalse) return MagickFalse; } @@ -2801,7 +2801,7 @@ static void WriteFourCC(Image *image, const size_t compression, } } - if (match == MagickTrue) + if (match != MagickFalse) continue; points[count].x = point.x; diff --git a/coders/gif.c b/coders/gif.c index 9884884ae..10ff941d1 100644 --- a/coders/gif.c +++ b/coders/gif.c @@ -704,7 +704,7 @@ static MagickBooleanType EncodeImage(const ImageInfo *image_info,Image *image, break; } } - if (next_pixel == MagickTrue) + if (next_pixel != MagickFalse) continue; } GIFOutputCode((size_t) waiting_code); @@ -1184,13 +1184,13 @@ static Image *ReadGIFImage(const ImageInfo *image_info,ExceptionInfo *exception) if (profile == (StringInfo *) NULL) ThrowReaderException(ResourceLimitError, "MemoryAllocationFailed"); - if (i8bim == MagickTrue) + if (i8bim != MagickFalse) (void) CopyMagickString(name,"8bim",sizeof(name)); - else if (icc == MagickTrue) + else if (icc != MagickFalse) (void) CopyMagickString(name,"icc",sizeof(name)); - else if (iptc == MagickTrue) + else if (iptc != MagickFalse) (void) CopyMagickString(name,"iptc",sizeof(name)); - else if (magick == MagickTrue) + else if (magick != MagickFalse) { (void) CopyMagickString(name,"magick",sizeof(name)); image->gamma=StringToDouble((char *) info+6,(char **) NULL); diff --git a/coders/ipl.c b/coders/ipl.c index ff98d5ebe..96a35a583 100644 --- a/coders/ipl.c +++ b/coders/ipl.c @@ -581,7 +581,7 @@ static MagickBooleanType WriteIPLImage(const ImageInfo *image_info,Image *image, if (IssRGBCompatibleColorspace(image->colorspace) == MagickFalse) (void) TransformImageColorspace(image,sRGBColorspace,exception); - if(IssRGBCompatibleColorspace(image->colorspace) == MagickTrue) { ipl_info.colors = 3; } + if(IssRGBCompatibleColorspace(image->colorspace) != MagickFalse) { ipl_info.colors = 3; } else{ ipl_info.colors = 1; } ipl_info.size = (unsigned int) (28 + diff --git a/coders/pix.c b/coders/pix.c index db48c3c9b..ccb5d57e8 100644 --- a/coders/pix.c +++ b/coders/pix.c @@ -222,7 +222,7 @@ static Image *ReadPIXImage(const ImageInfo *image_info,ExceptionInfo *exception) bits_per_pixel=ReadBlobMSBShort(image); status=(width != 0UL) && (height == 0UL) && ((bits_per_pixel == 8) || (bits_per_pixel == 24)) ? MagickTrue : MagickFalse; - if (status == MagickTrue) + if (status != MagickFalse) { /* Allocate next image structure. @@ -239,7 +239,7 @@ static Image *ReadPIXImage(const ImageInfo *image_info,ExceptionInfo *exception) if (status == MagickFalse) break; } - } while (status == MagickTrue); + } while (status != MagickFalse); (void) CloseBlob(image); return(GetFirstImageInList(image)); } diff --git a/coders/png.c b/coders/png.c index 5dfb96442..07510a80e 100644 --- a/coders/png.c +++ b/coders/png.c @@ -2767,7 +2767,7 @@ static Image *ReadOnePNGImage(MngInfo *mng_info, (ping_found_gAMA != MagickTrue || (image->gamma > .45 && image->gamma < .46)) && (ping_found_cHRM != MagickTrue || - ping_found_sRGB_cHRM == MagickTrue) && + ping_found_sRGB_cHRM != MagickFalse) && ping_found_iCCP != MagickTrue) { png_set_sRGB(ping,ping_info, diff --git a/coders/psd.c b/coders/psd.c index 688d321f2..962d1ec05 100644 --- a/coders/psd.c +++ b/coders/psd.c @@ -1054,7 +1054,7 @@ static Image *ReadPSDImage(const ImageInfo *image_info,ExceptionInfo *exception) layer_info[i].page.width=(ssize_t) (x-layer_info[i].page.x); layer_info[i].page.height=(ssize_t) (y-layer_info[i].page.y); layer_info[i].channels=ReadBlobMSBShort(image); - if (check_background == MagickTrue) + if (check_background != MagickFalse) { size_t quantum; diff --git a/coders/tiff.c b/coders/tiff.c index ec3ecd444..53f417347 100644 --- a/coders/tiff.c +++ b/coders/tiff.c @@ -1788,7 +1788,7 @@ RestoreMSCWarning if (image->scene >= (image_info->scene+image_info->number_scenes-1)) break; status=TIFFReadDirectory(tiff) != 0 ? MagickTrue : MagickFalse; - if (status == MagickTrue) + if (status != MagickFalse) { /* Allocate next image structure. @@ -1805,7 +1805,7 @@ RestoreMSCWarning if (status == MagickFalse) break; } - } while (status == MagickTrue); + } while (status != MagickFalse); (void) TIFFSetWarningHandler(warning_handler); (void) TIFFSetErrorHandler(error_handler); TIFFClose(tiff); @@ -3536,7 +3536,7 @@ RestoreMSCWarning DecodeLabImage(image,exception); DestroyTIFFInfo(&tiff_info); DisableMSCWarning(4127) - if (0 && (image_info->verbose == MagickTrue)) + if (0 && (image_info->verbose != MagickFalse)) RestoreMSCWarning TIFFPrintDirectory(tiff,stdout,MagickFalse); (void) TIFFWriteDirectory(tiff); diff --git a/coders/wmf.c b/coders/wmf.c index 3827063ab..af55beb74 100644 --- a/coders/wmf.c +++ b/coders/wmf.c @@ -456,7 +456,7 @@ int magick_progress_callback(void *context,float quantum) assert(image->signature == MagickSignature); status=SetImageProgress(image,LoadImagesTag,TellBlob(image), GetBlobSize(image)); - return(status == MagickTrue ? 0 : 1); + return(status != MagickFalse ? 0 : 1); } /* Set fill color */ -- 2.40.0