home *** CD-ROM | disk | FTP | other *** search
/ NetNews Usenet Archive 1992 #27 / NN_1992_27.iso / spool / alt / sources / patches / 46 < prev    next >
Encoding:
Internet Message Format  |  1992-11-20  |  42.9 KB
  1. Path: sparky!uunet!dtix!darwin.sura.net!udel!louie!eplrx7!eplrx7.es.dupont.com!cristy
  2. From: cristy@eplrx7.es.duPont.com (Cristy)
  3. Newsgroups: alt.sources.patches
  4. Subject: ImageMagick 2.1 - patch 05
  5. Summary: X11 image processing and display utilities
  6. Keywords: X11 image display image-processing JPEG TIFF GIF
  7. Message-ID: <cristy.722276394@eplrx7.es.dupont.com>
  8. Date: 20 Nov 92 16:19:54 GMT
  9. Organization: DuPont Engineering Physics Laboratory
  10. Lines: 1278
  11.  
  12. To apply this patch:
  13.  
  14. cd to the top of the source tree (to the directory containing the
  15. "ImageMagick" directory) and do:
  16.  
  17.       patch -p -s < ThisFile
  18.  
  19. Patch will work silently unless an error occurs.  If you want to watch
  20. patch do its thing, leave out the "-s" argument to patch.
  21.  
  22. Finally, to rebuild after applying this patch, cd to the "ImageMagick"
  23. directory and type:
  24.  
  25.       make
  26.  
  27. The entire distribution is available as contrib/ImageMagick.tar.Z on
  28. export.lcs.mit.edu.
  29.  
  30. Brief notes on what this patch fixes:
  31.  
  32. o Fixed ANSI warning on image composite code.
  33. o Panning uses a pixmap for faster panning speed.
  34. o Rotate.c now uses a table to force range limits.
  35. o Fixed strcasecmp to work under VMS.
  36. o range table in quantize.c is allocated from the heap instead of
  37.   the stack.
  38. o adjusted the sensitivity for automatic dithering.  Some JPEG images
  39.   were not being dithered.
  40.  
  41.  
  42. diff -c -r ImageMagick/Imakefile ImageMagick2.1.5/Imakefile
  43. *** ImageMagick/Imakefile    Sun May 31 13:04:19 1992
  44. --- ImageMagick2.1.5/Imakefile    Thu Nov 19 16:02:23 1992
  45. ***************
  46. *** 35,40 ****
  47. --- 35,41 ----
  48.   #TIFF_LIBRARIES= -Ltiff/libtiff -L../tiff/libtiff -ltiff
  49.   
  50.   DEFINES= $(JPEG) $(JPEG_INCLUDES) $(TIFF) $(TIFF_INCLUDES)
  51. + LOCALDIR = /usr/local/bin
  52.   SYS_LIBRARIES= $(XLIB) $(JPEG_LIBRARIES) $(TIFF_LIBRARIES) -lm
  53.   
  54.   MagickObjects= X.o image.o rotate.o quantize.o colors.o signature.o compress.o\
  55. ***************
  56. *** 74,80 ****
  57.   InstallMyManPage(miff,$(MANSOURCEPATH)5,5)
  58.   
  59.   #define IHaveSubdirs
  60. ! #define PassCDebugFlags 'DEFINES=$(DEFINES)' 'SYS_LIBRARIES=$(SYS_LIBRARIES)'
  61.   
  62.   SUBDIRS= utilities xtp
  63.   
  64. --- 75,82 ----
  65.   InstallMyManPage(miff,$(MANSOURCEPATH)5,5)
  66.   
  67.   #define IHaveSubdirs
  68. ! #define PassCDebugFlags 'DEFINES=$(DEFINES)' 'SYS_LIBRARIES=$(SYS_LIBRARIES)' \
  69. !   'LOCALDIR=$(LOCALDIR)'
  70.   
  71.   SUBDIRS= utilities xtp
  72.   
  73. diff -c -r ImageMagick/X.c ImageMagick2.1.5/X.c
  74. *** ImageMagick/X.c    Tue Nov 17 10:20:04 1992
  75. --- ImageMagick2.1.5/X.c    Tue Nov 17 16:22:17 1992
  76. ***************
  77. *** 2392,2408 ****
  78.       (char *) NULL,"0");
  79.     resource_info->number_colors=atoi(resource_value);
  80.     resource_value=XGetResource(resource_database,application_name,"colorspace",
  81. !     (char *) NULL,"RGB");
  82. !   if (strncasecmp("GRAY",resource_value,3) == 0)
  83.       resource_info->colorspace=GRAYColorspace;
  84.     else
  85. !     if (strncasecmp("YIQ",resource_value,3) == 0)
  86.         resource_info->colorspace=YIQColorspace;
  87.       else
  88. !       if (strncasecmp("YUV",resource_value,3) == 0)
  89.           resource_info->colorspace=YUVColorspace;
  90.         else
  91. !         if (strncasecmp("XYZ",resource_value,3) == 0)
  92.             resource_info->colorspace=XYZColorspace;
  93.           else
  94.             resource_info->colorspace=RGBColorspace;
  95. --- 2392,2408 ----
  96.       (char *) NULL,"0");
  97.     resource_info->number_colors=atoi(resource_value);
  98.     resource_value=XGetResource(resource_database,application_name,"colorspace",
  99. !     (char *) NULL,"rgb");
  100. !   if (strncasecmp("gray",resource_value,3) == 0)
  101.       resource_info->colorspace=GRAYColorspace;
  102.     else
  103. !     if (strncasecmp("yiq",resource_value,3) == 0)
  104.         resource_info->colorspace=YIQColorspace;
  105.       else
  106. !       if (strncasecmp("yuv",resource_value,3) == 0)
  107.           resource_info->colorspace=YUVColorspace;
  108.         else
  109. !         if (strncasecmp("xyz",resource_value,3) == 0)
  110.             resource_info->colorspace=XYZColorspace;
  111.           else
  112.             resource_info->colorspace=RGBColorspace;
  113. diff -c -r ImageMagick/alien.c ImageMagick2.1.5/alien.c
  114. *** ImageMagick/alien.c    Sat Nov 14 01:20:28 1992
  115. --- ImageMagick2.1.5/alien.c    Thu Nov 19 14:47:48 1992
  116. ***************
  117. *** 1891,1898 ****
  118.           x_resolution=XResolution;
  119.           y_resolution=YResolution;
  120.           if (alien_info->density != (char *) NULL)
  121. !           (void) XParseGeometry(alien_info->density,&x,&y,&x_resolution,
  122. !             &y_resolution);
  123.           (void) sprintf(clip_geometry,"%ux%u+%u-%u\0",
  124.             ((upper_x-lower_x)*x_resolution+(XResolution >> 1))/XResolution,
  125.             ((upper_y-lower_y)*y_resolution+(YResolution >> 1))/YResolution,
  126. --- 1891,1910 ----
  127.           x_resolution=XResolution;
  128.           y_resolution=YResolution;
  129.           if (alien_info->density != (char *) NULL)
  130. !           {
  131. !             int
  132. !               flags;
  133. ! 
  134. !             /*
  135. !               User specified density.
  136. !             */
  137. !             flags=XParseGeometry(alien_info->density,&x,&y,&x_resolution,
  138. !               &y_resolution);
  139. !             if ((flags & WidthValue) == 0)
  140. !               x_resolution=XResolution;
  141. !             if ((flags & HeightValue) == 0)
  142. !               y_resolution=x_resolution;
  143. !           }
  144.           (void) sprintf(clip_geometry,"%ux%u+%u-%u\0",
  145.             ((upper_x-lower_x)*x_resolution+(XResolution >> 1))/XResolution,
  146.             ((upper_y-lower_y)*y_resolution+(YResolution >> 1))/YResolution,
  147. diff -c -r ImageMagick/animate.c ImageMagick2.1.5/animate.c
  148. *** ImageMagick/animate.c    Sat Nov 14 01:20:24 1992
  149. --- ImageMagick2.1.5/animate.c    Tue Nov 17 16:22:12 1992
  150. ***************
  151. *** 1683,1701 ****
  152.                     if (i == argc)
  153.                       Error("missing type on -colorspace",(char *) NULL);
  154.                     option=argv[i];
  155. !                   if (strncasecmp("GRAY",option,3) == 0)
  156.                       resource_info.colorspace=GRAYColorspace;
  157.                     else
  158. !                     if (strncasecmp("RGB",option,3) == 0)
  159.                         resource_info.colorspace=RGBColorspace;
  160.                       else
  161. !                       if (strncasecmp("YIQ",option,3) == 0)
  162.                           resource_info.colorspace=YIQColorspace;
  163.                         else
  164. !                         if (strncasecmp("YUV",option,3) == 0)
  165.                             resource_info.colorspace=YUVColorspace;
  166.                           else
  167. !                           if (strncasecmp("XYZ",option,3) == 0)
  168.                               resource_info.colorspace=XYZColorspace;
  169.                             else
  170.                               Error("invalid colorspace type on -colorspace",
  171. --- 1683,1701 ----
  172.                     if (i == argc)
  173.                       Error("missing type on -colorspace",(char *) NULL);
  174.                     option=argv[i];
  175. !                   if (strncasecmp("gray",option,3) == 0)
  176.                       resource_info.colorspace=GRAYColorspace;
  177.                     else
  178. !                     if (strncasecmp("rgb",option,3) == 0)
  179.                         resource_info.colorspace=RGBColorspace;
  180.                       else
  181. !                       if (strncasecmp("yiq",option,3) == 0)
  182.                           resource_info.colorspace=YIQColorspace;
  183.                         else
  184. !                         if (strncasecmp("yuv",option,3) == 0)
  185.                             resource_info.colorspace=YUVColorspace;
  186.                           else
  187. !                           if (strncasecmp("xyz",option,3) == 0)
  188.                               resource_info.colorspace=XYZColorspace;
  189.                             else
  190.                               Error("invalid colorspace type on -colorspace",
  191. diff -c -r ImageMagick/display.c ImageMagick2.1.5/display.c
  192. *** ImageMagick/display.c    Mon Nov 16 12:47:03 1992
  193. --- ImageMagick2.1.5/display.c    Fri Nov 20 10:42:54 1992
  194. ***************
  195. *** 3005,3010 ****
  196. --- 3005,3011 ----
  197.               XSetWindowBackgroundPixmap(display,pan_window.id,pan_window.pixmap);
  198.               XClearWindow(display,pan_window.id);
  199.               XDrawPanRectangle(display,&image_window,&pan_window);
  200. +             (void) XMakePixmap(display,&image_window);
  201.               *state|=PanIconMappedState;
  202.               break;
  203.             }
  204. ***************
  205. *** 5021,5039 ****
  206.                     if (i == argc)
  207.                       Error("missing type on -colorspace",(char *) NULL);
  208.                     option=argv[i];
  209. !                   if (strncasecmp("GRAY",option,3) == 0)
  210.                       resource_info.colorspace=GRAYColorspace;
  211.                     else
  212. !                     if (strncasecmp("RGB",option,3) == 0)
  213.                         resource_info.colorspace=RGBColorspace;
  214.                       else
  215. !                       if (strncasecmp("YIQ",option,3) == 0)
  216.                           resource_info.colorspace=YIQColorspace;
  217.                         else
  218. !                         if (strncasecmp("YUV",option,3) == 0)
  219.                             resource_info.colorspace=YUVColorspace;
  220.                           else
  221. !                           if (strncasecmp("XYZ",option,3) == 0)
  222.                               resource_info.colorspace=XYZColorspace;
  223.                             else
  224.                               Error("invalid colorspace type on -colorspace",
  225. --- 5022,5040 ----
  226.                     if (i == argc)
  227.                       Error("missing type on -colorspace",(char *) NULL);
  228.                     option=argv[i];
  229. !                   if (strncasecmp("gray",option,3) == 0)
  230.                       resource_info.colorspace=GRAYColorspace;
  231.                     else
  232. !                     if (strncasecmp("rgb",option,3) == 0)
  233.                         resource_info.colorspace=RGBColorspace;
  234.                       else
  235. !                       if (strncasecmp("yiq",option,3) == 0)
  236.                           resource_info.colorspace=YIQColorspace;
  237.                         else
  238. !                         if (strncasecmp("yuv",option,3) == 0)
  239.                             resource_info.colorspace=YUVColorspace;
  240.                           else
  241. !                           if (strncasecmp("xyz",option,3) == 0)
  242.                               resource_info.colorspace=XYZColorspace;
  243.                             else
  244.                               Error("invalid colorspace type on -colorspace",
  245. diff -c -r ImageMagick/display.h ImageMagick2.1.5/display.h
  246. *** ImageMagick/display.h    Fri Nov 13 13:27:13 1992
  247. --- ImageMagick2.1.5/display.h    Tue Nov 17 15:19:44 1992
  248. ***************
  249. *** 44,49 ****
  250. --- 44,51 ----
  251.     (void) fprintf(stderr,".\n");  \
  252.   }
  253.   #ifdef vms
  254. + #define strcasecmp  strcmp
  255. + #define strncasecmp  strncmp
  256.   #define pclose(file)  exit(1)
  257.   #define popen(command,mode)  exit(1)
  258.   #define unlink(file)  remove(file)
  259. diff -c -r ImageMagick/image.c ImageMagick2.1.5/image.c
  260. *** ImageMagick/image.c    Sat Nov 14 01:20:32 1992
  261. --- ImageMagick2.1.5/image.c    Fri Nov 20 09:59:56 1992
  262. ***************
  263. *** 833,875 ****
  264.                 }
  265.               else
  266.                 {
  267. !                 red=(p->red*MaxRGB+q->red*(MaxRGB-p->index))/MaxRGB;
  268. !                 green=(p->green*MaxRGB+q->green*(MaxRGB-p->index))/MaxRGB;
  269. !                 blue=(p->blue*MaxRGB+q->blue*(MaxRGB-p->index))/MaxRGB;
  270. !                 index=(p->index*MaxRGB+q->index*(MaxRGB-p->index))/MaxRGB;
  271.                 }
  272.             break;
  273.           }
  274.           case InCompositeOp:
  275.           {
  276. !           red=(p->red*q->index)/MaxRGB;
  277. !           green=(p->green*q->index)/MaxRGB;
  278. !           blue=(p->blue*q->index)/MaxRGB;
  279. !           index=(p->index*q->index)/MaxRGB;
  280.             break;
  281.           }
  282.           case OutCompositeOp:
  283.           {
  284. !           red=(p->red*(MaxRGB-q->index))/MaxRGB;
  285. !           green=(p->green*(MaxRGB-q->index))/MaxRGB;
  286. !           blue=(p->blue*(MaxRGB-q->index))/MaxRGB;
  287. !           index=(p->index*(MaxRGB-q->index))/MaxRGB;
  288.             break;
  289.           }
  290.           case AtopCompositeOp:
  291.           {
  292. !           red=(p->red*q->index+q->red*(MaxRGB-p->index))/MaxRGB;
  293. !           green=(p->green*q->index+q->green*(MaxRGB-p->index))/MaxRGB;
  294. !           blue=(p->blue*q->index+q->blue*(MaxRGB-p->index))/MaxRGB;
  295. !           index=(p->index*q->index+q->index*(MaxRGB-p->index))/MaxRGB;
  296.             break;
  297.           }
  298.           case XorCompositeOp:
  299.           {
  300. !           red=(p->red*(MaxRGB-q->index)+q->red*(MaxRGB-p->index))/MaxRGB;
  301. !           green=(p->green*(MaxRGB-q->index)+q->green*(MaxRGB-p->index))/MaxRGB;
  302. !           blue=(p->blue*(MaxRGB-q->index)+q->blue*(MaxRGB-p->index))/MaxRGB;
  303. !           index=(p->index*(MaxRGB-q->index)+q->index*(MaxRGB-p->index))/MaxRGB;
  304.             break;
  305.           }
  306.           case PlusCompositeOp:
  307. --- 833,878 ----
  308.                 }
  309.               else
  310.                 {
  311. !                 red=(p->red*MaxRGB+q->red*(MaxRGB-p->index))/(int) MaxRGB;
  312. !                 green=(p->green*MaxRGB+q->green*(MaxRGB-p->index))/(int) MaxRGB;
  313. !                 blue=(p->blue*MaxRGB+q->blue*(MaxRGB-p->index))/(int) MaxRGB;
  314. !                 index=(p->index*MaxRGB+q->index*(MaxRGB-p->index))/(int) MaxRGB;
  315.                 }
  316.             break;
  317.           }
  318.           case InCompositeOp:
  319.           {
  320. !           red=(p->red*q->index)/(int) MaxRGB;
  321. !           green=(p->green*q->index)/(int) MaxRGB;
  322. !           blue=(p->blue*q->index)/(int) MaxRGB;
  323. !           index=(p->index*q->index)/(int) MaxRGB;
  324.             break;
  325.           }
  326.           case OutCompositeOp:
  327.           {
  328. !           red=(p->red*(MaxRGB-q->index))/(int) MaxRGB;
  329. !           green=(p->green*(MaxRGB-q->index))/(int) MaxRGB;
  330. !           blue=(p->blue*(MaxRGB-q->index))/(int) MaxRGB;
  331. !           index=(p->index*(MaxRGB-q->index))/(int) MaxRGB;
  332.             break;
  333.           }
  334.           case AtopCompositeOp:
  335.           {
  336. !           red=(p->red*q->index+q->red*(MaxRGB-p->index))/(int) MaxRGB;
  337. !           green=(p->green*q->index+q->green*(MaxRGB-p->index))/(int) MaxRGB;
  338. !           blue=(p->blue*q->index+q->blue*(MaxRGB-p->index))/(int) MaxRGB;
  339. !           index=(p->index*q->index+q->index*(MaxRGB-p->index))/(int) MaxRGB;
  340.             break;
  341.           }
  342.           case XorCompositeOp:
  343.           {
  344. !           red=(p->red*(MaxRGB-q->index)+q->red*(MaxRGB-p->index))/(int) MaxRGB;
  345. !           green=(p->green*(MaxRGB-q->index)+q->green*(MaxRGB-p->index))/
  346. !             (int) MaxRGB;
  347. !           blue=(p->blue*(MaxRGB-q->index)+q->blue*(MaxRGB-p->index))/
  348. !             (int) MaxRGB;
  349. !           index=(p->index*(MaxRGB-q->index)+q->index*(MaxRGB-p->index))/
  350. !             (int) MaxRGB;
  351.             break;
  352.           }
  353.           case PlusCompositeOp:
  354. Common subdirectories: ImageMagick/images and ImageMagick2.1.5/images
  355. diff -c -r ImageMagick/montage.c ImageMagick2.1.5/montage.c
  356. *** ImageMagick/montage.c    Sat Nov 14 01:20:22 1992
  357. --- ImageMagick2.1.5/montage.c    Tue Nov 17 16:22:14 1992
  358. ***************
  359. *** 886,904 ****
  360.                     if (i == argc)
  361.                       Error("missing type on -colorspace",(char *) NULL);
  362.                     option=argv[i];
  363. !                   if (strncasecmp("GRAY",option,3) == 0)
  364.                       resource_info.colorspace=GRAYColorspace;
  365.                     else
  366. !                     if (strncasecmp("RGB",option,3) == 0)
  367.                         resource_info.colorspace=RGBColorspace;
  368.                       else
  369. !                       if (strncasecmp("YIQ",option,3) == 0)
  370.                           resource_info.colorspace=YIQColorspace;
  371.                         else
  372. !                         if (strncasecmp("YUV",option,3) == 0)
  373.                             resource_info.colorspace=YUVColorspace;
  374.                           else
  375. !                           if (strncasecmp("XYZ",option,3) == 0)
  376.                               resource_info.colorspace=XYZColorspace;
  377.                             else
  378.                               Error("invalid colorspace type on -colorspace",
  379. --- 886,904 ----
  380.                     if (i == argc)
  381.                       Error("missing type on -colorspace",(char *) NULL);
  382.                     option=argv[i];
  383. !                   if (strncasecmp("gray",option,3) == 0)
  384.                       resource_info.colorspace=GRAYColorspace;
  385.                     else
  386. !                     if (strncasecmp("rgb",option,3) == 0)
  387.                         resource_info.colorspace=RGBColorspace;
  388.                       else
  389. !                       if (strncasecmp("yiq",option,3) == 0)
  390.                           resource_info.colorspace=YIQColorspace;
  391.                         else
  392. !                         if (strncasecmp("yuv",option,3) == 0)
  393.                             resource_info.colorspace=YUVColorspace;
  394.                           else
  395. !                           if (strncasecmp("xyz",option,3) == 0)
  396.                               resource_info.colorspace=XYZColorspace;
  397.                             else
  398.                               Error("invalid colorspace type on -colorspace",
  399. diff -c -r ImageMagick/quantize.c ImageMagick2.1.5/quantize.c
  400. *** ImageMagick/quantize.c    Wed Nov 11 14:12:13 1992
  401. --- ImageMagick2.1.5/quantize.c    Fri Nov 20 10:00:50 1992
  402. ***************
  403. *** 790,796 ****
  404.   
  405.     unsigned char
  406.       *range_limit,
  407. !     range_table[3*(MaxRGB+1)];
  408.   
  409.     unsigned int
  410.       i,
  411. --- 790,796 ----
  412.   
  413.     unsigned char
  414.       *range_limit,
  415. !     *range_table;
  416.   
  417.     unsigned int
  418.       i,
  419. ***************
  420. *** 812,820 ****
  421.       Allocate the cache & scanline buffers to keep track of quantization error.
  422.     */
  423.     cache=(int *) malloc((1 << 18)*sizeof(int));
  424.     scanline=(ScaledColorPacket *)
  425.       malloc(2*(image->columns+2)*sizeof(ScaledColorPacket));
  426. !   if ((cache == (int *) NULL) || (scanline == (ScaledColorPacket *) NULL))
  427.       {
  428.         Warning("unable to dither image","memory allocation failed");
  429.         return(True);
  430. --- 812,822 ----
  431.       Allocate the cache & scanline buffers to keep track of quantization error.
  432.     */
  433.     cache=(int *) malloc((1 << 18)*sizeof(int));
  434. +   range_table=(unsigned char *) malloc(3*(MaxRGB+1)*sizeof(unsigned char));
  435.     scanline=(ScaledColorPacket *)
  436.       malloc(2*(image->columns+2)*sizeof(ScaledColorPacket));
  437. !   if ((cache == (int *) NULL) || (range_table == (unsigned char *) NULL) ||
  438. !       (scanline == (ScaledColorPacket *) NULL))
  439.       {
  440.         Warning("unable to dither image","memory allocation failed");
  441.         return(True);
  442. ***************
  443. *** 962,967 ****
  444. --- 964,970 ----
  445.       Free up memory.
  446.     */
  447.     (void) free((void *) scanline);
  448. +   (void) free((void *) range_table);
  449.     (void) free((void *) cache);
  450.     (void) free((void *) image->pixels);
  451.     image->packets=dithered_image->packets;
  452. ***************
  453. *** 1581,1587 ****
  454.       RGBTransformImage(image,colorspace);
  455.     Classification(image);
  456.     if (!optimal)
  457. !     dither|=cube.colors > (1 << (cube.depth+2));
  458.     Reduction(number_colors);
  459.     Assignment(image,dither,optimal);
  460.     if (colorspace != RGBColorspace)
  461. --- 1584,1590 ----
  462.       RGBTransformImage(image,colorspace);
  463.     Classification(image);
  464.     if (!optimal)
  465. !     dither|=cube.colors > (1 << (cube.depth-1));
  466.     Reduction(number_colors);
  467.     Assignment(image,dither,optimal);
  468.     if (colorspace != RGBColorspace)
  469. ***************
  470. *** 1693,1699 ****
  471.       Classification(images[i]);
  472.     }
  473.     if (!optimal)
  474. !     dither|=cube.colors > (1 << (cube.depth+2));
  475.     Reduction(number_colors);
  476.     for (i=0; i < number_images; i++)
  477.     {
  478. --- 1696,1702 ----
  479.       Classification(images[i]);
  480.     }
  481.     if (!optimal)
  482. !     dither|=cube.colors > (1 << (cube.depth-1));
  483.     Reduction(number_colors);
  484.     for (i=0; i < number_images; i++)
  485.     {
  486. diff -c -r ImageMagick/rotate.c ImageMagick2.1.5/rotate.c
  487. *** ImageMagick/rotate.c    Mon Nov  9 14:48:31 1992
  488. --- ImageMagick2.1.5/rotate.c    Fri Nov 20 10:00:49 1992
  489. ***************
  490. *** 107,113 ****
  491.   %
  492.   */
  493.   static void ColumnShear(source_image,source_columns,column,y,length,
  494. !   displacement,background)
  495.   ColorPacket
  496.     *source_image;
  497.   
  498. --- 107,113 ----
  499.   %
  500.   */
  501.   static void ColumnShear(source_image,source_columns,column,y,length,
  502. !   displacement,background,range_limit)
  503.   ColorPacket
  504.     *source_image;
  505.   
  506. ***************
  507. *** 124,146 ****
  508.   
  509.   ColorPacket
  510.     background;
  511.   {
  512.     ColorPacket
  513.       last_pixel;
  514.   
  515. -   double
  516. -     fractional_step;
  517. - 
  518.     enum {UP,DOWN}
  519.       direction;
  520.   
  521. !   long int
  522.       blue,
  523.       green,
  524. -     int_fractional_step,
  525.       red,
  526.       step;
  527.   
  528.     register ColorPacket
  529.       *p,
  530.       *q;
  531. --- 124,148 ----
  532.   
  533.   ColorPacket
  534.     background;
  535. + 
  536. + register unsigned char
  537. +   *range_limit;
  538.   {
  539.     ColorPacket
  540.       last_pixel;
  541.   
  542.     enum {UP,DOWN}
  543.       direction;
  544.   
  545. !   int
  546.       blue,
  547.       green,
  548.       red,
  549.       step;
  550.   
  551. +   long int
  552. +     fractional_step;
  553. + 
  554.     register ColorPacket
  555.       *p,
  556.       *q;
  557. ***************
  558. *** 159,166 ****
  559.           direction=UP;
  560.         }
  561.     step=(int) floor(displacement);
  562. !   fractional_step=displacement-(double) step;
  563. !   if (fractional_step == 0.0)
  564.       {
  565.         /*
  566.           No fractional displacement-- just copy the pixels.
  567. --- 161,168 ----
  568.           direction=UP;
  569.         }
  570.     step=(int) floor(displacement);
  571. !   fractional_step=UpShifted(displacement-(double) step);
  572. !   if (fractional_step == 0)
  573.       {
  574.         /*
  575.           No fractional displacement-- just copy the pixels.
  576. ***************
  577. *** 214,220 ****
  578.       Fractional displacment.
  579.     */
  580.     step++;
  581. -   int_fractional_step=UpShifted(fractional_step);
  582.     last_pixel=background;
  583.     switch (direction)
  584.     {
  585. --- 216,221 ----
  586. ***************
  587. *** 224,290 ****
  588.         q=p-step*source_columns;
  589.         for (i=0; i < length; i++)
  590.         {
  591. !         red=(long) DownShift(last_pixel.red*
  592. !           (UpShift(1)-int_fractional_step)+p->red*int_fractional_step);
  593. !         if (red > MaxRGB)
  594. !           q->red=MaxRGB;
  595. !         else
  596. !           if (red < 0)
  597. !             q->red=0;
  598. !           else
  599. !             q->red=(unsigned char) red;
  600. !         green=(long) DownShift(last_pixel.green*
  601. !           (UpShift(1)-int_fractional_step)+p->green*int_fractional_step);
  602. !         if (green > MaxRGB)
  603. !           q->green=MaxRGB;
  604. !         else
  605. !           if (green < 0)
  606. !             q->green=0;
  607. !           else
  608. !             q->green=(unsigned char) green;
  609. !         blue=(long) DownShift(last_pixel.blue*
  610. !           (UpShift(1)-int_fractional_step)+p->blue*int_fractional_step);
  611. !         if (blue > MaxRGB)
  612. !           q->blue=MaxRGB;
  613. !         else
  614. !           if (blue < 0)
  615. !             q->blue=0;
  616. !           else
  617. !             q->blue=(unsigned char) blue;
  618.           last_pixel=(*p);
  619. -         q+=source_columns;
  620.           p+=source_columns;
  621.         }
  622.         /*
  623.           Set old column to background color.
  624.         */
  625. !       red=(long) DownShift(last_pixel.red*
  626. !         (UpShift(1)-int_fractional_step)+background.red*int_fractional_step);
  627. !       if (red > MaxRGB)
  628. !         q->red=MaxRGB;
  629. !       else
  630. !         if (red < 0)
  631. !           q->red=0;
  632. !         else
  633. !           q->red=(unsigned char) red;
  634. !       green=(long) DownShift(last_pixel.green*
  635. !         (UpShift(1)-int_fractional_step)+background.green*int_fractional_step);
  636. !       if (green > MaxRGB)
  637. !         q->green=MaxRGB;
  638. !       else
  639. !         if (green < 0)
  640. !           q->green=0;
  641. !         else
  642. !           q->green=(unsigned char) green;
  643. !       blue=(long) DownShift(last_pixel.blue*
  644. !         (UpShift(1)-int_fractional_step)+background.blue*int_fractional_step);
  645. !       if (blue > MaxRGB)
  646. !         q->blue=MaxRGB;
  647. !       else
  648. !         if (blue < 0)
  649. !           q->blue=0;
  650. !         else
  651. !           q->blue=(unsigned char) blue;
  652.         q+=source_columns;
  653.         for (i=0; i < step-1; i++)
  654.         {
  655. --- 225,255 ----
  656.         q=p-step*source_columns;
  657.         for (i=0; i < length; i++)
  658.         {
  659. !         red=DownShift(last_pixel.red*(UpShift(1)-fractional_step)+p->red*
  660. !           fractional_step);
  661. !         green=DownShift(last_pixel.green*(UpShift(1)-fractional_step)+p->green*
  662. !           fractional_step);
  663. !         blue=DownShift(last_pixel.blue*(UpShift(1)-fractional_step)+p->blue*
  664. !           fractional_step);
  665.           last_pixel=(*p);
  666.           p+=source_columns;
  667. +         q->red=range_limit[red];
  668. +         q->green=range_limit[green];
  669. +         q->blue=range_limit[blue];
  670. +         q+=source_columns;
  671.         }
  672.         /*
  673.           Set old column to background color.
  674.         */
  675. !       red=DownShift(last_pixel.red*(UpShift(1)-fractional_step)+
  676. !         background.red*fractional_step);
  677. !       green=DownShift(last_pixel.green*(UpShift(1)-fractional_step)+
  678. !         background.green*fractional_step);
  679. !       blue=DownShift(last_pixel.blue*(UpShift(1)-fractional_step)+
  680. !         background.blue*fractional_step);
  681. !       q->red=range_limit[red];
  682. !       q->green=range_limit[green];
  683. !       q->blue=range_limit[blue];
  684.         q+=source_columns;
  685.         for (i=0; i < step-1; i++)
  686.         {
  687. ***************
  688. *** 299,366 ****
  689.         q=p+step*source_columns;
  690.         for (i=0; i < length; i++)
  691.         {
  692. -         q-=source_columns;
  693.           p-=source_columns;
  694. !         red=(long) DownShift(last_pixel.red*
  695. !           (UpShift(1)-int_fractional_step)+p->red*int_fractional_step);
  696. !         if (red > MaxRGB)
  697. !           q->red=MaxRGB;
  698. !         else
  699. !           if (red < 0)
  700. !             q->red=0;
  701. !           else
  702. !             q->red=(unsigned char) red;
  703. !         green=(long) DownShift(last_pixel.green*
  704. !           (UpShift(1)-int_fractional_step)+p->green*int_fractional_step);
  705. !         if (green > MaxRGB)
  706. !           q->green=MaxRGB;
  707. !         else
  708. !           if (green < 0)
  709. !             q->green=0;
  710. !           else
  711. !             q->green=(unsigned char) green;
  712. !         blue=(long) DownShift(last_pixel.blue*
  713. !           (UpShift(1)-int_fractional_step)+p->blue*int_fractional_step);
  714. !         if (blue > MaxRGB)
  715. !           q->blue=MaxRGB;
  716. !         else
  717. !           if (blue < 0)
  718. !             q->blue=0;
  719. !           else
  720. !             q->blue=(unsigned char) blue;
  721.           last_pixel=(*p);
  722.         }
  723.         /*
  724.           Set old column to background color.
  725.         */
  726.         q-=source_columns;
  727. !       red=(long) DownShift(last_pixel.red*
  728. !         (UpShift(1)-int_fractional_step)+background.red*int_fractional_step);
  729. !       if (red > MaxRGB)
  730. !         q->red=MaxRGB;
  731. !       else
  732. !         if (red < 0)
  733. !           q->red=0;
  734. !         else
  735. !           q->red=(unsigned char) red;
  736. !       green=(long) DownShift(last_pixel.green*
  737. !         (UpShift(1)-int_fractional_step)+background.green*int_fractional_step);
  738. !       if (green > MaxRGB)
  739. !         q->green=MaxRGB;
  740. !       else
  741. !         if (green < 0)
  742. !           q->green=0;
  743. !         else
  744. !           q->green=(unsigned char) green;
  745. !       blue=(long) DownShift(last_pixel.blue*
  746. !         (UpShift(1)-int_fractional_step)+background.blue*int_fractional_step);
  747. !       if (blue > MaxRGB)
  748. !         q->blue=MaxRGB;
  749. !       else
  750. !         if (blue < 0)
  751. !           q->blue=0;
  752. !         else
  753. !           q->blue=(unsigned char) blue;
  754.         for (i=0; i < step-1; i++)
  755.         {
  756.           q-=source_columns;
  757. --- 264,295 ----
  758.         q=p+step*source_columns;
  759.         for (i=0; i < length; i++)
  760.         {
  761.           p-=source_columns;
  762. !         red=DownShift(last_pixel.red*(UpShift(1)-fractional_step)+p->red*
  763. !           fractional_step);
  764. !         green=DownShift(last_pixel.green*(UpShift(1)-fractional_step)+p->green*
  765. !           fractional_step);
  766. !         blue=DownShift(last_pixel.blue*(UpShift(1)-fractional_step)+p->blue*
  767. !           fractional_step);
  768.           last_pixel=(*p);
  769. +         q-=source_columns;
  770. +         q->red=range_limit[red];
  771. +         q->green=range_limit[green];
  772. +         q->blue=range_limit[blue];
  773.         }
  774.         /*
  775.           Set old column to background color.
  776.         */
  777. +       red=DownShift(last_pixel.red*(UpShift(1)-fractional_step)+
  778. +         background.red*fractional_step);
  779. +       green=DownShift(last_pixel.green*(UpShift(1)-fractional_step)+
  780. +         background.green*fractional_step);
  781. +       blue=DownShift(last_pixel.blue*(UpShift(1)-fractional_step)+
  782. +         background.blue*fractional_step);
  783.         q-=source_columns;
  784. !       q->red=range_limit[red];
  785. !       q->green=range_limit[green];
  786. !       q->blue=range_limit[blue];
  787.         for (i=0; i < step-1; i++)
  788.         {
  789.           q-=source_columns;
  790. ***************
  791. *** 601,607 ****
  792.   %
  793.   */
  794.   static void RowShear(source_image,source_columns,row,x,length,displacement,
  795. !   background)
  796.   ColorPacket
  797.     *source_image;
  798.   
  799. --- 530,536 ----
  800.   %
  801.   */
  802.   static void RowShear(source_image,source_columns,row,x,length,displacement,
  803. !   background,range_limit)
  804.   ColorPacket
  805.     *source_image;
  806.   
  807. ***************
  808. *** 616,638 ****
  809.   
  810.   ColorPacket
  811.     background;
  812.   {
  813.     ColorPacket
  814.       last_pixel;
  815.   
  816. -   double
  817. -     fractional_step;
  818. - 
  819.     enum {LEFT,RIGHT}
  820.       direction;
  821.   
  822. !   long int
  823.       blue,
  824.       green,
  825. -     int_fractional_step,
  826.       red,
  827.       step;
  828.   
  829.     register ColorPacket
  830.       *p,
  831.       *q;
  832. --- 545,569 ----
  833.   
  834.   ColorPacket
  835.     background;
  836. + 
  837. + register unsigned char
  838. +   *range_limit;
  839.   {
  840.     ColorPacket
  841.       last_pixel;
  842.   
  843.     enum {LEFT,RIGHT}
  844.       direction;
  845.   
  846. !   int
  847.       blue,
  848.       green,
  849.       red,
  850.       step;
  851.   
  852. +   long int
  853. +     fractional_step;
  854. + 
  855.     register ColorPacket
  856.       *p,
  857.       *q;
  858. ***************
  859. *** 651,658 ****
  860.           direction=LEFT;
  861.         }
  862.     step=(int) floor(displacement);
  863. !   fractional_step=displacement-(double)step;
  864. !   if (fractional_step == 0.0)
  865.       {
  866.         /*
  867.           No fractional displacement-- just copy.
  868. --- 582,589 ----
  869.           direction=LEFT;
  870.         }
  871.     step=(int) floor(displacement);
  872. !   fractional_step=UpShifted(displacement-(double) step);
  873. !   if (fractional_step == 0)
  874.       {
  875.         /*
  876.           No fractional displacement-- just copy.
  877. ***************
  878. *** 710,716 ****
  879.       Fractional displacement.
  880.     */
  881.     step++;
  882. -   int_fractional_step=UpShifted(fractional_step);
  883.     last_pixel=background;
  884.     switch (direction)
  885.     {
  886. --- 641,646 ----
  887. ***************
  888. *** 720,786 ****
  889.         q=p-step;
  890.         for (i=0; i < length; i++)
  891.         {
  892. !         red=(long) DownShift(last_pixel.red*
  893. !           (UpShift(1)-int_fractional_step)+p->red*int_fractional_step);
  894. !         if (red > MaxRGB)
  895. !           q->red=MaxRGB;
  896. !         else
  897. !           if (red < 0)
  898. !             q->red=0;
  899. !           else
  900. !             q->red=(unsigned char) red;
  901. !         green=(long) DownShift(last_pixel.green*
  902. !           (UpShift(1)-int_fractional_step)+p->green*int_fractional_step);
  903. !         if (green > MaxRGB)
  904. !           q->green=MaxRGB;
  905. !         else
  906. !           if (green < 0)
  907. !             q->green=0;
  908. !           else
  909. !             q->green=(unsigned char) green;
  910. !         blue=(long) DownShift(last_pixel.blue*
  911. !           (UpShift(1)-int_fractional_step)+p->blue*int_fractional_step);
  912. !         if (blue > MaxRGB)
  913. !           q->blue=MaxRGB;
  914. !         else
  915. !           if (blue < 0)
  916. !             q->blue=0;
  917. !           else
  918. !             q->blue=(unsigned char) blue;
  919.           last_pixel=(*p);
  920.           p++;
  921.           q++;
  922.         }
  923.         /*
  924.           Set old row to background color.
  925.         */
  926. !       red=(long) DownShift(last_pixel.red*
  927. !         (UpShift(1)-int_fractional_step)+background.red*int_fractional_step);
  928. !       if (red > MaxRGB)
  929. !         q->red=MaxRGB;
  930. !       else
  931. !         if (red < 0)
  932. !           q->red=0;
  933. !         else
  934. !           q->red=(unsigned char) red;
  935. !       green=(long) DownShift(last_pixel.green*
  936. !         (UpShift(1)-int_fractional_step)+background.green*int_fractional_step);
  937. !       if (green > MaxRGB)
  938. !         q->green=MaxRGB;
  939. !       else
  940. !         if (green < 0)
  941. !           q->green=0;
  942. !         else
  943. !           q->green=(unsigned ) green;
  944. !       blue=(long) DownShift(last_pixel.blue*
  945. !         (UpShift(1)-int_fractional_step)+background.blue*int_fractional_step);
  946. !       if (blue > MaxRGB)
  947. !         q->blue=MaxRGB;
  948. !       else
  949. !         if (blue < 0)
  950. !           q->blue=0;
  951. !         else
  952. !           q->blue=(unsigned char) blue;
  953.         q++;
  954.         for (i=0; i < step-1; i++)
  955.         {
  956. --- 650,680 ----
  957.         q=p-step;
  958.         for (i=0; i < length; i++)
  959.         {
  960. !         red=DownShift(last_pixel.red*(UpShift(1)-fractional_step)+p->red*
  961. !           fractional_step);
  962. !         green=DownShift(last_pixel.green*(UpShift(1)-fractional_step)+p->green*
  963. !           fractional_step);
  964. !         blue=DownShift(last_pixel.blue*(UpShift(1)-fractional_step)+p->blue*
  965. !           fractional_step);
  966.           last_pixel=(*p);
  967.           p++;
  968. +         q->red=range_limit[red];
  969. +         q->green=range_limit[green];
  970. +         q->blue=range_limit[blue];
  971.           q++;
  972.         }
  973.         /*
  974.           Set old row to background color.
  975.         */
  976. !       red=DownShift(last_pixel.red*(UpShift(1)-fractional_step)+
  977. !         background.red*fractional_step);
  978. !       green=DownShift(last_pixel.green*(UpShift(1)-fractional_step)+
  979. !         background.green*fractional_step);
  980. !       blue=DownShift(last_pixel.blue*(UpShift(1)-fractional_step)+
  981. !         background.blue*fractional_step);
  982. !       q->red=range_limit[red];
  983. !       q->green=range_limit[green];
  984. !       q->blue=range_limit[blue];
  985.         q++;
  986.         for (i=0; i < step-1; i++)
  987.         {
  988. ***************
  989. *** 796,862 ****
  990.         for (i=0; i < length; i++)
  991.         {
  992.           p--;
  993. !         q--;
  994. !         red=(long) DownShift(last_pixel.red*
  995. !           (UpShift(1)-int_fractional_step)+p->red*int_fractional_step);
  996. !         if (red > MaxRGB)
  997. !           q->red=MaxRGB;
  998. !         else
  999. !           if (red < 0)
  1000. !             q->red=0;
  1001. !           else
  1002. !             q->red=(unsigned char) red;
  1003. !         green=(long) DownShift(last_pixel.green*
  1004. !           (UpShift(1)-int_fractional_step)+p->green*int_fractional_step);
  1005. !         if (green > MaxRGB)
  1006. !           q->green=MaxRGB;
  1007. !         else
  1008. !           if (green < 0)
  1009. !             q->green=0;
  1010. !           else
  1011. !             q->green=(unsigned char) green;
  1012. !         blue=(long) DownShift(last_pixel.blue*
  1013. !           (UpShift(1)-int_fractional_step)+p->blue*int_fractional_step);
  1014. !         if (blue > MaxRGB)
  1015. !           blue=MaxRGB;
  1016. !         else
  1017. !           if (blue < 0)
  1018. !             blue=0;
  1019. !           else
  1020. !             q->blue=(unsigned char) blue;
  1021.           last_pixel=(*p);
  1022.         }
  1023.         /*
  1024.           Set old row to background color.
  1025.         */
  1026.         q--;
  1027. !       red=(long) DownShift(last_pixel.red*
  1028. !         (UpShift(1)-int_fractional_step)+background.red*int_fractional_step);
  1029. !       if (red > MaxRGB)
  1030. !         red=MaxRGB;
  1031. !       else
  1032. !         if (red < 0)
  1033. !           red=0;
  1034. !         else
  1035. !           q->red=(unsigned char) red;
  1036. !       green=(long) DownShift(last_pixel.green*
  1037. !         (UpShift(1)-int_fractional_step)+background.green*int_fractional_step);
  1038. !       if (green > MaxRGB)
  1039. !         green=MaxRGB;
  1040. !       else
  1041. !         if (green < 0)
  1042. !           green=0;
  1043. !         else
  1044. !           q->green=(unsigned char) green;
  1045. !       blue=(long) DownShift(last_pixel.blue*
  1046. !         (UpShift(1)-int_fractional_step)+background.blue*int_fractional_step);
  1047. !       if (blue > MaxRGB)
  1048. !         blue=MaxRGB;
  1049. !       else
  1050. !         if (blue < 0)
  1051. !           blue=0;
  1052. !         else
  1053. !           q->blue=(unsigned char) blue;
  1054.         for (i=0; i < step-1; i++)
  1055.         {
  1056.           q--;
  1057. --- 690,720 ----
  1058.         for (i=0; i < length; i++)
  1059.         {
  1060.           p--;
  1061. !         red=DownShift(last_pixel.red*(UpShift(1)-fractional_step)+p->red*
  1062. !           fractional_step);
  1063. !         green=DownShift(last_pixel.green*(UpShift(1)-fractional_step)+p->green*
  1064. !           fractional_step);
  1065. !         blue=DownShift(last_pixel.blue*(UpShift(1)-fractional_step)+p->blue*
  1066. !           fractional_step);
  1067.           last_pixel=(*p);
  1068. +         q--;
  1069. +         q->red=range_limit[red];
  1070. +         q->green=range_limit[green];
  1071. +         q->blue=range_limit[blue];
  1072.         }
  1073.         /*
  1074.           Set old row to background color.
  1075.         */
  1076. +       red=DownShift(last_pixel.red*(UpShift(1)-fractional_step)+
  1077. +         background.red*fractional_step);
  1078. +       green=DownShift(last_pixel.green*(UpShift(1)-fractional_step)+
  1079. +         background.green*fractional_step);
  1080. +       blue=DownShift(last_pixel.blue*(UpShift(1)-fractional_step)+
  1081. +         background.blue*fractional_step);
  1082.         q--;
  1083. !       q->red=range_limit[red];
  1084. !       q->green=range_limit[green];
  1085. !       q->blue=range_limit[blue];
  1086.         for (i=0; i < step-1; i++)
  1087.         {
  1088.           q--;
  1089. ***************
  1090. *** 916,922 ****
  1091.   int
  1092.     clip;
  1093.   {
  1094. ! #define DegreesToRadians(x) ((x)/180.0*3.14159265359)
  1095.   
  1096.     ColorPacket
  1097.       background,
  1098. --- 774,780 ----
  1099.   int
  1100.     clip;
  1101.   {
  1102. ! #define DegreesToRadians(x) ((x)*3.14159265358979323846/180.0)
  1103.   
  1104.     ColorPacket
  1105.       background,
  1106. ***************
  1107. *** 1041,1046 ****
  1108. --- 899,908 ----
  1109.         Point
  1110.           corners[4];
  1111.   
  1112. +       unsigned char
  1113. +         *range_limit,
  1114. +         *range_table;
  1115. + 
  1116.         unsigned int
  1117.           column,
  1118.           row;
  1119. ***************
  1120. *** 1067,1072 ****
  1121. --- 929,951 ----
  1122.           rotated_pixels+number_columns,number_columns,x_offset,y_offset,
  1123.           rotations);
  1124.         /*
  1125. +         Initialize range table.
  1126. +       */
  1127. +       range_table=(unsigned char *) malloc(3*(MaxRGB+1)*sizeof(unsigned char));
  1128. +       if (range_table == (unsigned char *) NULL)
  1129. +         {
  1130. +           DestroyImage(rotated_image);
  1131. +           Warning("unable to rotate image","memory allocation failed");
  1132. +           return((Image *) NULL);
  1133. +         }
  1134. +       for (i=0; i <= MaxRGB; i++)
  1135. +       {
  1136. +         range_table[i]=0;
  1137. +         range_table[i+(MaxRGB+1)]=(unsigned char) i;
  1138. +         range_table[i+(MaxRGB+1)*2]=MaxRGB;
  1139. +       }
  1140. +       range_limit=range_table+(MaxRGB+1);
  1141. +       /*
  1142.           Perform a fractional rotation.  First, shear the image rows.
  1143.         */
  1144.         row=(number_rows-rotated_image->rows)/2;
  1145. ***************
  1146. *** 1074,1080 ****
  1147.         {
  1148.           RowShear(rotated_pixels+number_columns,number_columns,row,x_offset,
  1149.             rotated_image->columns,x_shear*
  1150. !           (((double) i)-(rotated_image->rows-1)/2.0),background);
  1151.           row++;
  1152.         }
  1153.         /*
  1154. --- 953,959 ----
  1155.         {
  1156.           RowShear(rotated_pixels+number_columns,number_columns,row,x_offset,
  1157.             rotated_image->columns,x_shear*
  1158. !           (((double) i)-(rotated_image->rows-1)/2.0),background,range_limit);
  1159.           row++;
  1160.         }
  1161.         /*
  1162. ***************
  1163. *** 1085,1091 ****
  1164.         {
  1165.           ColumnShear(rotated_pixels+number_columns,number_columns,column,
  1166.             y_offset,rotated_image->rows,y_shear*(((double) i)-(y_width-1)/2.0),
  1167. !           background);
  1168.           column++;
  1169.         }
  1170.         /*
  1171. --- 964,970 ----
  1172.         {
  1173.           ColumnShear(rotated_pixels+number_columns,number_columns,column,
  1174.             y_offset,rotated_image->rows,y_shear*(((double) i)-(y_width-1)/2.0),
  1175. !           background,range_limit);
  1176.           column++;
  1177.         }
  1178.         /*
  1179. ***************
  1180. *** 1094,1100 ****
  1181.         for (i=0; i < number_rows; i++)
  1182.           RowShear(rotated_pixels+number_columns,number_columns,(unsigned int) i,
  1183.             (number_columns-y_width)/2,y_width,x_shear*
  1184. !           (((double) i)-(number_rows-1)/2.0),background);
  1185.         /*
  1186.           Calculate the rotated image size.
  1187.         */
  1188. --- 973,980 ----
  1189.         for (i=0; i < number_rows; i++)
  1190.           RowShear(rotated_pixels+number_columns,number_columns,(unsigned int) i,
  1191.             (number_columns-y_width)/2,y_width,x_shear*
  1192. !           (((double) i)-(number_rows-1)/2.0),background,range_limit);
  1193. !       (void) free((void *) range_table);
  1194.         /*
  1195.           Calculate the rotated image size.
  1196.         */
  1197. Common subdirectories: ImageMagick/scenes and ImageMagick2.1.5/scenes
  1198. Common subdirectories: ImageMagick/utilities and ImageMagick2.1.5/utilities
  1199. Common subdirectories: ImageMagick/xtp and ImageMagick2.1.5/xtp
  1200. diff -c -r ImageMagick/utilities/convert.c ImageMagick2.1.5/utilities/convert.c
  1201. *** ImageMagick/utilities/convert.c    Mon Nov 16 17:57:34 1992
  1202. --- ImageMagick2.1.5/utilities/convert.c    Tue Nov 17 16:22:19 1992
  1203. ***************
  1204. *** 295,313 ****
  1205.                     if (i == argc)
  1206.                       Error("missing type on -colorspace",(char *) NULL);
  1207.                     option=argv[i];
  1208. !                   if (strncasecmp("GRAY",option,3) == 0)
  1209.                       colorspace=GRAYColorspace;
  1210.                     else
  1211. !                     if (strncasecmp("RGB",option,3) == 0)
  1212.                         colorspace=RGBColorspace;
  1213.                       else
  1214. !                       if (strncasecmp("YIQ",option,3) == 0)
  1215.                           colorspace=YIQColorspace;
  1216.                         else
  1217. !                         if (strncasecmp("YUV",option,3) == 0)
  1218.                             colorspace=YUVColorspace;
  1219.                           else
  1220. !                           if (strncasecmp("XYZ",option,3) == 0)
  1221.                               colorspace=XYZColorspace;
  1222.                             else
  1223.                               Error("invalid colorspace type on -colorspace",
  1224. --- 295,313 ----
  1225.                     if (i == argc)
  1226.                       Error("missing type on -colorspace",(char *) NULL);
  1227.                     option=argv[i];
  1228. !                   if (strncasecmp("gray",option,3) == 0)
  1229.                       colorspace=GRAYColorspace;
  1230.                     else
  1231. !                     if (strncasecmp("rgb",option,3) == 0)
  1232.                         colorspace=RGBColorspace;
  1233.                       else
  1234. !                       if (strncasecmp("yiq",option,3) == 0)
  1235.                           colorspace=YIQColorspace;
  1236.                         else
  1237. !                         if (strncasecmp("yuv",option,3) == 0)
  1238.                             colorspace=YUVColorspace;
  1239.                           else
  1240. !                           if (strncasecmp("xyz",option,3) == 0)
  1241.                               colorspace=XYZColorspace;
  1242.                             else
  1243.                               Error("invalid colorspace type on -colorspace",
  1244. diff -c -r ImageMagick/utilities/mogrify.c ImageMagick2.1.5/utilities/mogrify.c
  1245. *** ImageMagick/utilities/mogrify.c    Sat Nov 14 01:20:33 1992
  1246. --- ImageMagick2.1.5/utilities/mogrify.c    Tue Nov 17 16:22:21 1992
  1247. ***************
  1248. *** 338,356 ****
  1249.                     if (i == argc)
  1250.                       Error("missing type on -colorspace",(char *) NULL);
  1251.                     option=argv[i];
  1252. !                   if (strncasecmp("GRAY",option,3) == 0)
  1253.                       colorspace=GRAYColorspace;
  1254.                     else
  1255. !                     if (strncasecmp("RGB",option,3) == 0)
  1256.                         colorspace=RGBColorspace;
  1257.                       else
  1258. !                       if (strncasecmp("YIQ",option,3) == 0)
  1259.                           colorspace=YIQColorspace;
  1260.                         else
  1261. !                         if (strncasecmp("YUV",option,3) == 0)
  1262.                             colorspace=YUVColorspace;
  1263.                           else
  1264. !                           if (strncasecmp("XYZ",option,3) == 0)
  1265.                               colorspace=XYZColorspace;
  1266.                             else
  1267.                               Error("invalid colorspace type on -colorspace",
  1268. --- 338,356 ----
  1269.                     if (i == argc)
  1270.                       Error("missing type on -colorspace",(char *) NULL);
  1271.                     option=argv[i];
  1272. !                   if (strncasecmp("gray",option,3) == 0)
  1273.                       colorspace=GRAYColorspace;
  1274.                     else
  1275. !                     if (strncasecmp("rgb",option,3) == 0)
  1276.                         colorspace=RGBColorspace;
  1277.                       else
  1278. !                       if (strncasecmp("yiq",option,3) == 0)
  1279.                           colorspace=YIQColorspace;
  1280.                         else
  1281. !                         if (strncasecmp("yuv",option,3) == 0)
  1282.                             colorspace=YUVColorspace;
  1283.                           else
  1284. !                           if (strncasecmp("xyz",option,3) == 0)
  1285.                               colorspace=XYZColorspace;
  1286.                             else
  1287.                               Error("invalid colorspace type on -colorspace",
  1288. -- 
  1289. cristy@dupont.com
  1290.