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

Comparing ray/src/px/pcompos.c (file contents):
Revision 2.4 by greg, Wed Feb 19 17:08:00 1992 UTC vs.
Revision 2.6 by greg, Mon Jun 22 14:14:40 1992 UTC

# Line 119 | Line 119 | dofiles:
119          for (nfile = 0; an < argc; nfile++) {
120                  if (nfile >= MAXFILE)
121                          goto toomany;
122 <                if (autolabel)
123 <                        thislabel = argv[an];
124 <                else
125 <                        thislabel = NULL;
122 >                thislabel = NULL;
123                  input[nfile].hasmin = input[nfile].hasmax = 0;
124                  while (an < argc && (argv[an][0] == '-' || argv[an][0] == '+'))
125                          switch (argv[an][1]) {
# Line 159 | Line 156 | dofiles:
156   getfile:
157                  if (argc-an < (ncolumns ? 1 : 3))
158                          goto userr;
159 +                if (autolabel && thislabel == NULL)
160 +                        thislabel = argv[an];
161                  if (!strcmp(argv[an], "-")) {
162                          input[nfile].name = "<stdin>";
163                          input[nfile].fp = stdin;
# Line 338 | Line 337 | int  *xp, *yp;
337          char  com[128];
338          FILE  *fp;
339  
340 <        sprintf(com, "psign -h %d '%.30s' | pfilt -1 -x /2 -y /2",
342 <                        2*labelht, s);
340 >        sprintf(com, "psign -s -.2 -h %d '%.30s'", labelht, s);
341          if ((fp = popen(com, "r")) == NULL)
342                  return(NULL);
343          if (checkheader(fp, COLRFMT, NULL) < 0)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines