home *** CD-ROM | disk | FTP | other *** search
/ NetNews Usenet Archive 1992 #31 / NN_1992_31.iso / spool / comp / sources / bugs / 314 < prev    next >
Encoding:
Text File  |  1992-12-22  |  45.2 KB  |  1,437 lines
  1. Newsgroups: comp.sources.bugs
  2. Path: sparky!uunet!cis.ohio-state.edu!zaphod.mps.ohio-state.edu!darwin.sura.net!udel!louie!eplrx7!eplrx7.es.dupont.com!cristy
  3. From: cristy@eplrx7.es.duPont.com (Cristy)
  4. Subject: ImageMagick 2.2 - patch #1, Part 03/3
  5. Message-ID: <cristy.724966590@eplrx7.es.dupont.com>
  6. Summary: X11 image processing and display utilities
  7. Keywords: UNIX VMS X11 SGI DEC Cray Sun Vax
  8. Organization: DuPont Engineering Physics Laboratory
  9. Date: Mon, 21 Dec 1992 19:36:30 GMT
  10. Lines: 1425
  11.  
  12. Submitted-by: cristy@dupont.com
  13. Archive-name: ImageMagick/patch0103
  14.  
  15. #!/bin/sh
  16. # this is magick.03 (part 3 of ImageMagick/patch01)
  17. # do not concatenate these parts, unpack them in order with /bin/sh
  18. # file fix-01 continued
  19. #
  20. if test ! -r _shar_seq_.tmp; then
  21.     echo 'Please unpack part 1 first!'
  22.     exit 1
  23. fi
  24. (read Scheck
  25.  if test "$Scheck" != 3; then
  26.     echo Please unpack part "$Scheck" next!
  27.     exit 1
  28.  else
  29.     exit 0
  30.  fi
  31. ) < _shar_seq_.tmp || exit 1
  32. if test ! -f _shar_wnt_.tmp; then
  33.     echo 'x - still skipping fix-01'
  34. else
  35. echo 'x - continuing file fix-01'
  36. sed 's/^X//' << 'SHAR_EOF' >> 'fix-01' &&
  37. !           return((Image *) NULL);
  38. !         }
  39. !       rotated_image->columns=image->rows;
  40. !       rotated_image->rows=image->columns;
  41. X      }
  42. X    else
  43. X      {
  44. !       y_width=image->columns+
  45. !         (int) ceil(fabs(x_shear)*(double) (image->rows-1));
  46. !       number_columns=image->columns+2*
  47. !         (int) ceil(fabs(x_shear)*(double) (image->rows-1));
  48. !       number_rows=image->rows+
  49. !         (int) ceil(fabs(y_shear)*(double) (y_width-1));
  50. !       rotated_image=CopyImage(image,number_columns,number_rows,False);
  51. !       if (rotated_image == (Image *) NULL)
  52. !         {
  53. !           Warning("unable to rotate image","memory allocation failed");
  54. !           return((Image *) NULL);
  55. !         }
  56. !       rotated_image->columns=image->columns;
  57. !       rotated_image->rows=image->rows;
  58. X      }
  59. X    /*
  60. !     Initialize rotated image attributes.
  61. X    */
  62. !   rotated_pixels=(ColorPacket *)
  63. !     malloc(number_columns*(number_rows+2)*sizeof(ColorPacket));
  64. !   if (rotated_pixels == (ColorPacket *) NULL)
  65. X      {
  66. X        Warning("unable to rotate image","memory allocation failed");
  67. X        return((Image *) NULL);
  68. X      }
  69. !   if ((x_shear == 0.0) || (y_shear == 0.0))
  70. !     {
  71. !       /*
  72. !         No shearing required; do integral rotation.
  73. !       */
  74. !       x_offset=0;
  75. !       y_offset=0;
  76. !       IntegralRotation(image,rotated_image->columns,rotated_image->rows,
  77. !         rotated_pixels+number_columns,number_columns,x_offset,y_offset,
  78. !         rotations);
  79. !     }
  80. !   else
  81. !     {
  82. !       typedef struct Point
  83. !       {
  84. !         double
  85. !           x,
  86. !           y;
  87. !       } Point;
  88. X  
  89. !       double
  90. !         x_max,
  91. !         x_min,
  92. !         y_max,
  93. !         y_min;
  94. X  
  95. !       Point
  96. !         corners[4];
  97. X  
  98. !       unsigned char
  99. !         *range_limit,
  100. !         *range_table;
  101. X  
  102. !       unsigned int
  103. !         column,
  104. !         row;
  105. X  
  106. !       /*
  107. !         Initialize rotated image buffer to background color.
  108. !       */
  109. !       rotated_image->class=DirectClass;
  110. !       background.red=image->pixels[0].red;
  111. !       background.green=image->pixels[0].green;
  112. !       background.blue=image->pixels[0].blue;
  113. !       p=rotated_pixels;
  114. !       for (i=0; i < (number_columns*(number_rows+2)); i++)
  115. !       {
  116. !         *p=background;
  117. !         p++;
  118. !       }
  119. !       /*
  120. !         Perform an initial integral 90 degree rotation.
  121. !       */
  122. !       x_offset=(number_columns-rotated_image->columns)/2;
  123. !       y_offset=(number_rows-rotated_image->rows)/2;
  124. !       IntegralRotation(image,rotated_image->columns,rotated_image->rows,
  125. !         rotated_pixels+number_columns,number_columns,x_offset,y_offset,
  126. !         rotations);
  127. !       /*
  128. !         Initialize range table.
  129. !       */
  130. !       range_table=(unsigned char *) malloc(3*(MaxRGB+1)*sizeof(unsigned char));
  131. !       if (range_table == (unsigned char *) NULL)
  132. !         {
  133. !           DestroyImage(rotated_image);
  134. !           Warning("unable to rotate image","memory allocation failed");
  135. !           return((Image *) NULL);
  136. !         }
  137. !       for (i=0; i <= MaxRGB; i++)
  138. !       {
  139. !         range_table[i]=0;
  140. !         range_table[i+(MaxRGB+1)]=(unsigned char) i;
  141. !         range_table[i+(MaxRGB+1)*2]=MaxRGB;
  142. !       }
  143. !       range_limit=range_table+(MaxRGB+1);
  144. !       /*
  145. !         Perform a fractional rotation.  First, shear the image rows.
  146. !       */
  147. !       row=(number_rows-rotated_image->rows)/2;
  148. !       for (i=0; i < rotated_image->rows; i++)
  149. !       {
  150. !         RowShear(rotated_pixels+number_columns,number_columns,row,x_offset,
  151. !           rotated_image->columns,x_shear*
  152. !           (((double) i)-(rotated_image->rows-1)/2.0),background,range_limit);
  153. !         row++;
  154. !       }
  155. !       /*
  156. !         Shear the image columns.
  157. !       */
  158. !       column=(number_columns-y_width)/2;
  159. !       for (i=0; i < y_width; i++)
  160. !       {
  161. !         ColumnShear(rotated_pixels+number_columns,number_columns,column,
  162. !           y_offset,rotated_image->rows,y_shear*(((double) i)-(y_width-1)/2.0),
  163. !           background,range_limit);
  164. !         column++;
  165. !       }
  166. !       /*
  167. !         Shear the image rows again.
  168. !       */
  169. !       for (i=0; i < number_rows; i++)
  170. !         RowShear(rotated_pixels+number_columns,number_columns,(unsigned int) i,
  171. !           (number_columns-y_width)/2,y_width,x_shear*
  172. !           (((double) i)-(number_rows-1)/2.0),background,range_limit);
  173. !       (void) free((char *) range_table);
  174. !       /*
  175. !         Calculate the rotated image size.
  176. !       */
  177. !       corners[0].x=(-((int) rotated_image->columns)/2.0);
  178. !       corners[0].y=(-((int) rotated_image->rows)/2.0);
  179. !       corners[1].x=((int) rotated_image->columns)/2.0;
  180. !       corners[1].y=(-((int) rotated_image->rows)/2.0);
  181. !       corners[2].x=(-((int) rotated_image->columns)/2.0);
  182. !       corners[2].y=((int) rotated_image->rows)/2.0;
  183. !       corners[3].x=((int) rotated_image->columns)/2.0;
  184. !       corners[3].y=((int) rotated_image->rows)/2.0;
  185. !       for (i=0; i < 4; i++)
  186. !       {
  187. !         corners[i].x+=x_shear*corners[i].y;
  188. !         corners[i].y+=y_shear*corners[i].x;
  189. !         corners[i].x+=x_shear*corners[i].y;
  190. !         corners[i].x+=(number_columns-1)/2.0;
  191. !         corners[i].y+=(number_rows-1)/2.0;
  192. !       }
  193. !       x_min=corners[0].x;
  194. !       y_min=corners[0].y;
  195. !       x_max=corners[0].x;
  196. !       y_max=corners[0].y;
  197. !       for (i=1; i < 4; i++)
  198. !       {
  199. !         if (x_min > corners[i].x)
  200. !           x_min=corners[i].x;
  201. !         if (y_min > corners[i].y)
  202. !           y_min=corners[i].y;
  203. !         if (x_max < corners[i].x)
  204. !           x_max=corners[i].x;
  205. !         if (y_max < corners[i].y)
  206. !           y_max=corners[i].y;
  207. !       }
  208. !       x_min=floor((double) x_min);
  209. !       x_max=ceil((double) x_max);
  210. !       y_min=floor((double) y_min);
  211. !       y_max=ceil((double) y_max);
  212. !       if (!clip)
  213. !         {
  214. !           /*
  215. !             Rotated image is not clipped.
  216. !           */
  217. !           rotated_image->columns=(unsigned int) (x_max-x_min);
  218. !           rotated_image->rows=(unsigned int) (y_max-y_min);
  219. !         }
  220. !       x_offset=(int) x_min+((int) (x_max-x_min)-rotated_image->columns)/2;
  221. !       y_offset=(int) y_min+((int) (y_max-y_min)-rotated_image->rows)/2;
  222. !     }
  223. X    /*
  224. !     Convert the rectangular array of pixels to runlength packets.
  225. X    */
  226. !   rotated_image->packets=rotated_image->columns*rotated_image->rows;
  227. !   q=rotated_image->pixels;
  228. !   for (y=0; y < rotated_image->rows; y++)
  229. !   {
  230. !     p=rotated_pixels+number_columns+(y+y_offset)*number_columns+x_offset;
  231. !     for (x=0; x < rotated_image->columns; x++)
  232. X      {
  233. !       q->red=p->red;
  234. !       q->green=p->green;
  235. !       q->blue=p->blue;
  236. !       q->index=p->index;
  237. !       q->length=0;
  238. !       q++;
  239. !       p++;
  240. X      }
  241. X    }
  242. !   (void) free((char *) rotated_pixels);
  243. !   return(rotated_image);
  244. X  }
  245. --- 989,1214 ----
  246. X    */
  247. X    x_shear=(-tan(DegreesToRadians(degrees)/2.0));
  248. X    y_shear=sin(DegreesToRadians(degrees));
  249. +   integral_image=IntegralRotateImage(image,rotations);
  250. +   if ((x_shear == 0.0) || (y_shear == 0.0))
  251. +     return(integral_image);
  252. +   /*
  253. +     Initialize range table.
  254. +   */
  255. +   range_table=(unsigned char *) malloc(3*(MaxRGB+1)*sizeof(unsigned char));
  256. +   if (range_table == (unsigned char *) NULL)
  257. +     {
  258. +       DestroyImage(integral_image);
  259. +       Warning("unable to rotate image","memory allocation failed");
  260. +       return((Image *) NULL);
  261. +     }
  262. +   for (i=0; i <= MaxRGB; i++)
  263. +   {
  264. +     range_table[i]=0;
  265. +     range_table[i+(MaxRGB+1)]=(unsigned char) i;
  266. +     range_table[i+(MaxRGB+1)*2]=MaxRGB;
  267. +   }
  268. +   range_limit=range_table+(MaxRGB+1);
  269. +   /*
  270. +     Compute image size.
  271. +   */
  272. X    if ((rotations == 1) || (rotations == 3))
  273. X      {
  274. !       y_width=image->rows+(int) ceil(fabs(x_shear)*(double) (image->columns-1));
  275. !       x_offset=(image->rows+2*
  276. !         (int) ceil(fabs(x_shear)*(double) (image->columns-1))-image->rows)/2;
  277. !       y_offset=(image->columns+
  278. !         (int) ceil(fabs(y_shear)*(double) (y_width-1))-image->columns)/2;
  279. !       width=image->rows;
  280. !       height=image->columns;
  281. X      }
  282. X    else
  283. X      {
  284. !       y_width=image->columns+(int) ceil(fabs(x_shear)*(double) (image->rows-1));
  285. !       x_offset=(image->columns+2*
  286. !         (int) ceil(fabs(x_shear)*(double) (image->rows-1))-image->columns)/2;
  287. !       y_offset=(image->rows+
  288. !         (int) ceil(fabs(y_shear)*(double) (y_width-1))-image->rows)/2;
  289. !       width=image->columns;
  290. !       height=image->rows;
  291. X      }
  292. X    /*
  293. !     Surround image with border of background color.
  294. X    */
  295. !   background.red=image->pixels[0].red;
  296. !   background.green=image->pixels[0].green;
  297. !   background.blue=image->pixels[0].blue;
  298. !   rotated_image=BorderImage(integral_image,x_offset,y_offset+1,background);
  299. !   DestroyImage(integral_image);
  300. !   if (rotated_image == (Image *) NULL)
  301. X      {
  302. X        Warning("unable to rotate image","memory allocation failed");
  303. X        return((Image *) NULL);
  304. X      }
  305. !   rotated_image->class=DirectClass;
  306. !   /*
  307. !     Perform a fractional rotation.  First, shear the image rows.
  308. !   */
  309. !   XShearImage(rotated_image,x_shear,width,height,x_offset,
  310. !     (int) (rotated_image->rows-height-2)/2+1,background,range_limit);
  311. !   /*
  312. !     Shear the image columns.
  313. !   */
  314. !   YShearImage(rotated_image,y_shear,y_width,height,
  315. !     (int) (rotated_image->columns-y_width)/2,y_offset+1,background,range_limit);
  316. !   /*
  317. !     Shear the image rows again.
  318. !   */
  319. !   XShearImage(rotated_image,x_shear,y_width,rotated_image->rows-2,
  320. !     (int) (rotated_image->columns-y_width)/2,1,background,range_limit);
  321. !   (void) free((char *) range_table);
  322. !   clipped_image=ClipShearImage(rotated_image,x_shear,y_shear,width,height,clip);
  323. !   DestroyImage(rotated_image);
  324. !   return(clipped_image);
  325. ! }
  326. ! 
  327. ! /*
  328. ! %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
  329. ! %                                                                             %
  330. ! %                                                                             %
  331. ! %                                                                             %
  332. ! %   S h e a r I m a g e                                                       %
  333. ! %                                                                             %
  334. ! %                                                                             %
  335. ! %                                                                             %
  336. ! %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
  337. ! %
  338. ! %  Function ShearImage creates a new image that is a sheared copy of an
  339. ! %  existing one.  Shearing slides one edge of an image along the X or Y
  340. ! %  axis, creating a parallelogram.  An X direction shear slides an edge
  341. ! %  along the X axis, while a Y direction shear slides an edge along the Y
  342. ! %  axis.  The amount of the shear is controlled by a shear angle.  For X
  343. ! %  direction shears, x_shear is measured relative to the Y axis, and
  344. ! %  similarly, for Y direction shears y_shear is measured relative to the
  345. ! %  X axis.  Empty triangles left over from shearing the image are filled
  346. ! %  with the color defined by the pixel at location (0,0).  ShearImage
  347. ! %  allocates the memory necessary for the new Image structure and returns
  348. ! %  a pointer to the new image.
  349. ! %
  350. ! %  Function ShearImage is based on the paper "A Fast Algorithm for General
  351. ! %  Raster Rotatation" by Alan W. Paeth.  
  352. ! %
  353. ! %  The format of the ShearImage routine is:
  354. ! %
  355. ! %      ShearImage(image,x_shear,y_shear,clip)
  356. ! %
  357. ! %  A description of each parameter follows.
  358. ! %
  359. ! %    o status: Function ShearImage returns a pointer to the image after
  360. ! %      rotating.  A null image is returned if there is a memory shortage.
  361. ! %
  362. ! %    o image: The address of a structure of type Image;  returned from
  363. ! %      ReadImage.
  364. ! %
  365. ! %    o x_shear, y_shear: Specifies the number of degrees to shear the image.
  366. ! %
  367. ! %    o clip: A value other than zero clips the corners of the rotated
  368. ! %      image and retains the original image size.
  369. ! %
  370. ! %
  371. ! */
  372. ! Image *ShearImage(image,x_shear,y_shear,clip)
  373. ! Image
  374. !   *image;
  375. X  
  376. ! double
  377. !   x_shear,
  378. !   y_shear;
  379. X  
  380. ! unsigned int
  381. !   clip;
  382. ! {
  383. !   ColorPacket
  384. !     background;
  385. X  
  386. !   Image
  387. !     *clipped_image,
  388. !     *sheared_image;
  389. X  
  390. !   int
  391. !     x_offset,
  392. !     y_offset;
  393. X  
  394. !   register int
  395. !     i;
  396. ! 
  397. !   unsigned char
  398. !     *range_limit,
  399. !     *range_table;
  400. ! 
  401. !   unsigned int
  402. !     y_width;
  403. ! 
  404. X    /*
  405. !     Adjust rotation angle.
  406. X    */
  407. !   while (x_shear < -45.0)
  408. !     x_shear+=360.0;
  409. !   while (x_shear > 45.0)
  410. !     x_shear-=90.0;
  411. !   while (y_shear < -45.0)
  412. !     y_shear+=360.0;
  413. !   while (y_shear > 45.0)
  414. !     y_shear-=90.0;
  415. !   x_shear=tan(DegreesToRadians(x_shear)/2.0);
  416. !   y_shear=(-sin(DegreesToRadians(y_shear)));
  417. !   /*
  418. !     Initialize range table.
  419. !   */
  420. !   range_table=(unsigned char *) malloc(3*(MaxRGB+1)*sizeof(unsigned char));
  421. !   if (range_table == (unsigned char *) NULL)
  422. X      {
  423. !       Warning("unable to rotate image","memory allocation failed");
  424. !       return((Image *) NULL);
  425. X      }
  426. +   for (i=0; i <= MaxRGB; i++)
  427. +   {
  428. +     range_table[i]=0;
  429. +     range_table[i+(MaxRGB+1)]=(unsigned char) i;
  430. +     range_table[i+(MaxRGB+1)*2]=MaxRGB;
  431. X    }
  432. !   range_limit=range_table+(MaxRGB+1);
  433. !   /*
  434. !     Compute image size.
  435. !   */
  436. !   y_width=image->columns+(int) ceil(fabs(x_shear)*(double) (image->rows-1));
  437. !   x_offset=(image->columns+2*
  438. !     (int) ceil(fabs(x_shear)*(double) (image->rows-1))-image->columns)/2;
  439. !   y_offset=(image->rows+
  440. !     (int) ceil(fabs(y_shear)*(double) (y_width-1))-image->rows)/2;
  441. !   /*
  442. !     Surround image with border of background color.
  443. !   */
  444. !   background.red=image->pixels[0].red;
  445. !   background.green=image->pixels[0].green;
  446. !   background.blue=image->pixels[0].blue;
  447. !   sheared_image=BorderImage(image,x_offset,y_offset+1,background);
  448. !   if (sheared_image == (Image *) NULL)
  449. !     {
  450. !       Warning("unable to rotate image","memory allocation failed");
  451. !       return((Image *) NULL);
  452. !     }
  453. !   sheared_image->class=DirectClass;
  454. !   /*
  455. !     Shear the image rows.
  456. !   */
  457. !   if (x_shear != 0.0)
  458. !     XShearImage(sheared_image,x_shear,image->columns,image->rows,x_offset,
  459. !       (int) (sheared_image->rows-image->rows)/2+1,background,range_limit);
  460. !   /*
  461. !     Shear the image columns.
  462. !   */
  463. !   if (y_shear != 0.0)
  464. !     YShearImage(sheared_image,y_shear,y_width,image->rows,(int)
  465. !       (sheared_image->columns-y_width)/2,y_offset+1,background,range_limit);
  466. !   (void) free((char *) range_table);
  467. !   clipped_image=ClipShearImage(sheared_image,x_shear,y_shear,image->columns,
  468. !     image->rows,clip);
  469. !   DestroyImage(sheared_image);
  470. !   return(clipped_image);
  471. X  }
  472. Common subdirectories: ImageMagick/scenes and ImageMagick2.2.1/scenes
  473. diff -r -c ImageMagick/signature.c ImageMagick2.2.1/signature.c
  474. *** ImageMagick/signature.c    Mon Dec  7 09:22:50 1992
  475. --- ImageMagick2.2.1/signature.c    Fri Dec 18 17:07:28 1992
  476. ***************
  477. *** 73,79 ****
  478. X    External declarations.
  479. X  */
  480. X  extern char
  481. !   *application_name;
  482. X  
  483. X  /*
  484. X    Forward declarations.
  485. --- 73,79 ----
  486. X    External declarations.
  487. X  */
  488. X  extern char
  489. !   *client_name;
  490. X  
  491. X  /*
  492. X    Forward declarations.
  493. Common subdirectories: ImageMagick/utilities and ImageMagick2.2.1/utilities
  494. Common subdirectories: ImageMagick/xtp and ImageMagick2.2.1/xtp
  495. diff -r -c ImageMagick/utilities/Imakefile ImageMagick2.2.1/utilities/Imakefile
  496. *** ImageMagick/utilities/Imakefile    Wed Nov 25 14:22:33 1992
  497. --- ImageMagick2.2.1/utilities/Imakefile    Fri Dec 18 17:47:54 1992
  498. ***************
  499. *** 27,33 ****
  500. X  
  501. X  EXTRA_INCLUDES= -I..
  502. X  
  503. ! MagickObjects= ../X.o ../image.o ../rotate.o ../quantize.o ../colors.o \
  504. X    ../signature.o ../compress.o ../alien.o ../PreRvIcccm.o
  505. X  
  506. X  CONVERTObjects= convert.o $(MagickObjects)
  507. --- 27,33 ----
  508. X  
  509. X  EXTRA_INCLUDES= -I..
  510. X  
  511. ! MagickObjects= ../X.o ../image.o ../shear.o ../quantize.o ../colors.o \
  512. X    ../signature.o ../compress.o ../alien.o ../PreRvIcccm.o
  513. X  
  514. X  CONVERTObjects= convert.o $(MagickObjects)
  515. diff -r -c ImageMagick/utilities/MIFFtoSTEREO.c ImageMagick2.2.1/utilities/MIFFtoSTEREO.c
  516. *** ImageMagick/utilities/MIFFtoSTEREO.c    Mon Dec  7 09:24:56 1992
  517. --- ImageMagick2.2.1/utilities/MIFFtoSTEREO.c    Fri Dec 18 17:08:24 1992
  518. ***************
  519. *** 68,74 ****
  520. X    Global declarations.
  521. X  */
  522. X  char
  523. !   *application_name;
  524. X  
  525. X  /*
  526. X  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
  527. --- 68,74 ----
  528. X    Global declarations.
  529. X  */
  530. X  char
  531. !   *client_name;
  532. X  
  533. X  /*
  534. X  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
  535. ***************
  536. *** 101,107 ****
  537. X    *message,
  538. X    *qualifier;
  539. X  {
  540. !   (void) fprintf(stderr,"%s: %s",application_name,message);
  541. X    if (qualifier != (char *) NULL)
  542. X      (void) fprintf(stderr," (%s)",qualifier);
  543. X    (void) fprintf(stderr,".\n");
  544. --- 101,107 ----
  545. X    *message,
  546. X    *qualifier;
  547. X  {
  548. !   (void) fprintf(stderr,"%s: %s",client_name,message);
  549. X    if (qualifier != (char *) NULL)
  550. X      (void) fprintf(stderr," (%s)",qualifier);
  551. X    (void) fprintf(stderr,".\n");
  552. ***************
  553. *** 138,144 ****
  554. X      (void) fprintf(stderr,"Can't continue, %s\n\n",message);
  555. X    (void) fprintf(stderr,
  556. X      "Usage: %s left_image.miff right_image.miff stereo_image.miff\n\n",
  557. !     application_name);
  558. X    (void) fprintf(stderr,"Specify 'left_image.miff' or 'right_image.miff' ");
  559. X    (void) fprintf(stderr,"as '-' for standard input.\n");
  560. X    (void) fprintf(stderr,
  561. --- 138,144 ----
  562. X      (void) fprintf(stderr,"Can't continue, %s\n\n",message);
  563. X    (void) fprintf(stderr,
  564. X      "Usage: %s left_image.miff right_image.miff stereo_image.miff\n\n",
  565. !     client_name);
  566. X    (void) fprintf(stderr,"Specify 'left_image.miff' or 'right_image.miff' ");
  567. X    (void) fprintf(stderr,"as '-' for standard input.\n");
  568. X    (void) fprintf(stderr,
  569. ***************
  570. *** 177,183 ****
  571. X    time_t
  572. X      start_time;
  573. X  
  574. !   application_name=argv[0];
  575. X    if (argc < 4)
  576. X      Usage((char *) NULL);
  577. X    start_time=time((time_t *) 0);
  578. --- 177,183 ----
  579. X    time_t
  580. X      start_time;
  581. X  
  582. !   client_name=argv[0];
  583. X    if (argc < 4)
  584. X      Usage((char *) NULL);
  585. X    start_time=time((time_t *) 0);
  586. diff -r -c ImageMagick/utilities/Make.com ImageMagick2.2.1/utilities/Make.com
  587. *** ImageMagick/utilities/Make.com    Wed Jun 24 10:40:27 1992
  588. --- ImageMagick2.2.1/utilities/Make.com    Fri Dec 18 17:08:14 1992
  589. ***************
  590. *** 11,17 ****
  591. X  $write sys$output "Making Mogrify..."
  592. X  $call Make mogrify
  593. X  $
  594. ! $link'link_options' mogrify,[-]X,[-]image,[-]rotate,[-]quantize,[-]colors, -
  595. X    [-]signature,[-]compress,[-]alien,[-]PreRvIcccm,sys$input:/opt
  596. X  sys$share:decw$xlibshr.exe/share
  597. X  $
  598. --- 11,17 ----
  599. X  $write sys$output "Making Mogrify..."
  600. X  $call Make mogrify
  601. X  $
  602. ! $link'link_options' mogrify,[-]X,[-]image,[-]shear,[-]quantize,[-]colors, -
  603. X    [-]signature,[-]compress,[-]alien,[-]PreRvIcccm,sys$input:/opt
  604. X  sys$share:decw$xlibshr.exe/share
  605. X  $
  606. ***************
  607. *** 23,29 ****
  608. X  $write sys$output "Making Convert..."
  609. X  $call Make convert
  610. X  $
  611. ! $link'link_options' convert,[-]X,[-]image,[-]rotate,[-]quantize,[-]colors, -
  612. X    [-]signature,[-]compress,[-]alien,[-]PreRvIcccm,sys$input:/opt
  613. X  sys$share:decw$xlibshr.exe/share
  614. X  $
  615. --- 23,29 ----
  616. X  $write sys$output "Making Convert..."
  617. X  $call Make convert
  618. X  $
  619. ! $link'link_options' convert,[-]X,[-]image,[-]shear,[-]quantize,[-]colors, -
  620. X    [-]signature,[-]compress,[-]alien,[-]PreRvIcccm,sys$input:/opt
  621. X  sys$share:decw$xlibshr.exe/share
  622. X  $
  623. ***************
  624. *** 35,41 ****
  625. X  $write sys$output "Making MIFFtoSTEREO..."
  626. X  $call Make MIFFtoSTEREO
  627. X  $
  628. ! $link'link_options' MIFFtoSTEREO,[-]X,[-]image,[-]rotate,[-]quantize, -
  629. X    [-]colors,[-]signature,[-]compress,[-]alien,[-]PreRvIcccm,sys$input:/opt
  630. X  sys$share:decw$xlibshr.exe/share
  631. X  $
  632. --- 35,41 ----
  633. X  $write sys$output "Making MIFFtoSTEREO..."
  634. X  $call Make MIFFtoSTEREO
  635. X  $
  636. ! $link'link_options' MIFFtoSTEREO,[-]X,[-]image,[-]shear,[-]quantize, -
  637. X    [-]colors,[-]signature,[-]compress,[-]alien,[-]PreRvIcccm,sys$input:/opt
  638. X  sys$share:decw$xlibshr.exe/share
  639. X  $
  640. diff -r -c ImageMagick/utilities/Makefile ImageMagick2.2.1/utilities/Makefile
  641. *** ImageMagick/utilities/Makefile    Fri Sep 11 12:04:48 1992
  642. --- ImageMagick2.2.1/utilities/Makefile    Fri Dec 18 17:08:13 1992
  643. ***************
  644. *** 45,51 ****
  645. X  DEFINES= -I.. $(JPEG) $(JPEG_INCLUDES) $(TIFF) $(TIFF_INCLUDES)
  646. X  SYS_LIBRARIES= $(XLIB) $(JPEG_LIBRARIES) $(TIFF_LIBRARIES) -lm
  647. X  
  648. ! MagickObjects= ../X.o ../image.o ../rotate.o ../quantize.o ../colors.o \
  649. X    ../signature.o ../compress.o ../alien.o ../PreRvIcccm.o
  650. X  
  651. X  ConvertObjects= convert.o $(MagickObjects)
  652. --- 45,51 ----
  653. X  DEFINES= -I.. $(JPEG) $(JPEG_INCLUDES) $(TIFF) $(TIFF_INCLUDES)
  654. X  SYS_LIBRARIES= $(XLIB) $(JPEG_LIBRARIES) $(TIFF_LIBRARIES) -lm
  655. X  
  656. ! MagickObjects= ../X.o ../image.o ../shear.o ../quantize.o ../colors.o \
  657. X    ../signature.o ../compress.o ../alien.o ../PreRvIcccm.o
  658. X  
  659. X  ConvertObjects= convert.o $(MagickObjects)
  660. diff -r -c ImageMagick/utilities/convert.c ImageMagick2.2.1/utilities/convert.c
  661. *** ImageMagick/utilities/convert.c    Tue Dec  8 11:16:29 1992
  662. --- ImageMagick2.2.1/utilities/convert.c    Fri Dec 18 17:08:24 1992
  663. ***************
  664. *** 81,87 ****
  665. X    Global declarations.
  666. X  */
  667. X  char
  668. !   *application_name;
  669. X  
  670. X  /*
  671. X  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
  672. --- 81,87 ----
  673. X    Global declarations.
  674. X  */
  675. X  char
  676. !   *client_name;
  677. X  
  678. X  /*
  679. X  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
  680. ***************
  681. *** 114,120 ****
  682. X    *message,
  683. X    *qualifier;
  684. X  {
  685. !   (void) fprintf(stderr,"%s: %s",application_name,message);
  686. X    if (qualifier != (char *) NULL)
  687. X      (void) fprintf(stderr," (%s)",qualifier);
  688. X    (void) fprintf(stderr,".\n");
  689. --- 114,120 ----
  690. X    *message,
  691. X    *qualifier;
  692. X  {
  693. !   (void) fprintf(stderr,"%s: %s",client_name,message);
  694. X    if (qualifier != (char *) NULL)
  695. X      (void) fprintf(stderr," (%s)",qualifier);
  696. X    (void) fprintf(stderr,".\n");
  697. ***************
  698. *** 163,169 ****
  699. X        (char *) NULL
  700. X      };
  701. X    (void) fprintf(stderr,"Usage: %s [options ...] input_file output_file\n",
  702. !     application_name);
  703. X    (void) fprintf(stderr,"\nWhere options include:\n");
  704. X    for (p=options; *p != (char *) NULL; p++)
  705. X      (void) fprintf(stderr,"  %s\n",*p);
  706. --- 163,169 ----
  707. X        (char *) NULL
  708. X      };
  709. X    (void) fprintf(stderr,"Usage: %s [options ...] input_file output_file\n",
  710. !     client_name);
  711. X    (void) fprintf(stderr,"\nWhere options include:\n");
  712. X    for (p=options; *p != (char *) NULL; p++)
  713. X      (void) fprintf(stderr,"  %s\n",*p);
  714. ***************
  715. *** 239,245 ****
  716. X    /*
  717. X      Initialize program variables.
  718. X    */
  719. !   application_name=argv[0];
  720. X    if (argc < 3)
  721. X      Usage();
  722. X    /*
  723. --- 239,245 ----
  724. X    /*
  725. X      Initialize program variables.
  726. X    */
  727. !   client_name=argv[0];
  728. X    if (argc < 3)
  729. X      Usage();
  730. X    /*
  731. ***************
  732. *** 470,476 ****
  733. X            Initialize image error attributes.
  734. X          */
  735. X          if (image->class == DirectClass)
  736. !           image->colors=NumberColors(image);
  737. X          total_colors=image->colors;
  738. X        }
  739. X      if (colorspace == GRAYColorspace)
  740. --- 470,476 ----
  741. X            Initialize image error attributes.
  742. X          */
  743. X          if (image->class == DirectClass)
  744. !           image->colors=NumberColors(image,(FILE *) NULL);
  745. X          total_colors=image->colors;
  746. X        }
  747. X      if (colorspace == GRAYColorspace)
  748. diff -r -c ImageMagick/utilities/convert.man ImageMagick2.2.1/utilities/convert.man
  749. *** ImageMagick/utilities/convert.man    Mon Dec  7 09:26:06 1992
  750. --- ImageMagick2.2.1/utilities/convert.man    Sat Dec 19 23:47:16 1992
  751. ***************
  752. *** 41,46 ****
  753. --- 41,48 ----
  754. X  .B GRAY
  755. X  Raw gray bytes.
  756. X  .TP 6
  757. + .B HISTOGRAM
  758. + .TP 6
  759. X  .B JPEG
  760. X  .TP 6
  761. X  .B MIFF
  762. ***************
  763. *** 80,86 ****
  764. X  select image from X server screen; read only.
  765. X  .TP 6
  766. X  .B XC
  767. ! constant image of X server background color.
  768. X  .TP 6
  769. X  .B XBM
  770. X  X11 bitmap.
  771. --- 82,88 ----
  772. X  select image from X server screen; read only.
  773. X  .TP 6
  774. X  .B XC
  775. ! constant image of X server border color.
  776. X  .TP 6
  777. X  .B XBM
  778. X  X11 bitmap.
  779. diff -r -c ImageMagick/utilities/mogrify.c ImageMagick2.2.1/utilities/mogrify.c
  780. *** ImageMagick/utilities/mogrify.c    Tue Dec  8 11:16:14 1992
  781. --- ImageMagick2.2.1/utilities/mogrify.c    Sat Dec 19 02:32:01 1992
  782. ***************
  783. *** 50,55 ****
  784. --- 50,56 ----
  785. X  %  Usage: mogrify [options ...] file [ [options ...] file ...]
  786. X  %
  787. X  %  Where options include:
  788. + %    -border geometry    surround image with a border of color
  789. X  %    -clip geometry      preferred size and location of the clipped image
  790. X  %    -colormap filename  transform image colors to match this set of colors
  791. X  %    -colors value       preferred number of colors in the image
  792. ***************
  793. *** 65,73 ****
  794. --- 66,76 ----
  795. X  %    -noise              reduce noise with a noise peak elimination filter
  796. X  %    -normalize          tranform image to span the full range of colors
  797. X  %    -reflect            reverse image scanlines
  798. + %    -roll geometry       roll an image vertically or horizontally
  799. X  %    -rotate degrees     apply Paeth rotation to the image
  800. X  %    -scale geometry     preferred size factors of the image
  801. X  %    -scene value        image scene number
  802. + %    -shear geomatry     slide one edge of the image along the X or Y axis
  803. X  %    -treedepth value    depth of the color classification tree
  804. X  %    -verbose            print detailed information about the image
  805. X  %
  806. ***************
  807. *** 95,101 ****
  808. X    Global declarations.
  809. X  */
  810. X  char
  811. !   *application_name;
  812. X  
  813. X  /*
  814. X  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
  815. --- 98,104 ----
  816. X    Global declarations.
  817. X  */
  818. X  char
  819. !   *client_name;
  820. X  
  821. X  /*
  822. X  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
  823. ***************
  824. *** 128,134 ****
  825. X    *message,
  826. X    *qualifier;
  827. X  {
  828. !   (void) fprintf(stderr,"%s: %s",application_name,message);
  829. X    if (qualifier != (char *) NULL)
  830. X      (void) fprintf(stderr," (%s)",qualifier);
  831. X    (void) fprintf(stderr,".\n");
  832. --- 131,137 ----
  833. X    *message,
  834. X    *qualifier;
  835. X  {
  836. !   (void) fprintf(stderr,"%s: %s",client_name,message);
  837. X    if (qualifier != (char *) NULL)
  838. X      (void) fprintf(stderr," (%s)",qualifier);
  839. X    (void) fprintf(stderr,".\n");
  840. ***************
  841. *** 162,167 ****
  842. --- 165,171 ----
  843. X    static char
  844. X      *options[]=
  845. X      {
  846. +       "-border geometry    surround image with a border of color",
  847. X        "-clip geometry      preferred size and location of the clipped image",
  848. X        "-colormap filename  transform image colors to match this set of colors",
  849. X        "-colors value       preferred number of colors in the image",
  850. ***************
  851. *** 177,192 ****
  852. X        "-noise              reduce noise with a noise peak elimination filter",
  853. X        "-normalize          tranform image to span the full range of colors",
  854. X        "-reflect            reflect the image scanlines",
  855. X        "-rotate degrees     apply Paeth rotation to the image",
  856. X        "-scale geometry     preferred size factors of the image",
  857. X        "-scene number       image scene number",
  858. X        "-treedepth value    depth of the color classification tree",
  859. X        "-verbose            print detailed information about the image",
  860. X        (char *) NULL
  861. X      };
  862. X    (void) fprintf(stderr,
  863. !     "Usage: %s [-options ...] file [ [-options ...] file ...]\n",
  864. !     application_name);
  865. X    (void) fprintf(stderr,"\nWhere options include: \n");
  866. X    for (p=options; *p != (char *) NULL; p++)
  867. X      (void) fprintf(stderr,"  %s\n",*p);
  868. --- 181,197 ----
  869. X        "-noise              reduce noise with a noise peak elimination filter",
  870. X        "-normalize          tranform image to span the full range of colors",
  871. X        "-reflect            reflect the image scanlines",
  872. +       "-roll geometry      roll an image vertically or horizontally",
  873. X        "-rotate degrees     apply Paeth rotation to the image",
  874. X        "-scale geometry     preferred size factors of the image",
  875. X        "-scene number       image scene number",
  876. +       "-shear geomatry     slide one edge of the image along the X or Y axis",
  877. X        "-treedepth value    depth of the color classification tree",
  878. X        "-verbose            print detailed information about the image",
  879. X        (char *) NULL
  880. X      };
  881. X    (void) fprintf(stderr,
  882. !     "Usage: %s [-options ...] file [ [-options ...] file ...]\n",client_name);
  883. X    (void) fprintf(stderr,"\nWhere options include: \n");
  884. X    for (p=options; *p != (char *) NULL; p++)
  885. X      (void) fprintf(stderr,"  %s\n",*p);
  886. ***************
  887. *** 230,240 ****
  888. X      alien_info;
  889. X  
  890. X    char
  891. X      *clip_geometry,
  892. X      *colormap_filename,
  893. X      *image_geometry,
  894. X      *option,
  895. !     *scale_geometry;
  896. X  
  897. X    double
  898. X      gamma;
  899. --- 235,248 ----
  900. X      alien_info;
  901. X  
  902. X    char
  903. +     *border_geometry,
  904. X      *clip_geometry,
  905. X      *colormap_filename,
  906. X      *image_geometry,
  907. X      *option,
  908. !     *roll_geometry,
  909. !     *scale_geometry,
  910. !     *shear_geometry;
  911. X  
  912. X    double
  913. X      gamma;
  914. ***************
  915. *** 244,257 ****
  916. X  
  917. X    int
  918. X      degrees,
  919. X      i,
  920. !     x;
  921. ! 
  922. X    unsigned int
  923. X      colorspace,
  924. X      compression,
  925. X      dither,
  926. X      enhance,
  927. X      image_number,
  928. X      inverse,
  929. X      maximum_images,
  930. --- 252,268 ----
  931. X  
  932. X    int
  933. X      degrees,
  934. +     flags,
  935. X      i,
  936. !     x,
  937. !     y;
  938. !          
  939. X    unsigned int
  940. X      colorspace,
  941. X      compression,
  942. X      dither,
  943. X      enhance,
  944. +     height,
  945. X      image_number,
  946. X      inverse,
  947. X      maximum_images,
  948. ***************
  949. *** 262,273 ****
  950. X      reflect,
  951. X      scene,
  952. X      tree_depth,
  953. !     verbose;
  954. X  
  955. X    /*
  956. X      Display usage profile if there are no command line arguments.
  957. X    */
  958. !   application_name=(*argv);
  959. X    if (argc < 2)
  960. X      Usage();
  961. X    /*
  962. --- 273,285 ----
  963. X      reflect,
  964. X      scene,
  965. X      tree_depth,
  966. !     verbose,
  967. !     width;
  968. X  
  969. X    /*
  970. X      Display usage profile if there are no command line arguments.
  971. X    */
  972. !   client_name=(*argv);
  973. X    if (argc < 2)
  974. X      Usage();
  975. X    /*
  976. ***************
  977. *** 274,279 ****
  978. --- 286,292 ----
  979. X      Set defaults.
  980. X    */
  981. X    GetAlienInfo(&alien_info);
  982. +   border_geometry=(char *) NULL;
  983. X    clip_geometry=(char *) NULL;
  984. X    colormap_filename=(char *) NULL;
  985. X    colorspace=RGBColorspace;
  986. ***************
  987. *** 289,295 ****
  988. --- 302,310 ----
  989. X    normalize=False;
  990. X    number_colors=0;
  991. X    reflect=False;
  992. +   roll_geometry=(char *) NULL;
  993. X    scale_geometry=(char *) NULL;
  994. +   shear_geometry=(char *) NULL;
  995. X    scene=0;
  996. X    tree_depth=0;
  997. X    verbose=False;
  998. ***************
  999. *** 307,312 ****
  1000. --- 322,344 ----
  1001. X      if (((int) strlen(option) > 1) && ((*option == '-') || (*option == '+')))
  1002. X        switch (*(option+1))
  1003. X        {
  1004. +         case 'b':
  1005. +         {
  1006. +           if (strncmp("border",option+1,2) == 0)
  1007. +             {
  1008. +               border_geometry=(char *) NULL;
  1009. +               if (*option == '-')
  1010. +                 {
  1011. +                   i++;
  1012. +                   if (i == argc)
  1013. +                     Error("missing geometry on -border",(char *) NULL);
  1014. +                   border_geometry=argv[i];
  1015. +                 }
  1016. +               break;
  1017. +             }
  1018. +           Error("unrecognized option",option);
  1019. +           break;
  1020. +         }
  1021. X          case 'c':
  1022. X          {
  1023. X            if (strncmp("clip",option+1,2) == 0)
  1024. ***************
  1025. *** 463,469 ****
  1026. X          }
  1027. X          case 'h':
  1028. X          {
  1029. !           Usage();
  1030. X            break;
  1031. X          }
  1032. X          case 'i':
  1033. --- 495,506 ----
  1034. X          }
  1035. X          case 'h':
  1036. X          {
  1037. !           if (strncmp("help",option+1,2) == 0)
  1038. !             {
  1039. !               Usage();
  1040. !               break;
  1041. !             }
  1042. !           Error("unrecognized option",option);
  1043. X            break;
  1044. X          }
  1045. X          case 'i':
  1046. ***************
  1047. *** 498,503 ****
  1048. --- 535,552 ----
  1049. X                reflect=(*option == '-');
  1050. X                break;
  1051. X              }
  1052. +           if (strncmp("roll",option+1,3) == 0)
  1053. +             {
  1054. +               roll_geometry=(char *) NULL;
  1055. +               if (*option == '-')
  1056. +                 {
  1057. +                   i++;
  1058. +                   if (i == argc)
  1059. +                     Error("missing geometry on -roll",(char *) NULL);
  1060. +                   roll_geometry=argv[i];
  1061. +                 }
  1062. +               break;
  1063. +             }
  1064. X            if (strncmp("rotate",option+1,3) == 0)
  1065. X              {
  1066. X                degrees=0;
  1067. ***************
  1068. *** 539,544 ****
  1069. --- 588,605 ----
  1070. X                  }
  1071. X                break;
  1072. X              }
  1073. +           if (strncmp("shear",option+1,2) == 0)
  1074. +             {
  1075. +               shear_geometry=(char *) NULL;
  1076. +               if (*option == '-')
  1077. +                 {
  1078. +                   i++;
  1079. +                   if ((i == argc) || !sscanf(argv[i],"%f",(float *) &x))
  1080. +                     Error("missing shear geometry on -shear",(char *) NULL);
  1081. +                   shear_geometry=argv[i];
  1082. +                 }
  1083. +               break;
  1084. +             }
  1085. X            Error("unrecognized option",option);
  1086. X            break;
  1087. X          }
  1088. ***************
  1089. *** 614,619 ****
  1090. --- 675,750 ----
  1091. X                    image=reflected_image;
  1092. X                  }
  1093. X              }
  1094. +           if (roll_geometry != (char *) NULL)
  1095. +             {
  1096. +               Image
  1097. +                 *rolled_image;
  1098. + 
  1099. +               /*
  1100. +                 Roll image.
  1101. +               */
  1102. +               x=0;
  1103. +               y=0;
  1104. +               flags=XParseGeometry(roll_geometry,&x,&y,&width,&height);
  1105. +               rolled_image=RollImage(image,x,y);
  1106. +               if (rolled_image != (Image *) NULL)
  1107. +                 {
  1108. +                   DestroyImage(image);
  1109. +                   image=rolled_image;
  1110. +                 }
  1111. +             }
  1112. +           if (border_geometry != (char *) NULL)
  1113. +             {
  1114. +               Image
  1115. +                 *bordered_image;
  1116. + 
  1117. +               /*
  1118. +                 Surround image with a border of solid.
  1119. +               */
  1120. +               bordered_image=ReadXCImage("border",(char *) NULL,"1x1");
  1121. +               if (bordered_image != (Image *) NULL)
  1122. +                 {
  1123. +                   ColorPacket
  1124. +                     border_color;
  1125. + 
  1126. +                   border_color.red=bordered_image->pixels->red;
  1127. +                   border_color.green=bordered_image->pixels->green;
  1128. +                   border_color.blue=bordered_image->pixels->blue;
  1129. +                   DestroyImage(bordered_image);
  1130. +                   width=0;
  1131. +                   height=0;
  1132. +                   flags=XParseGeometry(border_geometry,&x,&y,&width,&height);
  1133. +                   bordered_image=BorderImage(image,width,height,border_color);
  1134. +                   if (bordered_image != (Image *) NULL)
  1135. +                     {
  1136. +                       DestroyImage(image);
  1137. +                       bordered_image->class=DirectClass;
  1138. +                       image=bordered_image;
  1139. +                     }
  1140. +                 }
  1141. +             }
  1142. +           if (shear_geometry != (char *) NULL)
  1143. +             {
  1144. +               float
  1145. +                 x_shear,
  1146. +                 y_shear;
  1147. + 
  1148. +               Image
  1149. +                 *sheared_image;
  1150. + 
  1151. +               /*
  1152. +                 Shear image.
  1153. +               */
  1154. +               x_shear=0.0;
  1155. +               y_shear=0.0;
  1156. +               (void) sscanf(shear_geometry,"%fx%f",&x_shear,&y_shear);
  1157. +               sheared_image=ShearImage(image,x_shear,y_shear,False);
  1158. +               if (sheared_image != (Image *) NULL)
  1159. +                 {
  1160. +                   DestroyImage(image);
  1161. +                   image=sheared_image;
  1162. +                 }
  1163. +             }
  1164. X            if ((degrees % 360) != 0)
  1165. X              {
  1166. X                Image
  1167. ***************
  1168. *** 671,677 ****
  1169. X                  Initialize image error attributes.
  1170. X                */
  1171. X                if (image->class == DirectClass)
  1172. !                 image->colors=NumberColors(image);
  1173. X                total_colors=image->colors;
  1174. X              }
  1175. X            if (colorspace == GRAYColorspace)
  1176. --- 802,808 ----
  1177. X                  Initialize image error attributes.
  1178. X                */
  1179. X                if (image->class == DirectClass)
  1180. !                 image->colors=NumberColors(image,(FILE *) NULL);
  1181. X                total_colors=image->colors;
  1182. X              }
  1183. X            if (colorspace == GRAYColorspace)
  1184. ***************
  1185. *** 759,764 ****
  1186. --- 890,896 ----
  1187. X        /*
  1188. X          Global colormap option;  reduce colors then write image.
  1189. X        */
  1190. +       colormap_image=(Image *) NULL;
  1191. X        if (colormap_filename != (char *) NULL)
  1192. X          {
  1193. X            (void) strcpy(alien_info.filename,colormap_filename);
  1194. ***************
  1195. *** 770,776 ****
  1196. X        QuantizeImages(images,maximum_images,colormap_image,number_colors,
  1197. X          tree_depth,dither,colorspace,True);
  1198. X        if (colormap_image != (Image *) NULL)
  1199. !     DestroyImage(colormap_image);
  1200. X        for (image_number=0; image_number < maximum_images; image_number++)
  1201. X        {
  1202. X          (void) WriteAlienImage(images[image_number]);
  1203. --- 902,908 ----
  1204. X        QuantizeImages(images,maximum_images,colormap_image,number_colors,
  1205. X          tree_depth,dither,colorspace,True);
  1206. X        if (colormap_image != (Image *) NULL)
  1207. !         DestroyImage(colormap_image);
  1208. X        for (image_number=0; image_number < maximum_images; image_number++)
  1209. X        {
  1210. X          (void) WriteAlienImage(images[image_number]);
  1211. diff -r -c ImageMagick/utilities/mogrify.man ImageMagick2.2.1/utilities/mogrify.man
  1212. *** ImageMagick/utilities/mogrify.man    Mon Dec  7 09:26:14 1992
  1213. --- ImageMagick2.2.1/utilities/mogrify.man    Fri Dec 18 17:08:27 1992
  1214. ***************
  1215. *** 21,26 ****
  1216. --- 21,33 ----
  1217. X      mogrify -colors 256 scenes/birds.*
  1218. X  .SH OPTIONS
  1219. X  .TP 5
  1220. + .B "-border \fI<width>x<height>fP"
  1221. + surround the image with a border or color.  See \fBX(1)\fP for details
  1222. + about the geometry specification.
  1223. + 
  1224. + The color of the border is obtained from the X server and is defined as
  1225. + \fBbackground\fP (class \fBBackground\fP).  See \fBX(1)\fP for details.
  1226. + .TP 5
  1227. X  .B "-clip \fI<width>x<height>{\+-}<x offset>{\+-}<y offset>\fP"
  1228. X  preferred size and location of the clipped image.  See \fBX(1)\fP for details
  1229. X  about the geometry specification.
  1230. ***************
  1231. *** 28,33 ****
  1232. --- 35,52 ----
  1233. X  Use clipping to apply image processing options, or transmogrify, only a
  1234. X  particular area of an image.
  1235. X  .TP 5
  1236. + .B "-colormap \fIfilename\fP"
  1237. + choose a particular set of colors from this image.
  1238. + 
  1239. + By default, color reduction chooses an optimal set of colors that
  1240. + best represent the original image.  Alternatively, you can choose a
  1241. + particular set of colors with this option.  This is useful when
  1242. + you want to create a sequence of images with one particular set of
  1243. + colors for each image.
  1244. + 
  1245. + The \fB-colors\fP or \fB-monochrome\fP option is required
  1246. + for this option to take effect.
  1247. + .TP 5
  1248. X  .B "-colors \fIvalue\fP"
  1249. X  preferred number of colors in the image.
  1250. X  
  1251. ***************
  1252. *** 39,46 ****
  1253. X  If more than one image is specified on the command line, a single
  1254. X  colormap is created and saved with each image.
  1255. X  
  1256. ! Note, options \fB-dither\fP, \fB-colorspace\fP, and \fB-treedepth\fP affect
  1257. ! the color reduction algorithm.
  1258. X  .TP 5
  1259. X  .B "-colorspace \fIvalue\fP"
  1260. X  the type of colorspace: \fIGRAY\fP, \fIRGB\fP, \fIXYZ\fP, \fIYIQ\fP, or
  1261. --- 58,65 ----
  1262. X  If more than one image is specified on the command line, a single
  1263. X  colormap is created and saved with each image.
  1264. X  
  1265. ! Note, options \fB-colormap\fP, \fB-dither\fP, \fB-colorspace\fP, and
  1266. ! \fB-treedepth\fP affect the color reduction algorithm.
  1267. X  .TP 5
  1268. X  .B "-colorspace \fIvalue\fP"
  1269. X  the type of colorspace: \fIGRAY\fP, \fIRGB\fP, \fIXYZ\fP, \fIYIQ\fP, or
  1270. ***************
  1271. *** 137,144 ****
  1272. --- 156,174 ----
  1273. X  .B "-reflect"
  1274. X  create a "mirror image" by reflecting the image scanlines.
  1275. X  .TP 5
  1276. + .B "-roll \fI{\+-}<x offset>{\+-}<y offset>\fP"
  1277. + roll an image vertically or horizontally.  See \fBX(1)\fP for details
  1278. + about the geometry specification.
  1279. +  
  1280. + A negative \fIx offset\fP rolls the image left-to-right.  A negative
  1281. + \fIy offset\fP rolls the image top-to-bottom.
  1282. + .TP 5
  1283. X  .B "-rotate \fIdegrees\fP"
  1284. X  apply Paeth image rotation to the image.
  1285. + 
  1286. + Empty triangles left over from rotating the image are filled with the
  1287. + color defined by the pixel at location (0,0).  Refer to \fB-border\fP
  1288. + to choose a specific color.
  1289. X  .TP 5
  1290. X  .B "-scale \fI<width factor>x<height factor>\fP"
  1291. X  preferred size factors of the image.
  1292. ***************
  1293. *** 149,159 ****
  1294. X  one factor is specified, both the width and height factors assume the
  1295. X  value.
  1296. X  
  1297. ! Factors may be fractional.  For example, a factor of 1.5 will increase the
  1298. ! image size by one and one-half.
  1299. X  .TP 5
  1300. X  .B "-scene \fIvalue\fP"
  1301. X  image scene number.
  1302. X  .TP 5
  1303. X  .B "-treedepth \fIvalue\fP"
  1304. X  Normally, this integer value is zero or one.  A zero or one tells
  1305. --- 179,204 ----
  1306. X  one factor is specified, both the width and height factors assume the
  1307. X  value.
  1308. X  
  1309. ! Factors may be fractional.  To increase the size of an image, use a
  1310. ! scale factor greater than 1.0.  To decrease an image's size, use a
  1311. ! scale factor less than 1.0.  Default is 1.0.
  1312. X  .TP 5
  1313. X  .B "-scene \fIvalue\fP"
  1314. X  image scene number.
  1315. + .TP 5
  1316. + .B "-shear \fI<x degrees>x<y degrees>\fP"
  1317. + shear the image along the X or Y axis by a positive or negative shear angle.
  1318. + 
  1319. + Shearing slides one edge of an image along the X or Y axis, creating a
  1320. + parallelogram.  An X direction shear slides an edge along the X axis,
  1321. + while a Y direction shear slides an edge along the Y axis.  The amount
  1322. + of the shear is controlled by a shear angle.  For X direction shears,
  1323. + \fIx degrees>\fP is measured relative to the Y axis, and similarly, for
  1324. + Y direction shears \fIy degrees\fP is measured relative to the X axis.
  1325. + 
  1326. + Empty triangles left over from shearing the image are filled with the
  1327. + color defined by the pixel at location (0,0).  Refer to \fB-border\fP
  1328. + to choose a specific color.
  1329. X  .TP 5
  1330. X  .B "-treedepth \fIvalue\fP"
  1331. X  Normally, this integer value is zero or one.  A zero or one tells
  1332. diff -r -c ImageMagick/xtp/xtp.c ImageMagick2.2.1/xtp/xtp.c
  1333. *** ImageMagick/xtp/xtp.c    Mon Dec  7 09:28:48 1992
  1334. --- ImageMagick2.2.1/xtp/xtp.c    Mon Dec 21 12:54:03 1992
  1335. ***************
  1336. *** 88,94 ****
  1337. X    Variable declarations.
  1338. X  */
  1339. X  static char
  1340. !   *application_name,
  1341. X    slave_tty[16];
  1342. X  
  1343. X  static int
  1344. --- 88,94 ----
  1345. X    Variable declarations.
  1346. X  */
  1347. X  static char
  1348. !   *client_name,
  1349. X    slave_tty[16];
  1350. X  
  1351. X  static int
  1352. ***************
  1353. *** 187,193 ****
  1354. X    *message,
  1355. X    *qualifier;
  1356. X  {
  1357. !   (void) fprintf(stderr,"%s: %s",application_name,message);
  1358. X    if (qualifier != (char *) NULL)
  1359. X      (void) fprintf(stderr," (%s)",qualifier);
  1360. X    (void) fprintf(stderr,".\n");
  1361. --- 187,193 ----
  1362. X    *message,
  1363. X    *qualifier;
  1364. X  {
  1365. !   (void) fprintf(stderr,"%s: %s",client_name,message);
  1366. X    if (qualifier != (char *) NULL)
  1367. X      (void) fprintf(stderr," (%s)",qualifier);
  1368. X    (void) fprintf(stderr,".\n");
  1369. ***************
  1370. *** 940,946 ****
  1371. X      };
  1372. X    (void) fprintf(stderr,
  1373. X      "Usage: %s [-options ...] <host/ip address> [ <home directory> ]\n",
  1374. !     application_name);
  1375. X    (void) fprintf(stderr,"\nWhere options include:\n");
  1376. X    for (p=options; *p; p++)
  1377. X      (void) fprintf(stderr,"  %s\n",*p);
  1378. --- 940,946 ----
  1379. X      };
  1380. X    (void) fprintf(stderr,
  1381. X      "Usage: %s [-options ...] <host/ip address> [ <home directory> ]\n",
  1382. !     client_name);
  1383. X    (void) fprintf(stderr,"\nWhere options include:\n");
  1384. X    for (p=options; *p; p++)
  1385. X      (void) fprintf(stderr,"  %s\n",*p);
  1386. ***************
  1387. *** 1072,1078 ****
  1388. X    /*
  1389. X      Initialize program variables.
  1390. X    */
  1391. !   application_name=argv[0];
  1392. X    binary=False;
  1393. X    directory_expression=(RegularExpression *) NULL;
  1394. X    exclude_expression=(RegularExpression *) NULL;
  1395. --- 1072,1078 ----
  1396. X    /*
  1397. X      Initialize program variables.
  1398. X    */
  1399. !   client_name=argv[0];
  1400. X    binary=False;
  1401. X    directory_expression=(RegularExpression *) NULL;
  1402. X    exclude_expression=(RegularExpression *) NULL;
  1403. diff -r -c ImageMagick/xtp/xtp.h ImageMagick2.2.1/xtp/xtp.h
  1404. *** ImageMagick/xtp/xtp.h    Mon Dec  7 09:29:01 1992
  1405. --- ImageMagick2.2.1/xtp/xtp.h    Mon Dec 21 12:53:04 1992
  1406. ***************
  1407. *** 31,37 ****
  1408. X  #define True  1
  1409. X  #define Warning(message,qualifier)  \
  1410. X  {  \
  1411. !   (void) fprintf(stderr,"%s: %s",application_name,message);  \
  1412. X    if (qualifier != (char *) NULL)  \
  1413. X      (void) fprintf(stderr," (%s)",qualifier);  \
  1414. X    (void) fprintf(stderr,".\n");  \
  1415. --- 31,37 ----
  1416. X  #define True  1
  1417. X  #define Warning(message,qualifier)  \
  1418. X  {  \
  1419. !   (void) fprintf(stderr,"%s: %s",client_name,message);  \
  1420. X    if (qualifier != (char *) NULL)  \
  1421. X      (void) fprintf(stderr," (%s)",qualifier);  \
  1422. X    (void) fprintf(stderr,".\n");  \
  1423. SHAR_EOF
  1424. echo 'File fix-01 is complete' &&
  1425. chmod 0600 fix-01 ||
  1426. echo 'restore of fix-01 failed'
  1427. Wc_c="`wc -c < 'fix-01'`"
  1428. test 192865 -eq "$Wc_c" ||
  1429.     echo 'fix-01: original size 192865, current size' "$Wc_c"
  1430. rm -f _shar_wnt_.tmp
  1431. fi
  1432. rm -f _shar_seq_.tmp
  1433. echo You have unpacked the last part
  1434. exit 0
  1435. -- 
  1436. cristy@dupont.com
  1437.