• R/O
  • SSH

GM: Commit

Main GraphicsMagick source repository


Commit MetaInfo

Révision0858d48e28d3be01eaaf57e6e3b679ac149c2539 (tree)
l'heure1998-09-28 23:29:36
AuteurBob Friesenhahn <bfriesen@Grap...>
CommiterBob Friesenhahn

Message de Log

Update: Mon

Change Summary

Modification

diff -r 15a4d6a81d91 -r 0858d48e28d3 PerlMagick/Magick.xs
--- a/PerlMagick/Magick.xs Sun Sep 27 23:13:26 1998 -0500
+++ b/PerlMagick/Magick.xs Mon Sep 28 09:29:36 1998 -0500
@@ -37,9 +37,12 @@
3737 errno = 0;
3838 switch (*name)
3939 {
40+ case 'D':
41+ if (strEQ(name, "DelegateWarning"))
42+ return DelegateWarning;
4043 case 'P':
4144 if (strEQ(name, "PluginWarning"))
42- return PluginWarning;
45+ return DelegateWarning;
4346 break;
4447
4548 case 'O':
@@ -67,8 +70,10 @@
6770 break;
6871
6972 case 'M':
73+ if (strEQ(name, "MissingDelegateWarning"))
74+ return MissingDelegateWarning;
7075 if (strEQ(name, "MissingPluginWarning"))
71- return MissingPluginWarning;
76+ return MissingDelegateWarning;
7277 break;
7378
7479 case 'C':
@@ -573,7 +578,7 @@
573578 }
574579 return;
575580 }
576- if (strEQcase(attr, "blue-p"))
581+ if (strEQcase(attr, "blue_p"))
577582 {
578583 for ( ; image; image = image->next)
579584 {
@@ -795,7 +800,7 @@
795800 }
796801 break;
797802 case 'G': case 'g':
798- if (strEQcase(attr, "green-p"))
803+ if (strEQcase(attr, "green_p"))
799804 {
800805 for ( ; image; image = image->next)
801806 {
@@ -983,7 +988,7 @@
983988 }
984989 break;
985990 case 'R': case 'r':
986- if (strEQcase(attr, "red-p"))
991+ if (strEQcase(attr, "red_p"))
987992 {
988993 for ( ; image; image = image->next)
989994 {
@@ -1090,7 +1095,7 @@
10901095 }
10911096 break;
10921097 case 'W': case 'w':
1093- if (strEQcase(attr, "white-p"))
1098+ if (strEQcase(attr, "white_p"))
10941099 {
10951100 for ( ; image; image = image->next)
10961101 {
@@ -3289,7 +3294,7 @@
32893294 if (image)
32903295 s = newSViv(image->magick_columns);
32913296 }
3292- else if (strEQcase(arg, "blue-p"))
3297+ else if (strEQcase(arg, "blue_p"))
32933298 {
32943299 if (!image)
32953300 break;
@@ -3482,7 +3487,7 @@
34823487 if (image && image->geometry)
34833488 s = newSVpv(image->geometry, 0);
34843489 }
3485- else if (strEQcase(arg, "green-p"))
3490+ else if (strEQcase(arg, "green_p"))
34863491 {
34873492 if (!image)
34883493 break;
@@ -3585,14 +3590,12 @@
35853590 else if (image)
35863591 s = newSViv(image->colors);
35873592 }
3588- else if (strEQcase(arg, "normalized_max") ||
3589- strEQcase(arg, "normalizedmax"))
3593+ else if (strEQcase(arg, "normalized_max"))
35903594 {
35913595 if (image)
35923596 s = newSVnv(image->normalized_maximum_error);
35933597 }
3594- else if (strEQcase(arg, "normalized_mean") ||
3595- strEQcase(arg, "normalizedmean"))
3598+ else if (strEQcase(arg, "normalized_mean"))
35963599 {
35973600 if (image)
35983601 s = newSVnv(image->normalized_mean_error);
@@ -3687,7 +3690,7 @@
36873690 SvIOK_on(s);
36883691 }
36893692 }
3690- else if (strEQcase(arg, "red-p"))
3693+ else if (strEQcase(arg, "red_p"))
36913694 {
36923695 if (!image)
36933696 break;
@@ -3819,7 +3822,7 @@
38193822 }
38203823 break;
38213824 case 'W': case 'w':
3822- if (strEQcase(arg, "white-p"))
3825+ if (strEQcase(arg, "white_p"))
38233826 {
38243827 if (!image)
38253828 break;
diff -r 15a4d6a81d91 -r 0858d48e28d3 PerlMagick/Makefile.PL.in
--- a/PerlMagick/Makefile.PL.in Sun Sep 27 23:13:26 1998 -0500
+++ b/PerlMagick/Makefile.PL.in Mon Sep 28 09:29:36 1998 -0500
@@ -22,6 +22,7 @@
2222 #
2323 # Feature Formats Tested Prerequisites
2424 # ======= ====================== ======================================
25+ # bzlib BZip compression BZip library
2526 # cgm CGM format 'ralcgm' program
2627 # hdf HDF format HDF library
2728 # jbig JBIG format JBIG library
diff -r 15a4d6a81d91 -r 0858d48e28d3 magick/compress.c
--- a/magick/compress.c Sun Sep 27 23:13:26 1998 -0500
+++ b/magick/compress.c Mon Sep 28 09:29:36 1998 -0500
@@ -1746,7 +1746,7 @@
17461746 #else
17471747 Export unsigned int Huffman2DEncodeImage(ImageInfo *image_info,Image *image)
17481748 {
1749- MagickWarning(MissingPluginWarning,"TIFF library is not available",
1749+ MagickWarning(MissingDelegateWarning,"TIFF library is not available",
17501750 image_info->filename);
17511751 return(False);
17521752 }
@@ -1924,7 +1924,7 @@
19241924 Export unsigned int LZWEncodeImage(FILE *file,unsigned char *pixels,
19251925 const unsigned int number_pixels)
19261926 {
1927- MagickWarning(MissingPluginWarning,"LZW library is not available",
1927+ MagickWarning(MissingDelegateWarning,"LZW library is not available",
19281928 (char *) NULL);
19291929 return(False);
19301930 }
@@ -3537,7 +3537,7 @@
35373537 compressed_packets=stream.total_out;
35383538 }
35393539 if (status)
3540- MagickWarning(PluginWarning,"Unable to Zip compress image",(char *) NULL);
3540+ MagickWarning(DelegateWarning,"Unable to Zip compress image",(char *) NULL);
35413541 else
35423542 {
35433543 Ascii85Initialize();
@@ -3552,7 +3552,7 @@
35523552 Export unsigned int ZLIBEncodeImage(FILE *file,unsigned char *pixels,
35533553 const unsigned long number_pixels,const unsigned int quality)
35543554 {
3555- MagickWarning(MissingPluginWarning,"ZLIB library is not available",
3555+ MagickWarning(MissingDelegateWarning,"ZLIB library is not available",
35563556 (char *) NULL);
35573557 return(False);
35583558 }
diff -r 15a4d6a81d91 -r 0858d48e28d3 magick/decode.c
--- a/magick/decode.c Sun Sep 27 23:13:26 1998 -0500
+++ b/magick/decode.c Mon Sep 28 09:29:36 1998 -0500
@@ -2028,7 +2028,7 @@
20282028 #else
20292029 static Image *ReadDPSImage(const ImageInfo *image_info)
20302030 {
2031- MagickWarning(MissingPluginWarning,"Cannot read DPS images",
2031+ MagickWarning(MissingDelegateWarning,"Cannot read DPS images",
20322032 image_info->filename);
20332033 return((Image *) NULL);
20342034 }
@@ -2701,7 +2701,7 @@
27012701 memory_limit=20000000;
27022702 status=FPX_SetToolkitMemoryLimit(&memory_limit);
27032703 if (status != FPX_OK)
2704- PrematureExit(PluginWarning,"Unable to initialize FPX library",image);
2704+ PrematureExit(DelegateWarning,"Unable to initialize FPX library",image);
27052705 tile_width=64;
27062706 tile_height=64;
27072707 flashpix=(FPXImageHandle *) NULL;
@@ -2738,7 +2738,7 @@
27382738 aspect_ratio=(float) width/height;
27392739 status=FPX_GetImageResultAspectRatio(flashpix,&aspect_ratio);
27402740 if (status != FPX_OK)
2741- MagickWarning(PluginWarning,"Unable to read aspect ratio",
2741+ MagickWarning(DelegateWarning,"Unable to read aspect ratio",
27422742 image_info->filename);
27432743 if (width != (unsigned long) ((aspect_ratio*height)+0.5))
27442744 Swap(width,height);
@@ -2759,7 +2759,7 @@
27592759 image->label=(char *) AllocateMemory((unsigned int)
27602760 (summary_info.title.length+1)*sizeof(char));
27612761 if (image->label == (char *) NULL)
2762- MagickWarning(PluginWarning,"Memory allocation failed",
2762+ MagickWarning(DelegateWarning,"Memory allocation failed",
27632763 image_info->filename);
27642764 else
27652765 {
@@ -2778,7 +2778,7 @@
27782778 image->comments=(char *) AllocateMemory((unsigned int)
27792779 (summary_info.comments.length+1)*sizeof(char));
27802780 if (image->comments == (char *) NULL)
2781- MagickWarning(PluginWarning,"Memory allocation failed",
2781+ MagickWarning(DelegateWarning,"Memory allocation failed",
27822782 image_info->filename);
27832783 else
27842784 {
@@ -2989,7 +2989,7 @@
29892989 #else
29902990 static Image *ReadFPXImage(const ImageInfo *image_info)
29912991 {
2992- MagickWarning(MissingPluginWarning,"FPX library is not available",
2992+ MagickWarning(MissingDelegateWarning,"FPX library is not available",
29932993 image_info->filename);
29942994 return((Image *) NULL);
29952995 }
@@ -3940,7 +3940,7 @@
39403940 #else
39413941 static Image *ReadHDFImage(const ImageInfo *image_info)
39423942 {
3943- MagickWarning(MissingPluginWarning,"HDF library is not available",
3943+ MagickWarning(MissingDelegateWarning,"HDF library is not available",
39443944 image_info->filename);
39453945 return((Image *) NULL);
39463946 }
@@ -4054,7 +4054,7 @@
40544054 (void) remove(image_info->filename);
40554055 if (image == (Image *) NULL)
40564056 {
4057- MagickWarning(MissingPluginWarning,"HPGL delegation failed",
4057+ MagickWarning(MissingDelegateWarning,"HPGL delegation failed",
40584058 image_info->filename);
40594059 return((Image *) NULL);
40604060 }
@@ -4124,7 +4124,7 @@
41244124 status=SystemCommand(command);
41254125 if (status)
41264126 {
4127- MagickWarning(MissingPluginWarning,"HTML delegation failed",
4127+ MagickWarning(MissingDelegateWarning,"HTML delegation failed",
41284128 image_info->filename);
41294129 return((Image *) NULL);
41304130 }
@@ -4132,7 +4132,7 @@
41324132 (void) remove(image_info->filename);
41334133 if (image == (Image *) NULL)
41344134 {
4135- MagickWarning(MissingPluginWarning,"HTML delegation failed",
4135+ MagickWarning(MissingDelegateWarning,"HTML delegation failed",
41364136 image_info->filename);
41374137 return((Image *) NULL);
41384138 }
@@ -4365,7 +4365,7 @@
43654365 #else
43664366 static Image *ReadJBIGImage(const ImageInfo *image_info)
43674367 {
4368- MagickWarning(MissingPluginWarning,"JBIG library is not available",
4368+ MagickWarning(MissingDelegateWarning,"JBIG library is not available",
43694369 image_info->filename);
43704370 return((Image *) NULL);
43714371 }
@@ -4531,12 +4531,12 @@
45314531 if (level < 0)
45324532 {
45334533 if ((jpeg_error->num_warnings == 0) || (jpeg_error->trace_level >= 3))
4534- MagickWarning(PluginWarning,(char *) message,image->filename);
4534+ MagickWarning(DelegateWarning,(char *) message,image->filename);
45354535 jpeg_error->num_warnings++;
45364536 }
45374537 else
45384538 if (jpeg_error->trace_level >= level)
4539- MagickWarning(PluginWarning,(char *) message,image->filename);
4539+ MagickWarning(DelegateWarning,(char *) message,image->filename);
45404540 }
45414541
45424542 static void ErrorExit(j_common_ptr jpeg_info)
@@ -4808,7 +4808,7 @@
48084808 #else
48094809 static Image *ReadJPEGImage(const ImageInfo *image_info)
48104810 {
4811- MagickWarning(MissingPluginWarning,"JPEG library is not available",
4811+ MagickWarning(MissingDelegateWarning,"JPEG library is not available",
48124812 image_info->filename);
48134813 return((Image *) NULL);
48144814 }
@@ -5482,10 +5482,10 @@
54825482 */
54835483 error=TT_Init_FreeType(&engine);
54845484 if (error)
5485- PrematureExit(PluginWarning,"Cannot initialize TTF engine",image);
5485+ PrematureExit(DelegateWarning,"Cannot initialize TTF engine",image);
54865486 error=TT_Open_Face(engine,local_info.font+1,&face);
54875487 if (error)
5488- PrematureExit(PluginWarning,"Unable to open TTF font",image);
5488+ PrematureExit(DelegateWarning,"Unable to open TTF font",image);
54895489 TT_Get_Face_Properties(face,&face_properties);
54905490 GetFontInfo(face,&face_properties,image);
54915491 error=TT_New_Instance(face,&instance);
@@ -5498,7 +5498,7 @@
54985498 image->x_resolution,(unsigned short) image->y_resolution);
54995499 error|=TT_Set_Instance_CharSize(instance,local_info.pointsize*64);
55005500 if (error)
5501- PrematureExit(PluginWarning,"Cannot initialize TTF instance",image);
5501+ PrematureExit(DelegateWarning,"Cannot initialize TTF instance",image);
55025502 for (code=0; (int) code < (int) face_properties.num_CharMaps; code++)
55035503 {
55045504 TT_Get_CharMap_ID(face,code,&platform,&encoding);
@@ -5519,12 +5519,12 @@
55195519 }
55205520 glyphs=(TT_Glyph *) AllocateMemory(MaxGlyphs*sizeof(TT_Glyph));
55215521 if (glyphs == (TT_Glyph *) NULL)
5522- PrematureExit(PluginWarning,"Memory allocation failed",image);
5522+ PrematureExit(DelegateWarning,"Memory allocation failed",image);
55235523 for (i=0; i < MaxGlyphs; i++)
55245524 glyphs[i].z=(TT_Glyph *) NULL;
55255525 unicode=ConvertTextToUnicode(text,&length);
55265526 if (unicode == (unsigned short *) NULL)
5527- PrematureExit(PluginWarning,"Memory allocation failed",image);
5527+ PrematureExit(DelegateWarning,"Memory allocation failed",image);
55285528 for (i=0; i < length; i++)
55295529 {
55305530 if (glyphs[(unsigned char) unicode[i]].z != (TT_Glyph *) NULL)
@@ -5541,7 +5541,7 @@
55415541 error|=TT_Load_Glyph(instance,glyphs[(unsigned char) unicode[i]],code,
55425542 TTLOAD_SCALE_GLYPH | TTLOAD_HINT_GLYPH);
55435543 if (error)
5544- PrematureExit(PluginWarning,"Cannot initialize TTF glyph",image);
5544+ PrematureExit(DelegateWarning,"Cannot initialize TTF glyph",image);
55455545 }
55465546 TT_Get_Face_Properties(face,&face_properties);
55475547 TT_Get_Instance_Metrics(instance,&instance_metrics);
@@ -5564,7 +5564,7 @@
55645564 canvas.size=canvas.rows*canvas.width;
55655565 canvas.bitmap=(void *) AllocateMemory(canvas.size);
55665566 if (!canvas.bitmap)
5567- PrematureExit(PluginWarning,"Memory allocation failed",image);
5567+ PrematureExit(DelegateWarning,"Memory allocation failed",image);
55685568 p=(unsigned char *) canvas.bitmap;
55695569 for (i=0; i < canvas.size; i++)
55705570 *p++=0;
@@ -5575,7 +5575,7 @@
55755575 character.size=character.rows*character.width;
55765576 character.bitmap=(void *) AllocateMemory(character.size);
55775577 if (!character.bitmap)
5578- PrematureExit(PluginWarning,"Memory allocation failed",image);
5578+ PrematureExit(DelegateWarning,"Memory allocation failed",image);
55795579 x=0;
55805580 y=((int) -(face_properties.horizontal->Descender*instance_metrics.y_ppem)/
55815581 (int) face_properties.header->Units_Per_EM);
@@ -5634,7 +5634,7 @@
56345634 CondenseImage(image);
56355635 return(image);
56365636 #else
5637- MagickWarning(MissingPluginWarning,"FreeType library is not available",
5637+ MagickWarning(MissingDelegateWarning,"FreeType library is not available",
56385638 (char *) NULL);
56395639 #endif
56405640 }
@@ -6574,7 +6574,7 @@
65746574 image->packets=(unsigned int) (max_packets/image->packet_size);
65756575 FreeMemory((char *) compressed_pixels);
65766576 if (status)
6577- PrematureExit(PluginWarning,"Unable to uncompress image",image);
6577+ PrematureExit(DelegateWarning,"Unable to uncompress image",image);
65786578 }
65796579 if (image->compression == ZipCompression)
65806580 {
@@ -6601,7 +6601,7 @@
66016601 image->packets=(unsigned int) (max_packets/image->packet_size);
66026602 FreeMemory((char *) compressed_pixels);
66036603 if (status)
6604- PrematureExit(PluginWarning,"Unable to uncompress image",image);
6604+ PrematureExit(DelegateWarning,"Unable to uncompress image",image);
66056605 }
66066606 /*
66076607 Unpack the packed image pixels into runlength-encoded pixel packets.
@@ -7567,7 +7567,7 @@
75677567 */
75687568 static Image *ReadPCLImage(const ImageInfo *image_info)
75697569 {
7570- MagickWarning(MissingPluginWarning,"Cannot read PCL images",
7570+ MagickWarning(MissingDelegateWarning,"Cannot read PCL images",
75717571 image_info->filename);
75727572 return((Image *) NULL);
75737573 }
@@ -9226,7 +9226,7 @@
92269226
92279227 static void PNGError(png_struct *ping,png_const_charp message)
92289228 {
9229- MagickWarning(PluginWarning,message,(char *) NULL);
9229+ MagickWarning(DelegateWarning,message,(char *) NULL);
92309230 longjmp(ping->jmpbuf,1);
92319231 }
92329232
@@ -9256,7 +9256,7 @@
92569256
92579257 static void PNGWarning(png_struct *ping,png_const_charp message)
92589258 {
9259- MagickWarning(PluginWarning,message,(char *) NULL);
9259+ MagickWarning(DelegateWarning,message,(char *) NULL);
92609260 }
92619261
92629262 static Image *ReadPNGImage(const ImageInfo *image_info)
@@ -9831,7 +9831,7 @@
98319831 #else
98329832 static Image *ReadPNGImage(const ImageInfo *image_info)
98339833 {
9834- MagickWarning(MissingPluginWarning,"PNG library is not available",
9834+ MagickWarning(MissingDelegateWarning,"PNG library is not available",
98359835 image_info->filename);
98369836 return((Image *) NULL);
98379837 }
@@ -13938,7 +13938,7 @@
1393813938 }
1393913939 (void) vsprintf(p,format,warning);
1394013940 (void) strcat(p,".");
13941- MagickWarning(PluginWarning,message,(char *) NULL);
13941+ MagickWarning(DelegateWarning,message,(char *) NULL);
1394213942 }
1394313943
1394413944 static Image *ReadTIFFImage(const ImageInfo *image_info)
@@ -14596,7 +14596,7 @@
1459614596 #else
1459714597 static Image *ReadTIFFImage(const ImageInfo *image_info)
1459814598 {
14599- MagickWarning(MissingPluginWarning,"TIFF library is not available",
14599+ MagickWarning(MissingDelegateWarning,"TIFF library is not available",
1460014600 image_info->filename);
1460114601 return((Image *) NULL);
1460214602 }
@@ -15091,7 +15091,7 @@
1509115091 #else
1509215092 static Image *ReadTTFImage(const ImageInfo *image_info)
1509315093 {
15094- MagickWarning(MissingPluginWarning,"Cannot read TTF images",
15094+ MagickWarning(MissingDelegateWarning,"Cannot read TTF images",
1509515095 image_info->filename);
1509615096 return((Image *) NULL);
1509715097 }
@@ -15128,7 +15128,7 @@
1512815128 */
1512915129 static Image *ReadUILImage(const ImageInfo *image_info)
1513015130 {
15131- MagickWarning(MissingPluginWarning,"Cannot read UIL images",
15131+ MagickWarning(MissingDelegateWarning,"Cannot read UIL images",
1513215132 image_info->filename);
1513315133 return((Image *) NULL);
1513415134 }
diff -r 15a4d6a81d91 -r 0858d48e28d3 magick/delegates.h
--- a/magick/delegates.h Sun Sep 27 23:13:26 1998 -0500
+++ b/magick/delegates.h Mon Sep 28 09:29:36 1998 -0500
@@ -32,7 +32,7 @@
3232 #define CGMCommand CGMDecodeDelegate " -d ps %s %s %s"
3333 #if !defined(EditorDelegate)
3434 #if !defined(vms) && !defined(macintosh) && !defined(WIN32)
35-#define EditorDelegate "xterm"
35+#define EditorDelegate "xterm -e vi"
3636 #else
3737 #if defined(vms)
3838 #define EditorDelegate "cre/term/wait edit/tpu"
diff -r 15a4d6a81d91 -r 0858d48e28d3 magick/encode.c
--- a/magick/encode.c Sun Sep 27 23:13:26 1998 -0500
+++ b/magick/encode.c Mon Sep 28 09:29:36 1998 -0500
@@ -553,7 +553,7 @@
553553 */
554554 static unsigned int WriteCGMImage(const ImageInfo *image_info,Image *image)
555555 {
556- MagickWarning(MissingPluginWarning,"Cannot write CGM images",image->filename);
556+ MagickWarning(MissingDelegateWarning,"Cannot write CGM images",image->filename);
557557 return(False);
558558 }
559559
@@ -889,7 +889,7 @@
889889 */
890890 static unsigned int WriteDICOMImage(const ImageInfo *image_info,Image *image)
891891 {
892- MagickWarning(MissingPluginWarning,"Cannot write DICOM images",
892+ MagickWarning(MissingDelegateWarning,"Cannot write DICOM images",
893893 image->filename);
894894 return(False);
895895 }
@@ -1130,7 +1130,7 @@
11301130 */
11311131 static unsigned int WriteFIGImage(const ImageInfo *image_info,Image *image)
11321132 {
1133- MagickWarning(MissingPluginWarning,"Cannot write FIG images",image->filename);
1133+ MagickWarning(MissingDelegateWarning,"Cannot write FIG images",image->filename);
11341134 return(False);
11351135 }
11361136
@@ -1570,7 +1570,7 @@
15701570 status=
15711571 FPX_SetJPEGCompression(flashpix,(unsigned short) (image_info->quality));
15721572 if (status != FPX_OK)
1573- MagickWarning(PluginWarning,"Unable to set JPEG level",(char *) NULL);
1573+ MagickWarning(DelegateWarning,"Unable to set JPEG level",(char *) NULL);
15741574 }
15751575 /*
15761576 Set image summary info.
@@ -1603,7 +1603,7 @@
16031603 if (summary_info.title.ptr != (unsigned char *) NULL)
16041604 (void) strcpy((char *) summary_info.title.ptr,image->label);
16051605 else
1606- MagickWarning(PluginWarning,"Unable to set image title",(char *) NULL);
1606+ MagickWarning(DelegateWarning,"Unable to set image title",(char *) NULL);
16071607 }
16081608 if (image->comments != (char *) NULL)
16091609 {
@@ -1617,12 +1617,12 @@
16171617 if (summary_info.comments.ptr != (unsigned char *) NULL)
16181618 (void) strcpy((char *) summary_info.comments.ptr,image->comments);
16191619 else
1620- MagickWarning(PluginWarning,"Unable to set image comments",
1620+ MagickWarning(DelegateWarning,"Unable to set image comments",
16211621 (char *) NULL);
16221622 }
16231623 status=FPX_SetSummaryInformation(flashpix,&summary_info);
16241624 if (status != FPX_OK)
1625- MagickWarning(PluginWarning,"Unable to set summary info",(char *) NULL);
1625+ MagickWarning(DelegateWarning,"Unable to set summary info",(char *) NULL);
16261626 /*
16271627 Allocate scanline.
16281628 */
@@ -1780,41 +1780,41 @@
17801780 {
17811781 status=FPX_SetImageAffineMatrix(flashpix,&affine);
17821782 if (status != FPX_OK)
1783- MagickWarning(PluginWarning,"Unable to set affine matrix",
1783+ MagickWarning(DelegateWarning,"Unable to set affine matrix",
17841784 (char *) NULL);
17851785 }
17861786 if (aspect_ratio_valid)
17871787 {
17881788 status=FPX_SetImageResultAspectRatio(flashpix,&aspect_ratio);
17891789 if (status != FPX_OK)
1790- MagickWarning(PluginWarning,"Unable to set aspect ratio",
1790+ MagickWarning(DelegateWarning,"Unable to set aspect ratio",
17911791 (char *) NULL);
17921792 }
17931793 if (color_twist_valid)
17941794 {
17951795 status=FPX_SetImageColorTwistMatrix(flashpix,&color_twist);
17961796 if (status != FPX_OK)
1797- MagickWarning(PluginWarning,"Unable to set color color twist",
1797+ MagickWarning(DelegateWarning,"Unable to set color color twist",
17981798 (char *) NULL);
17991799 }
18001800 if (contrast_valid)
18011801 {
18021802 status=FPX_SetImageContrastAdjustment(flashpix,&contrast);
18031803 if (status != FPX_OK)
1804- MagickWarning(PluginWarning,"Unable to set contrast",(char *) NULL);
1804+ MagickWarning(DelegateWarning,"Unable to set contrast",(char *) NULL);
18051805 }
18061806 if (sharpen_valid)
18071807 {
18081808 status=FPX_SetImageFilteringValue(flashpix,&sharpen);
18091809 if (status != FPX_OK)
1810- MagickWarning(PluginWarning,"Unable to set filtering value",
1810+ MagickWarning(DelegateWarning,"Unable to set filtering value",
18111811 (char *) NULL);
18121812 }
18131813 if (view_rect_valid)
18141814 {
18151815 status=FPX_SetImageROI(flashpix, &view_rect);
18161816 if (status != FPX_OK)
1817- MagickWarning(PluginWarning,"Unable to set region of interest",
1817+ MagickWarning(DelegateWarning,"Unable to set region of interest",
18181818 (char *) NULL);
18191819 }
18201820 }
@@ -1851,7 +1851,7 @@
18511851 #else
18521852 static unsigned int WriteFPXImage(const ImageInfo *image_info,Image *image)
18531853 {
1854- MagickWarning(MissingPluginWarning,"FPX library is not available",
1854+ MagickWarning(MissingDelegateWarning,"FPX library is not available",
18551855 image->filename);
18561856 return(False);
18571857 }
@@ -2279,7 +2279,7 @@
22792279 static unsigned int WriteGRADATIONImage(const ImageInfo *image_info,
22802280 Image *image)
22812281 {
2282- MagickWarning(MissingPluginWarning,"Cannot write GRADATION images",
2282+ MagickWarning(MissingDelegateWarning,"Cannot write GRADATION images",
22832283 image->filename);
22842284 return(False);
22852285 }
@@ -2620,7 +2620,7 @@
26202620 #else
26212621 static unsigned int WriteHDFImage(const ImageInfo *image_info,Image *image)
26222622 {
2623- MagickWarning(MissingPluginWarning,"HDF library is not available",
2623+ MagickWarning(MissingDelegateWarning,"HDF library is not available",
26242624 image->filename);
26252625 return(False);
26262626 }
@@ -2865,7 +2865,7 @@
28652865 */
28662866 static unsigned int WriteHPGLImage(const ImageInfo *image_info,Image *image)
28672867 {
2868- MagickWarning(MissingPluginWarning,"Cannot write HPGL images",
2868+ MagickWarning(MissingDelegateWarning,"Cannot write HPGL images",
28692869 image->filename);
28702870 return(False);
28712871 }
@@ -3283,7 +3283,7 @@
32833283 #else
32843284 static unsigned int WriteJBIGImage(const ImageInfo *image_info,Image *image)
32853285 {
3286- MagickWarning(MissingPluginWarning,"JBIG library is not available",
3286+ MagickWarning(MissingDelegateWarning,"JBIG library is not available",
32873287 image->filename);
32883288 return(False);
32893289 }
@@ -3366,12 +3366,12 @@
33663366 if (level < 0)
33673367 {
33683368 if (jpeg_error->num_warnings == 0 || jpeg_error->trace_level >= 3)
3369- MagickWarning(PluginWarning,(char *) message,(char *) NULL);
3369+ MagickWarning(DelegateWarning,(char *) message,(char *) NULL);
33703370 jpeg_error->num_warnings++;
33713371 }
33723372 else
33733373 if (jpeg_error->trace_level >= level)
3374- MagickWarning(PluginWarning,(char *) message,(char *) NULL);
3374+ MagickWarning(DelegateWarning,(char *) message,(char *) NULL);
33753375 }
33763376
33773377 static unsigned int WriteJPEGImage(const ImageInfo *image_info,Image *image)
@@ -3643,7 +3643,7 @@
36433643 #else
36443644 static unsigned int WriteJPEGImage(const ImageInfo *image_info,Image *image)
36453645 {
3646- MagickWarning(MissingPluginWarning,"JPEG library is not available",
3646+ MagickWarning(MissingDelegateWarning,"JPEG library is not available",
36473647 image->filename);
36483648 return(False);
36493649 }
@@ -3681,7 +3681,7 @@
36813681 */
36823682 static unsigned int WriteICONImage(const ImageInfo *image_info,Image *image)
36833683 {
3684- MagickWarning(MissingPluginWarning,"Cannot write ICON images",
3684+ MagickWarning(MissingDelegateWarning,"Cannot write ICON images",
36853685 image->filename);
36863686 return(False);
36873687 }
@@ -3717,7 +3717,7 @@
37173717 */
37183718 static unsigned int WriteLABELImage(const ImageInfo *image_info,Image *image)
37193719 {
3720- MagickWarning(MissingPluginWarning,"Cannot write LABEL images",
3720+ MagickWarning(MissingDelegateWarning,"Cannot write LABEL images",
37213721 image->filename);
37223722 return(False);
37233723 }
@@ -4068,7 +4068,7 @@
40684068 if (status)
40694069 {
40704070 FreeMemory((char *) compressed_pixels);
4071- PrematureExit(PluginWarning,"Unable to compress image",image);
4071+ PrematureExit(DelegateWarning,"Unable to compress image",image);
40724072 }
40734073 else
40744074 {
@@ -4170,7 +4170,7 @@
41704170 if (image->label != (char *) NULL)
41714171 (void) fprintf(image->file,"label=\"%s\"\n",image->label);
41724172 if (image->comments != (char *) NULL)
4173- (void) fprintf(image->file,"{\n%s\n}\n",image->comments);
4173+ (void) fprintf(image->file,"{%s}\n",image->comments);
41744174 (void) fprintf(image->file,"\f\n:\n");
41754175 if (image->montage != (char *) NULL)
41764176 {
@@ -6828,7 +6828,7 @@
68286828 */
68296829 static unsigned int WritePIXImage(const ImageInfo *image_info,Image *image)
68306830 {
6831- MagickWarning(MissingPluginWarning,"Cannot write PIX images",image->filename);
6831+ MagickWarning(MissingDelegateWarning,"Cannot write PIX images",image->filename);
68326832 return(False);
68336833 }
68346834
@@ -6864,7 +6864,7 @@
68646864 static unsigned int WritePLASMAImage(const ImageInfo *image_info,
68656865 Image *image)
68666866 {
6867- MagickWarning(MissingPluginWarning,"Cannot write PLASMA images",
6867+ MagickWarning(MissingDelegateWarning,"Cannot write PLASMA images",
68686868 image->filename);
68696869 return(False);
68706870 }
@@ -6903,7 +6903,7 @@
69036903
69046904 static void PNGError(png_struct *ping,png_const_charp message)
69056905 {
6906- MagickWarning(PluginWarning,message,(char *) NULL);
6906+ MagickWarning(DelegateWarning,message,(char *) NULL);
69076907 longjmp(ping->jmpbuf,1);
69086908 }
69096909
@@ -6923,7 +6923,7 @@
69236923
69246924 static void PNGWarning(png_struct *ping,png_const_charp message)
69256925 {
6926- MagickWarning(PluginWarning,message,(char *) NULL);
6926+ MagickWarning(DelegateWarning,message,(char *) NULL);
69276927 }
69286928
69296929 static unsigned int WritePNGImage(const ImageInfo *image_info,Image *image)
@@ -7396,7 +7396,7 @@
73967396 #else
73977397 static unsigned int WritePNGImage(const ImageInfo *image_info,Image *image)
73987398 {
7399- MagickWarning(MissingPluginWarning,"PNG library is not available",
7399+ MagickWarning(MissingDelegateWarning,"PNG library is not available",
74007400 image->filename);
74017401 return(False);
74027402 }
@@ -9978,7 +9978,7 @@
99789978 static unsigned int WriteRADIANCEImage(const ImageInfo *image_info,
99799979 Image *image)
99809980 {
9981- MagickWarning(MissingPluginWarning,"Cannot write RADIANCE images",
9981+ MagickWarning(MissingDelegateWarning,"Cannot write RADIANCE images",
99829982 image->filename);
99839983 return(False);
99849984 }
@@ -10229,7 +10229,7 @@
1022910229 */
1023010230 static unsigned int WriteRLAImage(const ImageInfo *image_info,Image *image)
1023110231 {
10232- MagickWarning(MissingPluginWarning,"Cannot write RLA images",image->filename);
10232+ MagickWarning(MissingDelegateWarning,"Cannot write RLA images",image->filename);
1023310233 return(False);
1023410234 }
1023510235
@@ -10340,7 +10340,7 @@
1034010340 */
1034110341 static unsigned int WriteSCANImage(const ImageInfo *image_info,Image *image)
1034210342 {
10343- MagickWarning(MissingPluginWarning,"Cannot write SCAN images",
10343+ MagickWarning(MissingDelegateWarning,"Cannot write SCAN images",
1034410344 image->filename);
1034510345 return(False);
1034610346 }
@@ -11321,7 +11321,7 @@
1132111321 */
1132211322 static unsigned int WriteTEXTImage(const ImageInfo *image_info,Image *image)
1132311323 {
11324- MagickWarning(MissingPluginWarning,"Cannot write TEXT images",
11324+ MagickWarning(MissingDelegateWarning,"Cannot write TEXT images",
1132511325 image->filename);
1132611326 return(False);
1132711327 }
@@ -11948,7 +11948,7 @@
1194811948 #else
1194911949 static unsigned int WriteTIFFImage(const ImageInfo *image_info,Image *image)
1195011950 {
11951- MagickWarning(MissingPluginWarning,"TIFF library is not available",
11951+ MagickWarning(MissingDelegateWarning,"TIFF library is not available",
1195211952 image->filename);
1195311953 return(False);
1195411954 }
@@ -11985,7 +11985,7 @@
1198511985 */
1198611986 static unsigned int WriteTILEImage(const ImageInfo *image_info,Image *image)
1198711987 {
11988- MagickWarning(MissingPluginWarning,"Cannot write TILE images",
11988+ MagickWarning(MissingDelegateWarning,"Cannot write TILE images",
1198911989 image->filename);
1199011990 return(False);
1199111991 }
@@ -12021,7 +12021,7 @@
1202112021 */
1202212022 static unsigned int WriteTIMImage(const ImageInfo *image_info,Image *image)
1202312023 {
12024- MagickWarning(MissingPluginWarning,"Cannot write TIM images",image->filename);
12024+ MagickWarning(MissingDelegateWarning,"Cannot write TIM images",image->filename);
1202512025 return(False);
1202612026 }
1202712027
@@ -13241,7 +13241,7 @@
1324113241 */
1324213242 static unsigned int WriteXCImage(const ImageInfo *image_info,Image *image)
1324313243 {
13244- MagickWarning(MissingPluginWarning,"Cannot write XC images",image->filename);
13244+ MagickWarning(MissingDelegateWarning,"Cannot write XC images",image->filename);
1324513245 return(False);
1324613246 }
1324713247
@@ -14187,7 +14187,7 @@
1418714187 }
1418814188 if (strncmp(image_info->magick,"TTF",3) == 0)
1418914189 {
14190- MagickWarning(MissingPluginWarning,"Cannot write TTF images",
14190+ MagickWarning(MissingDelegateWarning,"Cannot write TTF images",
1419114191 image->filename);
1419214192 status=False;
1419314193 break;
diff -r 15a4d6a81d91 -r 0858d48e28d3 magick/error.h
--- a/magick/error.h Sun Sep 27 23:13:26 1998 -0500
+++ b/magick/error.h Mon Sep 28 09:29:36 1998 -0500
@@ -21,8 +21,8 @@
2121 ResourceLimitWarning = 300,
2222 XServerWarning = 305,
2323 OptionWarning = 310,
24- PluginWarning = 315,
25- MissingPluginWarning = 320,
24+ DelegateWarning = 315,
25+ MissingDelegateWarning = 320,
2626 CorruptImageWarning = 325,
2727 FileOpenWarning = 330
2828 } WarningType;
diff -r 15a4d6a81d91 -r 0858d48e28d3 magick/image.h
--- a/magick/image.h Sun Sep 27 23:13:26 1998 -0500
+++ b/magick/image.h Mon Sep 28 09:29:36 1998 -0500
@@ -574,7 +574,7 @@
574574 rows,
575575 depth;
576576
577- long
577+ int
578578 offset;
579579
580580 RectangleInfo
diff -r 15a4d6a81d91 -r 0858d48e28d3 www/formats.html
--- a/www/formats.html Sun Sep 27 23:13:26 1998 -0500
+++ b/www/formats.html Mon Sep 28 09:29:36 1998 -0500
@@ -163,7 +163,8 @@
163163 <TR>
164164 <td><B>HPGL</B></td>
165165 <td>HP-GL plotter language</td>
166- <td>requires <a href=http://ftp.wizards.dupont.com/pub/ImageMagick/plug-ins/hp2xx-3.2.0.tar.gz</a></td>
166+ <td>requires <a href=http://ftp.wizards.dupont.com/pub/ImageMagick/plug-ins/hp2xx-3.2.0.tar.gz>
167+ hp2xx-3.2.0.tar.gz</a></td>
167168 </TR>
168169 <TR>
169170 <td><B>HTML</B></td>
@@ -402,6 +403,10 @@
402403 freetype-1.1.tar.gz</a></td>
403404 </TR>
404405 <TR>
406+ <td><B>YUV</B></td>
407+ <td>digital video CCIR 601 file</td>
408+ <td>use <tt>-size</tt> command line option to specify width and height</td>
409+<TR>
405410 <td><B>UIL</B></td>
406411 <td>X-Motif UIL table</td>
407412 </TR>
diff -r 15a4d6a81d91 -r 0858d48e28d3 www/perl.html
--- a/www/perl.html Sun Sep 27 23:13:26 1998 -0500
+++ b/www/perl.html Mon Sep 28 09:29:36 1998 -0500
@@ -673,6 +673,11 @@
673673 <td>name of texture to tile onto the image background</td>
674674 </tr>
675675 <tr>
676+ <td>Threshold</td>
677+ <td>threshold=&gt;<i>integer</i></td>
678+ <td>threshold the image</td>
679+</tr>
680+<tr>
676681 <td>Transform</td>
677682 <td>crop=&gt;<i>geometry</i>, geometry=&gt;<i>geometry</i></td>
678683 <td>crop or resize an image with a fully-qualified geometry specification</td>
@@ -683,11 +688,6 @@
683688 <td>make this color transparent within the image</td>
684689 </tr>
685690 <tr>
686- <td>Threshold</td>
687- <td>threshold=&gt;<i>integer</i></td>
688- <td>threshold the image</td>
689-</tr>
690-<tr>
691691 <td>Trim</td>
692692 <td></td>
693693 <td>remove edges that are the background color from the image</td>
@@ -779,7 +779,7 @@
779779 <td>image background color</td>
780780 </tr>
781781 <tr>
782- <td>blue-primary</td>
782+ <td>blue_primary</td>
783783 <td><i>x-value</i>, <i>y-value</i></td>
784784 <td>chromaticity blue primary point (e.g. 0.15, 0.06)</td>
785785 </tr>
@@ -794,16 +794,16 @@
794794 <td>color name (e.g. red) or hex value (e.g. #ccc) at position <i>i</i></td>
795795 </tr>
796796 <tr>
797+ <td>colors</td>
798+ <td><i>integer<i></td>
799+ <td>preferred number of colors in the image</td>
800+</tr>
801+<tr>
797802 <td>colorspace</td>
798803 <td>{RGB, Gray, Transparent, OHTA, XYZ, YCbCr, YCC, YIQ, YPbPr, YUV, CMYK}</td>
799804 <td>type of colorspace</td>
800805 </tr>
801806 <tr>
802- <td>colors</td>
803- <td><i>integer<i></td>
804- <td>preferred number of colors in the image</td>
805-</tr>
806-<tr>
807807 <td>compress</td>
808808 <td>None, JPEG, LZW, Runlength, Zip</td>
809809 <td>type of image compression</td>
@@ -861,7 +861,7 @@
861861 <td>set the image format</td>
862862 </tr>
863863 <tr>
864- <td>green-primary</td>
864+ <td>green_primary</td>
865865 <td><i>x-value</i>, <i>y-value</i></td>
866866 <td>chromaticity green primary point (e.g. 0.3, 0.6)</td>
867867 </tr>
@@ -915,7 +915,7 @@
915915 <tr>
916916 <td>pointsize</td>
917917 <td><i>integer<i></td>
918- <td>pointsize of the Postscript font</td>
918+ <td>pointsize of the Postscript or TrueType font</td>
919919 </tr>
920920 <tr>
921921 <td>preview</td>
@@ -931,12 +931,12 @@
931931 <td>JPEG/MIFF/PNG compression level</td>
932932 </tr>
933933 <tr>
934- <td>red-primary</td>
934+ <td>red_primary</td>
935935 <td><i>x-value</i>, <i>y-value</i></td>
936936 <td>chromaticity red primary point (e.g. 0.64, 0.33)</td>
937937 </tr>
938938 <tr>
939- <td>rendering-intent</td>
939+ <td>rendering_intent</td>
940940 <td>{Undefined, Saturation, Perceptual, Absolute, Relative}</td>
941941 <td>the type of rendering intent</td>
942942 </tr>
@@ -991,7 +991,7 @@
991991 <td>print detailed information about the image</td>
992992 </tr>
993993 <tr>
994- <td>white-point</td>
994+ <td>white_point</td>
995995 <td><i>x-value</i>, <i>y-value</i></td>
996996 <td>chromaticity white point (e.g. 0.3127, 0.329)</td>
997997 </tr>
@@ -1115,12 +1115,12 @@
11151115 <td>tile size and offset within an image montage</td>
11161116 </tr>
11171117 <tr>
1118- <td>normalized_max</td>
1118+ <td>normalized-max</td>
11191119 <td><i>double</i></td>
11201120 <td>the normalized max error per pixel computed when an image is color reduced</td>
11211121 </tr>
11221122 <tr>
1123- <td>normalized_mean</td>
1123+ <td>normalized-mean</td>
11241124 <td><i>double</i></td>
11251125 <td>the normalized mean error per pixel computed when an image is color reduced</td>
11261126 </tr>
@@ -1150,7 +1150,7 @@
11501150 <td>any text associated with the image</td>
11511151 </tr>
11521152 <tr>
1153- <td>total_colors</td>
1153+ <td>total-colors</td>
11541154 <td><i>integer<i></td>
11551155 <td>number of colors in the image</td>
11561156 </tr>
@@ -1176,12 +1176,12 @@
11761176 <td>the number of columns or width of an image</td>
11771177 </tr>
11781178 <tr>
1179- <td>x_resolution</td>
1179+ <td>x-resolution</td>
11801180 <td><i>integer</i></td>
11811181 <td>x resolution of the image</td>
11821182 </tr>
11831183 <tr>
1184- <td>y_resolution</td>
1184+ <td>y-resolution</td>
11851185 <td><i>integer</i></td>
11861186 <td>y resolution of the image</td>
11871187 </tr>
@@ -1223,7 +1223,7 @@
12231223 </tr>
12241224 <tr>
12251225 <td>background</td>
1226- <td><i>string</i></td>
1226+ <td><i>color</i></td>
12271227 <td>X11 color name</td>
12281228 </tr>
12291229 <tr>
@@ -1287,7 +1287,7 @@
12871287 <tr>
12881288 <td>pointsize</td>
12891289 <td><i>integer<i></td>
1290- <td>pointsize of the Postscript font</td>
1290+ <td>pointsize of the Postscript or TrueType font</td>
12911291 </tr>
12921292 <tr>
12931293 <td>shadow</td>
@@ -1502,14 +1502,14 @@
15021502 </tr>
15031503 <tr>
15041504 <td>315</td>
1505- <td>PluginWarning</td>
1506- <td>an ImageMagick plug-in returned a warning</td>
1505+ <td>DelegateWarning</td>
1506+ <td>an ImageMagick <em>delegate</em> returned a warning</td>
15071507 </tr>
15081508 <tr>
15091509 <td>320</td>
1510- <td>MissingPluginWarning</td>
1510+ <td>MissingDelegateWarning</td>
15111511 <td>the image type can not be read or written because the appropriate
1512- plug-in is missing</td>
1512+ <em>Delegate</em> is missing</td>
15131513 </tr>
15141514 <tr>
15151515 <td>325</td>
Afficher sur ancien navigateur de dépôt.