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