home *** CD-ROM | disk | FTP | other *** search
/ Usenet 1994 October / usenetsourcesnewsgroupsinfomagicoctober1994disk2.iso / misc / volume34 / imagemagick / patch03 < prev    next >
Encoding:
Text File  |  1992-12-27  |  62.1 KB  |  2,114 lines
  1. Newsgroups: comp.sources.misc
  2. From: cristy@eplrx7.es.duPont.com (John Cristy)
  3. Subject: v34i089: imagemagick - X11 image processing and display v2.2, Patch03
  4. Message-ID: <1992Dec27.234100.3011@sparky.imd.sterling.com>
  5. X-Md4-Signature: 390278494462d340bd35ec240984b102
  6. Date: Sun, 27 Dec 1992 23:41:00 GMT
  7. Approved: kent@sparky.imd.sterling.com
  8.  
  9. Submitted-by: cristy@eplrx7.es.duPont.com (John Cristy)
  10. Posting-number: Volume 34, Issue 89
  11. Archive-name: imagemagick/patch03
  12. Environment: UNIX, VMS, X11, SGI, DEC, Cray, Sun, Vax
  13. Patch-To: imagemagick: Volume 34, Issue 28-54
  14.  
  15.                     ImageMagick 2.2 Patch #3
  16.  
  17. To apply this patch:
  18.  
  19. cd to the top of the source tree (to the directory containing the
  20. "ImageMagick" subdirectories) and do:
  21.  
  22.   patch -p < ThisFile
  23.  
  24. Prereq - ImageMagick 2.2.2 (posted from comp.sources.misc, Volume 34,
  25. Issue 28 + Patch 1 & 2).
  26.  
  27. Alternatively get the entire distribution as contrib/ImageMagick.tar.Z
  28. on export.lcs.mit.edu.
  29.  
  30.  
  31. diff -r -c ImageMagick/ChangeLog ImageMagick2.2.3/ChangeLog
  32. *** ImageMagick/ChangeLog    Tue Dec 22 16:07:20 1992
  33. --- ImageMagick2.2.3/ChangeLog    Wed Dec 23 18:10:05 1992
  34. ***************
  35. *** 1,3 ****
  36. --- 1,12 ----
  37. + ImageMagick 2.2.3
  38. + 
  39. +   o Non-color reduced images were being written even though the color
  40. +     reduction option was specified (-colors).  This affected images written
  41. +     as AVS, CMYK, and RGB.
  42. + 
  43. +   o Modified various sources to reduce lint warnings.
  44. + 
  45. + 
  46.   ImageMagick 2.2.2
  47.   
  48.     o Dithering did not work properly on the Cray (due to right shift problem).
  49. diff -r -c ImageMagick/X.c ImageMagick2.2.3/X.c
  50. *** ImageMagick/X.c    Tue Dec 22 16:06:18 1992
  51. --- ImageMagick2.2.3/X.c    Wed Dec 23 18:10:01 1992
  52. ***************
  53. *** 73,81 ****
  54. --- 73,89 ----
  55.   int
  56.     Latin1Compare _Declare((char *,char *));
  57.   
  58. + static unsigned int
  59. +   XReadColormap _Declare((Display *,XWindowAttributes *,XColor **));
  60. + 
  61.   static void
  62.     XMakeImageLSBFirst _Declare((XWindowInfo *,Image *, XImage *)),
  63.     XMakeImageMSBFirst _Declare((XWindowInfo *,Image *, XImage *));
  64. + 
  65. + static Window
  66. +   XClientWindow _Declare((Display *,Window)),
  67. +   XSelectWindow _Declare((Display *,XRectangle *)),
  68. +   XWindowByProperty _Declare((Display *,Window,Atom));
  69.   
  70.   /*
  71.   %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
  72. ***************
  73. *** 221,227 ****
  74.   %
  75.   %
  76.   */
  77. ! void Latin1Upper(string)
  78.   char
  79.     *string;
  80.   {
  81. --- 229,235 ----
  82.   %
  83.   %
  84.   */
  85. ! static void Latin1Upper(string)
  86.   char
  87.     *string;
  88.   {
  89. ***************
  90. *** 1296,1302 ****
  91.       Initialize graphics info.
  92.     */
  93.     graphic_context_value.background=0;
  94. !   graphic_context_value.foreground=(~0);
  95.     graphic_context_value.font=annotate_info->font_info->fid;
  96.     graphic_context=XCreateGC(display,window->id,GCBackground | GCFont |
  97.       GCForeground,&graphic_context_value);
  98. --- 1304,1310 ----
  99.       Initialize graphics info.
  100.     */
  101.     graphic_context_value.background=0;
  102. !   graphic_context_value.foreground=(unsigned long) (~0);
  103.     graphic_context_value.font=annotate_info->font_info->fid;
  104.     graphic_context=XCreateGC(display,window->id,GCBackground | GCFont |
  105.       GCForeground,&graphic_context_value);
  106. ***************
  107. *** 1711,1717 ****
  108.       Find closest representation for the requested RGB color.
  109.     */
  110.     color->pixel=0;
  111. !   min_distance=(~0);
  112.     for (i=0; i < number_colors; i++)
  113.     {
  114.       red_distance=(colors[i].red >> 8)-(color->red >> 8);
  115. --- 1719,1725 ----
  116.       Find closest representation for the requested RGB color.
  117.     */
  118.     color->pixel=0;
  119. !   min_distance=(unsigned long) (~0);
  120.     for (i=0; i < number_colors; i++)
  121.     {
  122.       red_distance=(colors[i].red >> 8)-(color->red >> 8);
  123. ***************
  124. *** 2019,2025 ****
  125.   %
  126.   %
  127.   */
  128. ! Window XClientWindow(display,target_window)
  129.   Display
  130.     *display;
  131.   
  132. --- 2027,2033 ----
  133.   %
  134.   %
  135.   */
  136. ! static Window XClientWindow(display,target_window)
  137.   Display
  138.     *display;
  139.   
  140. ***************
  141. *** 2993,2999 ****
  142.                 /*
  143.                   Advance to the next scanline.
  144.                 */
  145. !               if (bit > 0)
  146.                   *q=byte >> (8-bit);
  147.                 q+=scanline_pad;
  148.                 bit=0;
  149. --- 3001,3007 ----
  150.                 /*
  151.                   Advance to the next scanline.
  152.                 */
  153. !               if (bit != 0)
  154.                   *q=byte >> (8-bit);
  155.                 q+=scanline_pad;
  156.                 bit=0;
  157. ***************
  158. *** 3484,3490 ****
  159.                 /*
  160.                   Advance to the next scanline.
  161.                 */
  162. !               if (bit > 0)
  163.                   *q=byte << (8-bit);
  164.                 q+=scanline_pad;
  165.                 bit=0;
  166. --- 3492,3498 ----
  167.                 /*
  168.                   Advance to the next scanline.
  169.                 */
  170. !               if (bit != 0)
  171.                   *q=byte << (8-bit);
  172.                 q+=scanline_pad;
  173.                 bit=0;
  174. ***************
  175. *** 5357,5363 ****
  176.           status=XGetWindowProperty(display,XRootWindow(display,0),XA_CUT_BUFFER0,
  177.             0L,2047L,False,XA_STRING,&type,&format,&length,&after,&data);
  178.           if ((status != Success) || (type != XA_STRING) || (format == 32) ||
  179. !             (length <= 0))
  180.             break;
  181.           /*
  182.             Append cut buffer to reply.
  183. --- 5365,5371 ----
  184.           status=XGetWindowProperty(display,XRootWindow(display,0),XA_CUT_BUFFER0,
  185.             0L,2047L,False,XA_STRING,&type,&format,&length,&after,&data);
  186.           if ((status != Success) || (type != XA_STRING) || (format == 32) ||
  187. !             (length == 0))
  188.             break;
  189.           /*
  190.             Append cut buffer to reply.
  191. ***************
  192. *** 5527,5533 ****
  193.   %
  194.   %
  195.   */
  196. ! unsigned int XReadColormap(display,window_attributes,colors)
  197.   Display
  198.     *display;
  199.   
  200. --- 5535,5541 ----
  201.   %
  202.   %
  203.   */
  204. ! static unsigned int XReadColormap(display,window_attributes,colors)
  205.   Display
  206.     *display;
  207.   
  208. ***************
  209. *** 5727,5733 ****
  210.   %
  211.   %
  212.   */
  213. ! Window XSelectWindow(display,clip_info)
  214.   Display
  215.     *display;
  216.   
  217. --- 5735,5741 ----
  218.   %
  219.   %
  220.   */
  221. ! static Window XSelectWindow(display,clip_info)
  222.   Display
  223.     *display;
  224.   
  225. ***************
  226. *** 6102,6108 ****
  227.   %
  228.   %
  229.   */
  230. ! Window XWindowByProperty(display,window,property)
  231.   Display
  232.     *display;
  233.   
  234. --- 6110,6116 ----
  235.   %
  236.   %
  237.   */
  238. ! static Window XWindowByProperty(display,window,property)
  239.   Display
  240.     *display;
  241.   
  242. diff -r -c ImageMagick/X.h ImageMagick2.2.3/X.h
  243. *** ImageMagick/X.h    Tue Dec 22 16:04:15 1992
  244. --- ImageMagick2.2.3/X.h    Wed Dec 23 18:10:04 1992
  245. ***************
  246. *** 266,279 ****
  247.       unsigned int,unsigned int)),
  248.     XMakePixmap _Declare((Display *,XResourceInfo *,XWindowInfo *)),
  249.     XPopupMenu _Declare((Display *,XWindowInfo *,int,int,char *,char **,
  250. !     unsigned int,char *)),
  251. !   XReadColormap _Declare((Display *,XWindowAttributes *,XColor **));
  252.   
  253.   extern XVisualInfo 
  254.     *XBestVisualInfo _Declare((Display *,char *,char *,XStandardColormap *));
  255.   
  256.   extern void 
  257. -   Latin1Upper _Declare((char *)),
  258.     XBestIconSize _Declare((Display *,XWindowInfo *,Image *)),
  259.     XFreeStandardColormap _Declare((Display *,XVisualInfo *,XPixelInfo *,
  260.       XStandardColormap *)),
  261. --- 266,277 ----
  262.       unsigned int,unsigned int)),
  263.     XMakePixmap _Declare((Display *,XResourceInfo *,XWindowInfo *)),
  264.     XPopupMenu _Declare((Display *,XWindowInfo *,int,int,char *,char **,
  265. !     unsigned int,char *));
  266.   
  267.   extern XVisualInfo 
  268.     *XBestVisualInfo _Declare((Display *,char *,char *,XStandardColormap *));
  269.   
  270.   extern void 
  271.     XBestIconSize _Declare((Display *,XWindowInfo *,Image *)),
  272.     XFreeStandardColormap _Declare((Display *,XVisualInfo *,XPixelInfo *,
  273.       XStandardColormap *)),
  274. ***************
  275. *** 291,299 ****
  276.     XRefreshWindow _Declare((Display *,XWindowInfo *,XEvent *));
  277.   
  278.   extern Window 
  279. -   XClientWindow _Declare((Display *,Window)),
  280. -   XWindowByProperty _Declare((Display *,Window,Atom)),
  281. -   XSelectWindow _Declare((Display *,XRectangle *)),
  282.     XWindowByID _Declare((Display *,Window,unsigned long)),
  283.     XWindowByName _Declare((Display *,Window,char *));
  284.   
  285. --- 289,294 ----
  286. diff -r -c ImageMagick/XtoPS.c ImageMagick2.2.3/XtoPS.c
  287. *** ImageMagick/XtoPS.c    Tue Dec 22 16:04:16 1992
  288. --- ImageMagick2.2.3/XtoPS.c    Wed Dec 23 18:10:01 1992
  289. ***************
  290. *** 428,434 ****
  291.     /*
  292.       Read image from X server.
  293.     */
  294. !   if (resource_info.delay > 0)
  295.       (void) sleep(resource_info.delay);
  296.     start_time=time((time_t *) 0);
  297.     image=ReadXImage(target_window,server_name,frame,screen,borders);
  298. --- 428,434 ----
  299.     /*
  300.       Read image from X server.
  301.     */
  302. !   if (resource_info.delay != 0)
  303.       (void) sleep(resource_info.delay);
  304.     start_time=time((time_t *) 0);
  305.     image=ReadXImage(target_window,server_name,frame,screen,borders);
  306. ***************
  307. *** 469,475 ****
  308.           (void) fprintf(stderr," DirectClass ");
  309.         else
  310.           (void) fprintf(stderr," PseudoClass ");
  311. !       (void) fprintf(stderr,"%uc %s %ds\n",image->colors,image->magick,
  312.           time((time_t *) 0)-start_time+1);
  313.       }
  314.     DestroyImage(image);
  315. --- 469,475 ----
  316.           (void) fprintf(stderr," DirectClass ");
  317.         else
  318.           (void) fprintf(stderr," PseudoClass ");
  319. !       (void) fprintf(stderr,"%uc %s %lds\n",image->colors,image->magick,
  320.           time((time_t *) 0)-start_time+1);
  321.       }
  322.     DestroyImage(image);
  323. diff -r -c ImageMagick/alien.c ImageMagick2.2.3/alien.c
  324. *** ImageMagick/alien.c    Tue Dec 22 16:04:18 1992
  325. --- ImageMagick2.2.3/alien.c    Wed Dec 23 18:10:02 1992
  326. ***************
  327. *** 665,671 ****
  328.       /*
  329.         Read image attributes.
  330.       */
  331. !     if (image_count > 0)
  332.         {
  333.           /*
  334.             Allocate image structure.
  335. --- 665,671 ----
  336.       /*
  337.         Read image attributes.
  338.       */
  339. !     if (image_count != 0)
  340.         {
  341.           /*
  342.             Allocate image structure.
  343. ***************
  344. *** 2264,2270 ****
  345.           if ((number_planes % 2) == 0)
  346.             (void) fgetc(image->file);
  347.         }
  348. !     if (number_colormaps > 0)
  349.         {
  350.           /*
  351.             Read image colormaps.
  352. --- 2264,2270 ----
  353.           if ((number_planes % 2) == 0)
  354.             (void) fgetc(image->file);
  355.         }
  356. !     if (number_colormaps != 0)
  357.         {
  358.           /*
  359.             Read image colormaps.
  360. ***************
  361. *** 2457,2463 ****
  362.         }
  363.         opcode=fgetc(image->file);
  364.       }
  365. !     if (number_colormaps > 0)
  366.         {
  367.           unsigned char
  368.             pixel;
  369. --- 2457,2463 ----
  370.         }
  371.         opcode=fgetc(image->file);
  372.       }
  373. !     if (number_colormaps != 0)
  374.         {
  375.           unsigned char
  376.             pixel;
  377. ***************
  378. *** 4094,4100 ****
  379.     /*
  380.       Read colormap.
  381.     */
  382. !   if (header.ncolors > 0)
  383.       {
  384.         colors=(XColor *) malloc((unsigned int) header.ncolors*sizeof(XColor));
  385.         if (colors == (XColor *) NULL)
  386. --- 4094,4100 ----
  387.     /*
  388.       Read colormap.
  389.     */
  390. !   if (header.ncolors != 0)
  391.       {
  392.         colors=(XColor *) malloc((unsigned int) header.ncolors*sizeof(XColor));
  393.         if (colors == (XColor *) NULL)
  394. ***************
  395. *** 4288,4294 ****
  396.       Free image and colormap.
  397.     */
  398.     (void) free((char *) window_name);
  399. !   if (header.ncolors > 0)
  400.       (void) free((char *) colors);
  401.     XDestroyImage(ximage);
  402.     CloseImage(image);
  403. --- 4288,4294 ----
  404.       Free image and colormap.
  405.     */
  406.     (void) free((char *) window_name);
  407. !   if (header.ncolors != 0)
  408.       (void) free((char *) colors);
  409.     XDestroyImage(ximage);
  410.     CloseImage(image);
  411. ***************
  412. *** 5227,5233 ****
  413.                 /*
  414.                   Advance to the next scanline.
  415.                 */
  416. !               if (bit > 0)
  417.                   *q++=byte << (8-bit);
  418.                 bit=0;
  419.                 byte=0;
  420. --- 5227,5233 ----
  421.                 /*
  422.                   Advance to the next scanline.
  423.                 */
  424. !               if (bit != 0)
  425.                   *q++=byte << (8-bit);
  426.                 bit=0;
  427.                 byte=0;
  428. ***************
  429. *** 5255,5290 ****
  430.       }
  431.       case '6':
  432.       {
  433. -       unsigned short int
  434. -         index;
  435. - 
  436.         /*
  437.           Convert image to a PNM image.
  438.         */
  439.         (void) fprintf(image->file,"%d\n",MaxRGB);
  440. !       if (image->class == DirectClass)
  441. !         for (i=0; i < image->packets; i++)
  442.           {
  443. !           for (j=0; j <= ((int) p->length); j++)
  444. !           {
  445. !             *q++=p->red;
  446. !             *q++=p->green;
  447. !             *q++=p->blue;
  448. !           }
  449. !           p++;
  450.           }
  451. !       else
  452. !         for (i=0; i < image->packets; i++)
  453. !         {
  454. !           for (j=0; j <= ((int) p->length); j++)
  455. !           {
  456. !             index=p->index;
  457. !             *q++=image->colormap[index].red;
  458. !             *q++=image->colormap[index].green;
  459. !             *q++=image->colormap[index].blue;
  460. !           }
  461. !           p++;
  462. !         }
  463.         break;
  464.       }
  465.     }
  466. --- 5255,5274 ----
  467.       }
  468.       case '6':
  469.       {
  470.         /*
  471.           Convert image to a PNM image.
  472.         */
  473.         (void) fprintf(image->file,"%d\n",MaxRGB);
  474. !       for (i=0; i < image->packets; i++)
  475. !       {
  476. !         for (j=0; j <= ((int) p->length); j++)
  477.           {
  478. !           *q++=p->red;
  479. !           *q++=p->green;
  480. !           *q++=p->blue;
  481.           }
  482. !         p++;
  483. !       }
  484.         break;
  485.       }
  486.     }
  487. ***************
  488. *** 5627,5633 ****
  489.                     /*
  490.                       Advance to the next scanline.
  491.                     */
  492. !                   if (bit > 0)
  493.                       *q++=byte << (8-bit);
  494.                     if (TIFFWriteScanline(file,scanline,y,0) < 0)
  495.                       break;
  496. --- 5611,5617 ----
  497.                     /*
  498.                       Advance to the next scanline.
  499.                     */
  500. !                   if (bit != 0)
  501.                       *q++=byte << (8-bit);
  502.                     if (TIFFWriteScanline(file,scanline,y,0) < 0)
  503.                       break;
  504. ***************
  505. *** 5643,5649 ****
  506.           }
  507.     (void) free((char *) scanline);
  508.     (void) TIFFFlushData(file);
  509. !   if (verbose)
  510.       TIFFPrintDirectory(file,stderr,False);
  511.     (void) TIFFClose(file);
  512.     return(True);
  513. --- 5627,5633 ----
  514.           }
  515.     (void) free((char *) scanline);
  516.     (void) TIFFFlushData(file);
  517. !   if (verbose == True)
  518.       TIFFPrintDirectory(file,stderr,False);
  519.     (void) TIFFClose(file);
  520.     return(True);
  521. ***************
  522. *** 5930,5936 ****
  523.                   /*
  524.                     Advance to the next scanline.
  525.                   */
  526. !                 if (bit > 0)
  527.                     *q++=byte << (8-bit);
  528.                   if ((((image->columns/8)+
  529.                       (image->columns % 8 ? 1 : 0)) % 2) != 0)
  530. --- 5914,5920 ----
  531.                   /*
  532.                     Advance to the next scanline.
  533.                   */
  534. !                 if (bit != 0)
  535.                     *q++=byte << (8-bit);
  536.                   if ((((image->columns/8)+
  537.                       (image->columns % 8 ? 1 : 0)) % 2) != 0)
  538. ***************
  539. *** 6065,6071 ****
  540.         x++;
  541.         if (x == image->columns)
  542.           {
  543. !           if (bit > 0)
  544.               {
  545.                 /*
  546.                   Write a bitmap byte to the image file.
  547. --- 6049,6055 ----
  548.         x++;
  549.         if (x == image->columns)
  550.           {
  551. !           if (bit != 0)
  552.               {
  553.                 /*
  554.                   Write a bitmap byte to the image file.
  555. diff -r -c ImageMagick/animate.c ImageMagick2.2.3/animate.c
  556. *** ImageMagick/animate.c    Tue Dec 22 16:04:19 1992
  557. --- ImageMagick2.2.3/animate.c    Wed Dec 23 18:10:02 1992
  558. ***************
  559. *** 169,175 ****
  560.   {
  561.   }
  562.   
  563. ! void Delay(milliseconds)
  564.   unsigned long
  565.     milliseconds;
  566.   {
  567. --- 169,175 ----
  568.   {
  569.   }
  570.   
  571. ! static void Delay(milliseconds)
  572.   unsigned long
  573.     milliseconds;
  574.   {
  575. ***************
  576. *** 1967,1972 ****
  577. --- 1967,1976 ----
  578.         }
  579.       else
  580.         {
  581. +         double
  582. +           normalized_maximum_error,
  583. +           normalized_mean_error;
  584. + 
  585.           Image
  586.             *image,
  587.             info_image,
  588. ***************
  589. *** 1975,1980 ****
  590. --- 1979,1987 ----
  591.           time_t
  592.             start_time;
  593.   
  594. +         unsigned int
  595. +           mean_error_per_pixel;
  596. + 
  597.           unsigned long
  598.             total_colors;
  599.   
  600. ***************
  601. *** 1992,1997 ****
  602. --- 1999,2005 ----
  603.           do
  604.           {
  605.             info_image=(*image);
  606. +           total_colors=0;
  607.             /*
  608.               Transform image as defined by the clip, image and scale geometries.
  609.             */
  610. ***************
  611. *** 2029,2053 ****
  612.               }
  613.             if (gamma > 0.0)
  614.               GammaImage(image,gamma);
  615. -           if (verbose)
  616. -             {
  617. -               /*
  618. -                 Initialize image error attributes.
  619. -               */
  620. -               if (image->class == DirectClass)
  621. -                 image->colors=NumberColors(image,(FILE *) NULL);
  622. -               total_colors=image->colors;
  623. -             }
  624.             if (resource_info.colorspace == GRAYColorspace)
  625.               QuantizeImage(image,256,8,resource_info.dither,GRAYColorspace,True);
  626.             if (resource_info.monochrome)
  627.               QuantizeImage(image,2,8,resource_info.dither,GRAYColorspace,True);
  628. !           if (resource_info.number_colors > 0)
  629.               if ((image->class == DirectClass) ||
  630.                   (image->colors > resource_info.number_colors))
  631. !               QuantizeImage(image,resource_info.number_colors,
  632. !                 resource_info.tree_depth,resource_info.dither,
  633. !                 resource_info.colorspace,True);
  634.             if (verbose)
  635.               {
  636.                 /*
  637. --- 2037,2067 ----
  638.               }
  639.             if (gamma > 0.0)
  640.               GammaImage(image,gamma);
  641.             if (resource_info.colorspace == GRAYColorspace)
  642.               QuantizeImage(image,256,8,resource_info.dither,GRAYColorspace,True);
  643.             if (resource_info.monochrome)
  644.               QuantizeImage(image,2,8,resource_info.dither,GRAYColorspace,True);
  645. !           if (resource_info.number_colors != 0)
  646.               if ((image->class == DirectClass) ||
  647.                   (image->colors > resource_info.number_colors))
  648. !               {
  649. !                 /*
  650. !                   Reduce the number of colors in the image.
  651. !                 */
  652. !                 QuantizeImage(image,resource_info.number_colors,
  653. !                   resource_info.tree_depth,resource_info.dither,
  654. !                   resource_info.colorspace,True);
  655. !                 if (verbose)
  656. !                   {
  657. !                     /*
  658. !                       Measure quantization error.
  659. !                     */
  660. !                     QuantizationError(image,&mean_error_per_pixel,
  661. !                       &normalized_mean_error,&normalized_maximum_error);
  662. !                     total_colors=NumberColors(image,(FILE *) NULL);
  663. !                   }
  664. !                 SyncImage(image);
  665. !               }
  666.             if (verbose)
  667.               {
  668.                 /*
  669. ***************
  670. *** 2065,2087 ****
  671.                   (void) fprintf(stderr," DirectClass ");
  672.                 else
  673.                   (void) fprintf(stderr," PseudoClass ");
  674. !               if (total_colors != image->colors)
  675. !                 (void) fprintf(stderr,"%lu=>",total_colors);
  676. !               (void) fprintf(stderr,"%uc",image->colors);
  677. !               if ((resource_info.number_colors > 0) || resource_info.monochrome)
  678.                   {
  679. !                   double
  680. !                     normalized_maximum_error,
  681. !                     normalized_mean_error;
  682. ! 
  683. !                   unsigned int
  684. !                     mean_error_per_pixel;
  685. ! 
  686. !                   /*
  687. !                     Measure quantization error.
  688. !                   */
  689. !                   QuantizationError(image,&mean_error_per_pixel,
  690. !                     &normalized_mean_error,&normalized_maximum_error);
  691.                     (void) fprintf(stderr," %u/%.6f/%.6fe",mean_error_per_pixel,
  692.                       normalized_mean_error,normalized_maximum_error);
  693.                   }
  694. --- 2079,2089 ----
  695.                   (void) fprintf(stderr," DirectClass ");
  696.                 else
  697.                   (void) fprintf(stderr," PseudoClass ");
  698. !               if (total_colors == 0)
  699. !                 (void) fprintf(stderr,"%uc",image->colors);
  700. !               else
  701.                   {
  702. !                   (void) fprintf(stderr,"%lu=>%uc",total_colors,image->colors);
  703.                     (void) fprintf(stderr," %u/%.6f/%.6fe",mean_error_per_pixel,
  704.                       normalized_mean_error,normalized_maximum_error);
  705.                   }
  706. diff -r -c ImageMagick/colors.c ImageMagick2.2.3/colors.c
  707. *** ImageMagick/colors.c    Tue Dec 22 16:04:19 1992
  708. --- ImageMagick2.2.3/colors.c    Wed Dec 23 18:10:02 1992
  709. ***************
  710. *** 156,162 ****
  711.       if (node->child[id] != (Node *) NULL)
  712.         Histogram(node->child[id],file);
  713.     if (node->level == MaxTreeDepth)
  714. !     (void) fprintf(file,"%8d\t%d\t%d\t%d\n",node->number_colors,
  715.         node->mid_red,node->mid_green,node->mid_blue);
  716.   }
  717.   
  718. --- 156,162 ----
  719.       if (node->child[id] != (Node *) NULL)
  720.         Histogram(node->child[id],file);
  721.     if (node->level == MaxTreeDepth)
  722. !     (void) fprintf(file,"%8lu\t%d\t%d\t%d\n",node->number_colors,
  723.         node->mid_red,node->mid_green,node->mid_blue);
  724.   }
  725.   
  726. diff -r -c ImageMagick/compress.c ImageMagick2.2.3/compress.c
  727. *** ImageMagick/compress.c    Tue Dec 22 16:04:20 1992
  728. --- ImageMagick2.2.3/compress.c    Wed Dec 23 18:10:02 1992
  729. ***************
  730. *** 1078,1084 ****
  731.         k=((int) (p->index) << (MaxLZWBits-8))+waiting_code;
  732.         if (k >= MaxHashTable)
  733.           k-=MaxHashTable;
  734. !       if (hash_code[k] != 0)
  735.           {
  736.             if ((hash_prefix[k] == waiting_code) &&
  737.                 (hash_suffix[k] == (unsigned char) (p->index & 0xff)))
  738. --- 1078,1084 ----
  739.         k=((int) (p->index) << (MaxLZWBits-8))+waiting_code;
  740.         if (k >= MaxHashTable)
  741.           k-=MaxHashTable;
  742. !       if (hash_code[k] >= 0)
  743.           {
  744.             if ((hash_prefix[k] == waiting_code) &&
  745.                 (hash_suffix[k] == (unsigned char) (p->index & 0xff)))
  746. diff -r -c ImageMagick/display.c ImageMagick2.2.3/display.c
  747. *** ImageMagick/display.c    Tue Dec 22 16:04:22 1992
  748. --- ImageMagick2.2.3/display.c    Wed Dec 23 18:10:03 1992
  749. ***************
  750. *** 625,633 ****
  751.         if (resource_info->number_colors > 0)
  752.           if ((output_image->class == DirectClass) ||
  753.               (output_image->colors > resource_info->number_colors))
  754. !           QuantizeImage(output_image,resource_info->number_colors,
  755. !             resource_info->tree_depth,resource_info->dither,
  756. !             resource_info->colorspace,True);
  757.         (void) strcpy(output_image->filename,filename);
  758.         if (command == 'p')
  759.           (void) PrintImage(output_image,resource_info->image_geometry);
  760. --- 625,636 ----
  761.         if (resource_info->number_colors > 0)
  762.           if ((output_image->class == DirectClass) ||
  763.               (output_image->colors > resource_info->number_colors))
  764. !           {
  765. !             QuantizeImage(output_image,resource_info->number_colors,
  766. !               resource_info->tree_depth,resource_info->dither,
  767. !               resource_info->colorspace,True);
  768. !             SyncImage(output_image);
  769. !           }
  770.         (void) strcpy(output_image->filename,filename);
  771.         if (command == 'p')
  772.           (void) PrintImage(output_image,resource_info->image_geometry);
  773. ***************
  774. *** 668,674 ****
  775.         break;
  776.       }
  777.     }
  778. !   if ((width > 0) && (height > 0))
  779.       {
  780.         unsigned int
  781.           mask;
  782. --- 671,677 ----
  783.         break;
  784.       }
  785.     }
  786. !   if ((width != 0) && (height != 0))
  787.       {
  788.         unsigned int
  789.           mask;
  790. ***************
  791. *** 2193,2199 ****
  792.         /*
  793.           Free previous resources on the root window.
  794.         */
  795. !       XKillClient(display,*((Pixmap *) data));
  796.         XFree((void *) data);
  797.       }
  798.     /*
  799. --- 2196,2202 ----
  800.         /*
  801.           Free previous resources on the root window.
  802.         */
  803. !       XKillClient(display,(XID) (*((Pixmap *) data)));
  804.         XFree((void *) data);
  805.       }
  806.     /*
  807. ***************
  808. *** 2926,2932 ****
  809.     *state&=(~NextImageState);
  810.     *state&=(~TileImageState);
  811.     if (resource_info->delay == 0)
  812. !     timeout=(~0);
  813.     else
  814.       timeout=(unsigned long) time((time_t *) 0)+resource_info->delay;
  815.     do
  816. --- 2929,2935 ----
  817.     *state&=(~NextImageState);
  818.     *state&=(~TileImageState);
  819.     if (resource_info->delay == 0)
  820. !     timeout=(unsigned long) (~0);
  821.     else
  822.       timeout=(unsigned long) time((time_t *) 0)+resource_info->delay;
  823.     do
  824. ***************
  825. *** 3179,3185 ****
  826.                   Reset timeout after expose.
  827.                 */
  828.                 if (resource_info->delay == 0)
  829. !                 timeout=(~0);
  830.                 else
  831.                   timeout=(unsigned long) time((time_t *) 0)+resource_info->delay;
  832.                 break;
  833. --- 3182,3188 ----
  834.                   Reset timeout after expose.
  835.                 */
  836.                 if (resource_info->delay == 0)
  837. !                 timeout=(unsigned long) (~0);
  838.                 else
  839.                   timeout=(unsigned long) time((time_t *) 0)+resource_info->delay;
  840.                 break;
  841. ***************
  842. *** 3513,3521 ****
  843.         if (resource_info->number_colors > 0)
  844.           if ((displayed_image->class == DirectClass) ||
  845.               (displayed_image->colors > resource_info->number_colors))
  846. !           QuantizeImage(displayed_image,resource_info->number_colors,
  847. !             resource_info->tree_depth,resource_info->dither,
  848. !             resource_info->colorspace,True);
  849.       }
  850.     /*
  851.       Free X resources.
  852. --- 3516,3527 ----
  853.         if (resource_info->number_colors > 0)
  854.           if ((displayed_image->class == DirectClass) ||
  855.               (displayed_image->colors > resource_info->number_colors))
  856. !           {
  857. !             QuantizeImage(displayed_image,resource_info->number_colors,
  858. !               resource_info->tree_depth,resource_info->dither,
  859. !               resource_info->colorspace,True);
  860. !             SyncImage(displayed_image);
  861. !           }
  862.       }
  863.     /*
  864.       Free X resources.
  865. ***************
  866. *** 4109,4115 ****
  867.                       p++;
  868.                       p_bit=0;
  869.                     }
  870. !                 if (q_bit > 0)
  871.                     *q=byte >> (8-q_bit);
  872.                   q+=scanline_pad;
  873.                 }
  874. --- 4115,4121 ----
  875.                       p++;
  876.                       p_bit=0;
  877.                     }
  878. !                 if (q_bit != 0)
  879.                     *q=byte >> (8-q_bit);
  880.                   q+=scanline_pad;
  881.                 }
  882. ***************
  883. *** 4166,4172 ****
  884.                       p++;
  885.                       p_bit=0;
  886.                     }
  887. !                 if (q_bit > 0)
  888.                     *q=byte << (8-q_bit);
  889.                   q+=scanline_pad;
  890.                 }
  891. --- 4172,4178 ----
  892.                       p++;
  893.                       p_bit=0;
  894.                     }
  895. !                 if (q_bit != 0)
  896.                     *q=byte << (8-q_bit);
  897.                   q+=scanline_pad;
  898.                 }
  899. ***************
  900. *** 5556,5561 ****
  901. --- 5562,5571 ----
  902.         }
  903.       else
  904.         {
  905. +         double
  906. +           normalized_maximum_error,
  907. +           normalized_mean_error;
  908. + 
  909.           Image
  910.             *image,
  911.             info_image,
  912. ***************
  913. *** 5564,5570 ****
  914.           time_t
  915.             start_time;
  916.   
  917. !         unsigned long
  918.             total_colors;
  919.   
  920.           /*
  921. --- 5574,5583 ----
  922.           time_t
  923.             start_time;
  924.   
  925. !         unsigned int
  926. !           mean_error_per_pixel;
  927. ! 
  928. !         unsigned long int
  929.             total_colors;
  930.   
  931.           /*
  932. ***************
  933. *** 5581,5588 ****
  934.           do
  935.           {
  936.             info_image=(*image);
  937. !           if (scene > 0)
  938.               image->scene=scene;
  939.             /*
  940.               Transform image as defined by the clip, image and scale geometries.
  941.             */
  942. --- 5594,5602 ----
  943.           do
  944.           {
  945.             info_image=(*image);
  946. !           if (scene != 0)
  947.               image->scene=scene;
  948. +           total_colors=0;
  949.             /*
  950.               Transform image as defined by the clip, image and scale geometries.
  951.             */
  952. ***************
  953. *** 5654,5678 ****
  954.               InverseImage(image);
  955.             if (normalize)
  956.               NormalizeImage(image);
  957. -           if (verbose)
  958. -             {
  959. -               /*
  960. -                 Initialize image error attributes.
  961. -               */
  962. -               if (image->class == DirectClass)
  963. -                 image->colors=NumberColors(image,(FILE *) NULL);
  964. -               total_colors=image->colors;
  965. -             }
  966.             if (resource_info.colorspace == GRAYColorspace)
  967.               QuantizeImage(image,256,8,resource_info.dither,GRAYColorspace,True);
  968.             if (resource_info.monochrome)
  969.               QuantizeImage(image,2,8,resource_info.dither,GRAYColorspace,True);
  970. !           if (resource_info.number_colors > 0)
  971.               if ((image->class == DirectClass) ||
  972.                   (image->colors > resource_info.number_colors))
  973. !               QuantizeImage(image,resource_info.number_colors,
  974. !                 resource_info.tree_depth,resource_info.dither,
  975. !                 resource_info.colorspace,True);
  976.             /*
  977.               Display image to X server.
  978.             */
  979. --- 5668,5698 ----
  980.               InverseImage(image);
  981.             if (normalize)
  982.               NormalizeImage(image);
  983.             if (resource_info.colorspace == GRAYColorspace)
  984.               QuantizeImage(image,256,8,resource_info.dither,GRAYColorspace,True);
  985.             if (resource_info.monochrome)
  986.               QuantizeImage(image,2,8,resource_info.dither,GRAYColorspace,True);
  987. !           if (resource_info.number_colors != 0)
  988.               if ((image->class == DirectClass) ||
  989.                   (image->colors > resource_info.number_colors))
  990. !               {
  991. !                 /*
  992. !                   Reduce the number of colors in the image.
  993. !                 */
  994. !                 QuantizeImage(image,resource_info.number_colors,
  995. !                   resource_info.tree_depth,resource_info.dither,
  996. !                   resource_info.colorspace,True);
  997. !                 if (verbose)
  998. !                   {
  999. !                     /*
  1000. !                       Measure quantization error.
  1001. !                     */
  1002. !                     QuantizationError(image,&mean_error_per_pixel,
  1003. !                       &normalized_mean_error,&normalized_maximum_error);
  1004. !                     total_colors=NumberColors(image,(FILE *) NULL);
  1005. !                   }
  1006. !                 SyncImage(image);
  1007. !               }
  1008.             /*
  1009.               Display image to X server.
  1010.             */
  1011. ***************
  1012. *** 5744,5766 ****
  1013.                   (void) fprintf(stderr," DirectClass ");
  1014.                 else
  1015.                   (void) fprintf(stderr," PseudoClass ");
  1016. !               if (total_colors != image->colors)
  1017. !                 (void) fprintf(stderr,"%lu=>",total_colors);
  1018. !               (void) fprintf(stderr,"%uc",image->colors);
  1019. !               if ((resource_info.number_colors > 0) || resource_info.monochrome)
  1020.                   {
  1021. !                   double
  1022. !                     normalized_maximum_error,
  1023. !                     normalized_mean_error;
  1024. ! 
  1025. !                   unsigned int
  1026. !                     mean_error_per_pixel;
  1027. ! 
  1028. !                   /*
  1029. !                     Measure quantization error.
  1030. !                   */
  1031. !                   QuantizationError(image,&mean_error_per_pixel,
  1032. !                     &normalized_mean_error,&normalized_maximum_error);
  1033.                     (void) fprintf(stderr," %u/%.6f/%.6fe",mean_error_per_pixel,
  1034.                       normalized_mean_error,normalized_maximum_error);
  1035.                   }
  1036. --- 5764,5774 ----
  1037.                   (void) fprintf(stderr," DirectClass ");
  1038.                 else
  1039.                   (void) fprintf(stderr," PseudoClass ");
  1040. !               if (total_colors == 0)
  1041. !                 (void) fprintf(stderr,"%uc",image->colors);
  1042. !               else
  1043.                   {
  1044. !                   (void) fprintf(stderr,"%lu=>%uc",total_colors,image->colors);
  1045.                     (void) fprintf(stderr," %u/%.6f/%.6fe",mean_error_per_pixel,
  1046.                       normalized_mean_error,normalized_maximum_error);
  1047.                   }
  1048. ***************
  1049. *** 5791,5797 ****
  1050.               for (i--; i > 0; i--)
  1051.                 if (image_marker[i] == (image_number-2))
  1052.                   break;
  1053. !             if (image_number > 0)
  1054.                 image_number--;
  1055.             }
  1056.         }
  1057. --- 5799,5805 ----
  1058.               for (i--; i > 0; i--)
  1059.                 if (image_marker[i] == (image_number-2))
  1060.                   break;
  1061. !             if (image_number != 0)
  1062.                 image_number--;
  1063.             }
  1064.         }
  1065. diff -r -c ImageMagick/display.h ImageMagick2.2.3/display.h
  1066. *** ImageMagick/display.h    Tue Dec 22 16:23:32 1992
  1067. --- ImageMagick2.2.3/display.h    Wed Dec 23 18:10:04 1992
  1068. ***************
  1069. *** 51,55 ****
  1070.   */
  1071.   #ifndef lint
  1072.   static char 
  1073. !   Version[]="@(#)ImageMagick 2.2.2 92/12/22 cristy@dupont.com";
  1074.   #endif
  1075. --- 51,55 ----
  1076.   */
  1077.   #ifndef lint
  1078.   static char 
  1079. !   Version[]="@(#)ImageMagick 2.2.3 93/01/01 cristy@dupont.com";
  1080.   #endif
  1081. diff -r -c ImageMagick/image.c ImageMagick2.2.3/image.c
  1082. *** ImageMagick/image.c    Tue Dec 22 16:06:19 1992
  1083. --- ImageMagick2.2.3/image.c    Wed Dec 23 18:10:03 1992
  1084. ***************
  1085. *** 62,67 ****
  1086. --- 62,73 ----
  1087.     *client_name;
  1088.   
  1089.   /*
  1090. +   Forward declarations.
  1091. + */
  1092. + static Image
  1093. +   *ZoomImage _Declare((Image *));
  1094. + 
  1095. + /*
  1096.   %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
  1097.   %                                                                             %
  1098.   %                                                                             %
  1099. ***************
  1100. *** 1597,1605 ****
  1101.       }
  1102.       case PseudoClass:
  1103.       {
  1104. -       register unsigned short
  1105. -         index;
  1106. - 
  1107.         /*
  1108.           Gamma-correct PseudoClass image.
  1109.         */
  1110. --- 1603,1608 ----
  1111. ***************
  1112. *** 1609,1623 ****
  1113.           image->colormap[i].green=gamma_map[image->colormap[i].green];
  1114.           image->colormap[i].blue=gamma_map[image->colormap[i].blue];
  1115.         }
  1116. !       p=image->pixels;
  1117. !       for (i=0; i < image->packets; i++)
  1118. !       {
  1119. !         index=p->index;
  1120. !         p->red=image->colormap[index].red;
  1121. !         p->green=image->colormap[index].green;
  1122. !         p->blue=image->colormap[index].blue;
  1123. !         p++;
  1124. !       }
  1125.         break;
  1126.       }
  1127.     }
  1128. --- 1612,1618 ----
  1129.           image->colormap[i].green=gamma_map[image->colormap[i].green];
  1130.           image->colormap[i].blue=gamma_map[image->colormap[i].blue];
  1131.         }
  1132. !       SyncImage(image);
  1133.         break;
  1134.       }
  1135.     }
  1136. ***************
  1137. *** 1675,1683 ****
  1138.       }
  1139.       case PseudoClass:
  1140.       {
  1141. -       register unsigned short
  1142. -         index;
  1143. - 
  1144.         /*
  1145.           Inverse PseudoClass packets.
  1146.         */
  1147. --- 1670,1675 ----
  1148. ***************
  1149. *** 1687,1701 ****
  1150.           image->colormap[i].green=(~image->colormap[i].green);
  1151.           image->colormap[i].blue=(~image->colormap[i].blue);
  1152.         }
  1153. !       p=image->pixels;
  1154. !       for (i=0; i < image->packets; i++)
  1155. !       {
  1156. !         index=p->index;
  1157. !         p->red=image->colormap[index].red;
  1158. !         p->green=image->colormap[index].green;
  1159. !         p->blue=image->colormap[index].blue;
  1160. !         p++;
  1161. !       }
  1162.         break;
  1163.       }
  1164.     }
  1165. --- 1679,1685 ----
  1166.           image->colormap[i].green=(~image->colormap[i].green);
  1167.           image->colormap[i].blue=(~image->colormap[i].blue);
  1168.         }
  1169. !       SyncImage(image);
  1170.         break;
  1171.       }
  1172.     }
  1173. ***************
  1174. *** 2032,2038 ****
  1175.         break;
  1176.     }
  1177.     intensity=0;
  1178. !   for (high=MaxRGB; high > 0; high--)
  1179.     {
  1180.       intensity+=histogram[high];
  1181.       if (intensity > threshold_intensity)
  1182. --- 2016,2022 ----
  1183.         break;
  1184.     }
  1185.     intensity=0;
  1186. !   for (high=MaxRGB; high != 0; high--)
  1187.     {
  1188.       intensity+=histogram[high];
  1189.       if (intensity > threshold_intensity)
  1190. ***************
  1191. *** 2052,2058 ****
  1192.             break;
  1193.         }
  1194.         intensity=0;
  1195. !       for (high=MaxRGB; high > 0; high--)
  1196.         {
  1197.           intensity+=histogram[high];
  1198.           if (intensity > threshold_intensity)
  1199. --- 2036,2042 ----
  1200.             break;
  1201.         }
  1202.         intensity=0;
  1203. !       for (high=MaxRGB; high != 0; high--)
  1204.         {
  1205.           intensity+=histogram[high];
  1206.           if (intensity > threshold_intensity)
  1207. ***************
  1208. *** 2094,2102 ****
  1209.       }
  1210.       case PseudoClass:
  1211.       {
  1212. -       register unsigned short
  1213. -         index;
  1214. - 
  1215.         /*
  1216.           Normalize PseudoClass image.
  1217.         */
  1218. --- 2078,2083 ----
  1219. ***************
  1220. *** 2106,2120 ****
  1221.           image->colormap[i].green=normalize_map[image->colormap[i].green];
  1222.           image->colormap[i].blue=normalize_map[image->colormap[i].blue];
  1223.         }
  1224. !       p=image->pixels;
  1225. !       for (i=0; i < image->packets; i++)
  1226. !       {
  1227. !         index=p->index;
  1228. !         p->red=image->colormap[index].red;
  1229. !         p->green=image->colormap[index].green;
  1230. !         p->blue=image->colormap[index].blue;
  1231. !         p++;
  1232. !       }
  1233.         break;
  1234.       }
  1235.     }
  1236. --- 2087,2093 ----
  1237.           image->colormap[i].green=normalize_map[image->colormap[i].green];
  1238.           image->colormap[i].blue=normalize_map[image->colormap[i].blue];
  1239.         }
  1240. !       SyncImage(image);
  1241.         break;
  1242.       }
  1243.     }
  1244. ***************
  1245. *** 3502,3508 ****
  1246.   %
  1247.   %
  1248.   */
  1249. ! Image *ReduceImage(image)
  1250.   Image
  1251.     *image;
  1252.   {
  1253. --- 3475,3481 ----
  1254.   %
  1255.   %
  1256.   */
  1257. ! static Image *ReduceImage(image)
  1258.   Image
  1259.     *image;
  1260.   {
  1261. ***************
  1262. *** 4005,4013 ****
  1263.       }
  1264.       case PseudoClass:
  1265.       {
  1266. -       register unsigned short
  1267. -         index;
  1268. - 
  1269.         /*
  1270.           Convert PseudoClass image.
  1271.         */
  1272. --- 3978,3983 ----
  1273. ***************
  1274. *** 4023,4037 ****
  1275.           image->colormap[i].blue=
  1276.             range_limit[DownShift(x[red+Z]+y[green+Z]+z[blue+Z]+tz)];
  1277.         }
  1278. !       p=image->pixels;
  1279. !       for (i=0; i < image->packets; i++)
  1280. !       {
  1281. !         index=p->index;
  1282. !         p->red=image->colormap[index].red;
  1283. !         p->green=image->colormap[index].green;
  1284. !         p->blue=image->colormap[index].blue;
  1285. !         p++;
  1286. !       }
  1287.         break;
  1288.       }
  1289.     }
  1290. --- 3993,3999 ----
  1291.           image->colormap[i].blue=
  1292.             range_limit[DownShift(x[red+Z]+y[green+Z]+z[blue+Z]+tz)];
  1293.         }
  1294. !       SyncImage(image);
  1295.         break;
  1296.       }
  1297.     }
  1298. ***************
  1299. *** 4082,4088 ****
  1300.   Image
  1301.     *image;
  1302.   
  1303. ! unsigned int
  1304.     x_offset,
  1305.     y_offset;
  1306.   {
  1307. --- 4044,4050 ----
  1308.   Image
  1309.     *image;
  1310.   
  1311. ! int
  1312.     x_offset,
  1313.     y_offset;
  1314.   {
  1315. ***************
  1316. *** 4540,4545 ****
  1317. --- 4502,4554 ----
  1318.     return(stereo_image);
  1319.   }
  1320.   
  1321. + /*
  1322. + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
  1323. + %                                                                             %
  1324. + %                                                                             %
  1325. + %                                                                             %
  1326. + %   S y n c I m a g e                                                         %
  1327. + %                                                                             %
  1328. + %                                                                             %
  1329. + %                                                                             %
  1330. + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
  1331. + %
  1332. + %  Function SyncImage initializes the red, green, and blue intensities of each
  1333. + %  pixel as defined by the colormap index.
  1334. + %
  1335. + %  The format of the SyncImage routine is:
  1336. + %
  1337. + %      SyncImage(image)
  1338. + %
  1339. + %  A description of each parameter follows:
  1340. + %
  1341. + %    o image: The address of a structure of type Image.
  1342. + %
  1343. + %
  1344. + */
  1345. + void SyncImage(image)
  1346. + Image
  1347. +   *image;
  1348. + {
  1349. +   register int
  1350. +     i;
  1351. + 
  1352. +   register RunlengthPacket
  1353. +     *p;
  1354. + 
  1355. +   register unsigned short
  1356. +     index;
  1357. + 
  1358. +   p=image->pixels;
  1359. +   for (i=0; i < image->packets; i++)
  1360. +   {
  1361. +     index=p->index;
  1362. +     p->red=image->colormap[index].red;
  1363. +     p->green=image->colormap[index].green;
  1364. +     p->blue=image->colormap[index].blue;
  1365. +     p++;
  1366. +   }
  1367. + }
  1368.   
  1369.   /*
  1370.   %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
  1371. ***************
  1372. *** 5430,5436 ****
  1373.   %
  1374.   %
  1375.   */
  1376. ! Image *ZoomImage(image)
  1377.   Image
  1378.     *image;
  1379.   {
  1380. --- 5439,5445 ----
  1381.   %
  1382.   %
  1383.   */
  1384. ! static Image *ZoomImage(image)
  1385.   Image
  1386.     *image;
  1387.   {
  1388. diff -r -c ImageMagick/image.h ImageMagick2.2.3/image.h
  1389. *** ImageMagick/image.h    Tue Dec 22 16:04:24 1992
  1390. --- ImageMagick2.2.3/image.h    Wed Dec 23 18:33:18 1992
  1391. ***************
  1392. *** 146,159 ****
  1393.     *EnhanceImage _Declare((Image *)),
  1394.     *NoisyImage _Declare((Image *)),
  1395.     *ReadImage _Declare((char *)),
  1396. -   *ReduceImage _Declare((Image *)),
  1397.     *ReflectImage _Declare((Image *)),
  1398. !   *RollImage _Declare((Image *,unsigned int,unsigned int)),
  1399. !   *RotateImage _Declare((Image *,double,int)),
  1400.     *ScaleImage _Declare((Image *,unsigned int,unsigned int)),
  1401.     *ShearImage _Declare((Image *,double,double,unsigned int)),
  1402. !   *StereoImage _Declare((Image *,Image *)),
  1403. !   *ZoomImage _Declare((Image *));
  1404.   
  1405.   extern int
  1406.     ReadDataBlock _Declare((char *,FILE *));
  1407. --- 146,157 ----
  1408.     *EnhanceImage _Declare((Image *)),
  1409.     *NoisyImage _Declare((Image *)),
  1410.     *ReadImage _Declare((char *)),
  1411.     *ReflectImage _Declare((Image *)),
  1412. !   *RollImage _Declare((Image *,int,int)),
  1413. !   *RotateImage _Declare((Image *,double,unsigned int)),
  1414.     *ScaleImage _Declare((Image *,unsigned int,unsigned int)),
  1415.     *ShearImage _Declare((Image *,double,double,unsigned int)),
  1416. !   *StereoImage _Declare((Image *,Image *));
  1417.   
  1418.   extern int
  1419.     ReadDataBlock _Declare((char *,FILE *));
  1420. ***************
  1421. *** 186,190 ****
  1422. --- 184,189 ----
  1423.       unsigned int,unsigned int,unsigned int,unsigned int)),
  1424.     RGBTransformImage _Declare((Image *,unsigned int)),
  1425.     SortColormapByIntensity _Declare((Image *)),
  1426. +   SyncImage _Declare((Image *)),
  1427.     TransformImage _Declare((Image **,char *,char *,char *)),
  1428.     TransformRGBImage _Declare((Image *,unsigned int));
  1429. Common subdirectories: ImageMagick/images and ImageMagick2.2.3/images
  1430. diff -r -c ImageMagick/import.c ImageMagick2.2.3/import.c
  1431. *** ImageMagick/import.c    Tue Dec 22 16:04:24 1992
  1432. --- ImageMagick2.2.3/import.c    Wed Dec 23 18:10:03 1992
  1433. ***************
  1434. *** 433,439 ****
  1435.     /*
  1436.       Read image from X server.
  1437.     */
  1438. !   if (resource_info.delay > 0)
  1439.       (void) sleep(resource_info.delay);
  1440.     start_time=time((time_t *) 0);
  1441.     image=ReadXImage(target_window,server_name,frame,screen,borders);
  1442. --- 433,439 ----
  1443.     /*
  1444.       Read image from X server.
  1445.     */
  1446. !   if (resource_info.delay != 0)
  1447.       (void) sleep(resource_info.delay);
  1448.     start_time=time((time_t *) 0);
  1449.     image=ReadXImage(target_window,server_name,frame,screen,borders);
  1450. ***************
  1451. *** 459,465 ****
  1452.           (void) fprintf(stderr," DirectClass ");
  1453.         else
  1454.           (void) fprintf(stderr," PseudoClass ");
  1455. !       (void) fprintf(stderr,"%dc %s %ds\n",image->colors,image->magick,
  1456.           time((time_t *) 0)-start_time+1);
  1457.       }
  1458.     DestroyImage(image);
  1459. --- 459,465 ----
  1460.           (void) fprintf(stderr," DirectClass ");
  1461.         else
  1462.           (void) fprintf(stderr," PseudoClass ");
  1463. !       (void) fprintf(stderr,"%dc %s %lds\n",image->colors,image->magick,
  1464.           time((time_t *) 0)-start_time+1);
  1465.       }
  1466.     DestroyImage(image);
  1467. diff -r -c ImageMagick/montage.c ImageMagick2.2.3/montage.c
  1468. *** ImageMagick/montage.c    Tue Dec 22 16:04:25 1992
  1469. --- ImageMagick2.2.3/montage.c    Wed Dec 23 18:10:04 1992
  1470. ***************
  1471. *** 249,255 ****
  1472.       tile_border_height,
  1473.       tile_border_width,
  1474.       x,
  1475. !     y;
  1476.   
  1477.     register char
  1478.       *q;
  1479. --- 249,257 ----
  1480.       tile_border_height,
  1481.       tile_border_width,
  1482.       x,
  1483. !     x_offset,
  1484. !     y,
  1485. !     y_offset;
  1486.   
  1487.     register char
  1488.       *q;
  1489. ***************
  1490. *** 266,274 ****
  1491.       status,
  1492.       tile,
  1493.       tile_height,
  1494. !     tile_width,
  1495. !     x_offset,
  1496. !     y_offset;
  1497.   
  1498.     XAnnotateInfo
  1499.       annotate_info;
  1500. --- 268,274 ----
  1501.       status,
  1502.       tile,
  1503.       tile_height,
  1504. !     tile_width;
  1505.   
  1506.     XAnnotateInfo
  1507.       annotate_info;
  1508. ***************
  1509. *** 488,494 ****
  1510.       status=UnpackImage(image);
  1511.       if (status == False)
  1512.         Error("unable to unpack image",(char *) NULL);
  1513. !     if (border_width > 0)
  1514.         {
  1515.           Image
  1516.             *bordered_image;
  1517. --- 488,494 ----
  1518.       status=UnpackImage(image);
  1519.       if (status == False)
  1520.         Error("unable to unpack image",(char *) NULL);
  1521. !     if (border_width != 0)
  1522.         {
  1523.           Image
  1524.             *bordered_image;
  1525. ***************
  1526. *** 1396,1408 ****
  1527.       QuantizeImage(montage_image,256,8,resource_info.dither,GRAYColorspace,True);
  1528.     if (resource_info.monochrome)
  1529.       QuantizeImage(montage_image,2,8,resource_info.dither,GRAYColorspace,True);
  1530. !   if (resource_info.number_colors > 0)
  1531. !     QuantizeImage(montage_image,resource_info.number_colors,
  1532. !       resource_info.tree_depth,resource_info.dither,resource_info.colorspace,
  1533. !       True);
  1534.     if (compression != UndefinedCompression)
  1535.       montage_image->compression=compression;
  1536. !   strcpy(montage_image->filename,write_filename);
  1537.     (void) WriteAlienImage(montage_image);
  1538.     if (verbose)
  1539.       {
  1540. --- 1396,1411 ----
  1541.       QuantizeImage(montage_image,256,8,resource_info.dither,GRAYColorspace,True);
  1542.     if (resource_info.monochrome)
  1543.       QuantizeImage(montage_image,2,8,resource_info.dither,GRAYColorspace,True);
  1544. !   if (resource_info.number_colors != 0)
  1545. !     {
  1546. !       QuantizeImage(montage_image,resource_info.number_colors,
  1547. !         resource_info.tree_depth,resource_info.dither,resource_info.colorspace,
  1548. !         True);
  1549. !       SyncImage(montage_image);
  1550. !     }
  1551.     if (compression != UndefinedCompression)
  1552.       montage_image->compression=compression;
  1553. !   (void) strcpy(montage_image->filename,write_filename);
  1554.     (void) WriteAlienImage(montage_image);
  1555.     if (verbose)
  1556.       {
  1557. diff -r -c ImageMagick/quantize.c ImageMagick2.2.3/quantize.c
  1558. *** ImageMagick/quantize.c    Tue Dec 22 16:06:18 1992
  1559. --- ImageMagick2.2.3/quantize.c    Wed Dec 23 18:10:04 1992
  1560. ***************
  1561. *** 430,436 ****
  1562.           cube.color.red=p->red;
  1563.           cube.color.green=p->green;
  1564.           cube.color.blue=p->blue;
  1565. !         cube.distance=(~0);
  1566.           ClosestColor(node->parent);
  1567.           p->index=cube.color_number;
  1568.           p++;
  1569. --- 430,436 ----
  1570.           cube.color.red=p->red;
  1571.           cube.color.green=p->green;
  1572.           cube.color.blue=p->blue;
  1573. !         cube.distance=(unsigned long int) (~0);
  1574.           ClosestColor(node->parent);
  1575.           p->index=cube.color_number;
  1576.           p++;
  1577. ***************
  1578. *** 900,906 ****
  1579.             cube.color.red=red;
  1580.             cube.color.green=green;
  1581.             cube.color.blue=blue;
  1582. !           cube.distance=(~0);
  1583.             ClosestColor(node->parent);
  1584.             cache[i]=cube.color_number;
  1585.           }
  1586. --- 900,906 ----
  1587.             cube.color.red=red;
  1588.             cube.color.green=green;
  1589.             cube.color.blue=blue;
  1590. !           cube.distance=(unsigned long int) (~0);
  1591.             ClosestColor(node->parent);
  1592.             cache[i]=cube.color_number;
  1593.           }
  1594. ***************
  1595. *** 1020,1026 ****
  1596.     /*
  1597.       Initialize the shift values.
  1598.     */
  1599. !   for (max_shift=0; number_pixels > 0; max_shift++)
  1600.       number_pixels<<=1;
  1601.     for (level=0; level < cube.depth; level++)
  1602.     {
  1603. --- 1020,1026 ----
  1604.     /*
  1605.       Initialize the shift values.
  1606.     */
  1607. !   for (max_shift=0; number_pixels != 0; max_shift++)
  1608.       number_pixels<<=1;
  1609.     for (level=0; level < cube.depth; level++)
  1610.     {
  1611. ***************
  1612. *** 1044,1050 ****
  1613.         exit(1);
  1614.       }
  1615.     cube.root->parent=cube.root;
  1616. !   cube.root->number_colors=(~0);
  1617.     cube.colors=0;
  1618.   }
  1619.   
  1620. --- 1044,1050 ----
  1621.         exit(1);
  1622.       }
  1623.     cube.root->parent=cube.root;
  1624. !   cube.root->number_colors=(unsigned long int) (~0);
  1625.     cube.colors=0;
  1626.   }
  1627.   
  1628. ***************
  1629. *** 1552,1558 ****
  1630.       RGBTransformImage(image,colorspace);
  1631.     Classification(image);
  1632.     if (!optimal)
  1633. !     dither|=cube.colors > (1 << (cube.depth-1));
  1634.     Reduction(number_colors);
  1635.     Assignment(image,dither,optimal);
  1636.     if (colorspace != RGBColorspace)
  1637. --- 1552,1558 ----
  1638.       RGBTransformImage(image,colorspace);
  1639.     Classification(image);
  1640.     if (!optimal)
  1641. !     dither|=(cube.colors > (1 << (cube.depth-1)));
  1642.     Reduction(number_colors);
  1643.     Assignment(image,dither,optimal);
  1644.     if (colorspace != RGBColorspace)
  1645. ***************
  1646. *** 1689,1695 ****
  1647.         Classification(images[i]);
  1648.     }
  1649.     if (!optimal)
  1650. !     dither|=cube.colors > (1 << (cube.depth-1));
  1651.     Reduction(number_colors);
  1652.     for (i=0; i < number_images; i++)
  1653.     {
  1654. --- 1689,1695 ----
  1655.         Classification(images[i]);
  1656.     }
  1657.     if (!optimal)
  1658. !     dither|=(cube.colors > (1 << (cube.depth-1)));
  1659.     Reduction(number_colors);
  1660.     for (i=0; i < number_images; i++)
  1661.     {
  1662. Only in ImageMagick2.2.3: rotate.c
  1663. Common subdirectories: ImageMagick/scenes and ImageMagick2.2.3/scenes
  1664. diff -r -c ImageMagick/shear.c ImageMagick2.2.3/shear.c
  1665. *** ImageMagick/shear.c    Tue Dec 22 16:04:26 1992
  1666. --- ImageMagick2.2.3/shear.c    Wed Dec 23 21:12:31 1992
  1667. ***************
  1668. *** 940,946 ****
  1669.   double
  1670.     degrees;
  1671.   
  1672. ! int
  1673.     clip;
  1674.   {
  1675.     ColorPacket
  1676. --- 940,946 ----
  1677.   double
  1678.     degrees;
  1679.   
  1680. ! unsigned int
  1681.     clip;
  1682.   {
  1683.     ColorPacket
  1684. ***************
  1685. *** 1038,1044 ****
  1686.     background.red=image->pixels[0].red;
  1687.     background.green=image->pixels[0].green;
  1688.     background.blue=image->pixels[0].blue;
  1689. !   rotated_image=BorderImage(integral_image,x_offset,y_offset+1,background);
  1690.     DestroyImage(integral_image);
  1691.     if (rotated_image == (Image *) NULL)
  1692.       {
  1693. --- 1038,1045 ----
  1694.     background.red=image->pixels[0].red;
  1695.     background.green=image->pixels[0].green;
  1696.     background.blue=image->pixels[0].blue;
  1697. !   rotated_image=BorderImage(integral_image,(unsigned int) x_offset,
  1698. !     (unsigned int) y_offset+1,background);
  1699.     DestroyImage(integral_image);
  1700.     if (rotated_image == (Image *) NULL)
  1701.       {
  1702. ***************
  1703. *** 1187,1193 ****
  1704.     background.red=image->pixels[0].red;
  1705.     background.green=image->pixels[0].green;
  1706.     background.blue=image->pixels[0].blue;
  1707. !   sheared_image=BorderImage(image,x_offset,y_offset+1,background);
  1708.     if (sheared_image == (Image *) NULL)
  1709.       {
  1710.         Warning("unable to rotate image","memory allocation failed");
  1711. --- 1188,1195 ----
  1712.     background.red=image->pixels[0].red;
  1713.     background.green=image->pixels[0].green;
  1714.     background.blue=image->pixels[0].blue;
  1715. !   sheared_image=BorderImage(image,(unsigned int) x_offset,
  1716. !     (unsigned int) y_offset+1,background);
  1717.     if (sheared_image == (Image *) NULL)
  1718.       {
  1719.         Warning("unable to rotate image","memory allocation failed");
  1720. diff -r -c ImageMagick/signature.c ImageMagick2.2.3/signature.c
  1721. *** ImageMagick/signature.c    Tue Dec 22 16:04:27 1992
  1722. --- ImageMagick2.2.3/signature.c    Wed Dec 23 18:10:04 1992
  1723. ***************
  1724. *** 244,265 ****
  1725.     static unsigned long int
  1726.       additive_constant[64]=  /* 4294967296*abs(sin(i)), i in radians */
  1727.       {
  1728. !       3614090360L, 3905402710L,  606105819L, 3250441966L,
  1729. !       4118548399L, 1200080426L, 2821735955L, 4249261313L,
  1730. !       1770035416L, 2336552879L, 4294925233L, 2304563134L,
  1731. !       1804603682L, 4254626195L, 2792965006L, 1236535329L,
  1732. !       4129170786L, 3225465664L,  643717713L, 3921069994L,
  1733. !       3593408605L,   38016083L, 3634488961L, 3889429448L,
  1734. !        568446438L, 3275163606L, 4107603335L, 1163531501L,
  1735. !       2850285829L, 4243563512L, 1735328473L, 2368359562L,
  1736. !       4294588738L, 2272392833L, 1839030562L, 4259657740L,
  1737. !       2763975236L, 1272893353L, 4139469664L, 3200236656L,
  1738. !        681279174L, 3936430074L, 3572445317L,   76029189L,
  1739. !       3654602809L, 3873151461L,  530742520L, 3299628645L,
  1740. !       4096336452L, 1126891415L, 2878612391L, 4237533241L,
  1741. !       1700485571L, 2399980690L, 4293915773L, 2240044497L,
  1742. !       1873313359L, 4264355552L, 2734768916L, 1309151649L,
  1743. !       4149444226L, 3173756917L,  718787259L, 3951481745L
  1744.       };
  1745.   
  1746.     register int
  1747. --- 244,262 ----
  1748.     static unsigned long int
  1749.       additive_constant[64]=  /* 4294967296*abs(sin(i)), i in radians */
  1750.       {
  1751. !       0xd76aa478, 0xe8c7b756, 0x242070db, 0xc1bdceee, 0xf57c0faf,
  1752. !       0x4787c62a, 0xa8304613, 0xfd469501, 0x698098d8, 0x8b44f7af,
  1753. !       0xffff5bb1, 0x895cd7be, 0x6b901122, 0xfd987193, 0xa679438e,
  1754. !       0x49b40821, 0xf61e2562, 0xc040b340, 0x265e5a51, 0xe9b6c7aa,
  1755. !       0xd62f105d, 0x2441453,  0xd8a1e681, 0xe7d3fbc8, 0x21e1cde6,
  1756. !       0xc33707d6, 0xf4d50d87, 0x455a14ed, 0xa9e3e905, 0xfcefa3f8,
  1757. !       0x676f02d9, 0x8d2a4c8a, 0xfffa3942, 0x8771f681, 0x6d9d6122,
  1758. !       0xfde5380c, 0xa4beea44, 0x4bdecfa9, 0xf6bb4b60, 0xbebfbc70,
  1759. !       0x289b7ec6, 0xeaa127fa, 0xd4ef3085, 0x4881d05,  0xd9d4d039,
  1760. !       0xe6db99e5, 0x1fa27cf8, 0xc4ac5665, 0xf4292244, 0x432aff97,
  1761. !       0xab9423a7, 0xfc93a039, 0x655b59c3, 0x8f0ccc92, 0xffeff47d,
  1762. !       0x85845dd1, 0x6fa87e4f, 0xfe2ce6e0, 0xa3014314, 0x4e0811a1,
  1763. !       0xf7537e82, 0xbd3af235, 0x2ad7d2bb, 0xeb86d391,
  1764.       };
  1765.   
  1766.     register int
  1767. Common subdirectories: ImageMagick/utilities and ImageMagick2.2.3/utilities
  1768. Common subdirectories: ImageMagick/xtp and ImageMagick2.2.3/xtp
  1769. diff -r -c ImageMagick/utilities/MIFFtoSTEREO.c ImageMagick2.2.3/utilities/MIFFtoSTEREO.c
  1770. *** ImageMagick/utilities/MIFFtoSTEREO.c    Tue Dec 22 16:05:22 1992
  1771. --- ImageMagick2.2.3/utilities/MIFFtoSTEREO.c    Wed Dec 23 18:10:10 1992
  1772. ***************
  1773. *** 200,206 ****
  1774.       (void) fprintf(stderr," DirectClass ");
  1775.     else
  1776.       (void) fprintf(stderr," PseudoClass ");
  1777. !   (void) fprintf(stderr,"%dc %s %ds\n",stereo_image->colors,
  1778.       stereo_image->magick,time((time_t *) 0)-start_time+1);
  1779.     return(!status);
  1780.   }
  1781. --- 200,206 ----
  1782.       (void) fprintf(stderr," DirectClass ");
  1783.     else
  1784.       (void) fprintf(stderr," PseudoClass ");
  1785. !   (void) fprintf(stderr,"%dc %s %lds\n",stereo_image->colors,
  1786.       stereo_image->magick,time((time_t *) 0)-start_time+1);
  1787.     return(!status);
  1788.   }
  1789. diff -r -c ImageMagick/utilities/convert.c ImageMagick2.2.3/utilities/convert.c
  1790. *** ImageMagick/utilities/convert.c    Tue Dec 22 16:05:23 1992
  1791. --- ImageMagick2.2.3/utilities/convert.c    Wed Dec 23 18:10:10 1992
  1792. ***************
  1793. *** 203,209 ****
  1794.   char
  1795.     *argv[];
  1796.   {
  1797. ! #define NotInitialized  (~0)
  1798.   
  1799.     AlienInfo
  1800.       alien_info;
  1801. --- 203,209 ----
  1802.   char
  1803.     *argv[];
  1804.   {
  1805. ! #define NotInitialized  (unsigned int) (~0)
  1806.   
  1807.     AlienInfo
  1808.       alien_info;
  1809. ***************
  1810. *** 212,217 ****
  1811. --- 212,221 ----
  1812.       *filename,
  1813.       *option;
  1814.   
  1815. +   double
  1816. +     normalized_maximum_error,
  1817. +     normalized_mean_error;
  1818. + 
  1819.     Image
  1820.       *image,
  1821.       *next_image;
  1822. ***************
  1823. *** 229,241 ****
  1824.       colorspace,
  1825.       compression,
  1826.       dither,
  1827.       number_colors,
  1828.       quality,
  1829.       scene,
  1830. -     total_colors,
  1831.       tree_depth,
  1832.       verbose;
  1833.   
  1834.     /*
  1835.       Initialize program variables.
  1836.     */
  1837. --- 233,248 ----
  1838.       colorspace,
  1839.       compression,
  1840.       dither,
  1841. +     mean_error_per_pixel,
  1842.       number_colors,
  1843.       quality,
  1844.       scene,
  1845.       tree_depth,
  1846.       verbose;
  1847.   
  1848. +   unsigned long int
  1849. +     total_colors;
  1850. + 
  1851.     /*
  1852.       Initialize program variables.
  1853.     */
  1854. ***************
  1855. *** 453,483 ****
  1856.     */
  1857.     do
  1858.     {
  1859.       if (alpha != NotInitialized)
  1860.         image->alpha=alpha;
  1861.       if (compression != UndefinedCompression)
  1862.         image->compression=compression;
  1863. !     if (quality > 0)
  1864.         image->quality=quality;
  1865. !     if (scene > 0)
  1866.         image->scene=scene;
  1867.       (void) strcpy(image->filename,argv[i]);
  1868.       if (image->last != (Image *) NULL)
  1869.         (void) sprintf(image->filename,"%s.%u\0",argv[i],image->scene);
  1870. -     if (verbose)
  1871. -       {
  1872. -         /*
  1873. -           Initialize image error attributes.
  1874. -         */
  1875. -         if (image->class == DirectClass)
  1876. -           image->colors=NumberColors(image,(FILE *) NULL);
  1877. -         total_colors=image->colors;
  1878. -       }
  1879.       if (colorspace == GRAYColorspace)
  1880.         QuantizeImage(image,256,8,dither,GRAYColorspace,True);
  1881. !     if (number_colors > 0)
  1882.         if ((image->class == DirectClass) || (image->colors > number_colors))
  1883. !         QuantizeImage(image,number_colors,tree_depth,dither,colorspace,True);
  1884.       status=WriteAlienImage(image);
  1885.       if (verbose)
  1886.         {
  1887. --- 460,497 ----
  1888.     */
  1889.     do
  1890.     {
  1891. +     total_colors=0;
  1892.       if (alpha != NotInitialized)
  1893.         image->alpha=alpha;
  1894.       if (compression != UndefinedCompression)
  1895.         image->compression=compression;
  1896. !     if (quality != 0)
  1897.         image->quality=quality;
  1898. !     if (scene != 0)
  1899.         image->scene=scene;
  1900.       (void) strcpy(image->filename,argv[i]);
  1901.       if (image->last != (Image *) NULL)
  1902.         (void) sprintf(image->filename,"%s.%u\0",argv[i],image->scene);
  1903.       if (colorspace == GRAYColorspace)
  1904.         QuantizeImage(image,256,8,dither,GRAYColorspace,True);
  1905. !     if (number_colors != 0)
  1906.         if ((image->class == DirectClass) || (image->colors > number_colors))
  1907. !         {
  1908. !           /*
  1909. !             Reduce the number of colors in the image.
  1910. !           */
  1911. !           QuantizeImage(image,number_colors,tree_depth,dither,colorspace,True);
  1912. !           if (verbose)
  1913. !             {
  1914. !               /*
  1915. !                 Measure quantization error.
  1916. !               */
  1917. !               QuantizationError(image,&mean_error_per_pixel,
  1918. !                 &normalized_mean_error,&normalized_maximum_error);
  1919. !               total_colors=NumberColors(image,(FILE *) NULL);
  1920. !             }
  1921. !           SyncImage(image);
  1922. !         }
  1923.       status=WriteAlienImage(image);
  1924.       if (verbose)
  1925.         {
  1926. ***************
  1927. *** 490,512 ****
  1928.             (void) fprintf(stderr," DirectClass ");
  1929.           else
  1930.             (void) fprintf(stderr," PseudoClass ");
  1931. !         if (total_colors != image->colors)
  1932. !           (void) fprintf(stderr,"%u=>",total_colors);
  1933. !         (void) fprintf(stderr,"%uc",image->colors);
  1934. !         if (number_colors > 0)
  1935.             {
  1936. !             double
  1937. !               normalized_maximum_error,
  1938. !               normalized_mean_error;
  1939. ! 
  1940. !             unsigned int
  1941. !               mean_error_per_pixel;
  1942. ! 
  1943. !             /*
  1944. !               Measure quantization error.
  1945. !             */
  1946. !             QuantizationError(image,&mean_error_per_pixel,
  1947. !               &normalized_mean_error,&normalized_maximum_error);
  1948.               (void) fprintf(stderr," %u/%.6f/%.6fe",mean_error_per_pixel,
  1949.                 normalized_mean_error,normalized_maximum_error);
  1950.             }
  1951. --- 504,514 ----
  1952.             (void) fprintf(stderr," DirectClass ");
  1953.           else
  1954.             (void) fprintf(stderr," PseudoClass ");
  1955. !         if (total_colors == 0)
  1956. !           (void) fprintf(stderr,"%uc",image->colors);
  1957. !         else
  1958.             {
  1959. !             (void) fprintf(stderr,"%lu=>%uc",total_colors,image->colors);
  1960.               (void) fprintf(stderr," %u/%.6f/%.6fe",mean_error_per_pixel,
  1961.                 normalized_mean_error,normalized_maximum_error);
  1962.             }
  1963. diff -r -c ImageMagick/utilities/mogrify.c ImageMagick2.2.3/utilities/mogrify.c
  1964. *** ImageMagick/utilities/mogrify.c    Tue Dec 22 16:05:24 1992
  1965. --- ImageMagick2.2.3/utilities/mogrify.c    Wed Dec 23 18:10:10 1992
  1966. ***************
  1967. *** 629,634 ****
  1968. --- 629,638 ----
  1969.         }
  1970.       else
  1971.         {
  1972. +         double
  1973. +           normalized_maximum_error,
  1974. +           normalized_mean_error;
  1975. + 
  1976.           Image
  1977.             *image,
  1978.             info_image,
  1979. ***************
  1980. *** 637,642 ****
  1981. --- 641,649 ----
  1982.           time_t
  1983.             start_time;
  1984.   
  1985. +         unsigned int
  1986. +           mean_error_per_pixel;
  1987. + 
  1988.           unsigned long
  1989.             total_colors;
  1990.   
  1991. ***************
  1992. *** 656,661 ****
  1993. --- 663,669 ----
  1994.             info_image=(*image);
  1995.             if (scene > 0)
  1996.               image->scene=scene;
  1997. +           total_colors=0;
  1998.             /*
  1999.               Transform image as defined by the clip, image and scale geometries.
  2000.             */
  2001. ***************
  2002. *** 796,810 ****
  2003.               InverseImage(image);
  2004.             if (normalize)
  2005.               NormalizeImage(image);
  2006. -           if (verbose)
  2007. -             {
  2008. -               /*
  2009. -                 Initialize image error attributes.
  2010. -               */
  2011. -               if (image->class == DirectClass)
  2012. -                 image->colors=NumberColors(image,(FILE *) NULL);
  2013. -               total_colors=image->colors;
  2014. -             }
  2015.             if (colorspace == GRAYColorspace)
  2016.               QuantizeImage(image,256,8,dither,GRAYColorspace,True);
  2017.             if (monochrome)
  2018. --- 804,809 ----
  2019. ***************
  2020. *** 812,819 ****
  2021.             if (number_colors > 0)
  2022.               if ((image->class == DirectClass) ||
  2023.                   (image->colors > number_colors))
  2024. !               QuantizeImage(image,number_colors,tree_depth,dither,colorspace,
  2025. !                 True);
  2026.             if (verbose)
  2027.               {
  2028.                 /*
  2029. --- 811,833 ----
  2030.             if (number_colors > 0)
  2031.               if ((image->class == DirectClass) ||
  2032.                   (image->colors > number_colors))
  2033. !               {
  2034. !                 /*
  2035. !                   Reduce the number of colors in the image.
  2036. !                 */
  2037. !                 QuantizeImage(image,number_colors,tree_depth,dither,colorspace,
  2038. !                   True);
  2039. !                 if (verbose)
  2040. !                   {
  2041. !                     /*
  2042. !                       Measure quantization error.
  2043. !                     */
  2044. !                     QuantizationError(image,&mean_error_per_pixel,
  2045. !                       &normalized_mean_error,&normalized_maximum_error);
  2046. !                     total_colors=NumberColors(image,(FILE *) NULL);
  2047. !                   }
  2048. !                 SyncImage(image);
  2049. !               }
  2050.             if (verbose)
  2051.               {
  2052.                 /*
  2053. ***************
  2054. *** 831,853 ****
  2055.                   (void) fprintf(stderr," DirectClass ");
  2056.                 else
  2057.                   (void) fprintf(stderr," PseudoClass ");
  2058. !               if (total_colors != image->colors)
  2059. !                 (void) fprintf(stderr,"%lu=>",total_colors);
  2060. !               (void) fprintf(stderr,"%uc",image->colors);
  2061. !               if ((number_colors > 0) || monochrome)
  2062.                   {
  2063. !                   double
  2064. !                     normalized_maximum_error,
  2065. !                     normalized_mean_error;
  2066. ! 
  2067. !                   unsigned int
  2068. !                     mean_error_per_pixel;
  2069. ! 
  2070. !                   /*
  2071. !                     Measure quantization error.
  2072. !                   */
  2073. !                   QuantizationError(image,&mean_error_per_pixel,
  2074. !                     &normalized_mean_error,&normalized_maximum_error);
  2075.                     (void) fprintf(stderr," %u/%.6f/%.6fe",mean_error_per_pixel,
  2076.                       normalized_mean_error,normalized_maximum_error);
  2077.                   }
  2078. --- 845,855 ----
  2079.                   (void) fprintf(stderr," DirectClass ");
  2080.                 else
  2081.                   (void) fprintf(stderr," PseudoClass ");
  2082. !               if (total_colors == 0)
  2083. !                 (void) fprintf(stderr,"%uc",image->colors);
  2084. !               else
  2085.                   {
  2086. !                   (void) fprintf(stderr,"%lu=>%uc",total_colors,image->colors);
  2087.                     (void) fprintf(stderr," %u/%.6f/%.6fe",mean_error_per_pixel,
  2088.                       normalized_mean_error,normalized_maximum_error);
  2089.                   }
  2090. diff -r -c ImageMagick/xtp/xtp.c ImageMagick2.2.3/xtp/xtp.c
  2091. *** ImageMagick/xtp/xtp.c    Tue Dec 22 16:05:32 1992
  2092. --- ImageMagick2.2.3/xtp/xtp.c    Wed Dec 23 21:12:13 1992
  2093. ***************
  2094. *** 313,319 ****
  2095.     (void) tcgetattr(STDIN_FILENO,&attributes);
  2096.     attributes.c_lflag&=(~ECHO);
  2097.     (void) tcsetattr(STDIN_FILENO,TCSANOW,&attributes);
  2098. !   gets(password);
  2099.     attributes.c_lflag|=ECHO;
  2100.     (void) tcsetattr(STDIN_FILENO,TCSANOW,&attributes);
  2101.     (void) fprintf(stdout,"\n");
  2102. --- 313,319 ----
  2103.     (void) tcgetattr(STDIN_FILENO,&attributes);
  2104.     attributes.c_lflag&=(~ECHO);
  2105.     (void) tcsetattr(STDIN_FILENO,TCSANOW,&attributes);
  2106. !   (void) gets(password);
  2107.     attributes.c_lflag|=ECHO;
  2108.     (void) tcsetattr(STDIN_FILENO,TCSANOW,&attributes);
  2109.     (void) fprintf(stdout,"\n");
  2110. -- 
  2111. cristy@dupont.com
  2112.  
  2113. exit 0 # Just in case...
  2114.