home *** CD-ROM | disk | FTP | other *** search
/ NetNews Usenet Archive 1992 #31 / NN_1992_31.iso / spool / comp / sources / bugs / 315 < prev    next >
Encoding:
Text File  |  1992-12-22  |  75.3 KB  |  2,482 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 02/3
  5. Message-ID: <cristy.724966583@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:23 GMT
  10. Lines: 2470
  11.  
  12. Submitted-by: cristy@dupont.com
  13. Archive-name: ImageMagick/patch0102
  14.  
  15. #!/bin/sh
  16. # this is magick.02 (part 2 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" != 2; 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. !   resource_value=XGetResource(resource_database,client_name,"scene","0");
  38. X    scene=atoi(resource_value);
  39. !   resource_value=XGetResource(resource_database,client_name,"verbose","False");
  40. X    verbose=IsTrue(resource_value);
  41. !   window_id=
  42. !     XGetResource(resource_database,client_name,"windowId",(char *) NULL);
  43. X    /*
  44. X      Parse command line.
  45. X    */
  46. ***************
  47. *** 5659,5665 ****
  48. X                  Initialize image error attributes.
  49. X                */
  50. X                if (image->class == DirectClass)
  51. !                 image->colors=NumberColors(image);
  52. X                total_colors=image->colors;
  53. X              }
  54. X            if (resource_info.colorspace == GRAYColorspace)
  55. --- 5660,5666 ----
  56. X                  Initialize image error attributes.
  57. X                */
  58. X                if (image->class == DirectClass)
  59. !                 image->colors=NumberColors(image,(FILE *) NULL);
  60. X                total_colors=image->colors;
  61. X              }
  62. X            if (resource_info.colorspace == GRAYColorspace)
  63. diff -r -c ImageMagick/display.h ImageMagick2.2.1/display.h
  64. *** ImageMagick/display.h    Mon Dec  7 09:23:25 1992
  65. --- ImageMagick2.2.1/display.h    Fri Dec 18 17:07:29 1992
  66. ***************
  67. *** 35,41 ****
  68. X  #define UpShifted(x) ((int) ((x)*(1L << 16)+0.5))
  69. X  #define Warning(message,qualifier)  \
  70. X  {  \
  71. !   (void) fprintf(stderr,"%s: %s",application_name,message);  \
  72. X    if (qualifier != (char *) NULL)  \
  73. X      (void) fprintf(stderr," (%s)",qualifier);  \
  74. X    (void) fprintf(stderr,".\n");  \
  75. --- 35,41 ----
  76. X  #define UpShifted(x) ((int) ((x)*(1L << 16)+0.5))
  77. X  #define Warning(message,qualifier)  \
  78. X  {  \
  79. !   (void) fprintf(stderr,"%s: %s",client_name,message);  \
  80. X    if (qualifier != (char *) NULL)  \
  81. X      (void) fprintf(stderr," (%s)",qualifier);  \
  82. X    (void) fprintf(stderr,".\n");  \
  83. ***************
  84. *** 51,55 ****
  85. X  */
  86. X  #ifndef lint
  87. X  static char 
  88. !   Version[]="@(#)ImageMagick 2.2 92/12/10 cristy@dupont.com";
  89. X  #endif
  90. --- 51,55 ----
  91. X  */
  92. X  #ifndef lint
  93. X  static char 
  94. !   Version[]="@(#)ImageMagick 2.2.1 92/12/10 cristy@dupont.com";
  95. X  #endif
  96. diff -r -c ImageMagick/display.man ImageMagick2.2.1/display.man
  97. *** ImageMagick/display.man    Mon Dec  7 19:53:00 1992
  98. --- ImageMagick2.2.1/display.man    Fri Dec 18 17:07:31 1992
  99. ***************
  100. *** 207,213 ****
  101. X  tranform image to span the full range of color values.  This is a contrast
  102. X  enhancement technique.
  103. X  .TP 5
  104. ! .B "-print \fIfile\fP"
  105. X  write image as encapsulated Postscript to a file.
  106. X  
  107. X  If \fIfile\fP already exists, you will be prompted as to whether
  108. --- 207,213 ----
  109. X  tranform image to span the full range of color values.  This is a contrast
  110. X  enhancement technique.
  111. X  .TP 5
  112. ! .B "-print \fIfilename\fP"
  113. X  write image as encapsulated Postscript to a file.
  114. X  
  115. X  If \fIfile\fP already exists, you will be prompted as to whether
  116. ***************
  117. *** 232,237 ****
  118. --- 232,240 ----
  119. X  .TP 5
  120. X  .B "-rotate \fIdegrees\fP"
  121. X  apply Paeth image rotation to the image.
  122. + 
  123. + Empty triangles left over from rotating the image are filled with
  124. + the color defined by the pixel at location (0,0).
  125. X  .TP 5
  126. X  .B "-scale \fI<width factor>x<height factor>\fP"
  127. X  preferred size factors of the image.
  128. ***************
  129. *** 242,249 ****
  130. X  one factor is specified, both the width and height factors assume the
  131. X  value.
  132. X  
  133. ! Factors may be fractional.  For example, a factor of 1.5 will increase the
  134. ! image size by one and one-half.
  135. X  
  136. X  The equivalent X resource for this option is \fBscaleGeometry\fP
  137. X  (class \fBScaleGeometry\fP).  See \fBX RESOURCES\fP for details.
  138. --- 245,253 ----
  139. X  one factor is specified, both the width and height factors assume the
  140. X  value.
  141. X  
  142. ! Factors may be fractional.  To increase the size of an image, use a
  143. ! scale factor greater than 1.0.  To decrease an image's size, use a
  144. ! scale factor less than 1.0.  Default is 1.0.
  145. X  
  146. X  The equivalent X resource for this option is \fBscaleGeometry\fP
  147. X  (class \fBScaleGeometry\fP).  See \fBX RESOURCES\fP for details.
  148. ***************
  149. *** 311,317 ****
  150. X  unique colors than the target window colormap allows.  Use
  151. X  \fB-colors\fP to reduce the number of colors.
  152. X  .TP 5
  153. ! .B "-write \fIfile\fP"
  154. X  write image to a file.
  155. X  
  156. X  If \fIfile\fP already exists, you will be prompted as to whether
  157. --- 315,321 ----
  158. X  unique colors than the target window colormap allows.  Use
  159. X  \fB-colors\fP to reduce the number of colors.
  160. X  .TP 5
  161. ! .B "-write \fIfilename\fP"
  162. X  write image to a file.
  163. X  
  164. X  If \fIfile\fP already exists, you will be prompted as to whether
  165. diff -r -c ImageMagick/image.c ImageMagick2.2.1/image.c
  166. *** ImageMagick/image.c    Mon Dec  7 09:18:21 1992
  167. --- ImageMagick2.2.1/image.c    Fri Dec 18 17:07:28 1992
  168. ***************
  169. *** 59,65 ****
  170. X    External declarations.
  171. X  */
  172. X  extern char
  173. !   *application_name;
  174. X  
  175. X  /*
  176. X  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
  177. --- 59,65 ----
  178. X    External declarations.
  179. X  */
  180. X  extern char
  181. !   *client_name;
  182. X  
  183. X  /*
  184. X  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
  185. ***************
  186. *** 4050,4055 ****
  187. --- 4050,4156 ----
  188. X  %                                                                             %
  189. X  %                                                                             %
  190. X  %                                                                             %
  191. + %   R o l l I m a g e                                                         %
  192. + %                                                                             %
  193. + %                                                                             %
  194. + %                                                                             %
  195. + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
  196. + %
  197. + %  Function RollImage rolls an image vertically and horizontally.  It
  198. + %  allocates the memory necessary for the new Image structure and returns a
  199. + %  pointer to the new image.
  200. + %
  201. + %  The format of the RollImage routine is:
  202. + %
  203. + %      rolled_image=RollImage(image,columns,rows)
  204. + %
  205. + %  A description of each parameter follows:
  206. + %
  207. + %    o rolled_image: Function RollImage returns a pointer to the image after
  208. + %      rolling.  A null image is returned if there is a memory shortage.
  209. + %
  210. + %    o image: The address of a structure of type Image.
  211. + %
  212. + %    o x_offset: An integer that specifies the number of columns to roll
  213. + %      in the horizonal direction.
  214. + %
  215. + %    o y_offset: An integer that specifies the number of rows to roll in the
  216. + %      veritical direction.
  217. + %
  218. + %
  219. + */
  220. + Image *RollImage(image,x_offset,y_offset)
  221. + Image
  222. +   *image;
  223. + 
  224. + unsigned int
  225. +   x_offset,
  226. +   y_offset;
  227. + {
  228. +   Image
  229. +     *rolled_image;
  230. + 
  231. +   register RunlengthPacket
  232. +     *p,
  233. +     *q;
  234. + 
  235. +   register unsigned int
  236. +     packets,
  237. +     x;
  238. + 
  239. +   unsigned int
  240. +     y;
  241. + 
  242. +   /*
  243. +     Initialize rolled image attributes.
  244. +   */
  245. +   rolled_image=CopyImage(image,image->columns,image->rows,False);
  246. +   if (rolled_image == (Image *) NULL)
  247. +     {
  248. +       Warning("unable to roll image","memory allocation failed");
  249. +       return((Image *) NULL);
  250. +     }
  251. +   /*
  252. +     Roll image.
  253. +   */
  254. +   p=image->pixels;
  255. +   image->runlength=p->length+1;
  256. +   packets=image->columns*image->rows;
  257. +   for (y=0; y < image->rows; y++)
  258. +   {
  259. +     /*
  260. +       Transfer scanline.
  261. +     */
  262. +     for (x=0; x < image->columns; x++)
  263. +     {
  264. +       if (image->runlength > 0)
  265. +         image->runlength--;
  266. +       else
  267. +         {
  268. +           p++;
  269. +           image->runlength=p->length;
  270. +         }
  271. +       q=rolled_image->pixels+(y_offset+y)*image->columns+x+x_offset;
  272. +       if (q < rolled_image->pixels)
  273. +         q+=packets;
  274. +       else
  275. +         if (q >= (rolled_image->pixels+packets))
  276. +           q-=packets;
  277. +       q->red=p->red;
  278. +       q->green=p->green;
  279. +       q->blue=p->blue;
  280. +       q->index=p->index;
  281. +       q->length=0;
  282. +     }
  283. +   }
  284. +   return(rolled_image);
  285. + }
  286. + 
  287. + /*
  288. + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
  289. + %                                                                             %
  290. + %                                                                             %
  291. + %                                                                             %
  292. X  %   S c a l e I m a g e                                                       %
  293. X  %                                                                             %
  294. X  %                                                                             %
  295. ***************
  296. *** 4477,4483 ****
  297. X  %      transformed image is returned as this parameter.
  298. X  %
  299. X  %    o clip_geometry: Specifies a pointer to a clip geometry string.
  300. ! %      This geometry defined a subregion of the image.
  301. X  %
  302. X  %    o image_geometry: Specifies a pointer to a image geometry string.
  303. X  %      The specified width and height of this geometry string are absolute.
  304. --- 4578,4584 ----
  305. X  %      transformed image is returned as this parameter.
  306. X  %
  307. X  %    o clip_geometry: Specifies a pointer to a clip geometry string.
  308. ! %      This geometry defines a subregion of the image.
  309. X  %
  310. X  %    o image_geometry: Specifies a pointer to a image geometry string.
  311. X  %      The specified width and height of this geometry string are absolute.
  312. ***************
  313. *** 4543,4558 ****
  314. X    if (scale_geometry != (char *) NULL)
  315. X      {
  316. X        float
  317. !         scale_height,
  318. !         scale_width;
  319. X  
  320. !       scale_width=0.0;
  321. !       scale_height=0.0;
  322. !       (void) sscanf(scale_geometry,"%fx%f",&scale_width,&scale_height);
  323. !       if (scale_height == 0.0)
  324. !         scale_height=scale_width;
  325. !       width=(unsigned int) (width*scale_width);
  326. !       height=(unsigned int) (height*scale_height);
  327. X      }
  328. X    if (image_geometry != (char *) NULL)
  329. X      (void) XParseGeometry(image_geometry,&x,&y,&width,&height);
  330. --- 4644,4659 ----
  331. X    if (scale_geometry != (char *) NULL)
  332. X      {
  333. X        float
  334. !         height_factor,
  335. !         width_factor;
  336. X  
  337. !       width_factor=0.0;
  338. !       height_factor=0.0;
  339. !       (void) sscanf(scale_geometry,"%fx%f",&width_factor,&height_factor);
  340. !       if (height_factor == 0.0)
  341. !         height_factor=width_factor;
  342. !       width=(unsigned int) (width*width_factor);
  343. !       height=(unsigned int) (height*height_factor);
  344. X      }
  345. X    if (image_geometry != (char *) NULL)
  346. X      (void) XParseGeometry(image_geometry,&x,&y,&width,&height);
  347. diff -r -c ImageMagick/image.h ImageMagick2.2.1/image.h
  348. *** ImageMagick/image.h    Mon Dec  7 17:10:46 1992
  349. --- ImageMagick2.2.1/image.h    Fri Dec 18 17:07:29 1992
  350. ***************
  351. *** 2,7 ****
  352. --- 2,8 ----
  353. X    Image define declarations.
  354. X  */
  355. X  #define AbsoluteValue(x)  ((x) < 0 ? -(x) : (x))
  356. + #define DegreesToRadians(x) ((x)*3.14159265358979323846/180.0)
  357. X  #define Intensity(color)  (unsigned int)  \
  358. X    ((unsigned int) ((color).red*77+(color).green*150+(color).blue*29) >> 8)
  359. X  #define MaxColormapSize  65535
  360. ***************
  361. *** 147,154 ****
  362. --- 148,157 ----
  363. X    *ReadImage _Declare((char *)),
  364. X    *ReduceImage _Declare((Image *)),
  365. X    *ReflectImage _Declare((Image *)),
  366. +   *RollImage _Declare((Image *,unsigned int,unsigned int)),
  367. X    *RotateImage _Declare((Image *,double,int)),
  368. X    *ScaleImage _Declare((Image *,unsigned int,unsigned int)),
  369. +   *ShearImage _Declare((Image *,double,double,unsigned int)),
  370. X    *StereoImage _Declare((Image *,Image *)),
  371. X    *ZoomImage _Declare((Image *));
  372. X  
  373. ***************
  374. *** 156,162 ****
  375. X    ReadDataBlock _Declare((char *,FILE *));
  376. X  
  377. X  extern unsigned int
  378. !   NumberColors _Declare((Image *)),
  379. X    PackImage _Declare((Image *)),
  380. X    PrintImage _Declare((Image *,char *)),
  381. X    ReadData _Declare((char *,int,int,FILE *)),
  382. --- 159,165 ----
  383. X    ReadDataBlock _Declare((char *,FILE *));
  384. X  
  385. X  extern unsigned int
  386. !   NumberColors _Declare((Image *,FILE *)),
  387. X    PackImage _Declare((Image *)),
  388. X    PrintImage _Declare((Image *,char *)),
  389. X    ReadData _Declare((char *,int,int,FILE *)),
  390. Common subdirectories: ImageMagick/images and ImageMagick2.2.1/images
  391. diff -r -c ImageMagick/import.c ImageMagick2.2.1/import.c
  392. *** ImageMagick/import.c    Mon Dec  7 09:18:45 1992
  393. --- ImageMagick2.2.1/import.c    Fri Dec 18 17:07:28 1992
  394. ***************
  395. *** 90,96 ****
  396. X    Global declarations.
  397. X  */
  398. X  char
  399. !   *application_name;
  400. X  
  401. X  /*
  402. X  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
  403. --- 90,96 ----
  404. X    Global declarations.
  405. X  */
  406. X  char
  407. !   *client_name;
  408. X  
  409. X  /*
  410. X  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
  411. ***************
  412. *** 123,129 ****
  413. X    *message,
  414. X    *qualifier;
  415. X  {
  416. !   (void) fprintf(stderr,"%s: %s",application_name,message);
  417. X    if (qualifier != (char *) NULL)
  418. X      (void) fprintf(stderr," (%s)",qualifier);
  419. X    (void) fprintf(stderr,".\n");
  420. --- 123,129 ----
  421. X    *message,
  422. X    *qualifier;
  423. X  {
  424. !   (void) fprintf(stderr,"%s: %s",client_name,message);
  425. X    if (qualifier != (char *) NULL)
  426. X      (void) fprintf(stderr," (%s)",qualifier);
  427. X    (void) fprintf(stderr,".\n");
  428. ***************
  429. *** 169,175 ****
  430. X        "-window id       select window with this id or name",
  431. X        (char *) NULL
  432. X      };
  433. !   (void) fprintf(stderr,"Usage: %s [options ...] file\n",application_name);
  434. X    (void) fprintf(stderr,"\nWhere options include:\n");
  435. X    for (p=options; *p != (char *) NULL; p++)
  436. X      (void) fprintf(stderr,"  %s\n",*p);
  437. --- 169,175 ----
  438. X        "-window id       select window with this id or name",
  439. X        (char *) NULL
  440. X      };
  441. !   (void) fprintf(stderr,"Usage: %s [options ...] file\n",client_name);
  442. X    (void) fprintf(stderr,"\nWhere options include:\n");
  443. X    for (p=options; *p != (char *) NULL; p++)
  444. X      (void) fprintf(stderr,"  %s\n",*p);
  445. ***************
  446. *** 247,253 ****
  447. X    /*
  448. X      Display usage profile if there are no command line arguments.
  449. X    */
  450. !   application_name=(*argv);
  451. X    if (argc < 2)
  452. X      Usage();
  453. X    /*
  454. --- 247,253 ----
  455. X    /*
  456. X      Display usage profile if there are no command line arguments.
  457. X    */
  458. !   client_name=(*argv);
  459. X    if (argc < 2)
  460. X      Usage();
  461. X    /*
  462. ***************
  463. *** 293,319 ****
  464. X    /*
  465. X      Get user defaults from X resource database.
  466. X    */
  467. !   XGetResourceInfo(resource_database,application_name,&resource_info);
  468. !   resource_value=XGetResource(resource_database,application_name,"borders",
  469. !     (char *) NULL,"False");
  470. X    borders=IsTrue(resource_value);
  471. !   resource_value=XGetResource(resource_database,application_name,
  472. !     "compression",(char *) NULL,"Runlength");
  473. X    if (Latin1Compare("qencoded",resource_value) == 0)
  474. X      compression=QEncodedCompression;
  475. X    else
  476. X      compression=RunlengthEncodedCompression;
  477. !   resource_value=XGetResource(resource_database,application_name,"frame",
  478. !     (char *) NULL,"False");
  479. X    frame=IsTrue(resource_value);
  480. !   resource_value=XGetResource(resource_database,application_name,"scene",
  481. !     (char *) NULL,"0");
  482. X    scene=atoi(resource_value);
  483. !   resource_value=XGetResource(resource_database,application_name,"screen",
  484. !     (char *) NULL,"False");
  485. X    screen=IsTrue(resource_value);
  486. !   resource_value=XGetResource(resource_database,application_name,"verbose",
  487. !     (char *) NULL,"False");
  488. X    verbose=IsTrue(resource_value);
  489. X    /*
  490. X      Check command syntax.
  491. --- 293,314 ----
  492. X    /*
  493. X      Get user defaults from X resource database.
  494. X    */
  495. !   XGetResourceInfo(resource_database,client_name,&resource_info);
  496. !   resource_value=XGetResource(resource_database,client_name,"borders","False");
  497. X    borders=IsTrue(resource_value);
  498. !   resource_value=
  499. !     XGetResource(resource_database,client_name,"compression","Runlength");
  500. X    if (Latin1Compare("qencoded",resource_value) == 0)
  501. X      compression=QEncodedCompression;
  502. X    else
  503. X      compression=RunlengthEncodedCompression;
  504. !   resource_value=XGetResource(resource_database,client_name,"frame","False");
  505. X    frame=IsTrue(resource_value);
  506. !   resource_value=XGetResource(resource_database,client_name,"scene","0");
  507. X    scene=atoi(resource_value);
  508. !   resource_value=XGetResource(resource_database,client_name,"screen","False");
  509. X    screen=IsTrue(resource_value);
  510. !   resource_value=XGetResource(resource_database,client_name,"verbose","False");
  511. X    verbose=IsTrue(resource_value);
  512. X    /*
  513. X      Check command syntax.
  514. ***************
  515. *** 457,463 ****
  516. X          Display detailed info about the image.
  517. X        */
  518. X        if (image->class == DirectClass)
  519. !         image->colors=NumberColors(image);
  520. X        (void) fprintf(stderr,"[%u] %s %ux%u",image->scene,image->filename,
  521. X          image->columns,image->rows);
  522. X        if (image->class == DirectClass)
  523. --- 452,458 ----
  524. X          Display detailed info about the image.
  525. X        */
  526. X        if (image->class == DirectClass)
  527. !         image->colors=NumberColors(image,(FILE *) NULL);
  528. X        (void) fprintf(stderr,"[%u] %s %ux%u",image->scene,image->filename,
  529. X          image->columns,image->rows);
  530. X        if (image->class == DirectClass)
  531. diff -r -c ImageMagick/montage.c ImageMagick2.2.1/montage.c
  532. *** ImageMagick/montage.c    Wed Dec  9 09:43:25 1992
  533. --- ImageMagick2.2.1/montage.c    Fri Dec 18 17:07:28 1992
  534. ***************
  535. *** 129,135 ****
  536. X    Global declarations.
  537. X  */
  538. X  char
  539. !   *application_name;
  540. X  
  541. X  /*
  542. X  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
  543. --- 129,135 ----
  544. X    Global declarations.
  545. X  */
  546. X  char
  547. !   *client_name;
  548. X  
  549. X  /*
  550. X  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
  551. ***************
  552. *** 162,168 ****
  553. X    *message,
  554. X    *qualifier;
  555. X  {
  556. !   (void) fprintf(stderr,"%s: %s",application_name,message);
  557. X    if (qualifier != (char *) NULL)
  558. X      (void) fprintf(stderr," (%s)",qualifier);
  559. X    (void) fprintf(stderr,".\n");
  560. --- 162,168 ----
  561. X    *message,
  562. X    *qualifier;
  563. X  {
  564. !   (void) fprintf(stderr,"%s: %s",client_name,message);
  565. X    if (qualifier != (char *) NULL)
  566. X      (void) fprintf(stderr," (%s)",qualifier);
  567. X    (void) fprintf(stderr,".\n");
  568. ***************
  569. *** 670,676 ****
  570. X      };
  571. X    (void) fprintf(stderr,
  572. X      "Usage: %s [-options ...] file [ [-options ...] file ...] file\n",
  573. !     application_name);
  574. X    (void) fprintf(stderr,"\nWhere options include: \n");
  575. X    for (p=options; *p != (char *) NULL; p++)
  576. X      (void) fprintf(stderr,"  %s\n",*p);
  577. --- 670,676 ----
  578. X      };
  579. X    (void) fprintf(stderr,
  580. X      "Usage: %s [-options ...] file [ [-options ...] file ...] file\n",
  581. !     client_name);
  582. X    (void) fprintf(stderr,"\nWhere options include: \n");
  583. X    for (p=options; *p != (char *) NULL; p++)
  584. X      (void) fprintf(stderr,"  %s\n",*p);
  585. ***************
  586. *** 762,768 ****
  587. X    /*
  588. X      Display usage profile if there are no command line arguments.
  589. X    */
  590. !   application_name=(*argv);
  591. X    if (argc < 3)
  592. X      Usage();
  593. X    /*
  594. --- 762,768 ----
  595. X    /*
  596. X      Display usage profile if there are no command line arguments.
  597. X    */
  598. !   client_name=(*argv);
  599. X    if (argc < 3)
  600. X      Usage();
  601. X    /*
  602. ***************
  603. *** 849,877 ****
  604. X        /*
  605. X          Get user defaults from X resource database.
  606. X        */
  607. !       XGetResourceInfo(resource_database,application_name,&resource_info);
  608. !       resource_value=XGetResource(resource_database,application_name,
  609. !         "aspect_ratio",(char *) NULL,"True");
  610. X        aspect_ratio=IsTrue(resource_value);
  611. !       clip_geometry=XGetResource(resource_database,application_name,
  612. !         "clipGeometry","ClipGeometry",(char *) NULL);
  613. !       resource_value=XGetResource(resource_database,application_name,
  614. !         "compression",(char *) NULL,"RunlengthEncoded");
  615. X        if (Latin1Compare("qencoded",resource_value) == 0)
  616. X          compression=QEncodedCompression;
  617. X        else
  618. X          compression=RunlengthEncodedCompression;
  619. !       resource_value=XGetResource(resource_database,application_name,"gamma",
  620. !         (char *) NULL,"0.0");
  621. X        gamma=atof(resource_value);
  622. !       resource_value=XGetResource(resource_database,application_name,"rotate",
  623. !         (char *) NULL,"0");
  624. X        degrees=atoi(resource_value);
  625. !       resource_value=XGetResource(resource_database,application_name,
  626. !         "tiles_per_row","TilesPerRow","0");
  627. X        tiles_per_row=atoi(resource_value);
  628. !       resource_value=XGetResource(resource_database,application_name,"verbose",
  629. !         (char *) NULL,"False");
  630. X        verbose=IsTrue(resource_value);
  631. X      }
  632. X    /*
  633. --- 849,877 ----
  634. X        /*
  635. X          Get user defaults from X resource database.
  636. X        */
  637. !       XGetResourceInfo(resource_database,client_name,&resource_info);
  638. !       resource_value=
  639. !         XGetResource(resource_database,client_name,"aspect_ratio","True");
  640. X        aspect_ratio=IsTrue(resource_value);
  641. !       clip_geometry=XGetResource(resource_database,client_name,"clipGeometry",
  642. !         (char *) NULL);
  643. !       resource_value=XGetResource(resource_database,client_name,
  644. !         "compression","RunlengthEncoded");
  645. X        if (Latin1Compare("qencoded",resource_value) == 0)
  646. X          compression=QEncodedCompression;
  647. X        else
  648. X          compression=RunlengthEncodedCompression;
  649. !       resource_value=XGetResource(resource_database,client_name,"gamma",
  650. !         "0.0");
  651. X        gamma=atof(resource_value);
  652. !       resource_value=XGetResource(resource_database,client_name,"rotate",
  653. !         "0");
  654. X        degrees=atoi(resource_value);
  655. !       resource_value=XGetResource(resource_database,client_name,
  656. !         "tiles_per_row","0");
  657. X        tiles_per_row=atoi(resource_value);
  658. !       resource_value=
  659. !         XGetResource(resource_database,client_name,"verbose","False");
  660. X        verbose=IsTrue(resource_value);
  661. X      }
  662. X    /*
  663. ***************
  664. *** 1410,1416 ****
  665. X          Display detailed info about the image.
  666. X        */
  667. X        if (montage_image->class == DirectClass)
  668. !         montage_image->colors=NumberColors(montage_image);
  669. X        (void) fprintf(stderr,"[%u] %s %ux%u",montage_image->scene,
  670. X          montage_image->filename,montage_image->columns,montage_image->rows);
  671. X        if (montage_image->class == DirectClass)
  672. --- 1410,1416 ----
  673. X          Display detailed info about the image.
  674. X        */
  675. X        if (montage_image->class == DirectClass)
  676. !         montage_image->colors=NumberColors(montage_image,False);
  677. X        (void) fprintf(stderr,"[%u] %s %ux%u",montage_image->scene,
  678. X          montage_image->filename,montage_image->columns,montage_image->rows);
  679. X        if (montage_image->class == DirectClass)
  680. diff -r -c ImageMagick/montage.man ImageMagick2.2.1/montage.man
  681. *** ImageMagick/montage.man    Mon Dec  7 19:53:01 1992
  682. --- ImageMagick2.2.1/montage.man    Fri Dec 18 17:07:31 1992
  683. ***************
  684. *** 279,284 ****
  685. --- 279,287 ----
  686. X  .TP 5
  687. X  .B "-rotate \fIdegrees\fP"
  688. X  apply Paeth image rotation to the image.
  689. + 
  690. + Empty triangles left over from rotating the image are filled with
  691. + the color defined by the pixel at location (0,0).
  692. X  .TP 5
  693. X  .B "-tiles_per_row \fIvalue\fP"
  694. X  specifies how many images are to appear in each row of the composite image.
  695. diff -r -c ImageMagick/quantize.c ImageMagick2.2.1/quantize.c
  696. *** ImageMagick/quantize.c    Thu Dec 10 12:53:06 1992
  697. --- ImageMagick2.2.1/quantize.c    Mon Dec 21 11:12:00 1992
  698. ***************
  699. *** 271,277 ****
  700. X    External declarations.
  701. X  */
  702. X  extern char
  703. !   *application_name;
  704. X  
  705. X  /*
  706. X    Forward declarations.
  707. --- 271,277 ----
  708. X    External declarations.
  709. X  */
  710. X  extern char
  711. !   *client_name;
  712. X  
  713. X  /*
  714. X    Forward declarations.
  715. ***************
  716. *** 396,402 ****
  717. X            Identify the deepest node containing the pixel's color.
  718. X          */
  719. X          node=cube.root;
  720. !         do
  721. X          {
  722. X            id=(p->red > node->mid_red ? 1 : 0) |
  723. X              (p->green > node->mid_green ? 1 : 0) << 1 |
  724. --- 396,402 ----
  725. X            Identify the deepest node containing the pixel's color.
  726. X          */
  727. X          node=cube.root;
  728. !         for ( ; ; )
  729. X          {
  730. X            id=(p->red > node->mid_red ? 1 : 0) |
  731. X              (p->green > node->mid_green ? 1 : 0) << 1 |
  732. ***************
  733. *** 404,410 ****
  734. X            if ((node->children & (1 << id)) == 0)
  735. X              break;
  736. X            node=node->child[id];
  737. !         } while (True);
  738. X          p->index=(unsigned short) node->color_number;
  739. X          p++;
  740. X        }
  741. --- 404,410 ----
  742. X            if ((node->children & (1 << id)) == 0)
  743. X              break;
  744. X            node=node->child[id];
  745. !         }
  746. X          p->index=(unsigned short) node->color_number;
  747. X          p++;
  748. X        }
  749. ***************
  750. *** 415,421 ****
  751. X            Identify the deepest node containing the pixel's color.
  752. X          */
  753. X          node=cube.root;
  754. !         do
  755. X          {
  756. X            id=(p->red > node->mid_red ? 1 : 0) |
  757. X              (p->green > node->mid_green ? 1 : 0) << 1 |
  758. --- 415,421 ----
  759. X            Identify the deepest node containing the pixel's color.
  760. X          */
  761. X          node=cube.root;
  762. !         for ( ; ; )
  763. X          {
  764. X            id=(p->red > node->mid_red ? 1 : 0) |
  765. X              (p->green > node->mid_green ? 1 : 0) << 1 |
  766. ***************
  767. *** 424,430 ****
  768. X              break;
  769. X            node=node->child[id];
  770. X          }
  771. -         while (True);
  772. X          /*
  773. X            Find closest color among siblings and their children.
  774. X          */
  775. --- 424,429 ----
  776. ***************
  777. *** 902,908 ****
  778. X              Identify the deepest node containing the pixel's color.
  779. X            */
  780. X            node=cube.root;
  781. !           do
  782. X            {
  783. X              id=(q->red > node->mid_red ? 1 : 0) |
  784. X                (q->green > node->mid_green ? 1 : 0) << 1 |
  785. --- 901,907 ----
  786. X              Identify the deepest node containing the pixel's color.
  787. X            */
  788. X            node=cube.root;
  789. !           for ( ; ; )
  790. X            {
  791. X              id=(q->red > node->mid_red ? 1 : 0) |
  792. X                (q->green > node->mid_green ? 1 : 0) << 1 |
  793. ***************
  794. *** 911,917 ****
  795. X                break;
  796. X              node=node->child[id];
  797. X            }
  798. -           while (True);
  799. X            /*
  800. X              Find closest color among siblings and their children.
  801. X            */
  802. --- 910,915 ----
  803. ***************
  804. *** 1061,1068 ****
  805. X    /*
  806. X      Initialize root node.
  807. X    */
  808. !   cube.root=
  809. !     InitializeNode(0,0,(Node *) NULL,MaxRGB >> 1,MaxRGB >> 1,MaxRGB >> 1);
  810. X    if (cube.root == (Node *) NULL)
  811. X      {
  812. X        Warning("unable to quantize image","memory allocation failed");
  813. --- 1059,1066 ----
  814. X    /*
  815. X      Initialize root node.
  816. X    */
  817. !   cube.root=InitializeNode(0,0,(Node *) NULL,(MaxRGB+1) >> 1,(MaxRGB+1) >> 1,
  818. !     (MaxRGB+1) >> 1);
  819. X    if (cube.root == (Node *) NULL)
  820. X      {
  821. X        Warning("unable to quantize image","memory allocation failed");
  822. ***************
  823. *** 1478,1486 ****
  824. X    */
  825. X    *mean_error_per_pixel=(unsigned int) total_error/(image->columns*image->rows);
  826. X    *normalized_mean_square_error=((double) *mean_error_per_pixel)/
  827. !     (3.0*MaxRGB*MaxRGB);
  828. X    *normalized_maximum_square_error=((double) maximum_error_per_pixel)/
  829. !     (3.0*MaxRGB*MaxRGB);
  830. X  }
  831. X  
  832. X  /*
  833. --- 1476,1484 ----
  834. X    */
  835. X    *mean_error_per_pixel=(unsigned int) total_error/(image->columns*image->rows);
  836. X    *normalized_mean_square_error=((double) *mean_error_per_pixel)/
  837. !     (3.0*(MaxRGB+1)*(MaxRGB+1));
  838. X    *normalized_maximum_square_error=((double) maximum_error_per_pixel)/
  839. !     (3.0*(MaxRGB+1)*(MaxRGB+1));
  840. X  }
  841. X  
  842. X  /*
  843. diff -r -c ImageMagick/rotate.c ImageMagick2.2.1/rotate.c
  844. *** ImageMagick/rotate.c    Mon Dec  7 09:22:11 1992
  845. --- ImageMagick2.2.1/rotate.c    Sat Dec 19 23:46:26 1992
  846. ***************
  847. *** 3,22 ****
  848. X  %                                                                             %
  849. X  %                                                                             %
  850. X  %                                                                             %
  851. ! %                 RRRR    OOO   TTTTT   AAA   TTTTT   EEEEE                   %
  852. ! %                 R   R  O   O    T    A   A    T     E                       %
  853. ! %                 RRRR   O   O    T    AAAAA    T     EEE                     %
  854. ! %                 R R    O   O    T    A   A    T     E                       %
  855. ! %                 R  R    OOO     T    A   A    T     EEEEE                   %
  856. X  %                                                                             %
  857. X  %                                                                             %
  858. ! %                Rotate a raster image by an arbitrary angle.                 %
  859. X  %                                                                             %
  860. X  %                                                                             %
  861. X  %                                                                             %
  862. ! %                           Software Design                                   %
  863. ! %                             John Cristy                                     %
  864. ! %                              July 1992                                      %
  865. X  %                                                                             %
  866. X  %                                                                             %
  867. X  %  Copyright 1992 E. I. du Pont de Nemours & Company                          %
  868. --- 3,22 ----
  869. X  %                                                                             %
  870. X  %                                                                             %
  871. X  %                                                                             %
  872. ! %                      SSSSS  H   H  EEEEE   AAA    RRRR                      %
  873. ! %                      SS     H   H  E      A   A   R   R                     %
  874. ! %                       SSS   HHHHH  EEE    AAAAA   RRRR                      %
  875. ! %                         SS  H   H  E      A   A   R R                       %
  876. ! %                      SSSSS  H   H  EEEEE  A   A   R  R                      %
  877. X  %                                                                             %
  878. X  %                                                                             %
  879. ! %              Shear or rotate a raster image by an arbitrary angle.          %
  880. X  %                                                                             %
  881. X  %                                                                             %
  882. X  %                                                                             %
  883. ! %                               Software Design                               %
  884. ! %                                 John Cristy                                 %
  885. ! %                                  July 1992                                  %
  886. X  %                                                                             %
  887. X  %                                                                             %
  888. X  %  Copyright 1992 E. I. du Pont de Nemours & Company                          %
  889. ***************
  890. *** 42,52 ****
  891. X  %                                                                             %
  892. X  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
  893. X  %
  894. ! %  Function RotateImage is based on the paper "A Fast Algorithm for General
  895. ! %  Raster Rotatation" by Alan W. Paeth.  RotateImage is adapted from a similiar
  896. ! %  routine based on the Paeth paper written by Michael Halle of the Spatial
  897. ! %  Imaging Group, MIT Media Lab.
  898. X  %
  899. X  */
  900. X  
  901. X  /*
  902. --- 42,53 ----
  903. X  %                                                                             %
  904. X  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
  905. X  %
  906. ! %  Function RotateImage, XShearImage, and YShearImage is based on the paper
  907. ! %  "A Fast Algorithm for General Raster Rotatation" by Alan W. Paeth.
  908. ! %  RotateImage is adapted from a similiar routine based on the Paeth paper
  909. ! %  written by Michael Halle of the Spatial Imaging Group, MIT Media Lab.
  910. X  %
  911. + %
  912. X  */
  913. X  
  914. X  /*
  915. ***************
  916. *** 59,65 ****
  917. X    External declarations.
  918. X  */
  919. X  extern char
  920. !   *application_name;
  921. X  
  922. X  /*
  923. X  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
  924. --- 60,66 ----
  925. X    External declarations.
  926. X  */
  927. X  extern char
  928. !   *client_name;
  929. X  
  930. X  /*
  931. X  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
  932. ***************
  933. *** 66,298 ****
  934. X  %                                                                             %
  935. X  %                                                                             %
  936. X  %                                                                             %
  937. ! %   C o l u m n S h e a r                                                     %
  938. X  %                                                                             %
  939. X  %                                                                             %
  940. X  %                                                                             %
  941. X  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
  942. X  %
  943. ! %  Procedure ColumnShear displaces a subcolumn of pixels a specified number of
  944. ! %  pixels.
  945. X  %
  946. ! %  The format of the ColumnShear routine is:
  947. X  %
  948. ! %      ColumnShear(source_image,source_columns,column,y,length,displacement,
  949. ! %        background)
  950. X  %
  951. X  %  A description of each parameter follows.
  952. X  %
  953. ! %    o source_image: A pointer to a ColorPacket structure which contains the
  954. ! %      source image.
  955. X  %
  956. ! %    o source_columns: Specifies the number of columns in the source image.
  957. X  %
  958. ! %    o column: Specifies which column in the image to move.
  959. X  %
  960. - %    o y: Specifies the offset in the source image.
  961. X  %
  962. - %    o length: Specifies the number of pixels to move.
  963. - %
  964. - %    o displacement: Specifies the number of pixels to displace the column of
  965. - %      pixels.
  966. - %
  967. - %    o background: Specifies the background color.
  968. - %
  969. - %
  970. X  */
  971. ! static void ColumnShear(source_image,source_columns,column,y,length,
  972. !   displacement,background,range_limit)
  973. ! ColorPacket
  974. !   *source_image;
  975. X  
  976. - register unsigned int
  977. -   source_columns;
  978. - 
  979. - unsigned int
  980. -   column,
  981. -   y,
  982. -   length;
  983. - 
  984. X  double
  985. !   displacement;
  986. X  
  987. ! ColorPacket
  988. !   background;
  989. ! 
  990. ! register unsigned char
  991. !   *range_limit;
  992. X  {
  993. !   ColorPacket
  994. !     last_pixel;
  995. X  
  996. !   enum {UP,DOWN}
  997. !     direction;
  998. X  
  999. X    int
  1000. !     blue,
  1001. !     green,
  1002. !     red,
  1003. !     step;
  1004. X  
  1005. !   long int
  1006. !     fractional_step;
  1007. X  
  1008. -   register ColorPacket
  1009. -     *p,
  1010. -     *q;
  1011. - 
  1012. X    register int
  1013. X      i;
  1014. X  
  1015. -   if (displacement == 0.0)
  1016. -     return;
  1017. -   else
  1018. -     if (displacement > 0.0)
  1019. -       direction=DOWN;
  1020. -     else
  1021. -       {
  1022. -         displacement*=(-1.0);
  1023. -         direction=UP;
  1024. -       }
  1025. -   step=(int) floor(displacement);
  1026. -   fractional_step=UpShifted(displacement-(double) step);
  1027. -   if (fractional_step == 0)
  1028. -     {
  1029. -       /*
  1030. -         No fractional displacement-- just copy the pixels.
  1031. -       */
  1032. -       switch (direction)
  1033. -       {
  1034. -         case UP:
  1035. -         {
  1036. -           p=source_image+y*source_columns+column;
  1037. -           q=p-step*source_columns;
  1038. -           for (i=0; i < length; i++)
  1039. -           {
  1040. -             *q=(*p);
  1041. -             q+=source_columns;
  1042. -             p+=source_columns;
  1043. -           }
  1044. -           /*
  1045. -             Set old column to background color.
  1046. -           */
  1047. -           for (i=0; i < step; i++)
  1048. -           {
  1049. -             *q=background;
  1050. -             q+=source_columns;
  1051. -           }
  1052. -           break;
  1053. -         }
  1054. -         case DOWN:
  1055. -         {
  1056. -           p=source_image+(y+length)*source_columns+column;
  1057. -           q=p+step*source_columns;
  1058. -           for (i=0; i < length; i++)
  1059. -           {
  1060. -             q-=source_columns;
  1061. -             p-=source_columns;
  1062. -             *q=(*p);
  1063. -           }
  1064. -           /*
  1065. -             Set old column to background color.
  1066. -           */
  1067. -           for (i=0; i < step; i++)
  1068. -           {
  1069. -             q-=source_columns;
  1070. -             *q=background;
  1071. -           }
  1072. -           break;
  1073. -         }
  1074. -       }
  1075. -       return;
  1076. -     }
  1077. X    /*
  1078. !     Fractional displacment.
  1079. X    */
  1080. !   step++;
  1081. !   last_pixel=background;
  1082. !   switch (direction)
  1083. X    {
  1084. !     case UP:
  1085. X      {
  1086. -       p=source_image+y*source_columns+column;
  1087. -       q=p-step*source_columns;
  1088. -       for (i=0; i < length; i++)
  1089. -       {
  1090. -         red=DownShift(last_pixel.red*(UpShift(1)-fractional_step)+p->red*
  1091. -           fractional_step);
  1092. -         green=DownShift(last_pixel.green*(UpShift(1)-fractional_step)+p->green*
  1093. -           fractional_step);
  1094. -         blue=DownShift(last_pixel.blue*(UpShift(1)-fractional_step)+p->blue*
  1095. -           fractional_step);
  1096. -         last_pixel=(*p);
  1097. -         p+=source_columns;
  1098. -         q->red=range_limit[red];
  1099. -         q->green=range_limit[green];
  1100. -         q->blue=range_limit[blue];
  1101. -         q+=source_columns;
  1102. -       }
  1103. X        /*
  1104. !         Set old column to background color.
  1105. X        */
  1106. !       red=DownShift(last_pixel.red*(UpShift(1)-fractional_step)+
  1107. !         background.red*fractional_step);
  1108. !       green=DownShift(last_pixel.green*(UpShift(1)-fractional_step)+
  1109. !         background.green*fractional_step);
  1110. !       blue=DownShift(last_pixel.blue*(UpShift(1)-fractional_step)+
  1111. !         background.blue*fractional_step);
  1112. !       q->red=range_limit[red];
  1113. !       q->green=range_limit[green];
  1114. !       q->blue=range_limit[blue];
  1115. !       q+=source_columns;
  1116. !       for (i=0; i < step-1; i++)
  1117. !       {
  1118. !         *q=background;
  1119. !         q+=source_columns;
  1120. !       }
  1121. !       break;
  1122. X      }
  1123. !     case DOWN:
  1124. !     {
  1125. !       p=source_image+(y+length)*source_columns+column;
  1126. !       q=p+step*source_columns;
  1127. !       for (i=0; i < length; i++)
  1128. !       {
  1129. !         p-=source_columns;
  1130. !         red=DownShift(last_pixel.red*(UpShift(1)-fractional_step)+p->red*
  1131. !           fractional_step);
  1132. !         green=DownShift(last_pixel.green*(UpShift(1)-fractional_step)+p->green*
  1133. !           fractional_step);
  1134. !         blue=DownShift(last_pixel.blue*(UpShift(1)-fractional_step)+p->blue*
  1135. !           fractional_step);
  1136. !         last_pixel=(*p);
  1137. !         q-=source_columns;
  1138. !         q->red=range_limit[red];
  1139. !         q->green=range_limit[green];
  1140. !         q->blue=range_limit[blue];
  1141. !       }
  1142. !       /*
  1143. !         Set old column to background color.
  1144. !       */
  1145. !       red=DownShift(last_pixel.red*(UpShift(1)-fractional_step)+
  1146. !         background.red*fractional_step);
  1147. !       green=DownShift(last_pixel.green*(UpShift(1)-fractional_step)+
  1148. !         background.green*fractional_step);
  1149. !       blue=DownShift(last_pixel.blue*(UpShift(1)-fractional_step)+
  1150. !         background.blue*fractional_step);
  1151. !       q-=source_columns;
  1152. !       q->red=range_limit[red];
  1153. !       q->green=range_limit[green];
  1154. !       q->blue=range_limit[blue];
  1155. !       for (i=0; i < step-1; i++)
  1156. !       {
  1157. !         q-=source_columns;
  1158. !         *q=background;
  1159. !       }
  1160. !       break;
  1161. !     }
  1162. !   }
  1163. !   return;
  1164. X  }
  1165. X  
  1166. X  /*
  1167. --- 67,188 ----
  1168. X  %                                                                             %
  1169. X  %                                                                             %
  1170. X  %                                                                             %
  1171. ! %   C l i p S h e a r I m a g e                                               %
  1172. X  %                                                                             %
  1173. X  %                                                                             %
  1174. X  %                                                                             %
  1175. X  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
  1176. X  %
  1177. ! %  Function ClipShearImage clips the sheared image as determined by the
  1178. ! %  bounding box as defined by width and height and shearing angles.
  1179. X  %
  1180. ! %  The format of the ClipShearImage routine is:
  1181. X  %
  1182. ! %      ClipShearImage(image,x_shear,y_shear,width,height,clip)
  1183. X  %
  1184. X  %  A description of each parameter follows.
  1185. X  %
  1186. ! %    o image: The address of a structure of type Image.
  1187. X  %
  1188. ! %    o x_shear, y_shear, width, height: Defines a region of the image to clip.
  1189. X  %
  1190. ! %    o clip: A value other than zero clips the corners of the rotated
  1191. ! %      image and retains the original image size.
  1192. X  %
  1193. X  %
  1194. X  */
  1195. ! static Image *ClipShearImage(image,x_shear,y_shear,width,height,clip)
  1196. ! Image
  1197. !   *image;
  1198. X  
  1199. X  double
  1200. !   x_shear,
  1201. !   y_shear;
  1202. X  
  1203. ! unsigned int
  1204. !   width,
  1205. !   height,
  1206. !   clip;
  1207. X  {
  1208. !   typedef struct Point
  1209. !   {
  1210. !     double
  1211. !       x,
  1212. !       y;
  1213. !   } Point;
  1214. X  
  1215. !   double
  1216. !     x_max,
  1217. !     x_min,
  1218. !     y_max,
  1219. !     y_min;
  1220. X  
  1221. +   Image
  1222. +     *clipped_image;
  1223. + 
  1224. X    int
  1225. !     x_offset,
  1226. !     y_offset;
  1227. X  
  1228. !   Point
  1229. !     corners[4];
  1230. X  
  1231. X    register int
  1232. X      i;
  1233. X  
  1234. X    /*
  1235. !     Calculate the rotated image size.
  1236. X    */
  1237. !   corners[0].x=(-((int) width)/2.0);
  1238. !   corners[0].y=(-((int) height)/2.0);
  1239. !   corners[1].x=((int) width)/2.0;
  1240. !   corners[1].y=(-((int) height)/2.0);
  1241. !   corners[2].x=(-((int) width)/2.0);
  1242. !   corners[2].y=((int) height)/2.0;
  1243. !   corners[3].x=((int) width)/2.0;
  1244. !   corners[3].y=((int) height)/2.0;
  1245. !   for (i=0; i < 4; i++)
  1246. X    {
  1247. !     corners[i].x+=x_shear*corners[i].y;
  1248. !     corners[i].y+=y_shear*corners[i].x;
  1249. !     corners[i].x+=x_shear*corners[i].y;
  1250. !     corners[i].x+=(image->columns-1)/2.0;
  1251. !     corners[i].y+=(image->rows-3)/2.0;
  1252. !   }
  1253. !   x_min=corners[0].x;
  1254. !   y_min=corners[0].y;
  1255. !   x_max=corners[0].x;
  1256. !   y_max=corners[0].y;
  1257. !   for (i=1; i < 4; i++)
  1258. !   {
  1259. !     if (x_min > corners[i].x)
  1260. !       x_min=corners[i].x;
  1261. !     if (y_min > corners[i].y)
  1262. !       y_min=corners[i].y;
  1263. !     if (x_max < corners[i].x)
  1264. !       x_max=corners[i].x;
  1265. !     if (y_max < corners[i].y)
  1266. !       y_max=corners[i].y;
  1267. !   }
  1268. !   x_min=floor((double) x_min);
  1269. !   x_max=ceil((double) x_max);
  1270. !   y_min=floor((double) y_min);
  1271. !   y_max=ceil((double) y_max);
  1272. !   if (!clip)
  1273. X      {
  1274. X        /*
  1275. !         Do not clip sheared image.
  1276. X        */
  1277. !       width=(unsigned int) (x_max-x_min);
  1278. !       height=(unsigned int) (y_max-y_min);
  1279. X      }
  1280. !   x_offset=(int) x_min+((int) (x_max-x_min)-width)/2;
  1281. !   y_offset=(int) y_min+((int) (y_max-y_min)-height)/2;
  1282. !   /*
  1283. !     Clip image and return.
  1284. !   */
  1285. !   clipped_image=ClipImage(image,x_offset,y_offset+1,width,height);
  1286. !   return(clipped_image);
  1287. X  }
  1288. X  
  1289. X  /*
  1290. ***************
  1291. *** 300,374 ****
  1292. X  %                                                                             %
  1293. X  %                                                                             %
  1294. X  %                                                                             %
  1295. ! %   I n t e g r a l R o t a t i o n                                           %
  1296. X  %                                                                             %
  1297. X  %                                                                             %
  1298. X  %                                                                             %
  1299. X  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
  1300. X  %
  1301. ! %  Function IntegralRotation rotates the source image starting at location
  1302. ! %  (x,y) an integral of 90 degrees and copies the result to the rotated image
  1303. ! %  buffer.
  1304. X  %
  1305. ! %  The format of the IntegralRotation routine is:
  1306. X  %
  1307. ! %      IntegralRotation(image,source_columns,source_rows,rotated_image,
  1308. ! %        rotated_columns,x,y,rotations)
  1309. X  %
  1310. X  %  A description of each parameter follows.
  1311. X  %
  1312. ! %    o source_image: A pointer to a Image structure containing the source
  1313. ! %      image.
  1314. X  %
  1315. ! %    o source_columns: Specifies the number of columns of pixels in the
  1316. ! %      source image.
  1317. X  %
  1318. - %    o source_rows: Specifies the number of rows of pixels in the source
  1319. - %      image.
  1320. - %
  1321. - %    o rotated_image: A pointer to a ColorPacket structure containing the
  1322. - %      rotated image.
  1323. - %
  1324. - %    o rotated_columns: Specifies the number of columns of pixels in the
  1325. - %      rotated image.
  1326. - %
  1327. - %    o x: Specifies the x offset in the source image.
  1328. - %
  1329. - %    o y: Specifies the y offset in the source image.
  1330. - %
  1331. X  %    o rotations: Specifies the number of 90 degree rotations.
  1332. X  %
  1333. X  %
  1334. X  */
  1335. ! static void IntegralRotation(image,source_columns,source_rows,rotated_image,
  1336. !   rotated_columns,x,y,rotations)
  1337. X  Image
  1338. X    *image;
  1339. X  
  1340. X  unsigned int
  1341. -   source_columns,
  1342. -   source_rows;
  1343. - 
  1344. - ColorPacket
  1345. -   *rotated_image;
  1346. - 
  1347. - unsigned int
  1348. -   rotated_columns,
  1349. -   x,
  1350. -   y,
  1351. X    rotations;
  1352. X  {
  1353. !   ColorPacket
  1354. !     *q;
  1355. X  
  1356. X    register RunlengthPacket
  1357. !     *p;
  1358. X  
  1359. X    register int
  1360. !     i,
  1361. !     j;
  1362. X  
  1363. X    /*
  1364. X      Expand runlength packets into a rectangular array of pixels.
  1365. X    */
  1366. X    p=image->pixels;
  1367. --- 190,252 ----
  1368. X  %                                                                             %
  1369. X  %                                                                             %
  1370. X  %                                                                             %
  1371. ! %   I n t e g r a l R o t a t e I m a g e                                     %
  1372. X  %                                                                             %
  1373. X  %                                                                             %
  1374. X  %                                                                             %
  1375. X  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
  1376. X  %
  1377. ! %  Function IntegralRotateImage rotates the image an integral of 90 degrees.
  1378. ! %  It allocates the memory necessary for the new Image structure and returns
  1379. ! %  a pointer to the rotated image.
  1380. X  %
  1381. ! %  The format of the IntegralRotateImage routine is:
  1382. X  %
  1383. ! %      rotated_image=IntegralRotateImage(image,rotations)
  1384. X  %
  1385. X  %  A description of each parameter follows.
  1386. X  %
  1387. ! %    o rotated_image: Function IntegralRotateImage returns a pointer to the
  1388. ! %      rotated image.  A null image is returned if there is a a memory shortage.
  1389. X  %
  1390. ! %    o image: The address of a structure of type Image.
  1391. X  %
  1392. X  %    o rotations: Specifies the number of 90 degree rotations.
  1393. X  %
  1394. X  %
  1395. X  */
  1396. ! static Image *IntegralRotateImage(image,rotations)
  1397. X  Image
  1398. X    *image;
  1399. X  
  1400. X  unsigned int
  1401. X    rotations;
  1402. X  {
  1403. !   Image
  1404. !     *rotated_image;
  1405. X  
  1406. X    register RunlengthPacket
  1407. !     *p,
  1408. !     *q;
  1409. X  
  1410. X    register int
  1411. !     x,
  1412. !     y;
  1413. X  
  1414. X    /*
  1415. +     Initialize rotated image attributes.
  1416. +   */
  1417. +   rotations%=4;
  1418. +   if ((rotations == 1) || (rotations == 3))
  1419. +     rotated_image=CopyImage(image,image->rows,image->columns,False);
  1420. +   else
  1421. +     rotated_image=CopyImage(image,image->columns,image->rows,False);
  1422. +   if (rotated_image == (Image *) NULL)
  1423. +     {
  1424. +       Warning("unable to rotate image","memory allocation failed");
  1425. +       return((Image *) NULL);
  1426. +     }
  1427. +   /*
  1428. X      Expand runlength packets into a rectangular array of pixels.
  1429. X    */
  1430. X    p=image->pixels;
  1431. ***************
  1432. *** 380,389 ****
  1433. X        /*
  1434. X          Rotate 0 degrees.
  1435. X        */
  1436. !       for (j=0; j < source_rows; j++)
  1437. X        {
  1438. !         q=rotated_image+rotated_columns*(y+j)+x;
  1439. !         for (i=0; i < source_columns; i++)
  1440. X          {
  1441. X            if (image->runlength > 0)
  1442. X              image->runlength--;
  1443. --- 258,267 ----
  1444. X        /*
  1445. X          Rotate 0 degrees.
  1446. X        */
  1447. !       for (y=0; y < image->rows; y++)
  1448. X        {
  1449. !         q=rotated_image->pixels+rotated_image->columns*y;
  1450. !         for (x=0; x < image->columns; x++)
  1451. X          {
  1452. X            if (image->runlength > 0)
  1453. X              image->runlength--;
  1454. ***************
  1455. *** 396,401 ****
  1456. --- 274,280 ----
  1457. X            q->green=p->green;
  1458. X            q->blue=p->blue;
  1459. X            q->index=p->index;
  1460. +           q->length=0;
  1461. X            q++;
  1462. X          }
  1463. X        }
  1464. ***************
  1465. *** 406,415 ****
  1466. X        /*
  1467. X          Rotate 90 degrees.
  1468. X        */
  1469. !       for (j=source_columns-1; j >= 0; j--)
  1470. X        {
  1471. !         q=rotated_image+rotated_columns*y+x+j;
  1472. !         for (i=0; i < source_rows; i++)
  1473. X          {
  1474. X            if (image->runlength > 0)
  1475. X              image->runlength--;
  1476. --- 285,294 ----
  1477. X        /*
  1478. X          Rotate 90 degrees.
  1479. X        */
  1480. !       for (x=0; x < rotated_image->columns; x++)
  1481. X        {
  1482. !         q=rotated_image->pixels+(rotated_image->columns-x-1);
  1483. !         for (y=0; y < rotated_image->rows; y++)
  1484. X          {
  1485. X            if (image->runlength > 0)
  1486. X              image->runlength--;
  1487. ***************
  1488. *** 422,428 ****
  1489. X            q->green=p->green;
  1490. X            q->blue=p->blue;
  1491. X            q->index=p->index;
  1492. !           q+=rotated_columns;
  1493. X          }
  1494. X        }
  1495. X        break;
  1496. --- 301,308 ----
  1497. X            q->green=p->green;
  1498. X            q->blue=p->blue;
  1499. X            q->index=p->index;
  1500. !           q->length=0;
  1501. !           q+=rotated_image->columns;
  1502. X          }
  1503. X        }
  1504. X        break;
  1505. ***************
  1506. *** 432,442 ****
  1507. X        /*
  1508. X          Rotate 180 degrees.
  1509. X        */
  1510. !       q=rotated_image;
  1511. !       for (j=source_rows-1; j >= 0; j--)
  1512. X        {
  1513. !         q=rotated_image+rotated_columns*(y+j)+x+source_columns;
  1514. !         for (i=0; i < source_columns; i++)
  1515. X          {
  1516. X            if (image->runlength > 0)
  1517. X              image->runlength--;
  1518. --- 312,322 ----
  1519. X        /*
  1520. X          Rotate 180 degrees.
  1521. X        */
  1522. !       q=rotated_image->pixels;
  1523. !       for (y=image->rows-1; y >= 0; y--)
  1524. X        {
  1525. !         q=rotated_image->pixels+rotated_image->columns*y+rotated_image->columns;
  1526. !         for (x=0; x < image->columns; x++)
  1527. X          {
  1528. X            if (image->runlength > 0)
  1529. X              image->runlength--;
  1530. ***************
  1531. *** 450,455 ****
  1532. --- 330,336 ----
  1533. X            q->green=p->green;
  1534. X            q->blue=p->blue;
  1535. X            q->index=p->index;
  1536. +           q->length=0;
  1537. X          }
  1538. X        }
  1539. X        break;
  1540. ***************
  1541. *** 459,468 ****
  1542. X        /*
  1543. X          Rotate 270 degrees.
  1544. X        */
  1545. !       for (j=0; j < source_columns; j++)
  1546. X        {
  1547. !         q=rotated_image+rotated_columns*(y+source_rows)+x+j-rotated_columns;
  1548. !         for (i=0; i < source_rows; i++)
  1549. X          {
  1550. X            if (image->runlength > 0)
  1551. X              image->runlength--;
  1552. --- 340,350 ----
  1553. X        /*
  1554. X          Rotate 270 degrees.
  1555. X        */
  1556. !       for (x=0; x < rotated_image->columns; x++)
  1557. X        {
  1558. !         q=rotated_image->pixels+(rotated_image->columns*rotated_image->rows)-
  1559. !           (rotated_image->columns-x-1)-1;
  1560. !         for (y=0; y < rotated_image->rows; y++)
  1561. X          {
  1562. X            if (image->runlength > 0)
  1563. X              image->runlength--;
  1564. ***************
  1565. *** 475,488 ****
  1566. X            q->green=p->green;
  1567. X            q->blue=p->blue;
  1568. X            q->index=p->index;
  1569. !           q-=rotated_columns;
  1570. X          }
  1571. X        }
  1572. X        break;
  1573. X      }
  1574. -     default:
  1575. -       break;
  1576. X    }
  1577. X  }
  1578. X  
  1579. X  /*
  1580. --- 357,370 ----
  1581. X            q->green=p->green;
  1582. X            q->blue=p->blue;
  1583. X            q->index=p->index;
  1584. !           q->length=0;
  1585. !           q-=rotated_image->columns;
  1586. X          }
  1587. X        }
  1588. X        break;
  1589. X      }
  1590. X    }
  1591. +   return(rotated_image);
  1592. X  }
  1593. X  
  1594. X  /*
  1595. ***************
  1596. *** 490,541 ****
  1597. X  %                                                                             %
  1598. X  %                                                                             %
  1599. X  %                                                                             %
  1600. ! %   R o w S h e a r                                                           %
  1601. X  %                                                                             %
  1602. X  %                                                                             %
  1603. X  %                                                                             %
  1604. X  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
  1605. X  %
  1606. ! %  Procedure RowShear displaces a subrow of pixels a specified number of
  1607. ! %  pixels.
  1608. X  %
  1609. ! %  The format of the RowShear routine is:
  1610. X  %
  1611. ! %      RowShear(source_image,source_columns,row,y,length,displacement,
  1612. ! %        background)
  1613. X  %
  1614. X  %  A description of each parameter follows.
  1615. X  %
  1616. ! %    o source_image: A pointer to a ColorPacket structure.
  1617. X  %
  1618. ! %    o source_columns: Specifies the number of columns in the source image.
  1619. X  %
  1620. ! %    o row: Specifies which row in the image to move.
  1621. X  %
  1622. ! %    o y: Specifies the offset in the source image.
  1623. X  %
  1624. - %    o length: Specifies the number of pixels to move.
  1625. X  %
  1626. - %    o displacement: Specifies the number of pixels to displace the row of
  1627. - %      pixels.
  1628. - %
  1629. - %    o background: Specifies the background color.
  1630. - %
  1631. - %
  1632. X  */
  1633. ! static void RowShear(source_image,source_columns,row,x,length,displacement,
  1634. !   background,range_limit)
  1635. ! ColorPacket
  1636. !   *source_image;
  1637. X  
  1638. X  unsigned int
  1639. !   source_columns,
  1640. !   row,
  1641. !   x,
  1642. !   length;
  1643. X  
  1644. ! double
  1645. !   displacement;
  1646. X  
  1647. X  ColorPacket
  1648. X    background;
  1649. --- 372,423 ----
  1650. X  %                                                                             %
  1651. X  %                                                                             %
  1652. X  %                                                                             %
  1653. ! %   X S h e a r I m a g e                                                     %
  1654. X  %                                                                             %
  1655. X  %                                                                             %
  1656. X  %                                                                             %
  1657. X  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
  1658. X  %
  1659. ! %  Procedure XShearImage shears the image in the X direction with a shear angle
  1660. ! %  of 'degrees'.  Positive angles shear counter-clockwise (right-hand rule),
  1661. ! %  and negative angles shear clockwise.  Angles are measured relative to a
  1662. ! %  vertical Y-axis.  X shears will widen an image creating 'empty' triangles
  1663. ! %  on the left and right sides of the source image.
  1664. X  %
  1665. ! %  The format of the XShearImage routine is:
  1666. X  %
  1667. ! %      XShearImage(image,degrees,width,height,x_offset,y_offset,background,
  1668. ! %        range_limit)
  1669. X  %
  1670. X  %  A description of each parameter follows.
  1671. X  %
  1672. ! %    o image: The address of a structure of type Image.
  1673. X  %
  1674. ! %    o degrees: A double representing the shearing angle along the X axis.
  1675. X  %
  1676. ! %    o width, height, x_offset, y_offset: Defines a region of the image
  1677. ! %      to shear.
  1678. X  %
  1679. ! %    o background: Specifies a ColorPacket used to fill empty triangles
  1680. ! %      left over from shearing.
  1681. X  %
  1682. X  %
  1683. X  */
  1684. ! static void XShearImage(image,degrees,width,height,x_offset,y_offset,background,
  1685. !   range_limit)
  1686. ! Image
  1687. !   *image;
  1688. X  
  1689. + double
  1690. +   degrees;
  1691. + 
  1692. X  unsigned int
  1693. !   width,
  1694. !   height;
  1695. X  
  1696. ! int
  1697. !   x_offset,
  1698. !   y_offset;
  1699. X  
  1700. X  ColorPacket
  1701. X    background;
  1702. ***************
  1703. *** 543,573 ****
  1704. X  register unsigned char
  1705. X    *range_limit;
  1706. X  {
  1707. !   ColorPacket
  1708. !     last_pixel;
  1709. X  
  1710. X    enum {LEFT,RIGHT}
  1711. X      direction;
  1712. X  
  1713. X    int
  1714. !     blue,
  1715. !     green,
  1716. !     red,
  1717. !     step;
  1718. X  
  1719. X    long int
  1720. X      fractional_step;
  1721. X  
  1722. !   register ColorPacket
  1723. X      *p,
  1724. X      *q;
  1725. X  
  1726. X    register int
  1727. !     i;
  1728. X  
  1729. !   if (displacement == 0.0)
  1730. !     return;
  1731. !   else
  1732. X      if (displacement > 0.0)
  1733. X        direction=RIGHT;
  1734. X      else
  1735. --- 425,463 ----
  1736. X  register unsigned char
  1737. X    *range_limit;
  1738. X  {
  1739. !   double
  1740. !     displacement;
  1741. X  
  1742. X    enum {LEFT,RIGHT}
  1743. X      direction;
  1744. X  
  1745. X    int
  1746. !     step,
  1747. !     y;
  1748. X  
  1749. X    long int
  1750. X      fractional_step;
  1751. X  
  1752. !   register RunlengthPacket
  1753. X      *p,
  1754. X      *q;
  1755. X  
  1756. X    register int
  1757. !     blue,
  1758. !     green,
  1759. !     i,
  1760. !     red;
  1761. X  
  1762. !   RunlengthPacket
  1763. !     last_pixel;
  1764. ! 
  1765. !   y_offset--;
  1766. !   for (y=0; y < height; y++)
  1767. !   {
  1768. !     y_offset++;
  1769. !     displacement=degrees*(((double) y)-(height-1)/2.0);
  1770. !     if (displacement == 0.0)
  1771. !       continue;
  1772. X      if (displacement > 0.0)
  1773. X        direction=RIGHT;
  1774. X      else
  1775. ***************
  1776. *** 575,723 ****
  1777. X          displacement*=(-1.0);
  1778. X          direction=LEFT;
  1779. X        }
  1780. !   step=(int) floor(displacement);
  1781. !   fractional_step=UpShifted(displacement-(double) step);
  1782. !   if (fractional_step == 0)
  1783. !     {
  1784. !       /*
  1785. !         No fractional displacement-- just copy.
  1786. !       */
  1787. !       switch (direction)
  1788. X        {
  1789. !         case LEFT:
  1790. X          {
  1791. !           p=source_image+row*source_columns+x;
  1792. !           q=p-step;
  1793. !           for (i=0; i < length; i++)
  1794. X            {
  1795. !             *q=(*p);
  1796. !             q++;
  1797. !             p++;
  1798. X            }
  1799. !           /*
  1800. !             Set old row to background color.
  1801. !           */
  1802. !           for (i=0; i < step; i++)
  1803. X            {
  1804. !             *q=background;
  1805. !             q++;
  1806. X            }
  1807. -           break;
  1808. X          }
  1809. !         case RIGHT:
  1810. !         {
  1811. !           /*
  1812. !             Right is the same as left except data is transferred backwards
  1813. !             to prevent deleting data we need later.
  1814. !           */
  1815. !           p=source_image+row*source_columns+x+length;
  1816. !           q=p+step;
  1817. !           for (i=0; i < length; i++)
  1818. !           {
  1819. !             p--;
  1820. !             q--;
  1821. !             *q=(*p);
  1822. !           }
  1823. !           /*
  1824. !             Set old row to background color.
  1825. !           */
  1826. !           for (i=0; i < step; i++)
  1827. !           {
  1828. !             q--;
  1829. !             *q=background;
  1830. !           }
  1831. !           break;
  1832. !         }
  1833. X        }
  1834. !       return;
  1835. !     }
  1836. !   /*
  1837. !     Fractional displacement.
  1838. !   */
  1839. !   step++;
  1840. !   last_pixel=background;
  1841. !   switch (direction)
  1842. !   {
  1843. !     case LEFT:
  1844. X      {
  1845. !       p=source_image+row*source_columns+x;
  1846. !       q=p-step;
  1847. !       for (i=0; i < length; i++)
  1848. X        {
  1849. !         red=DownShift(last_pixel.red*(UpShift(1)-fractional_step)+p->red*
  1850. !           fractional_step);
  1851. !         green=DownShift(last_pixel.green*(UpShift(1)-fractional_step)+p->green*
  1852. !           fractional_step);
  1853. !         blue=DownShift(last_pixel.blue*(UpShift(1)-fractional_step)+p->blue*
  1854. !           fractional_step);
  1855. !         last_pixel=(*p);
  1856. !         p++;
  1857. X          q->red=range_limit[red];
  1858. X          q->green=range_limit[green];
  1859. X          q->blue=range_limit[blue];
  1860. X          q++;
  1861. X        }
  1862. !       /*
  1863. !         Set old row to background color.
  1864. !       */
  1865. !       red=DownShift(last_pixel.red*(UpShift(1)-fractional_step)+
  1866. !         background.red*fractional_step);
  1867. !       green=DownShift(last_pixel.green*(UpShift(1)-fractional_step)+
  1868. !         background.green*fractional_step);
  1869. !       blue=DownShift(last_pixel.blue*(UpShift(1)-fractional_step)+
  1870. !         background.blue*fractional_step);
  1871. !       q->red=range_limit[red];
  1872. !       q->green=range_limit[green];
  1873. !       q->blue=range_limit[blue];
  1874. !       q++;
  1875. !       for (i=0; i < step-1; i++)
  1876. X        {
  1877. !         *q=background;
  1878. !         q++;
  1879. X        }
  1880. -       break;
  1881. X      }
  1882. !     case RIGHT:
  1883. X      {
  1884. !       p=source_image+row*source_columns+x+length;
  1885. !       q=p+step;
  1886. !       for (i=0; i < length; i++)
  1887. X        {
  1888. !         p--;
  1889. !         red=DownShift(last_pixel.red*(UpShift(1)-fractional_step)+p->red*
  1890. !           fractional_step);
  1891. !         green=DownShift(last_pixel.green*(UpShift(1)-fractional_step)+p->green*
  1892. !           fractional_step);
  1893. !         blue=DownShift(last_pixel.blue*(UpShift(1)-fractional_step)+p->blue*
  1894. !           fractional_step);
  1895. !         last_pixel=(*p);
  1896. !         q--;
  1897. X          q->red=range_limit[red];
  1898. X          q->green=range_limit[green];
  1899. X          q->blue=range_limit[blue];
  1900. X        }
  1901. !       /*
  1902. !         Set old row to background color.
  1903. !       */
  1904. !       red=DownShift(last_pixel.red*(UpShift(1)-fractional_step)+
  1905. !         background.red*fractional_step);
  1906. !       green=DownShift(last_pixel.green*(UpShift(1)-fractional_step)+
  1907. !         background.green*fractional_step);
  1908. !       blue=DownShift(last_pixel.blue*(UpShift(1)-fractional_step)+
  1909. !         background.blue*fractional_step);
  1910. !       q--;
  1911. !       q->red=range_limit[red];
  1912. !       q->green=range_limit[green];
  1913. !       q->blue=range_limit[blue];
  1914. !       for (i=0; i < step-1; i++)
  1915. X        {
  1916. !         q--;
  1917. !         *q=background;
  1918. X        }
  1919. -       break;
  1920. X      }
  1921. X    }
  1922. -   return;
  1923. X  }
  1924. X  
  1925. X  /*
  1926. --- 465,892 ----
  1927. X          displacement*=(-1.0);
  1928. X          direction=LEFT;
  1929. X        }
  1930. !     step=(int) floor(displacement);
  1931. !     fractional_step=UpShifted(displacement-(double) step);
  1932. !     if (fractional_step == 0)
  1933. X        {
  1934. !         /*
  1935. !           No fractional displacement-- just copy.
  1936. !         */
  1937. !         switch (direction)
  1938. X          {
  1939. !           case LEFT:
  1940. X            {
  1941. !             /*
  1942. !               Transfer pixels left-to-right.
  1943. !             */
  1944. !             p=image->pixels+image->columns*y_offset+x_offset;
  1945. !             q=p-step;
  1946. !             for (i=0; i < width; i++)
  1947. !             {
  1948. !               *q=(*p);
  1949. !               q++;
  1950. !               p++;
  1951. !             }
  1952. !             /*
  1953. !               Set old row to background color.
  1954. !             */
  1955. !             for (i=0; i < step; i++)
  1956. !             {
  1957. !               q->red=background.red;
  1958. !               q->green=background.green;
  1959. !               q->blue=background.blue;
  1960. !               q++;
  1961. !             }
  1962. !             break;
  1963. X            }
  1964. !           case RIGHT:
  1965. X            {
  1966. !             /*
  1967. !               Transfer pixels right-to-left.
  1968. !             */
  1969. !             p=image->pixels+image->columns*y_offset+x_offset+width;
  1970. !             q=p+step;
  1971. !             for (i=0; i < width; i++)
  1972. !             {
  1973. !               p--;
  1974. !               q--;
  1975. !               *q=(*p);
  1976. !             }
  1977. !             /*
  1978. !               Set old row to background color.
  1979. !             */
  1980. !             for (i=0; i < step; i++)
  1981. !             {
  1982. !               q--;
  1983. !               q->red=background.red;
  1984. !               q->green=background.green;
  1985. !               q->blue=background.blue;
  1986. !             }
  1987. !             break;
  1988. X            }
  1989. X          }
  1990. !         continue;
  1991. X        }
  1992. !     /*
  1993. !       Fractional displacement.
  1994. !     */
  1995. !     step++;
  1996. !     last_pixel.red=background.red;
  1997. !     last_pixel.green=background.green;
  1998. !     last_pixel.blue=background.blue;
  1999. !     switch (direction)
  2000. X      {
  2001. !       case LEFT:
  2002. X        {
  2003. !         /*
  2004. !           Transfer pixels left-to-right.
  2005. !         */
  2006. !         p=image->pixels+image->columns*y_offset+x_offset;
  2007. !         q=p-step;
  2008. !         for (i=0; i < width; i++)
  2009. !         {
  2010. !           red=DownShift(last_pixel.red*(UpShift(1)-fractional_step)+p->red*
  2011. !             fractional_step);
  2012. !           green=DownShift(last_pixel.green*(UpShift(1)-fractional_step)+
  2013. !             p->green*fractional_step);
  2014. !           blue=DownShift(last_pixel.blue*(UpShift(1)-fractional_step)+p->blue*
  2015. !             fractional_step);
  2016. !           last_pixel=(*p);
  2017. !           p++;
  2018. !           q->red=range_limit[red];
  2019. !           q->green=range_limit[green];
  2020. !           q->blue=range_limit[blue];
  2021. !           q++;
  2022. !         }
  2023. !         /*
  2024. !           Set old row to background color.
  2025. !         */
  2026. !         red=DownShift(last_pixel.red*(UpShift(1)-fractional_step)+
  2027. !           background.red*fractional_step);
  2028. !         green=DownShift(last_pixel.green*(UpShift(1)-fractional_step)+
  2029. !           background.green*fractional_step);
  2030. !         blue=DownShift(last_pixel.blue*(UpShift(1)-fractional_step)+
  2031. !           background.blue*fractional_step);
  2032. X          q->red=range_limit[red];
  2033. X          q->green=range_limit[green];
  2034. X          q->blue=range_limit[blue];
  2035. X          q++;
  2036. +         for (i=0; i < step-1; i++)
  2037. +         {
  2038. +           q->red=background.red;
  2039. +           q->green=background.green;
  2040. +           q->blue=background.blue;
  2041. +           q++;
  2042. +         }
  2043. +         break;
  2044. X        }
  2045. !       case RIGHT:
  2046. X        {
  2047. !         /*
  2048. !           Transfer pixels right-to-left.
  2049. !         */
  2050. !         p=image->pixels+image->columns*y_offset+x_offset+width;
  2051. !         q=p+step;
  2052. !         for (i=0; i < width; i++)
  2053. !         {
  2054. !           p--;
  2055. !           red=DownShift(last_pixel.red*(UpShift(1)-fractional_step)+p->red*
  2056. !             fractional_step);
  2057. !           green=DownShift(last_pixel.green*(UpShift(1)-fractional_step)+
  2058. !             p->green*fractional_step);
  2059. !           blue=DownShift(last_pixel.blue*(UpShift(1)-fractional_step)+p->blue*
  2060. !             fractional_step);
  2061. !           last_pixel=(*p);
  2062. !           q--;
  2063. !           q->red=range_limit[red];
  2064. !           q->green=range_limit[green];
  2065. !           q->blue=range_limit[blue];
  2066. !         }
  2067. !         /*
  2068. !           Set old row to background color.
  2069. !         */
  2070. !         red=DownShift(last_pixel.red*(UpShift(1)-fractional_step)+
  2071. !           background.red*fractional_step);
  2072. !         green=DownShift(last_pixel.green*(UpShift(1)-fractional_step)+
  2073. !           background.green*fractional_step);
  2074. !         blue=DownShift(last_pixel.blue*(UpShift(1)-fractional_step)+
  2075. !           background.blue*fractional_step);
  2076. !         q--;
  2077. !         q->red=range_limit[red];
  2078. !         q->green=range_limit[green];
  2079. !         q->blue=range_limit[blue];
  2080. !         for (i=0; i < step-1; i++)
  2081. !         {
  2082. !           q--;
  2083. !           q->red=background.red;
  2084. !           q->green=background.green;
  2085. !           q->blue=background.blue;
  2086. !         }
  2087. !         break;
  2088. X        }
  2089. X      }
  2090. !   }
  2091. ! }
  2092. ! 
  2093. ! /*
  2094. ! %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
  2095. ! %                                                                             %
  2096. ! %                                                                             %
  2097. ! %                                                                             %
  2098. ! %   Y S h e a r I m a g e                                                     %
  2099. ! %                                                                             %
  2100. ! %                                                                             %
  2101. ! %                                                                             %
  2102. ! %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
  2103. ! %
  2104. ! %  Procedure YShearImage shears the image in the Y direction with a shear
  2105. ! %  angle of 'degrees'.  Positive angles shear counter-clockwise (right-hand
  2106. ! %  rule), and negative angles shear clockwise.  Angles are measured relative
  2107. ! %  to a horizontal X-axis.  Y shears will increase the height of an image
  2108. ! %  creating 'empty' triangles on the top and bottom of the source image.
  2109. ! %
  2110. ! %  The format of the YShearImage routine is:
  2111. ! %
  2112. ! %      YShearImage(image,degrees,width,height,x_offset,y_offset,background,
  2113. ! %        range_limit)
  2114. ! %
  2115. ! %  A description of each parameter follows.
  2116. ! %
  2117. ! %    o image: The address of a structure of type Image.
  2118. ! %
  2119. ! %    o degrees: A double representing the shearing angle along the Y axis.
  2120. ! %
  2121. ! %    o width, height, x_offset, y_offset: Defines a region of the image
  2122. ! %      to shear.
  2123. ! %
  2124. ! %    o background: Specifies a ColorPacket used to fill empty triangles
  2125. ! %      left over from shearing.
  2126. ! %
  2127. ! %
  2128. ! */
  2129. ! static void YShearImage(image,degrees,width,height,x_offset,y_offset,background,
  2130. !   range_limit)
  2131. ! Image
  2132. !   *image;
  2133. ! 
  2134. ! double
  2135. !   degrees;
  2136. ! 
  2137. ! unsigned int
  2138. !   width,
  2139. !   height;
  2140. ! 
  2141. ! int
  2142. !   x_offset,
  2143. !   y_offset;
  2144. ! 
  2145. ! ColorPacket
  2146. !   background;
  2147. ! 
  2148. ! register unsigned char
  2149. !   *range_limit;
  2150. ! {
  2151. !   double
  2152. !     displacement;
  2153. ! 
  2154. !   enum {UP,DOWN}
  2155. !     direction;
  2156. ! 
  2157. !   int
  2158. !     step,
  2159. !     y;
  2160. ! 
  2161. !   long int
  2162. !     fractional_step;
  2163. ! 
  2164. !   register RunlengthPacket
  2165. !     *p,
  2166. !     *q;
  2167. ! 
  2168. !   register int
  2169. !     blue,
  2170. !     green,
  2171. !     i,
  2172. !     red;
  2173. ! 
  2174. !   RunlengthPacket
  2175. !     last_pixel;
  2176. ! 
  2177. !   x_offset--;
  2178. !   for (y=0; y < width; y++)
  2179. !   {
  2180. !     x_offset++;
  2181. !     displacement=degrees*(((double) y)-(width-1)/2.0);
  2182. !     if (displacement == 0.0)
  2183. !       continue;
  2184. !     if (displacement > 0.0)
  2185. !       direction=DOWN;
  2186. !     else
  2187. !       {
  2188. !         displacement*=(-1.0);
  2189. !         direction=UP;
  2190. !       }
  2191. !     step=(int) floor(displacement);
  2192. !     fractional_step=UpShifted(displacement-(double) step);
  2193. !     if (fractional_step == 0)
  2194. !       {
  2195. !         /*
  2196. !           No fractional displacement-- just copy the pixels.
  2197. !         */
  2198. !         switch (direction)
  2199. !         {
  2200. !           case UP:
  2201. !           {
  2202. !             /*
  2203. !               Transfer pixels top-to-bottom.
  2204. !             */
  2205. !             p=image->pixels+image->columns*y_offset+x_offset;
  2206. !             q=p-step*image->columns;
  2207. !             for (i=0; i < height; i++)
  2208. !             {
  2209. !               *q=(*p);
  2210. !               q+=image->columns;
  2211. !               p+=image->columns;
  2212. !             }
  2213. !             /*
  2214. !               Set old column to background color.
  2215. !             */
  2216. !             for (i=0; i < step; i++)
  2217. !             {
  2218. !               q->red=background.red;
  2219. !               q->green=background.green;
  2220. !               q->blue=background.blue;
  2221. !               q+=image->columns;
  2222. !             }
  2223. !             break;
  2224. !           }
  2225. !           case DOWN:
  2226. !           {
  2227. !             /*
  2228. !               Transfer pixels bottom-to-top.
  2229. !             */
  2230. !             p=image->pixels+image->columns*(y_offset+height)+x_offset;
  2231. !             q=p+step*image->columns;
  2232. !             for (i=0; i < height; i++)
  2233. !             {
  2234. !               q-=image->columns;
  2235. !               p-=image->columns;
  2236. !               *q=(*p);
  2237. !             }
  2238. !             /*
  2239. !               Set old column to background color.
  2240. !             */
  2241. !             for (i=0; i < step; i++)
  2242. !             {
  2243. !               q-=image->columns;
  2244. !               q->red=background.red;
  2245. !               q->green=background.green;
  2246. !               q->blue=background.blue;
  2247. !             }
  2248. !             break;
  2249. !           }
  2250. !         }
  2251. !         continue;
  2252. !       }
  2253. !     /*
  2254. !       Fractional displacment.
  2255. !     */
  2256. !     step++;
  2257. !     last_pixel.red=background.red;
  2258. !     last_pixel.green=background.green;
  2259. !     last_pixel.blue=background.blue;
  2260. !     switch (direction)
  2261. X      {
  2262. !       case UP:
  2263. X        {
  2264. !         /*
  2265. !           Transfer pixels top-to-bottom.
  2266. !         */
  2267. !         p=image->pixels+image->columns*y_offset+x_offset;
  2268. !         q=p-step*image->columns;
  2269. !         for (i=0; i < height; i++)
  2270. !         {
  2271. !           red=DownShift(last_pixel.red*(UpShift(1)-fractional_step)+p->red*
  2272. !             fractional_step);
  2273. !           green=DownShift(last_pixel.green*(UpShift(1)-fractional_step)+
  2274. !             p->green*fractional_step);
  2275. !           blue=DownShift(last_pixel.blue*(UpShift(1)-fractional_step)+p->blue*
  2276. !             fractional_step);
  2277. !           last_pixel=(*p);
  2278. !           p+=image->columns;
  2279. !           q->red=range_limit[red];
  2280. !           q->green=range_limit[green];
  2281. !           q->blue=range_limit[blue];
  2282. !           q+=image->columns;
  2283. !         }
  2284. !         /*
  2285. !           Set old column to background color.
  2286. !         */
  2287. !         red=DownShift(last_pixel.red*(UpShift(1)-fractional_step)+
  2288. !           background.red*fractional_step);
  2289. !         green=DownShift(last_pixel.green*(UpShift(1)-fractional_step)+
  2290. !           background.green*fractional_step);
  2291. !         blue=DownShift(last_pixel.blue*(UpShift(1)-fractional_step)+
  2292. !           background.blue*fractional_step);
  2293. X          q->red=range_limit[red];
  2294. X          q->green=range_limit[green];
  2295. X          q->blue=range_limit[blue];
  2296. +         q+=image->columns;
  2297. +         for (i=0; i < step-1; i++)
  2298. +         {
  2299. +           q->red=background.red;
  2300. +           q->green=background.green;
  2301. +           q->blue=background.blue;
  2302. +           q+=image->columns;
  2303. +         }
  2304. +         break;
  2305. X        }
  2306. !       case DOWN:
  2307. X        {
  2308. !         /*
  2309. !           Transfer pixels bottom-to-top.
  2310. !         */
  2311. !         p=image->pixels+image->columns*(y_offset+height)+x_offset;
  2312. !         q=p+step*image->columns;
  2313. !         for (i=0; i < height; i++)
  2314. !         {
  2315. !           p-=image->columns;
  2316. !           red=DownShift(last_pixel.red*(UpShift(1)-fractional_step)+p->red*
  2317. !             fractional_step);
  2318. !           green=DownShift(last_pixel.green*(UpShift(1)-fractional_step)+
  2319. !             p->green*fractional_step);
  2320. !           blue=DownShift(last_pixel.blue*(UpShift(1)-fractional_step)+p->blue*
  2321. !             fractional_step);
  2322. !           last_pixel=(*p);
  2323. !           q-=image->columns;
  2324. !           q->red=range_limit[red];
  2325. !           q->green=range_limit[green];
  2326. !           q->blue=range_limit[blue];
  2327. !         }
  2328. !         /*
  2329. !           Set old column to background color.
  2330. !         */
  2331. !         red=DownShift(last_pixel.red*(UpShift(1)-fractional_step)+
  2332. !           background.red*fractional_step);
  2333. !         green=DownShift(last_pixel.green*(UpShift(1)-fractional_step)+
  2334. !           background.green*fractional_step);
  2335. !         blue=DownShift(last_pixel.blue*(UpShift(1)-fractional_step)+
  2336. !           background.blue*fractional_step);
  2337. !         q-=image->columns;
  2338. !         q->red=range_limit[red];
  2339. !         q->green=range_limit[green];
  2340. !         q->blue=range_limit[blue];
  2341. !         for (i=0; i < step-1; i++)
  2342. !         {
  2343. !           q-=image->columns;
  2344. !           q->red=background.red;
  2345. !           q->green=background.green;
  2346. !           q->blue=background.blue;
  2347. !         }
  2348. !         break;
  2349. X        }
  2350. X      }
  2351. X    }
  2352. X  }
  2353. X  
  2354. X  /*
  2355. ***************
  2356. *** 732,738 ****
  2357. X  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
  2358. X  %
  2359. X  %  Function RotateImage creates a new image that is a rotated copy of an
  2360. ! %  existing one.  It allocates the memory necessary for the new Image structure %  and returns a pointer to the new image.
  2361. X  %
  2362. X  %  Function RotateImage is based on the paper "A Fast Algorithm for General
  2363. X  %  Raster Rotatation" by Alan W. Paeth.  RotateImage is adapted from a similiar
  2364. --- 901,913 ----
  2365. X  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
  2366. X  %
  2367. X  %  Function RotateImage creates a new image that is a rotated copy of an
  2368. ! %  existing one.  Positive angles rotate counter-clockwise (right-hand rule),
  2369. ! %  while negative angles rotate clockwise.  Rotated images are usually larger
  2370. ! %  than the originals and have 'empty' triangular corners.  X axis.  Empty
  2371. ! %  triangles left over from shearing the image are filled with the color
  2372. ! %  defined by the pixel at location (0,0).  RotateImage allocates the memory
  2373. ! %  necessary for the new Image structure and returns a pointer to the new
  2374. ! %  image.
  2375. X  %
  2376. X  %  Function RotateImage is based on the paper "A Fast Algorithm for General
  2377. X  %  Raster Rotatation" by Alan W. Paeth.  RotateImage is adapted from a similiar
  2378. ***************
  2379. *** 768,778 ****
  2380. X  int
  2381. X    clip;
  2382. X  {
  2383. - #define DegreesToRadians(x) ((x)*3.14159265358979323846/180.0)
  2384. - 
  2385. X    ColorPacket
  2386. !     background,
  2387. !     *rotated_pixels;
  2388. X  
  2389. X    double
  2390. X      x_shear,
  2391. --- 943,950 ----
  2392. X  int
  2393. X    clip;
  2394. X  {
  2395. X    ColorPacket
  2396. !     background;
  2397. X  
  2398. X    double
  2399. X      x_shear,
  2400. ***************
  2401. *** 779,803 ****
  2402. X      y_shear;
  2403. X  
  2404. X    Image
  2405. X      *rotated_image;
  2406. X  
  2407. !   register ColorPacket
  2408. !     *p;
  2409. X  
  2410. X    register int
  2411. !     i,
  2412. !     x,
  2413. !     y;
  2414. X  
  2415. !   register RunlengthPacket
  2416. !     *q;
  2417. X  
  2418. X    unsigned int
  2419. !     number_rows,
  2420. !     number_columns,
  2421. X      rotations,
  2422. !     x_offset,
  2423. !     y_offset,
  2424. X      y_width;
  2425. X  
  2426. X    /*
  2427. --- 951,975 ----
  2428. X      y_shear;
  2429. X  
  2430. X    Image
  2431. +     *clipped_image,
  2432. +     *integral_image,
  2433. X      *rotated_image;
  2434. X  
  2435. !   int
  2436. !     x_offset,
  2437. !     y_offset;
  2438. X  
  2439. X    register int
  2440. !     i;
  2441. X  
  2442. !   unsigned char
  2443. !     *range_limit,
  2444. !     *range_table;
  2445. X  
  2446. X    unsigned int
  2447. !     height,
  2448. X      rotations,
  2449. !     width,
  2450. X      y_width;
  2451. X  
  2452. X    /*
  2453. ***************
  2454. *** 817,1042 ****
  2455. X    */
  2456. X    x_shear=(-tan(DegreesToRadians(degrees)/2.0));
  2457. X    y_shear=sin(DegreesToRadians(degrees));
  2458. X    if ((rotations == 1) || (rotations == 3))
  2459. X      {
  2460. !       /*
  2461. !         Invert image size.
  2462. !       */
  2463. !       y_width=image->rows+
  2464. !         (int) ceil(fabs(x_shear)*(double) (image->columns-1));
  2465. !       number_columns=image->rows+2*
  2466. !         (int) ceil(fabs(x_shear)*(double) (image->columns-1));
  2467. !       number_rows=image->columns+
  2468. !         (int) ceil(fabs(y_shear)*(double) (y_width-1));
  2469. !       rotated_image=CopyImage(image,number_columns,number_rows,False);
  2470. !       if (rotated_image == (Image *) NULL)
  2471. !         {
  2472. !           Warning("unable to rotate image","memory allocation failed");
  2473. SHAR_EOF
  2474. true || echo 'restore of fix-01 failed'
  2475. fi
  2476. echo 'End of ImageMagick/patch01 part 2'
  2477. echo 'File fix-01 is continued in part 3'
  2478. echo 3 > _shar_seq_.tmp
  2479. exit 0
  2480. -- 
  2481. cristy@dupont.com
  2482.