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