ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/src/px/protate.c
(Generate patch)

Comparing ray/src/px/protate.c (file contents):
Revision 1.7 by greg, Tue Dec 4 11:25:46 1990 UTC vs.
Revision 2.3 by greg, Wed Feb 1 09:52:34 1995 UTC

# Line 1 | Line 1
1 < /* Copyright (c) 1988 Regents of the University of California */
1 > /* Copyright (c) 1991 Regents of the University of California */
2  
3   #ifndef lint
4   static char SCCSid[] = "$SunId$ LBL";
5   #endif
6 +
7   /*
8   * prot.c - program to rotate picture file 90 degrees clockwise.
9   *
# Line 13 | Line 14 | static char SCCSid[] = "$SunId$ LBL";
14  
15   #include "color.h"
16  
17 + #include "resolu.h"
18 +
19 + int     order;                          /* input scanline order */
20   int     xres, yres;                     /* input resolution */
17 – double  inpaspect = 1.0;                /* input aspect ratio */
21  
22 + int     correctorder = 0;               /* order correction? */
23 +
24 + #ifdef BIGMEM
25 + char    buf[1<<22];                     /* output buffer */
26 + #else
27   char    buf[1<<20];                     /* output buffer */
28 + #endif
29  
30   int     nrows;                          /* number of rows output at once */
31  
# Line 24 | Line 33 | int    nrows;                          /* number of rows output at once */
33  
34   char    *progname;
35  
36 + #define neworder()      (correctorder ? order : \
37 +                        (order^(order&YMAJOR?YDECR:XDECR)^YMAJOR))
38  
28 – headline(s)                             /* process line from header */
29 – char    *s;
30 – {
31 –        fputs(s, stdout);
32 –        if (isaspect(s))
33 –                inpaspect *= aspectval(s);
34 – }
39  
36 –
40   main(argc, argv)
41   int     argc;
42   char    *argv[];
# Line 42 | Line 45 | char   *argv[];
45  
46          progname = argv[0];
47  
48 +        if (argc > 2 && !strcmp(argv[1], "-c")) {
49 +                correctorder++;
50 +                argc--; argv++;
51 +        }
52          if (argc != 2 && argc != 3) {
53 <                fprintf(stderr, "Usage: %s infile [outfile]\n", progname);
53 >                fprintf(stderr, "Usage: %s [-c] infile [outfile]\n", progname);
54                  exit(1);
55          }
56          if ((fin = fopen(argv[1], "r")) == NULL) {
# Line 55 | Line 62 | char   *argv[];
62                  exit(1);
63          }
64                                          /* transfer header */
65 <        getheader(fin, headline);
65 >        if (checkheader(fin, COLRFMT, stdout) < 0) {
66 >                fprintf(stderr, "%s: not a Radiance picture\n", progname);
67 >                exit(1);
68 >        }
69                                          /* add new header info. */
70 <        if (inpaspect < .99 || inpaspect > 1.01)
61 <                fputaspect(1./inpaspect/inpaspect, stdout);
62 <        printf("%s\n\n", progname);
70 >        printf("%s%s\n\n", progname, correctorder?" -c":"");
71                                          /* get picture size */
72 <        if (fgetresolu(&xres, &yres, fin) != (YMAJOR|YDECR)) {
72 >        if ((order = fgetresolu(&xres, &yres, fin)) < 0) {
73                  fprintf(stderr, "%s: bad picture size\n", progname);
74                  exit(1);
75          }
76                                          /* write new picture size */
77 <        fputresolu(YMAJOR|YDECR, yres, xres, stdout);
77 >        fputresolu(neworder(), yres, xres, stdout);
78                                          /* compute buffer capacity */
79          nrows = sizeof(buf)/sizeof(COLR)/yres;
80          rotate(fin);                    /* rotate the image */

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)