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