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