home *** CD-ROM | disk | FTP | other *** search
/ Usenet 1994 October / usenetsourcesnewsgroupsinfomagicoctober1994disk2.iso / misc / volume34 / imagemagick / patch04 < prev    next >
Text File  |  1993-01-06  |  18KB  |  566 lines
  1. Newsgroups: comp.sources.misc
  2. From: cristy@eplrx7.es.duPont.com (Cristy)
  3. Subject: v34i098: imagemagick - X11 image processing and display v2.2, Patch04
  4. Message-ID: <1993Jan7.042714.15882@sparky.imd.sterling.com>
  5. X-Md4-Signature: 25418f9de6626460535ee87d2132c059
  6. Date: Thu, 7 Jan 1993 04:27:14 GMT
  7. Approved: kent@sparky.imd.sterling.com
  8.  
  9. Submitted-by: cristy@dupont.com (Cristy)
  10. Posting-number: Volume 34, Issue 98
  11. Archive-name: imagemagick/patch04
  12. Environment: UNIX, VMS, X11, SGI, DEC, Cray, Sun, Vax
  13. Patch-To: imagemagick: Volume 34, Issue 28-54
  14.  
  15.                     ImageMagick 2.2 Patch #4
  16.  
  17. To apply this patch:
  18.  
  19. cd to the top of the source tree (to the directory containing the
  20. "ImageMagick" subdirectories) and do:
  21.  
  22.   patch -p < ThisFile
  23.  
  24. Prereq - ImageMagick 2.2.2 (posted from comp.sources.misc, Volume 34,
  25. Issue 28 + Patch 1 - 3).
  26.  
  27. Alternatively get the entire distribution as contrib/ImageMagick.tar.Z
  28. on export.lcs.mit.edu.
  29. -------------------
  30. diff -r -c ImageMagick/ChangeLog ImageMagick2.2.4/ChangeLog
  31. *** ImageMagick/ChangeLog    Wed Dec 23 18:10:05 1992
  32. --- ImageMagick2.2.4/ChangeLog    Wed Jan  6 17:57:53 1993
  33. ***************
  34. *** 1,3 ****
  35. --- 1,13 ----
  36. + ImageMagick 2.2.4
  37. + 
  38. +   o time between images did not always match the value specified on
  39. +     -delay.
  40. + 
  41. +   o Sped up and reduced memory requirement of dithering.
  42. + 
  43. +   o GIF files were corrupted on SVR4.
  44. + 
  45. + 
  46.   ImageMagick 2.2.3
  47.   
  48.     o Non-color reduced images were being written even though the color
  49. diff -r -c ImageMagick/X.c ImageMagick2.2.4/X.c
  50. *** ImageMagick/X.c    Wed Dec 23 18:10:01 1992
  51. --- ImageMagick2.2.4/X.c    Wed Jan  6 17:56:06 1993
  52. ***************
  53. *** 656,663 ****
  54.       *image;
  55.   
  56.     int
  57. -     display_width,
  58.       display_height,
  59.       number_colors,
  60.       status,
  61.       x,
  62. --- 656,663 ----
  63.       *image;
  64.   
  65.     int
  66.       display_height,
  67. +     display_width,
  68.       number_colors,
  69.       status,
  70.       x,
  71. ***************
  72. *** 4634,4639 ****
  73. --- 4634,4640 ----
  74.   #define MinWindowSize  64
  75.   
  76.     int
  77. +     mask,
  78.       status;
  79.   
  80.     XSizeHints
  81. ***************
  82. *** 4714,4722 ****
  83.       window_info->id=XCreateWindow(display,parent,window_info->x,window_info->y,
  84.         window_info->width,window_info->height,window_info->border_width,
  85.         window_info->depth,InputOutput,window_info->visual_info->visual,
  86. !       CWBackingStore | CWBackPixel | CWBackPixmap | CWBitGravity |
  87. !       CWBorderPixel | CWColormap | CWCursor | CWDontPropagate | CWEventMask |
  88. !       CWOverrideRedirect | CWSaveUnder | CWWinGravity,&window_info->attributes);
  89.     else
  90.       {
  91.         unsigned int
  92. --- 4715,4721 ----
  93.       window_info->id=XCreateWindow(display,parent,window_info->x,window_info->y,
  94.         window_info->width,window_info->height,window_info->border_width,
  95.         window_info->depth,InputOutput,window_info->visual_info->visual,
  96. !       window_info->mask,&window_info->attributes);
  97.     else
  98.       {
  99.         unsigned int
  100. ***************
  101. *** 4731,4740 ****
  102.         /*
  103.           Window already exists;  change relevant attributes.
  104.         */
  105. !       XChangeWindowAttributes(display,window_info->id,CWBackingStore |
  106. !         CWBackPixel | CWBackPixmap | CWBitGravity | CWBorderPixel |
  107. !         CWColormap | CWCursor | CWDontPropagate | CWEventMask |
  108. !         CWOverrideRedirect | CWSaveUnder | CWWinGravity,
  109.           &window_info->attributes);
  110.         XSync(display,False);
  111.         while (XCheckTypedWindowEvent(display,window_info->id,ConfigureNotify,
  112. --- 4730,4736 ----
  113.         /*
  114.           Window already exists;  change relevant attributes.
  115.         */
  116. !       XChangeWindowAttributes(display,window_info->id,window_info->mask,
  117.           &window_info->attributes);
  118.         XSync(display,False);
  119.         while (XCheckTypedWindowEvent(display,window_info->id,ConfigureNotify,
  120. diff -r -c ImageMagick/X.h ImageMagick2.2.4/X.h
  121. *** ImageMagick/X.h    Wed Dec 23 18:10:04 1992
  122. --- ImageMagick2.2.4/X.h    Wed Jan  6 17:56:09 1993
  123. ***************
  124. *** 222,227 ****
  125. --- 222,230 ----
  126.       pixmap,
  127.       *pixmaps;
  128.   
  129. +   int
  130. +     mask;
  131. + 
  132.     XSetWindowAttributes
  133.       attributes;
  134.   } XWindowInfo;
  135. diff -r -c ImageMagick/animate.c ImageMagick2.2.4/animate.c
  136. *** ImageMagick/animate.c    Wed Dec 23 18:10:02 1992
  137. --- ImageMagick2.2.4/animate.c    Wed Jan  6 17:56:07 1993
  138. ***************
  139. *** 810,815 ****
  140. --- 810,818 ----
  141.     window->superclass.immutable=True;
  142.     window->superclass.ximage=(XImage *) NULL;
  143.     window->superclass.pixmap=(Pixmap) NULL;
  144. +   window->superclass.mask=CWBackingStore | CWBackPixel | CWBackPixmap |
  145. +     CWBitGravity | CWBorderPixel | CWColormap | CWCursor | CWDontPropagate |
  146. +     CWEventMask | CWOverrideRedirect | CWSaveUnder | CWWinGravity;
  147.     window->superclass.attributes.background_pixel=
  148.       pixel_info.background_color.pixel;
  149.     window->superclass.attributes.background_pixmap=(Pixmap) NULL;
  150. diff -r -c ImageMagick/compress.c ImageMagick2.2.4/compress.c
  151. *** ImageMagick/compress.c    Wed Dec 23 18:10:02 1992
  152. --- ImageMagick2.2.4/compress.c    Wed Jan  6 17:56:07 1993
  153. ***************
  154. *** 967,976 ****
  155.   unsigned int
  156.     data_size;
  157.   {
  158. ! #define MaxCode(number_bits)  (((short int) (1 << (number_bits)))-1)
  159.   #define MaxHashTable  5003
  160.   #define MaxLZWBits  12
  161. ! #define MaxLZWTable  ((short int) 1 << MaxLZWBits)
  162.   #define LZWOutputCode(code) \
  163.   { \
  164.     /*  \
  165. --- 967,976 ----
  166.   unsigned int
  167.     data_size;
  168.   {
  169. ! #define MaxCode(number_bits)  ((1 << (number_bits))-1)
  170.   #define MaxHashTable  5003
  171.   #define MaxLZWBits  12
  172. ! #define MaxLZWTable  (1 << MaxLZWBits)
  173.   #define LZWOutputCode(code) \
  174.   { \
  175.     /*  \
  176. ***************
  177. *** 979,985 ****
  178.     if (bits > 0) \
  179.       datum|=((long int) code << bits); \
  180.     else \
  181. !     datum=code; \
  182.     bits+=number_bits; \
  183.     while (bits >= 8)  \
  184.     { \
  185. --- 979,985 ----
  186.     if (bits > 0) \
  187.       datum|=((long int) code << bits); \
  188.     else \
  189. !     datum=(long int) code; \
  190.     bits+=number_bits; \
  191.     while (bits >= 8)  \
  192.     { \
  193. ***************
  194. *** 1031,1036 ****
  195. --- 1031,1037 ----
  196.       free_code,
  197.       *hash_code,
  198.       *hash_prefix,
  199. +     index,
  200.       max_code,
  201.       waiting_code;
  202.   
  203. ***************
  204. *** 1067,1073 ****
  205.       Encode pixels.
  206.     */
  207.     p=image->pixels;
  208. !   waiting_code=(short int) (p->index & 0xff);
  209.     for (i=0; i < image->packets; i++)
  210.     {
  211.       for (j=0; j <= ((int) p->length); j++)
  212. --- 1068,1074 ----
  213.       Encode pixels.
  214.     */
  215.     p=image->pixels;
  216. !   waiting_code=p->index;
  217.     for (i=0; i < image->packets; i++)
  218.     {
  219.       for (j=0; j <= ((int) p->length); j++)
  220. ***************
  221. *** 1075,1087 ****
  222.         /*
  223.           Probe hash table.
  224.         */
  225. !       k=((int) (p->index) << (MaxLZWBits-8))+waiting_code;
  226.         if (k >= MaxHashTable)
  227.           k-=MaxHashTable;
  228. !       if (hash_code[k] >= 0)
  229.           {
  230. !           if ((hash_prefix[k] == waiting_code) &&
  231. !               (hash_suffix[k] == (unsigned char) (p->index & 0xff)))
  232.               {
  233.                 waiting_code=hash_code[k];
  234.                 continue;
  235. --- 1076,1088 ----
  236.         /*
  237.           Probe hash table.
  238.         */
  239. !       index=p->index & 0xff;
  240. !       k=(int) ((int) index << (MaxLZWBits-8))+waiting_code;
  241.         if (k >= MaxHashTable)
  242.           k-=MaxHashTable;
  243. !       if (hash_code[k] > 0)
  244.           {
  245. !           if ((hash_prefix[k] == waiting_code) && (hash_suffix[k] == index))
  246.               {
  247.                 waiting_code=hash_code[k];
  248.                 continue;
  249. ***************
  250. *** 1098,1105 ****
  251.                 k+=MaxHashTable;
  252.               if (hash_code[k] == 0)
  253.                 break;
  254. !             if ((hash_prefix[k] == waiting_code) &&
  255. !                 (hash_suffix[k] == (unsigned char) (p->index & 0xff)))
  256.                 {
  257.                   waiting_code=hash_code[k];
  258.                   next_pixel=True;
  259. --- 1099,1105 ----
  260.                 k+=MaxHashTable;
  261.               if (hash_code[k] == 0)
  262.                 break;
  263. !             if ((hash_prefix[k] == waiting_code) && (hash_suffix[k] == index))
  264.                 {
  265.                   waiting_code=hash_code[k];
  266.                   next_pixel=True;
  267. ***************
  268. *** 1114,1120 ****
  269.           {
  270.             hash_code[k]=free_code++;
  271.             hash_prefix[k]=waiting_code;
  272. !           hash_suffix[k]=(unsigned char) (p->index & 0xff);
  273.           }
  274.         else
  275.           {
  276. --- 1114,1120 ----
  277.           {
  278.             hash_code[k]=free_code++;
  279.             hash_prefix[k]=waiting_code;
  280. !           hash_suffix[k]=index;
  281.           }
  282.         else
  283.           {
  284. ***************
  285. *** 1131,1137 ****
  286.             number_bits=data_size;
  287.             max_code=MaxCode(number_bits);
  288.           }
  289. !       waiting_code=(short int) (p->index & 0xff);
  290.       }
  291.       p++;
  292.     }
  293. --- 1131,1137 ----
  294.             number_bits=data_size;
  295.             max_code=MaxCode(number_bits);
  296.           }
  297. !       waiting_code=index;
  298.       }
  299.       p++;
  300.     }
  301. diff -r -c ImageMagick/display.c ImageMagick2.2.4/display.c
  302. *** ImageMagick/display.c    Wed Dec 23 18:10:03 1992
  303. --- ImageMagick2.2.4/display.c    Wed Jan  6 17:56:08 1993
  304. ***************
  305. *** 2649,2654 ****
  306. --- 2649,2657 ----
  307.     window->superclass.immutable=True;
  308.     window->superclass.ximage=(XImage *) NULL;
  309.     window->superclass.pixmap=(Pixmap) NULL;
  310. +   window->superclass.mask=CWBackingStore | CWBackPixel | CWBackPixmap |
  311. +     CWBitGravity | CWBorderPixel | CWColormap | CWCursor | CWDontPropagate |
  312. +     CWEventMask | CWOverrideRedirect | CWSaveUnder | CWWinGravity;
  313.     window->superclass.attributes.background_pixel=
  314.       pixel_info.background_color.pixel;
  315.     window->superclass.attributes.background_pixmap=(Pixmap) NULL;
  316. ***************
  317. *** 2928,2937 ****
  318.     *state&=(~LastImageState);
  319.     *state&=(~NextImageState);
  320.     *state&=(~TileImageState);
  321. !   if (resource_info->delay == 0)
  322. !     timeout=(unsigned long) (~0);
  323. !   else
  324. !     timeout=(unsigned long) time((time_t *) 0)+resource_info->delay;
  325.     do
  326.     {
  327.       /*
  328. --- 2931,2937 ----
  329.     *state&=(~LastImageState);
  330.     *state&=(~NextImageState);
  331.     *state&=(~TileImageState);
  332. !   timeout=(unsigned long) (~0);
  333.     do
  334.     {
  335.       /*
  336. ***************
  337. *** 3181,3189 ****
  338.                 /*
  339.                   Reset timeout after expose.
  340.                 */
  341. !               if (resource_info->delay == 0)
  342. !                 timeout=(unsigned long) (~0);
  343. !               else
  344.                   timeout=(unsigned long) time((time_t *) 0)+resource_info->delay;
  345.                 break;
  346.               }
  347. --- 3181,3187 ----
  348.                 /*
  349.                   Reset timeout after expose.
  350.                 */
  351. !               if (resource_info->delay != 0)
  352.                   timeout=(unsigned long) time((time_t *) 0)+resource_info->delay;
  353.                 break;
  354.               }
  355. diff -r -c ImageMagick/image.c ImageMagick2.2.4/image.c
  356. *** ImageMagick/image.c    Wed Dec 23 18:10:03 1992
  357. --- ImageMagick2.2.4/image.c    Wed Jan  6 17:56:08 1993
  358. ***************
  359. *** 5189,5195 ****
  360.   {
  361.     register int
  362.       i,
  363. !     j;
  364.   
  365.     register RunlengthPacket
  366.       *p,
  367. --- 5189,5196 ----
  368.   {
  369.     register int
  370.       i,
  371. !     j,
  372. !     length;
  373.   
  374.     register RunlengthPacket
  375.       *p,
  376. ***************
  377. *** 5203,5217 ****
  378.     /*
  379.       Uncompress runlength-encoded packets.
  380.     */
  381. !   uncompressed_pixels=(RunlengthPacket *)
  382. !     malloc(image->columns*image->rows*sizeof(RunlengthPacket));
  383.     if (uncompressed_pixels == (RunlengthPacket *) NULL)
  384.       return(False);
  385. !   p=image->pixels;
  386. !   q=uncompressed_pixels;
  387.     for (i=0; i < image->packets; i++)
  388.     {
  389. !     for (j=0; j <= ((int) p->length); j++)
  390.       {
  391.         q->red=p->red;
  392.         q->green=p->green;
  393. --- 5204,5220 ----
  394.     /*
  395.       Uncompress runlength-encoded packets.
  396.     */
  397. !   uncompressed_pixels=(RunlengthPacket *) realloc((char *) image->pixels,
  398. !     image->columns*image->rows*sizeof(RunlengthPacket));
  399.     if (uncompressed_pixels == (RunlengthPacket *) NULL)
  400.       return(False);
  401. !   image->pixels=uncompressed_pixels;
  402. !   p=image->pixels+image->packets-1;
  403. !   q=uncompressed_pixels+image->columns*image->rows-1;
  404.     for (i=0; i < image->packets; i++)
  405.     {
  406. !     length=p->length;
  407. !     for (j=0; j <= length; j++)
  408.       {
  409.         q->red=p->red;
  410.         q->green=p->green;
  411. ***************
  412. *** 5218,5229 ****
  413.         q->blue=p->blue;
  414.         q->index=p->index;
  415.         q->length=0;
  416. !       q++;
  417.       }
  418. !     p++;
  419.     }
  420. -   (void) free((char *) image->pixels);
  421. -   image->pixels=uncompressed_pixels;
  422.     image->packets=image->columns*image->rows;
  423.     return(True);
  424.   }
  425. --- 5221,5230 ----
  426.         q->blue=p->blue;
  427.         q->index=p->index;
  428.         q->length=0;
  429. !       q--;
  430.       }
  431. !     p--;
  432.     }
  433.     image->packets=image->columns*image->rows;
  434.     return(True);
  435.   }
  436. Common subdirectories: ImageMagick/images and ImageMagick2.2.4/images
  437. diff -r -c ImageMagick/montage.c ImageMagick2.2.4/montage.c
  438. *** ImageMagick/montage.c    Wed Dec 23 18:10:04 1992
  439. --- ImageMagick2.2.4/montage.c    Wed Jan  6 17:56:08 1993
  440. ***************
  441. *** 1297,1303 ****
  442.               malloc(((strlen(image->filename)+2048)*sizeof(char)));
  443.             if (image->label == (char *) NULL)
  444.               Error("unable to montage images","memory allocation failed");
  445. !           (void) sprintf(image->label,"%s %ux%u\0",image->filename,
  446.               image->columns,image->rows);
  447.             /*
  448.               Tile size maintains the aspect ratio of the image.
  449. --- 1297,1303 ----
  450.               malloc(((strlen(image->filename)+2048)*sizeof(char)));
  451.             if (image->label == (char *) NULL)
  452.               Error("unable to montage images","memory allocation failed");
  453. !           (void) sprintf(image->label,"%s  %ux%u\0",image->filename,
  454.               image->columns,image->rows);
  455.             /*
  456.               Tile size maintains the aspect ratio of the image.
  457. diff -r -c ImageMagick/quantize.c ImageMagick2.2.4/quantize.c
  458. *** ImageMagick/quantize.c    Wed Dec 23 18:10:04 1992
  459. --- ImageMagick2.2.4/quantize.c    Wed Jan  6 17:56:08 1993
  460. ***************
  461. *** 1545,1558 ****
  462.     if (number_colors > MaxColormapSize)
  463.       number_colors=MaxColormapSize;
  464.     InitializeCube(number_colors,tree_depth,image->columns*image->rows,optimal);
  465. !   if ((image->compression == RunlengthEncodedCompression) &&
  466. !       (image->packets == (image->columns*image->rows)))
  467. !     CompressImage(image);
  468.     if (colorspace != RGBColorspace)
  469.       RGBTransformImage(image,colorspace);
  470.     Classification(image);
  471. -   if (!optimal)
  472. -     dither|=(cube.colors > (1 << (cube.depth-1)));
  473.     Reduction(number_colors);
  474.     Assignment(image,dither,optimal);
  475.     if (colorspace != RGBColorspace)
  476. --- 1545,1558 ----
  477.     if (number_colors > MaxColormapSize)
  478.       number_colors=MaxColormapSize;
  479.     InitializeCube(number_colors,tree_depth,image->columns*image->rows,optimal);
  480. !   if (!optimal)
  481. !     dither|=cube.depth > 3;
  482. !   if (!dither)
  483. !     if (image->packets == (image->columns*image->rows))
  484. !       CompressImage(image);
  485.     if (colorspace != RGBColorspace)
  486.       RGBTransformImage(image,colorspace);
  487.     Classification(image);
  488.     Reduction(number_colors);
  489.     Assignment(image,dither,optimal);
  490.     if (colorspace != RGBColorspace)
  491. ***************
  492. *** 1662,1676 ****
  493.       Reduce the number of colors in the continuous tone image sequence.
  494.     */
  495.     InitializeCube(number_colors,tree_depth,~0,optimal);
  496.     if (colormap_image != (Image *) NULL)
  497.       {
  498.         /*
  499.           Reduce images to a set of colors represented by the colormap image.
  500.         */
  501. !       if ((colormap_image->compression == RunlengthEncodedCompression) &&
  502. !           (colormap_image->packets ==
  503. !            (colormap_image->columns*colormap_image->rows)))
  504. !         CompressImage(colormap_image);
  505.         if (colorspace != RGBColorspace)
  506.           RGBTransformImage(colormap_image,colorspace);
  507.         Classification(colormap_image);
  508. --- 1662,1678 ----
  509.       Reduce the number of colors in the continuous tone image sequence.
  510.     */
  511.     InitializeCube(number_colors,tree_depth,~0,optimal);
  512. +   if (!optimal)
  513. +     dither|=cube.depth > 3;
  514.     if (colormap_image != (Image *) NULL)
  515.       {
  516.         /*
  517.           Reduce images to a set of colors represented by the colormap image.
  518.         */
  519. !       if (!dither)
  520. !         if (colormap_image->packets ==
  521. !              (colormap_image->columns*colormap_image->rows))
  522. !           CompressImage(colormap_image);
  523.         if (colorspace != RGBColorspace)
  524.           RGBTransformImage(colormap_image,colorspace);
  525.         Classification(colormap_image);
  526. ***************
  527. *** 1680,1695 ****
  528.       }
  529.     for (i=0; i < number_images; i++)
  530.     {
  531. !     if ((images[i]->compression == RunlengthEncodedCompression) &&
  532. !         (images[i]->packets == (images[i]->columns*images[i]->rows)))
  533. !       CompressImage(images[i]);
  534.       if (colorspace != RGBColorspace)
  535.         RGBTransformImage(images[i],colorspace);
  536.       if (colormap_image == (Image *) NULL)
  537.         Classification(images[i]);
  538.     }
  539. -   if (!optimal)
  540. -     dither|=(cube.colors > (1 << (cube.depth-1)));
  541.     Reduction(number_colors);
  542.     for (i=0; i < number_images; i++)
  543.     {
  544. --- 1682,1695 ----
  545.       }
  546.     for (i=0; i < number_images; i++)
  547.     {
  548. !     if (!dither)
  549. !       if (images[i]->packets == (images[i]->columns*images[i]->rows))
  550. !         CompressImage(images[i]);
  551.       if (colorspace != RGBColorspace)
  552.         RGBTransformImage(images[i],colorspace);
  553.       if (colormap_image == (Image *) NULL)
  554.         Classification(images[i]);
  555.     }
  556.     Reduction(number_colors);
  557.     for (i=0; i < number_images; i++)
  558.     {
  559. Common subdirectories: ImageMagick/scenes and ImageMagick2.2.4/scenes
  560. Common subdirectories: ImageMagick/utilities and ImageMagick2.2.4/utilities
  561. Common subdirectories: ImageMagick/xtp and ImageMagick2.2.4/xtp
  562. -- 
  563. cristy@dupont.com
  564.  
  565. exit 0 # Just in case...
  566.