Main GraphicsMagick source repository
Révision | 0858d48e28d3be01eaaf57e6e3b679ac149c2539 (tree) |
---|---|
l'heure | 1998-09-28 23:29:36 |
Auteur | Bob Friesenhahn <bfriesen@Grap...> |
Commiter | Bob Friesenhahn |
Update: Mon
@@ -37,9 +37,12 @@ | ||
37 | 37 | errno = 0; |
38 | 38 | switch (*name) |
39 | 39 | { |
40 | + case 'D': | |
41 | + if (strEQ(name, "DelegateWarning")) | |
42 | + return DelegateWarning; | |
40 | 43 | case 'P': |
41 | 44 | if (strEQ(name, "PluginWarning")) |
42 | - return PluginWarning; | |
45 | + return DelegateWarning; | |
43 | 46 | break; |
44 | 47 | |
45 | 48 | case 'O': |
@@ -67,8 +70,10 @@ | ||
67 | 70 | break; |
68 | 71 | |
69 | 72 | case 'M': |
73 | + if (strEQ(name, "MissingDelegateWarning")) | |
74 | + return MissingDelegateWarning; | |
70 | 75 | if (strEQ(name, "MissingPluginWarning")) |
71 | - return MissingPluginWarning; | |
76 | + return MissingDelegateWarning; | |
72 | 77 | break; |
73 | 78 | |
74 | 79 | case 'C': |
@@ -573,7 +578,7 @@ | ||
573 | 578 | } |
574 | 579 | return; |
575 | 580 | } |
576 | - if (strEQcase(attr, "blue-p")) | |
581 | + if (strEQcase(attr, "blue_p")) | |
577 | 582 | { |
578 | 583 | for ( ; image; image = image->next) |
579 | 584 | { |
@@ -795,7 +800,7 @@ | ||
795 | 800 | } |
796 | 801 | break; |
797 | 802 | case 'G': case 'g': |
798 | - if (strEQcase(attr, "green-p")) | |
803 | + if (strEQcase(attr, "green_p")) | |
799 | 804 | { |
800 | 805 | for ( ; image; image = image->next) |
801 | 806 | { |
@@ -983,7 +988,7 @@ | ||
983 | 988 | } |
984 | 989 | break; |
985 | 990 | case 'R': case 'r': |
986 | - if (strEQcase(attr, "red-p")) | |
991 | + if (strEQcase(attr, "red_p")) | |
987 | 992 | { |
988 | 993 | for ( ; image; image = image->next) |
989 | 994 | { |
@@ -1090,7 +1095,7 @@ | ||
1090 | 1095 | } |
1091 | 1096 | break; |
1092 | 1097 | case 'W': case 'w': |
1093 | - if (strEQcase(attr, "white-p")) | |
1098 | + if (strEQcase(attr, "white_p")) | |
1094 | 1099 | { |
1095 | 1100 | for ( ; image; image = image->next) |
1096 | 1101 | { |
@@ -3289,7 +3294,7 @@ | ||
3289 | 3294 | if (image) |
3290 | 3295 | s = newSViv(image->magick_columns); |
3291 | 3296 | } |
3292 | - else if (strEQcase(arg, "blue-p")) | |
3297 | + else if (strEQcase(arg, "blue_p")) | |
3293 | 3298 | { |
3294 | 3299 | if (!image) |
3295 | 3300 | break; |
@@ -3482,7 +3487,7 @@ | ||
3482 | 3487 | if (image && image->geometry) |
3483 | 3488 | s = newSVpv(image->geometry, 0); |
3484 | 3489 | } |
3485 | - else if (strEQcase(arg, "green-p")) | |
3490 | + else if (strEQcase(arg, "green_p")) | |
3486 | 3491 | { |
3487 | 3492 | if (!image) |
3488 | 3493 | break; |
@@ -3585,14 +3590,12 @@ | ||
3585 | 3590 | else if (image) |
3586 | 3591 | s = newSViv(image->colors); |
3587 | 3592 | } |
3588 | - else if (strEQcase(arg, "normalized_max") || | |
3589 | - strEQcase(arg, "normalizedmax")) | |
3593 | + else if (strEQcase(arg, "normalized_max")) | |
3590 | 3594 | { |
3591 | 3595 | if (image) |
3592 | 3596 | s = newSVnv(image->normalized_maximum_error); |
3593 | 3597 | } |
3594 | - else if (strEQcase(arg, "normalized_mean") || | |
3595 | - strEQcase(arg, "normalizedmean")) | |
3598 | + else if (strEQcase(arg, "normalized_mean")) | |
3596 | 3599 | { |
3597 | 3600 | if (image) |
3598 | 3601 | s = newSVnv(image->normalized_mean_error); |
@@ -3687,7 +3690,7 @@ | ||
3687 | 3690 | SvIOK_on(s); |
3688 | 3691 | } |
3689 | 3692 | } |
3690 | - else if (strEQcase(arg, "red-p")) | |
3693 | + else if (strEQcase(arg, "red_p")) | |
3691 | 3694 | { |
3692 | 3695 | if (!image) |
3693 | 3696 | break; |
@@ -3819,7 +3822,7 @@ | ||
3819 | 3822 | } |
3820 | 3823 | break; |
3821 | 3824 | case 'W': case 'w': |
3822 | - if (strEQcase(arg, "white-p")) | |
3825 | + if (strEQcase(arg, "white_p")) | |
3823 | 3826 | { |
3824 | 3827 | if (!image) |
3825 | 3828 | break; |
@@ -22,6 +22,7 @@ | ||
22 | 22 | # |
23 | 23 | # Feature Formats Tested Prerequisites |
24 | 24 | # ======= ====================== ====================================== |
25 | + # bzlib BZip compression BZip library | |
25 | 26 | # cgm CGM format 'ralcgm' program |
26 | 27 | # hdf HDF format HDF library |
27 | 28 | # jbig JBIG format JBIG library |
@@ -1746,7 +1746,7 @@ | ||
1746 | 1746 | #else |
1747 | 1747 | Export unsigned int Huffman2DEncodeImage(ImageInfo *image_info,Image *image) |
1748 | 1748 | { |
1749 | - MagickWarning(MissingPluginWarning,"TIFF library is not available", | |
1749 | + MagickWarning(MissingDelegateWarning,"TIFF library is not available", | |
1750 | 1750 | image_info->filename); |
1751 | 1751 | return(False); |
1752 | 1752 | } |
@@ -1924,7 +1924,7 @@ | ||
1924 | 1924 | Export unsigned int LZWEncodeImage(FILE *file,unsigned char *pixels, |
1925 | 1925 | const unsigned int number_pixels) |
1926 | 1926 | { |
1927 | - MagickWarning(MissingPluginWarning,"LZW library is not available", | |
1927 | + MagickWarning(MissingDelegateWarning,"LZW library is not available", | |
1928 | 1928 | (char *) NULL); |
1929 | 1929 | return(False); |
1930 | 1930 | } |
@@ -3537,7 +3537,7 @@ | ||
3537 | 3537 | compressed_packets=stream.total_out; |
3538 | 3538 | } |
3539 | 3539 | if (status) |
3540 | - MagickWarning(PluginWarning,"Unable to Zip compress image",(char *) NULL); | |
3540 | + MagickWarning(DelegateWarning,"Unable to Zip compress image",(char *) NULL); | |
3541 | 3541 | else |
3542 | 3542 | { |
3543 | 3543 | Ascii85Initialize(); |
@@ -3552,7 +3552,7 @@ | ||
3552 | 3552 | Export unsigned int ZLIBEncodeImage(FILE *file,unsigned char *pixels, |
3553 | 3553 | const unsigned long number_pixels,const unsigned int quality) |
3554 | 3554 | { |
3555 | - MagickWarning(MissingPluginWarning,"ZLIB library is not available", | |
3555 | + MagickWarning(MissingDelegateWarning,"ZLIB library is not available", | |
3556 | 3556 | (char *) NULL); |
3557 | 3557 | return(False); |
3558 | 3558 | } |
@@ -2028,7 +2028,7 @@ | ||
2028 | 2028 | #else |
2029 | 2029 | static Image *ReadDPSImage(const ImageInfo *image_info) |
2030 | 2030 | { |
2031 | - MagickWarning(MissingPluginWarning,"Cannot read DPS images", | |
2031 | + MagickWarning(MissingDelegateWarning,"Cannot read DPS images", | |
2032 | 2032 | image_info->filename); |
2033 | 2033 | return((Image *) NULL); |
2034 | 2034 | } |
@@ -2701,7 +2701,7 @@ | ||
2701 | 2701 | memory_limit=20000000; |
2702 | 2702 | status=FPX_SetToolkitMemoryLimit(&memory_limit); |
2703 | 2703 | if (status != FPX_OK) |
2704 | - PrematureExit(PluginWarning,"Unable to initialize FPX library",image); | |
2704 | + PrematureExit(DelegateWarning,"Unable to initialize FPX library",image); | |
2705 | 2705 | tile_width=64; |
2706 | 2706 | tile_height=64; |
2707 | 2707 | flashpix=(FPXImageHandle *) NULL; |
@@ -2738,7 +2738,7 @@ | ||
2738 | 2738 | aspect_ratio=(float) width/height; |
2739 | 2739 | status=FPX_GetImageResultAspectRatio(flashpix,&aspect_ratio); |
2740 | 2740 | if (status != FPX_OK) |
2741 | - MagickWarning(PluginWarning,"Unable to read aspect ratio", | |
2741 | + MagickWarning(DelegateWarning,"Unable to read aspect ratio", | |
2742 | 2742 | image_info->filename); |
2743 | 2743 | if (width != (unsigned long) ((aspect_ratio*height)+0.5)) |
2744 | 2744 | Swap(width,height); |
@@ -2759,7 +2759,7 @@ | ||
2759 | 2759 | image->label=(char *) AllocateMemory((unsigned int) |
2760 | 2760 | (summary_info.title.length+1)*sizeof(char)); |
2761 | 2761 | if (image->label == (char *) NULL) |
2762 | - MagickWarning(PluginWarning,"Memory allocation failed", | |
2762 | + MagickWarning(DelegateWarning,"Memory allocation failed", | |
2763 | 2763 | image_info->filename); |
2764 | 2764 | else |
2765 | 2765 | { |
@@ -2778,7 +2778,7 @@ | ||
2778 | 2778 | image->comments=(char *) AllocateMemory((unsigned int) |
2779 | 2779 | (summary_info.comments.length+1)*sizeof(char)); |
2780 | 2780 | if (image->comments == (char *) NULL) |
2781 | - MagickWarning(PluginWarning,"Memory allocation failed", | |
2781 | + MagickWarning(DelegateWarning,"Memory allocation failed", | |
2782 | 2782 | image_info->filename); |
2783 | 2783 | else |
2784 | 2784 | { |
@@ -2989,7 +2989,7 @@ | ||
2989 | 2989 | #else |
2990 | 2990 | static Image *ReadFPXImage(const ImageInfo *image_info) |
2991 | 2991 | { |
2992 | - MagickWarning(MissingPluginWarning,"FPX library is not available", | |
2992 | + MagickWarning(MissingDelegateWarning,"FPX library is not available", | |
2993 | 2993 | image_info->filename); |
2994 | 2994 | return((Image *) NULL); |
2995 | 2995 | } |
@@ -3940,7 +3940,7 @@ | ||
3940 | 3940 | #else |
3941 | 3941 | static Image *ReadHDFImage(const ImageInfo *image_info) |
3942 | 3942 | { |
3943 | - MagickWarning(MissingPluginWarning,"HDF library is not available", | |
3943 | + MagickWarning(MissingDelegateWarning,"HDF library is not available", | |
3944 | 3944 | image_info->filename); |
3945 | 3945 | return((Image *) NULL); |
3946 | 3946 | } |
@@ -4054,7 +4054,7 @@ | ||
4054 | 4054 | (void) remove(image_info->filename); |
4055 | 4055 | if (image == (Image *) NULL) |
4056 | 4056 | { |
4057 | - MagickWarning(MissingPluginWarning,"HPGL delegation failed", | |
4057 | + MagickWarning(MissingDelegateWarning,"HPGL delegation failed", | |
4058 | 4058 | image_info->filename); |
4059 | 4059 | return((Image *) NULL); |
4060 | 4060 | } |
@@ -4124,7 +4124,7 @@ | ||
4124 | 4124 | status=SystemCommand(command); |
4125 | 4125 | if (status) |
4126 | 4126 | { |
4127 | - MagickWarning(MissingPluginWarning,"HTML delegation failed", | |
4127 | + MagickWarning(MissingDelegateWarning,"HTML delegation failed", | |
4128 | 4128 | image_info->filename); |
4129 | 4129 | return((Image *) NULL); |
4130 | 4130 | } |
@@ -4132,7 +4132,7 @@ | ||
4132 | 4132 | (void) remove(image_info->filename); |
4133 | 4133 | if (image == (Image *) NULL) |
4134 | 4134 | { |
4135 | - MagickWarning(MissingPluginWarning,"HTML delegation failed", | |
4135 | + MagickWarning(MissingDelegateWarning,"HTML delegation failed", | |
4136 | 4136 | image_info->filename); |
4137 | 4137 | return((Image *) NULL); |
4138 | 4138 | } |
@@ -4365,7 +4365,7 @@ | ||
4365 | 4365 | #else |
4366 | 4366 | static Image *ReadJBIGImage(const ImageInfo *image_info) |
4367 | 4367 | { |
4368 | - MagickWarning(MissingPluginWarning,"JBIG library is not available", | |
4368 | + MagickWarning(MissingDelegateWarning,"JBIG library is not available", | |
4369 | 4369 | image_info->filename); |
4370 | 4370 | return((Image *) NULL); |
4371 | 4371 | } |
@@ -4531,12 +4531,12 @@ | ||
4531 | 4531 | if (level < 0) |
4532 | 4532 | { |
4533 | 4533 | 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); | |
4535 | 4535 | jpeg_error->num_warnings++; |
4536 | 4536 | } |
4537 | 4537 | else |
4538 | 4538 | if (jpeg_error->trace_level >= level) |
4539 | - MagickWarning(PluginWarning,(char *) message,image->filename); | |
4539 | + MagickWarning(DelegateWarning,(char *) message,image->filename); | |
4540 | 4540 | } |
4541 | 4541 | |
4542 | 4542 | static void ErrorExit(j_common_ptr jpeg_info) |
@@ -4808,7 +4808,7 @@ | ||
4808 | 4808 | #else |
4809 | 4809 | static Image *ReadJPEGImage(const ImageInfo *image_info) |
4810 | 4810 | { |
4811 | - MagickWarning(MissingPluginWarning,"JPEG library is not available", | |
4811 | + MagickWarning(MissingDelegateWarning,"JPEG library is not available", | |
4812 | 4812 | image_info->filename); |
4813 | 4813 | return((Image *) NULL); |
4814 | 4814 | } |
@@ -5482,10 +5482,10 @@ | ||
5482 | 5482 | */ |
5483 | 5483 | error=TT_Init_FreeType(&engine); |
5484 | 5484 | if (error) |
5485 | - PrematureExit(PluginWarning,"Cannot initialize TTF engine",image); | |
5485 | + PrematureExit(DelegateWarning,"Cannot initialize TTF engine",image); | |
5486 | 5486 | error=TT_Open_Face(engine,local_info.font+1,&face); |
5487 | 5487 | if (error) |
5488 | - PrematureExit(PluginWarning,"Unable to open TTF font",image); | |
5488 | + PrematureExit(DelegateWarning,"Unable to open TTF font",image); | |
5489 | 5489 | TT_Get_Face_Properties(face,&face_properties); |
5490 | 5490 | GetFontInfo(face,&face_properties,image); |
5491 | 5491 | error=TT_New_Instance(face,&instance); |
@@ -5498,7 +5498,7 @@ | ||
5498 | 5498 | image->x_resolution,(unsigned short) image->y_resolution); |
5499 | 5499 | error|=TT_Set_Instance_CharSize(instance,local_info.pointsize*64); |
5500 | 5500 | if (error) |
5501 | - PrematureExit(PluginWarning,"Cannot initialize TTF instance",image); | |
5501 | + PrematureExit(DelegateWarning,"Cannot initialize TTF instance",image); | |
5502 | 5502 | for (code=0; (int) code < (int) face_properties.num_CharMaps; code++) |
5503 | 5503 | { |
5504 | 5504 | TT_Get_CharMap_ID(face,code,&platform,&encoding); |
@@ -5519,12 +5519,12 @@ | ||
5519 | 5519 | } |
5520 | 5520 | glyphs=(TT_Glyph *) AllocateMemory(MaxGlyphs*sizeof(TT_Glyph)); |
5521 | 5521 | if (glyphs == (TT_Glyph *) NULL) |
5522 | - PrematureExit(PluginWarning,"Memory allocation failed",image); | |
5522 | + PrematureExit(DelegateWarning,"Memory allocation failed",image); | |
5523 | 5523 | for (i=0; i < MaxGlyphs; i++) |
5524 | 5524 | glyphs[i].z=(TT_Glyph *) NULL; |
5525 | 5525 | unicode=ConvertTextToUnicode(text,&length); |
5526 | 5526 | if (unicode == (unsigned short *) NULL) |
5527 | - PrematureExit(PluginWarning,"Memory allocation failed",image); | |
5527 | + PrematureExit(DelegateWarning,"Memory allocation failed",image); | |
5528 | 5528 | for (i=0; i < length; i++) |
5529 | 5529 | { |
5530 | 5530 | if (glyphs[(unsigned char) unicode[i]].z != (TT_Glyph *) NULL) |
@@ -5541,7 +5541,7 @@ | ||
5541 | 5541 | error|=TT_Load_Glyph(instance,glyphs[(unsigned char) unicode[i]],code, |
5542 | 5542 | TTLOAD_SCALE_GLYPH | TTLOAD_HINT_GLYPH); |
5543 | 5543 | if (error) |
5544 | - PrematureExit(PluginWarning,"Cannot initialize TTF glyph",image); | |
5544 | + PrematureExit(DelegateWarning,"Cannot initialize TTF glyph",image); | |
5545 | 5545 | } |
5546 | 5546 | TT_Get_Face_Properties(face,&face_properties); |
5547 | 5547 | TT_Get_Instance_Metrics(instance,&instance_metrics); |
@@ -5564,7 +5564,7 @@ | ||
5564 | 5564 | canvas.size=canvas.rows*canvas.width; |
5565 | 5565 | canvas.bitmap=(void *) AllocateMemory(canvas.size); |
5566 | 5566 | if (!canvas.bitmap) |
5567 | - PrematureExit(PluginWarning,"Memory allocation failed",image); | |
5567 | + PrematureExit(DelegateWarning,"Memory allocation failed",image); | |
5568 | 5568 | p=(unsigned char *) canvas.bitmap; |
5569 | 5569 | for (i=0; i < canvas.size; i++) |
5570 | 5570 | *p++=0; |
@@ -5575,7 +5575,7 @@ | ||
5575 | 5575 | character.size=character.rows*character.width; |
5576 | 5576 | character.bitmap=(void *) AllocateMemory(character.size); |
5577 | 5577 | if (!character.bitmap) |
5578 | - PrematureExit(PluginWarning,"Memory allocation failed",image); | |
5578 | + PrematureExit(DelegateWarning,"Memory allocation failed",image); | |
5579 | 5579 | x=0; |
5580 | 5580 | y=((int) -(face_properties.horizontal->Descender*instance_metrics.y_ppem)/ |
5581 | 5581 | (int) face_properties.header->Units_Per_EM); |
@@ -5634,7 +5634,7 @@ | ||
5634 | 5634 | CondenseImage(image); |
5635 | 5635 | return(image); |
5636 | 5636 | #else |
5637 | - MagickWarning(MissingPluginWarning,"FreeType library is not available", | |
5637 | + MagickWarning(MissingDelegateWarning,"FreeType library is not available", | |
5638 | 5638 | (char *) NULL); |
5639 | 5639 | #endif |
5640 | 5640 | } |
@@ -6574,7 +6574,7 @@ | ||
6574 | 6574 | image->packets=(unsigned int) (max_packets/image->packet_size); |
6575 | 6575 | FreeMemory((char *) compressed_pixels); |
6576 | 6576 | if (status) |
6577 | - PrematureExit(PluginWarning,"Unable to uncompress image",image); | |
6577 | + PrematureExit(DelegateWarning,"Unable to uncompress image",image); | |
6578 | 6578 | } |
6579 | 6579 | if (image->compression == ZipCompression) |
6580 | 6580 | { |
@@ -6601,7 +6601,7 @@ | ||
6601 | 6601 | image->packets=(unsigned int) (max_packets/image->packet_size); |
6602 | 6602 | FreeMemory((char *) compressed_pixels); |
6603 | 6603 | if (status) |
6604 | - PrematureExit(PluginWarning,"Unable to uncompress image",image); | |
6604 | + PrematureExit(DelegateWarning,"Unable to uncompress image",image); | |
6605 | 6605 | } |
6606 | 6606 | /* |
6607 | 6607 | Unpack the packed image pixels into runlength-encoded pixel packets. |
@@ -7567,7 +7567,7 @@ | ||
7567 | 7567 | */ |
7568 | 7568 | static Image *ReadPCLImage(const ImageInfo *image_info) |
7569 | 7569 | { |
7570 | - MagickWarning(MissingPluginWarning,"Cannot read PCL images", | |
7570 | + MagickWarning(MissingDelegateWarning,"Cannot read PCL images", | |
7571 | 7571 | image_info->filename); |
7572 | 7572 | return((Image *) NULL); |
7573 | 7573 | } |
@@ -9226,7 +9226,7 @@ | ||
9226 | 9226 | |
9227 | 9227 | static void PNGError(png_struct *ping,png_const_charp message) |
9228 | 9228 | { |
9229 | - MagickWarning(PluginWarning,message,(char *) NULL); | |
9229 | + MagickWarning(DelegateWarning,message,(char *) NULL); | |
9230 | 9230 | longjmp(ping->jmpbuf,1); |
9231 | 9231 | } |
9232 | 9232 |
@@ -9256,7 +9256,7 @@ | ||
9256 | 9256 | |
9257 | 9257 | static void PNGWarning(png_struct *ping,png_const_charp message) |
9258 | 9258 | { |
9259 | - MagickWarning(PluginWarning,message,(char *) NULL); | |
9259 | + MagickWarning(DelegateWarning,message,(char *) NULL); | |
9260 | 9260 | } |
9261 | 9261 | |
9262 | 9262 | static Image *ReadPNGImage(const ImageInfo *image_info) |
@@ -9831,7 +9831,7 @@ | ||
9831 | 9831 | #else |
9832 | 9832 | static Image *ReadPNGImage(const ImageInfo *image_info) |
9833 | 9833 | { |
9834 | - MagickWarning(MissingPluginWarning,"PNG library is not available", | |
9834 | + MagickWarning(MissingDelegateWarning,"PNG library is not available", | |
9835 | 9835 | image_info->filename); |
9836 | 9836 | return((Image *) NULL); |
9837 | 9837 | } |
@@ -13938,7 +13938,7 @@ | ||
13938 | 13938 | } |
13939 | 13939 | (void) vsprintf(p,format,warning); |
13940 | 13940 | (void) strcat(p,"."); |
13941 | - MagickWarning(PluginWarning,message,(char *) NULL); | |
13941 | + MagickWarning(DelegateWarning,message,(char *) NULL); | |
13942 | 13942 | } |
13943 | 13943 | |
13944 | 13944 | static Image *ReadTIFFImage(const ImageInfo *image_info) |
@@ -14596,7 +14596,7 @@ | ||
14596 | 14596 | #else |
14597 | 14597 | static Image *ReadTIFFImage(const ImageInfo *image_info) |
14598 | 14598 | { |
14599 | - MagickWarning(MissingPluginWarning,"TIFF library is not available", | |
14599 | + MagickWarning(MissingDelegateWarning,"TIFF library is not available", | |
14600 | 14600 | image_info->filename); |
14601 | 14601 | return((Image *) NULL); |
14602 | 14602 | } |
@@ -15091,7 +15091,7 @@ | ||
15091 | 15091 | #else |
15092 | 15092 | static Image *ReadTTFImage(const ImageInfo *image_info) |
15093 | 15093 | { |
15094 | - MagickWarning(MissingPluginWarning,"Cannot read TTF images", | |
15094 | + MagickWarning(MissingDelegateWarning,"Cannot read TTF images", | |
15095 | 15095 | image_info->filename); |
15096 | 15096 | return((Image *) NULL); |
15097 | 15097 | } |
@@ -15128,7 +15128,7 @@ | ||
15128 | 15128 | */ |
15129 | 15129 | static Image *ReadUILImage(const ImageInfo *image_info) |
15130 | 15130 | { |
15131 | - MagickWarning(MissingPluginWarning,"Cannot read UIL images", | |
15131 | + MagickWarning(MissingDelegateWarning,"Cannot read UIL images", | |
15132 | 15132 | image_info->filename); |
15133 | 15133 | return((Image *) NULL); |
15134 | 15134 | } |
@@ -32,7 +32,7 @@ | ||
32 | 32 | #define CGMCommand CGMDecodeDelegate " -d ps %s %s %s" |
33 | 33 | #if !defined(EditorDelegate) |
34 | 34 | #if !defined(vms) && !defined(macintosh) && !defined(WIN32) |
35 | -#define EditorDelegate "xterm" | |
35 | +#define EditorDelegate "xterm -e vi" | |
36 | 36 | #else |
37 | 37 | #if defined(vms) |
38 | 38 | #define EditorDelegate "cre/term/wait edit/tpu" |
@@ -553,7 +553,7 @@ | ||
553 | 553 | */ |
554 | 554 | static unsigned int WriteCGMImage(const ImageInfo *image_info,Image *image) |
555 | 555 | { |
556 | - MagickWarning(MissingPluginWarning,"Cannot write CGM images",image->filename); | |
556 | + MagickWarning(MissingDelegateWarning,"Cannot write CGM images",image->filename); | |
557 | 557 | return(False); |
558 | 558 | } |
559 | 559 |
@@ -889,7 +889,7 @@ | ||
889 | 889 | */ |
890 | 890 | static unsigned int WriteDICOMImage(const ImageInfo *image_info,Image *image) |
891 | 891 | { |
892 | - MagickWarning(MissingPluginWarning,"Cannot write DICOM images", | |
892 | + MagickWarning(MissingDelegateWarning,"Cannot write DICOM images", | |
893 | 893 | image->filename); |
894 | 894 | return(False); |
895 | 895 | } |
@@ -1130,7 +1130,7 @@ | ||
1130 | 1130 | */ |
1131 | 1131 | static unsigned int WriteFIGImage(const ImageInfo *image_info,Image *image) |
1132 | 1132 | { |
1133 | - MagickWarning(MissingPluginWarning,"Cannot write FIG images",image->filename); | |
1133 | + MagickWarning(MissingDelegateWarning,"Cannot write FIG images",image->filename); | |
1134 | 1134 | return(False); |
1135 | 1135 | } |
1136 | 1136 |
@@ -1570,7 +1570,7 @@ | ||
1570 | 1570 | status= |
1571 | 1571 | FPX_SetJPEGCompression(flashpix,(unsigned short) (image_info->quality)); |
1572 | 1572 | if (status != FPX_OK) |
1573 | - MagickWarning(PluginWarning,"Unable to set JPEG level",(char *) NULL); | |
1573 | + MagickWarning(DelegateWarning,"Unable to set JPEG level",(char *) NULL); | |
1574 | 1574 | } |
1575 | 1575 | /* |
1576 | 1576 | Set image summary info. |
@@ -1603,7 +1603,7 @@ | ||
1603 | 1603 | if (summary_info.title.ptr != (unsigned char *) NULL) |
1604 | 1604 | (void) strcpy((char *) summary_info.title.ptr,image->label); |
1605 | 1605 | else |
1606 | - MagickWarning(PluginWarning,"Unable to set image title",(char *) NULL); | |
1606 | + MagickWarning(DelegateWarning,"Unable to set image title",(char *) NULL); | |
1607 | 1607 | } |
1608 | 1608 | if (image->comments != (char *) NULL) |
1609 | 1609 | { |
@@ -1617,12 +1617,12 @@ | ||
1617 | 1617 | if (summary_info.comments.ptr != (unsigned char *) NULL) |
1618 | 1618 | (void) strcpy((char *) summary_info.comments.ptr,image->comments); |
1619 | 1619 | else |
1620 | - MagickWarning(PluginWarning,"Unable to set image comments", | |
1620 | + MagickWarning(DelegateWarning,"Unable to set image comments", | |
1621 | 1621 | (char *) NULL); |
1622 | 1622 | } |
1623 | 1623 | status=FPX_SetSummaryInformation(flashpix,&summary_info); |
1624 | 1624 | if (status != FPX_OK) |
1625 | - MagickWarning(PluginWarning,"Unable to set summary info",(char *) NULL); | |
1625 | + MagickWarning(DelegateWarning,"Unable to set summary info",(char *) NULL); | |
1626 | 1626 | /* |
1627 | 1627 | Allocate scanline. |
1628 | 1628 | */ |
@@ -1780,41 +1780,41 @@ | ||
1780 | 1780 | { |
1781 | 1781 | status=FPX_SetImageAffineMatrix(flashpix,&affine); |
1782 | 1782 | if (status != FPX_OK) |
1783 | - MagickWarning(PluginWarning,"Unable to set affine matrix", | |
1783 | + MagickWarning(DelegateWarning,"Unable to set affine matrix", | |
1784 | 1784 | (char *) NULL); |
1785 | 1785 | } |
1786 | 1786 | if (aspect_ratio_valid) |
1787 | 1787 | { |
1788 | 1788 | status=FPX_SetImageResultAspectRatio(flashpix,&aspect_ratio); |
1789 | 1789 | if (status != FPX_OK) |
1790 | - MagickWarning(PluginWarning,"Unable to set aspect ratio", | |
1790 | + MagickWarning(DelegateWarning,"Unable to set aspect ratio", | |
1791 | 1791 | (char *) NULL); |
1792 | 1792 | } |
1793 | 1793 | if (color_twist_valid) |
1794 | 1794 | { |
1795 | 1795 | status=FPX_SetImageColorTwistMatrix(flashpix,&color_twist); |
1796 | 1796 | if (status != FPX_OK) |
1797 | - MagickWarning(PluginWarning,"Unable to set color color twist", | |
1797 | + MagickWarning(DelegateWarning,"Unable to set color color twist", | |
1798 | 1798 | (char *) NULL); |
1799 | 1799 | } |
1800 | 1800 | if (contrast_valid) |
1801 | 1801 | { |
1802 | 1802 | status=FPX_SetImageContrastAdjustment(flashpix,&contrast); |
1803 | 1803 | if (status != FPX_OK) |
1804 | - MagickWarning(PluginWarning,"Unable to set contrast",(char *) NULL); | |
1804 | + MagickWarning(DelegateWarning,"Unable to set contrast",(char *) NULL); | |
1805 | 1805 | } |
1806 | 1806 | if (sharpen_valid) |
1807 | 1807 | { |
1808 | 1808 | status=FPX_SetImageFilteringValue(flashpix,&sharpen); |
1809 | 1809 | if (status != FPX_OK) |
1810 | - MagickWarning(PluginWarning,"Unable to set filtering value", | |
1810 | + MagickWarning(DelegateWarning,"Unable to set filtering value", | |
1811 | 1811 | (char *) NULL); |
1812 | 1812 | } |
1813 | 1813 | if (view_rect_valid) |
1814 | 1814 | { |
1815 | 1815 | status=FPX_SetImageROI(flashpix, &view_rect); |
1816 | 1816 | if (status != FPX_OK) |
1817 | - MagickWarning(PluginWarning,"Unable to set region of interest", | |
1817 | + MagickWarning(DelegateWarning,"Unable to set region of interest", | |
1818 | 1818 | (char *) NULL); |
1819 | 1819 | } |
1820 | 1820 | } |
@@ -1851,7 +1851,7 @@ | ||
1851 | 1851 | #else |
1852 | 1852 | static unsigned int WriteFPXImage(const ImageInfo *image_info,Image *image) |
1853 | 1853 | { |
1854 | - MagickWarning(MissingPluginWarning,"FPX library is not available", | |
1854 | + MagickWarning(MissingDelegateWarning,"FPX library is not available", | |
1855 | 1855 | image->filename); |
1856 | 1856 | return(False); |
1857 | 1857 | } |
@@ -2279,7 +2279,7 @@ | ||
2279 | 2279 | static unsigned int WriteGRADATIONImage(const ImageInfo *image_info, |
2280 | 2280 | Image *image) |
2281 | 2281 | { |
2282 | - MagickWarning(MissingPluginWarning,"Cannot write GRADATION images", | |
2282 | + MagickWarning(MissingDelegateWarning,"Cannot write GRADATION images", | |
2283 | 2283 | image->filename); |
2284 | 2284 | return(False); |
2285 | 2285 | } |
@@ -2620,7 +2620,7 @@ | ||
2620 | 2620 | #else |
2621 | 2621 | static unsigned int WriteHDFImage(const ImageInfo *image_info,Image *image) |
2622 | 2622 | { |
2623 | - MagickWarning(MissingPluginWarning,"HDF library is not available", | |
2623 | + MagickWarning(MissingDelegateWarning,"HDF library is not available", | |
2624 | 2624 | image->filename); |
2625 | 2625 | return(False); |
2626 | 2626 | } |
@@ -2865,7 +2865,7 @@ | ||
2865 | 2865 | */ |
2866 | 2866 | static unsigned int WriteHPGLImage(const ImageInfo *image_info,Image *image) |
2867 | 2867 | { |
2868 | - MagickWarning(MissingPluginWarning,"Cannot write HPGL images", | |
2868 | + MagickWarning(MissingDelegateWarning,"Cannot write HPGL images", | |
2869 | 2869 | image->filename); |
2870 | 2870 | return(False); |
2871 | 2871 | } |
@@ -3283,7 +3283,7 @@ | ||
3283 | 3283 | #else |
3284 | 3284 | static unsigned int WriteJBIGImage(const ImageInfo *image_info,Image *image) |
3285 | 3285 | { |
3286 | - MagickWarning(MissingPluginWarning,"JBIG library is not available", | |
3286 | + MagickWarning(MissingDelegateWarning,"JBIG library is not available", | |
3287 | 3287 | image->filename); |
3288 | 3288 | return(False); |
3289 | 3289 | } |
@@ -3366,12 +3366,12 @@ | ||
3366 | 3366 | if (level < 0) |
3367 | 3367 | { |
3368 | 3368 | 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); | |
3370 | 3370 | jpeg_error->num_warnings++; |
3371 | 3371 | } |
3372 | 3372 | else |
3373 | 3373 | if (jpeg_error->trace_level >= level) |
3374 | - MagickWarning(PluginWarning,(char *) message,(char *) NULL); | |
3374 | + MagickWarning(DelegateWarning,(char *) message,(char *) NULL); | |
3375 | 3375 | } |
3376 | 3376 | |
3377 | 3377 | static unsigned int WriteJPEGImage(const ImageInfo *image_info,Image *image) |
@@ -3643,7 +3643,7 @@ | ||
3643 | 3643 | #else |
3644 | 3644 | static unsigned int WriteJPEGImage(const ImageInfo *image_info,Image *image) |
3645 | 3645 | { |
3646 | - MagickWarning(MissingPluginWarning,"JPEG library is not available", | |
3646 | + MagickWarning(MissingDelegateWarning,"JPEG library is not available", | |
3647 | 3647 | image->filename); |
3648 | 3648 | return(False); |
3649 | 3649 | } |
@@ -3681,7 +3681,7 @@ | ||
3681 | 3681 | */ |
3682 | 3682 | static unsigned int WriteICONImage(const ImageInfo *image_info,Image *image) |
3683 | 3683 | { |
3684 | - MagickWarning(MissingPluginWarning,"Cannot write ICON images", | |
3684 | + MagickWarning(MissingDelegateWarning,"Cannot write ICON images", | |
3685 | 3685 | image->filename); |
3686 | 3686 | return(False); |
3687 | 3687 | } |
@@ -3717,7 +3717,7 @@ | ||
3717 | 3717 | */ |
3718 | 3718 | static unsigned int WriteLABELImage(const ImageInfo *image_info,Image *image) |
3719 | 3719 | { |
3720 | - MagickWarning(MissingPluginWarning,"Cannot write LABEL images", | |
3720 | + MagickWarning(MissingDelegateWarning,"Cannot write LABEL images", | |
3721 | 3721 | image->filename); |
3722 | 3722 | return(False); |
3723 | 3723 | } |
@@ -4068,7 +4068,7 @@ | ||
4068 | 4068 | if (status) |
4069 | 4069 | { |
4070 | 4070 | FreeMemory((char *) compressed_pixels); |
4071 | - PrematureExit(PluginWarning,"Unable to compress image",image); | |
4071 | + PrematureExit(DelegateWarning,"Unable to compress image",image); | |
4072 | 4072 | } |
4073 | 4073 | else |
4074 | 4074 | { |
@@ -4170,7 +4170,7 @@ | ||
4170 | 4170 | if (image->label != (char *) NULL) |
4171 | 4171 | (void) fprintf(image->file,"label=\"%s\"\n",image->label); |
4172 | 4172 | 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); | |
4174 | 4174 | (void) fprintf(image->file,"\f\n:\n"); |
4175 | 4175 | if (image->montage != (char *) NULL) |
4176 | 4176 | { |
@@ -6828,7 +6828,7 @@ | ||
6828 | 6828 | */ |
6829 | 6829 | static unsigned int WritePIXImage(const ImageInfo *image_info,Image *image) |
6830 | 6830 | { |
6831 | - MagickWarning(MissingPluginWarning,"Cannot write PIX images",image->filename); | |
6831 | + MagickWarning(MissingDelegateWarning,"Cannot write PIX images",image->filename); | |
6832 | 6832 | return(False); |
6833 | 6833 | } |
6834 | 6834 |
@@ -6864,7 +6864,7 @@ | ||
6864 | 6864 | static unsigned int WritePLASMAImage(const ImageInfo *image_info, |
6865 | 6865 | Image *image) |
6866 | 6866 | { |
6867 | - MagickWarning(MissingPluginWarning,"Cannot write PLASMA images", | |
6867 | + MagickWarning(MissingDelegateWarning,"Cannot write PLASMA images", | |
6868 | 6868 | image->filename); |
6869 | 6869 | return(False); |
6870 | 6870 | } |
@@ -6903,7 +6903,7 @@ | ||
6903 | 6903 | |
6904 | 6904 | static void PNGError(png_struct *ping,png_const_charp message) |
6905 | 6905 | { |
6906 | - MagickWarning(PluginWarning,message,(char *) NULL); | |
6906 | + MagickWarning(DelegateWarning,message,(char *) NULL); | |
6907 | 6907 | longjmp(ping->jmpbuf,1); |
6908 | 6908 | } |
6909 | 6909 |
@@ -6923,7 +6923,7 @@ | ||
6923 | 6923 | |
6924 | 6924 | static void PNGWarning(png_struct *ping,png_const_charp message) |
6925 | 6925 | { |
6926 | - MagickWarning(PluginWarning,message,(char *) NULL); | |
6926 | + MagickWarning(DelegateWarning,message,(char *) NULL); | |
6927 | 6927 | } |
6928 | 6928 | |
6929 | 6929 | static unsigned int WritePNGImage(const ImageInfo *image_info,Image *image) |
@@ -7396,7 +7396,7 @@ | ||
7396 | 7396 | #else |
7397 | 7397 | static unsigned int WritePNGImage(const ImageInfo *image_info,Image *image) |
7398 | 7398 | { |
7399 | - MagickWarning(MissingPluginWarning,"PNG library is not available", | |
7399 | + MagickWarning(MissingDelegateWarning,"PNG library is not available", | |
7400 | 7400 | image->filename); |
7401 | 7401 | return(False); |
7402 | 7402 | } |
@@ -9978,7 +9978,7 @@ | ||
9978 | 9978 | static unsigned int WriteRADIANCEImage(const ImageInfo *image_info, |
9979 | 9979 | Image *image) |
9980 | 9980 | { |
9981 | - MagickWarning(MissingPluginWarning,"Cannot write RADIANCE images", | |
9981 | + MagickWarning(MissingDelegateWarning,"Cannot write RADIANCE images", | |
9982 | 9982 | image->filename); |
9983 | 9983 | return(False); |
9984 | 9984 | } |
@@ -10229,7 +10229,7 @@ | ||
10229 | 10229 | */ |
10230 | 10230 | static unsigned int WriteRLAImage(const ImageInfo *image_info,Image *image) |
10231 | 10231 | { |
10232 | - MagickWarning(MissingPluginWarning,"Cannot write RLA images",image->filename); | |
10232 | + MagickWarning(MissingDelegateWarning,"Cannot write RLA images",image->filename); | |
10233 | 10233 | return(False); |
10234 | 10234 | } |
10235 | 10235 |
@@ -10340,7 +10340,7 @@ | ||
10340 | 10340 | */ |
10341 | 10341 | static unsigned int WriteSCANImage(const ImageInfo *image_info,Image *image) |
10342 | 10342 | { |
10343 | - MagickWarning(MissingPluginWarning,"Cannot write SCAN images", | |
10343 | + MagickWarning(MissingDelegateWarning,"Cannot write SCAN images", | |
10344 | 10344 | image->filename); |
10345 | 10345 | return(False); |
10346 | 10346 | } |
@@ -11321,7 +11321,7 @@ | ||
11321 | 11321 | */ |
11322 | 11322 | static unsigned int WriteTEXTImage(const ImageInfo *image_info,Image *image) |
11323 | 11323 | { |
11324 | - MagickWarning(MissingPluginWarning,"Cannot write TEXT images", | |
11324 | + MagickWarning(MissingDelegateWarning,"Cannot write TEXT images", | |
11325 | 11325 | image->filename); |
11326 | 11326 | return(False); |
11327 | 11327 | } |
@@ -11948,7 +11948,7 @@ | ||
11948 | 11948 | #else |
11949 | 11949 | static unsigned int WriteTIFFImage(const ImageInfo *image_info,Image *image) |
11950 | 11950 | { |
11951 | - MagickWarning(MissingPluginWarning,"TIFF library is not available", | |
11951 | + MagickWarning(MissingDelegateWarning,"TIFF library is not available", | |
11952 | 11952 | image->filename); |
11953 | 11953 | return(False); |
11954 | 11954 | } |
@@ -11985,7 +11985,7 @@ | ||
11985 | 11985 | */ |
11986 | 11986 | static unsigned int WriteTILEImage(const ImageInfo *image_info,Image *image) |
11987 | 11987 | { |
11988 | - MagickWarning(MissingPluginWarning,"Cannot write TILE images", | |
11988 | + MagickWarning(MissingDelegateWarning,"Cannot write TILE images", | |
11989 | 11989 | image->filename); |
11990 | 11990 | return(False); |
11991 | 11991 | } |
@@ -12021,7 +12021,7 @@ | ||
12021 | 12021 | */ |
12022 | 12022 | static unsigned int WriteTIMImage(const ImageInfo *image_info,Image *image) |
12023 | 12023 | { |
12024 | - MagickWarning(MissingPluginWarning,"Cannot write TIM images",image->filename); | |
12024 | + MagickWarning(MissingDelegateWarning,"Cannot write TIM images",image->filename); | |
12025 | 12025 | return(False); |
12026 | 12026 | } |
12027 | 12027 |
@@ -13241,7 +13241,7 @@ | ||
13241 | 13241 | */ |
13242 | 13242 | static unsigned int WriteXCImage(const ImageInfo *image_info,Image *image) |
13243 | 13243 | { |
13244 | - MagickWarning(MissingPluginWarning,"Cannot write XC images",image->filename); | |
13244 | + MagickWarning(MissingDelegateWarning,"Cannot write XC images",image->filename); | |
13245 | 13245 | return(False); |
13246 | 13246 | } |
13247 | 13247 |
@@ -14187,7 +14187,7 @@ | ||
14187 | 14187 | } |
14188 | 14188 | if (strncmp(image_info->magick,"TTF",3) == 0) |
14189 | 14189 | { |
14190 | - MagickWarning(MissingPluginWarning,"Cannot write TTF images", | |
14190 | + MagickWarning(MissingDelegateWarning,"Cannot write TTF images", | |
14191 | 14191 | image->filename); |
14192 | 14192 | status=False; |
14193 | 14193 | break; |
@@ -21,8 +21,8 @@ | ||
21 | 21 | ResourceLimitWarning = 300, |
22 | 22 | XServerWarning = 305, |
23 | 23 | OptionWarning = 310, |
24 | - PluginWarning = 315, | |
25 | - MissingPluginWarning = 320, | |
24 | + DelegateWarning = 315, | |
25 | + MissingDelegateWarning = 320, | |
26 | 26 | CorruptImageWarning = 325, |
27 | 27 | FileOpenWarning = 330 |
28 | 28 | } WarningType; |
@@ -574,7 +574,7 @@ | ||
574 | 574 | rows, |
575 | 575 | depth; |
576 | 576 | |
577 | - long | |
577 | + int | |
578 | 578 | offset; |
579 | 579 | |
580 | 580 | RectangleInfo |
@@ -163,7 +163,8 @@ | ||
163 | 163 | <TR> |
164 | 164 | <td><B>HPGL</B></td> |
165 | 165 | <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> | |
167 | 168 | </TR> |
168 | 169 | <TR> |
169 | 170 | <td><B>HTML</B></td> |
@@ -402,6 +403,10 @@ | ||
402 | 403 | freetype-1.1.tar.gz</a></td> |
403 | 404 | </TR> |
404 | 405 | <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> | |
405 | 410 | <td><B>UIL</B></td> |
406 | 411 | <td>X-Motif UIL table</td> |
407 | 412 | </TR> |
@@ -673,6 +673,11 @@ | ||
673 | 673 | <td>name of texture to tile onto the image background</td> |
674 | 674 | </tr> |
675 | 675 | <tr> |
676 | + <td>Threshold</td> | |
677 | + <td>threshold=><i>integer</i></td> | |
678 | + <td>threshold the image</td> | |
679 | +</tr> | |
680 | +<tr> | |
676 | 681 | <td>Transform</td> |
677 | 682 | <td>crop=><i>geometry</i>, geometry=><i>geometry</i></td> |
678 | 683 | <td>crop or resize an image with a fully-qualified geometry specification</td> |
@@ -683,11 +688,6 @@ | ||
683 | 688 | <td>make this color transparent within the image</td> |
684 | 689 | </tr> |
685 | 690 | <tr> |
686 | - <td>Threshold</td> | |
687 | - <td>threshold=><i>integer</i></td> | |
688 | - <td>threshold the image</td> | |
689 | -</tr> | |
690 | -<tr> | |
691 | 691 | <td>Trim</td> |
692 | 692 | <td></td> |
693 | 693 | <td>remove edges that are the background color from the image</td> |
@@ -779,7 +779,7 @@ | ||
779 | 779 | <td>image background color</td> |
780 | 780 | </tr> |
781 | 781 | <tr> |
782 | - <td>blue-primary</td> | |
782 | + <td>blue_primary</td> | |
783 | 783 | <td><i>x-value</i>, <i>y-value</i></td> |
784 | 784 | <td>chromaticity blue primary point (e.g. 0.15, 0.06)</td> |
785 | 785 | </tr> |
@@ -794,16 +794,16 @@ | ||
794 | 794 | <td>color name (e.g. red) or hex value (e.g. #ccc) at position <i>i</i></td> |
795 | 795 | </tr> |
796 | 796 | <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> | |
797 | 802 | <td>colorspace</td> |
798 | 803 | <td>{RGB, Gray, Transparent, OHTA, XYZ, YCbCr, YCC, YIQ, YPbPr, YUV, CMYK}</td> |
799 | 804 | <td>type of colorspace</td> |
800 | 805 | </tr> |
801 | 806 | <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> | |
807 | 807 | <td>compress</td> |
808 | 808 | <td>None, JPEG, LZW, Runlength, Zip</td> |
809 | 809 | <td>type of image compression</td> |
@@ -861,7 +861,7 @@ | ||
861 | 861 | <td>set the image format</td> |
862 | 862 | </tr> |
863 | 863 | <tr> |
864 | - <td>green-primary</td> | |
864 | + <td>green_primary</td> | |
865 | 865 | <td><i>x-value</i>, <i>y-value</i></td> |
866 | 866 | <td>chromaticity green primary point (e.g. 0.3, 0.6)</td> |
867 | 867 | </tr> |
@@ -915,7 +915,7 @@ | ||
915 | 915 | <tr> |
916 | 916 | <td>pointsize</td> |
917 | 917 | <td><i>integer<i></td> |
918 | - <td>pointsize of the Postscript font</td> | |
918 | + <td>pointsize of the Postscript or TrueType font</td> | |
919 | 919 | </tr> |
920 | 920 | <tr> |
921 | 921 | <td>preview</td> |
@@ -931,12 +931,12 @@ | ||
931 | 931 | <td>JPEG/MIFF/PNG compression level</td> |
932 | 932 | </tr> |
933 | 933 | <tr> |
934 | - <td>red-primary</td> | |
934 | + <td>red_primary</td> | |
935 | 935 | <td><i>x-value</i>, <i>y-value</i></td> |
936 | 936 | <td>chromaticity red primary point (e.g. 0.64, 0.33)</td> |
937 | 937 | </tr> |
938 | 938 | <tr> |
939 | - <td>rendering-intent</td> | |
939 | + <td>rendering_intent</td> | |
940 | 940 | <td>{Undefined, Saturation, Perceptual, Absolute, Relative}</td> |
941 | 941 | <td>the type of rendering intent</td> |
942 | 942 | </tr> |
@@ -991,7 +991,7 @@ | ||
991 | 991 | <td>print detailed information about the image</td> |
992 | 992 | </tr> |
993 | 993 | <tr> |
994 | - <td>white-point</td> | |
994 | + <td>white_point</td> | |
995 | 995 | <td><i>x-value</i>, <i>y-value</i></td> |
996 | 996 | <td>chromaticity white point (e.g. 0.3127, 0.329)</td> |
997 | 997 | </tr> |
@@ -1115,12 +1115,12 @@ | ||
1115 | 1115 | <td>tile size and offset within an image montage</td> |
1116 | 1116 | </tr> |
1117 | 1117 | <tr> |
1118 | - <td>normalized_max</td> | |
1118 | + <td>normalized-max</td> | |
1119 | 1119 | <td><i>double</i></td> |
1120 | 1120 | <td>the normalized max error per pixel computed when an image is color reduced</td> |
1121 | 1121 | </tr> |
1122 | 1122 | <tr> |
1123 | - <td>normalized_mean</td> | |
1123 | + <td>normalized-mean</td> | |
1124 | 1124 | <td><i>double</i></td> |
1125 | 1125 | <td>the normalized mean error per pixel computed when an image is color reduced</td> |
1126 | 1126 | </tr> |
@@ -1150,7 +1150,7 @@ | ||
1150 | 1150 | <td>any text associated with the image</td> |
1151 | 1151 | </tr> |
1152 | 1152 | <tr> |
1153 | - <td>total_colors</td> | |
1153 | + <td>total-colors</td> | |
1154 | 1154 | <td><i>integer<i></td> |
1155 | 1155 | <td>number of colors in the image</td> |
1156 | 1156 | </tr> |
@@ -1176,12 +1176,12 @@ | ||
1176 | 1176 | <td>the number of columns or width of an image</td> |
1177 | 1177 | </tr> |
1178 | 1178 | <tr> |
1179 | - <td>x_resolution</td> | |
1179 | + <td>x-resolution</td> | |
1180 | 1180 | <td><i>integer</i></td> |
1181 | 1181 | <td>x resolution of the image</td> |
1182 | 1182 | </tr> |
1183 | 1183 | <tr> |
1184 | - <td>y_resolution</td> | |
1184 | + <td>y-resolution</td> | |
1185 | 1185 | <td><i>integer</i></td> |
1186 | 1186 | <td>y resolution of the image</td> |
1187 | 1187 | </tr> |
@@ -1223,7 +1223,7 @@ | ||
1223 | 1223 | </tr> |
1224 | 1224 | <tr> |
1225 | 1225 | <td>background</td> |
1226 | - <td><i>string</i></td> | |
1226 | + <td><i>color</i></td> | |
1227 | 1227 | <td>X11 color name</td> |
1228 | 1228 | </tr> |
1229 | 1229 | <tr> |
@@ -1287,7 +1287,7 @@ | ||
1287 | 1287 | <tr> |
1288 | 1288 | <td>pointsize</td> |
1289 | 1289 | <td><i>integer<i></td> |
1290 | - <td>pointsize of the Postscript font</td> | |
1290 | + <td>pointsize of the Postscript or TrueType font</td> | |
1291 | 1291 | </tr> |
1292 | 1292 | <tr> |
1293 | 1293 | <td>shadow</td> |
@@ -1502,14 +1502,14 @@ | ||
1502 | 1502 | </tr> |
1503 | 1503 | <tr> |
1504 | 1504 | <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> | |
1507 | 1507 | </tr> |
1508 | 1508 | <tr> |
1509 | 1509 | <td>320</td> |
1510 | - <td>MissingPluginWarning</td> | |
1510 | + <td>MissingDelegateWarning</td> | |
1511 | 1511 | <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> | |
1513 | 1513 | </tr> |
1514 | 1514 | <tr> |
1515 | 1515 | <td>325</td> |