From 6aa47adc8b43dfdf8d1c2b6323c0bb1f57a5f011 Mon Sep 17 00:00:00 2001 From: cristy Date: Fri, 28 May 2010 19:32:32 +0000 Subject: [PATCH] --- magick/log.h | 2 +- tests/validate.c | 67 +++++++++++++++++++++++++++--------------------- 2 files changed, 39 insertions(+), 30 deletions(-) diff --git a/magick/log.h b/magick/log.h index 14bf30e18..c3aab0b48 100644 --- a/magick/log.h +++ b/magick/log.h @@ -26,7 +26,7 @@ extern "C" { #include "magick/exception.h" #if !defined(GetMagickModule) -# define GetMagickModule() __FILE__,__func__,(size_t) __LINE__ +# define GetMagickModule() __FILE__,__func__,(unsigned long) __LINE__ #endif #define MagickLogFilename "log.xml" diff --git a/tests/validate.c b/tests/validate.c index 9f30a6189..effa271fb 100644 --- a/tests/validate.c +++ b/tests/validate.c @@ -108,7 +108,8 @@ static size_t ValidateCompareCommand(ImageInfo *image_info, for (i=0; compare_options[i] != (char *) NULL; i++) { CatchException(exception); - (void) fprintf(stdout," test %lu: %s",test++,compare_options[i]); + (void) fprintf(stdout," test %lu: %s",(unsigned long) test++, + compare_options[i]); (void) FormatMagickString(command,MaxTextExtent,"%s %s %s %s", compare_options[i],reference_filename,reference_filename,output_filename); arguments=StringToArgv(command,&number_arguments); @@ -132,7 +133,7 @@ static size_t ValidateCompareCommand(ImageInfo *image_info, (void) fprintf(stdout,"... pass.\n"); } (void) fprintf(stdout," summary: %lu subtests; %lu passed; %lu failed.\n", - test,test-(*fail),*fail); + (unsigned long) test,(unsigned long) (test-(*fail)),(unsigned long) *fail); return(test); } @@ -195,7 +196,8 @@ static size_t ValidateCompositeCommand(ImageInfo *image_info, for (i=0; composite_options[i] != (char *) NULL; i++) { CatchException(exception); - (void) fprintf(stdout," test %lu: %s",test++,composite_options[i]); + (void) fprintf(stdout," test %lu: %s",(unsigned long) test++, + composite_options[i]); (void) FormatMagickString(command,MaxTextExtent,"%s %s %s %s", reference_filename,composite_options[i],reference_filename, output_filename); @@ -220,7 +222,7 @@ static size_t ValidateCompositeCommand(ImageInfo *image_info, (void) fprintf(stdout,"... pass.\n"); } (void) fprintf(stdout," summary: %lu subtests; %lu passed; %lu failed.\n", - test,test-(*fail),*fail); + (unsigned long) test,(unsigned long) (test-(*fail)),(unsigned long) *fail); return(test); } @@ -283,7 +285,8 @@ static size_t ValidateConvertCommand(ImageInfo *image_info, for (i=0; convert_options[i] != (char *) NULL; i++) { CatchException(exception); - (void) fprintf(stdout," test %lu: %s",test++,convert_options[i]); + (void) fprintf(stdout," test %lu: %s",(unsigned long) test++, + convert_options[i]); (void) FormatMagickString(command,MaxTextExtent,"%s %s %s %s", reference_filename,convert_options[i],reference_filename,output_filename); arguments=StringToArgv(command,&number_arguments); @@ -307,7 +310,7 @@ static size_t ValidateConvertCommand(ImageInfo *image_info, (void) fprintf(stdout,"... pass.\n"); } (void) fprintf(stdout," summary: %lu subtests; %lu passed; %lu failed.\n", - test,test-(*fail),*fail); + (unsigned long) test,(unsigned long) (test-(*fail)),(unsigned long) *fail); return(test); } @@ -371,7 +374,8 @@ static size_t ValidateIdentifyCommand(ImageInfo *image_info, for (i=0; identify_options[i] != (char *) NULL; i++) { CatchException(exception); - (void) fprintf(stdout," test %lu: %s",test++,identify_options[i]); + (void) fprintf(stdout," test %lu: %s",(unsigned long) test++, + identify_options[i]); (void) FormatMagickString(command,MaxTextExtent,"%s %s", identify_options[i],reference_filename); arguments=StringToArgv(command,&number_arguments); @@ -395,7 +399,7 @@ static size_t ValidateIdentifyCommand(ImageInfo *image_info, (void) fprintf(stdout,"... pass.\n"); } (void) fprintf(stdout," summary: %lu subtests; %lu passed; %lu failed.\n", - test,test-(*fail),*fail); + (unsigned long) test,(unsigned long) (test-(*fail)),(unsigned long) *fail); return(test); } @@ -482,11 +486,11 @@ static size_t ValidateImageFormatsInMemory(ImageInfo *image_info, Generate reference image. */ CatchException(exception); - (void) fprintf(stdout," test %lu: %s/%s/%s/%lu-bits",test++, - reference_formats[i].magick,MagickOptionToMnemonic( + (void) fprintf(stdout," test %lu: %s/%s/%s/%lu-bits",(unsigned long) + test++,reference_formats[i].magick,MagickOptionToMnemonic( MagickCompressOptions,reference_formats[i].compression), MagickOptionToMnemonic(MagickTypeOptions,reference_types[j].type), - reference_types[j].depth); + (unsigned long) reference_types[j].depth); (void) CopyMagickString(image_info->filename,reference_filename, MaxTextExtent); reference_image=ReadImage(image_info,exception); @@ -500,7 +504,8 @@ static size_t ValidateImageFormatsInMemory(ImageInfo *image_info, Write reference image. */ (void) FormatMagickString(size,MaxTextExtent,"%lux%lu", - reference_image->columns,reference_image->rows); + (unsigned long) reference_image->columns,(unsigned long) + reference_image->rows); (void) CloneString(&image_info->size,size); image_info->depth=reference_types[j].depth; (void) FormatMagickString(reference_image->filename,MaxTextExtent,"%s:%s", @@ -611,7 +616,7 @@ static size_t ValidateImageFormatsInMemory(ImageInfo *image_info, } } (void) fprintf(stdout," summary: %lu subtests; %lu passed; %lu failed.\n", - test,test-(*fail),*fail); + (unsigned long) test,(unsigned long) (test-(*fail)),(unsigned long) *fail); return(test); } @@ -692,11 +697,11 @@ static size_t ValidateImageFormatsOnDisk(ImageInfo *image_info, Generate reference image. */ CatchException(exception); - (void) fprintf(stdout," test %lu: %s/%s/%s/%lu-bits",test++, - reference_formats[i].magick,MagickOptionToMnemonic( + (void) fprintf(stdout," test %lu: %s/%s/%s/%lu-bits",(unsigned long) + test++,reference_formats[i].magick,MagickOptionToMnemonic( MagickCompressOptions,reference_formats[i].compression), MagickOptionToMnemonic(MagickTypeOptions,reference_types[j].type), - reference_types[j].depth); + (unsigned long) reference_types[j].depth); (void) CopyMagickString(image_info->filename,reference_filename, MaxTextExtent); reference_image=ReadImage(image_info,exception); @@ -710,7 +715,8 @@ static size_t ValidateImageFormatsOnDisk(ImageInfo *image_info, Write reference image. */ (void) FormatMagickString(size,MaxTextExtent,"%lux%lu", - reference_image->columns,reference_image->rows); + (unsigned long) reference_image->columns,(unsigned long) + reference_image->rows); (void) CloneString(&image_info->size,size); image_info->depth=reference_types[j].depth; (void) FormatMagickString(reference_image->filename,MaxTextExtent,"%s:%s", @@ -818,7 +824,7 @@ static size_t ValidateImageFormatsOnDisk(ImageInfo *image_info, } } (void) fprintf(stdout," summary: %lu subtests; %lu passed; %lu failed.\n", - test,test-(*fail),*fail); + (unsigned long) test,(unsigned long) (test-(*fail)),(unsigned long) *fail); return(test); } @@ -894,7 +900,7 @@ static size_t ValidateImportExportPixels(ImageInfo *image_info, Generate reference image. */ CatchException(exception); - (void) fprintf(stdout," test %lu: %s/%s",test++, + (void) fprintf(stdout," test %lu: %s/%s",(unsigned long) test++, reference_map[i],MagickOptionToMnemonic(MagickStorageOptions, reference_storage[j].type)); (void) CopyMagickString(image_info->filename,reference_filename, @@ -988,7 +994,7 @@ static size_t ValidateImportExportPixels(ImageInfo *image_info, } } (void) fprintf(stdout," summary: %lu subtests; %lu passed; %lu failed.\n", - test,test-(*fail),*fail); + (unsigned long) test,(unsigned long) (test-(*fail)),(unsigned long) *fail); return(test); } @@ -1051,7 +1057,8 @@ static size_t ValidateMontageCommand(ImageInfo *image_info, for (i=0; montage_options[i] != (char *) NULL; i++) { CatchException(exception); - (void) fprintf(stdout," test %lu: %s",test++,montage_options[i]); + (void) fprintf(stdout," test %lu: %s",(unsigned long) test++, + montage_options[i]); (void) FormatMagickString(command,MaxTextExtent,"%s %s %s %s", reference_filename,montage_options[i],reference_filename, output_filename); @@ -1076,7 +1083,7 @@ static size_t ValidateMontageCommand(ImageInfo *image_info, (void) fprintf(stdout,"... pass.\n"); } (void) fprintf(stdout," summary: %lu subtests; %lu passed; %lu failed.\n", - test,test-(*fail),*fail); + (unsigned long) test,(unsigned long) (test-(*fail)),(unsigned long) *fail); return(test); } @@ -1139,7 +1146,8 @@ static size_t ValidateStreamCommand(ImageInfo *image_info, for (i=0; stream_options[i] != (char *) NULL; i++) { CatchException(exception); - (void) fprintf(stdout," test %lu: %s",test++,stream_options[i]); + (void) fprintf(stdout," test %lu: %s",(unsigned long) test++, + stream_options[i]); (void) FormatMagickString(command,MaxTextExtent,"%s %s %s", stream_options[i],reference_filename,output_filename); arguments=StringToArgv(command,&number_arguments); @@ -1163,7 +1171,7 @@ static size_t ValidateStreamCommand(ImageInfo *image_info, (void) fprintf(stdout,"... pass.\n"); } (void) fprintf(stdout," summary: %lu subtests; %lu passed; %lu failed.\n", - test,test-(*fail),*fail); + (unsigned long) test,(unsigned long) (test-(*fail)),(unsigned long) *fail); return(test); } @@ -1428,7 +1436,8 @@ int main(int argc,char **argv) tests+=ValidateStreamCommand(image_info,reference_filename, output_filename,&fail,exception); (void) fprintf(stdout,"validation suite: %lu tests; %lu passed; " - "%lu failed.\n",tests,tests-fail,fail); + "%lu failed.\n",(unsigned long) tests,(unsigned long) (tests-fail), + (unsigned long) fail); } (void) RelinquishUniqueFileResource(output_filename); (void) RelinquishUniqueFileResource(reference_filename); @@ -1440,10 +1449,10 @@ int main(int argc,char **argv) elapsed_time=GetElapsedTime(timer); user_time=GetUserTime(timer); (void) fprintf(stderr, - "Performance: %lui %gips %0.3fu %ld:%02ld.%03ld\n", - iterations,1.0*iterations/elapsed_time,user_time,(ssize_t) - (elapsed_time/60.0),(ssize_t) ceil(fmod(elapsed_time,60.0)), - (ssize_t) (1000.0*(elapsed_time-floor(elapsed_time)))); + "Performance: %lui %gips %0.3fu %ld:%02ld.%03ld\n",(unsigned long) + iterations,1.0*iterations/elapsed_time,user_time,(long) + (elapsed_time/60.0),(long) ceil(fmod(elapsed_time,60.0)), + (long) (1000.0*(elapsed_time-floor(elapsed_time)))); timer=DestroyTimerInfo(timer); } DestroyValidate(); -- 2.40.0