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

Comparing ray/src/cv/ies2rad.c (file contents):
Revision 2.23 by schorsch, Sat Nov 15 13:29:23 2003 UTC vs.
Revision 2.26 by greg, Wed Jun 22 19:57:17 2011 UTC

# Line 76 | Line 76 | int    filerev = FIRSTREV;
76                                          /* photometric types */
77   #define PM_C            1
78   #define PM_B            2
79 + #define PM_A            3
80                                          /* unit types */
81   #define U_FEET          1
82   #define U_METERS        2
# Line 699 | Line 700 | dosource(      /* create source and distribution */
700                  fprintf(stderr, "dosource: bad lamp specification\n");
701                  return(-1);
702          }
703 +        if (pmtype != PM_C && pmtype != PM_B) {
704 +                fprintf(stderr, "dosource: unsupported photometric type (%d)\n",
705 +                                pmtype);
706 +                return(-1);
707 +        }
708          sinf->mult = multiplier*mult*bfactor*pfactor;
709          if (nangles[0] < 2 || nangles[1] < 1) {
710                  fprintf(stderr, "dosource: too few measured angles\n");
# Line 736 | Line 742 | dosource(      /* create source and distribution */
742                  fprintf(out, "7 ");
743          else
744                  fprintf(out, "5 ");
745 <        dolower = (bounds[0][0] < 90.);
746 <        doupper = (bounds[0][1] > 90.);
745 >        dolower = (bounds[0][0] < 90.-FTINY);
746 >        doupper = (bounds[0][1] > 90.+FTINY);
747          dosides = (doupper & dolower && sinf->h > MINDIM);
748          fprintf(out, "%s %s source.cal ",
749                          sinf->type==SPHERE ? "corr" :
# Line 750 | Line 756 | dosource(      /* create source and distribution */
756                  else
757                          fprintf(out, "srcB_horiz ");
758                  fprintf(out, "srcB_vert ");
759 <        } else /* pmtype == PM_A */ {
759 >        } else /* pmtype == PM_C */ {
760                  if (nangles[1] >= 2) {
761                          d1 = bounds[1][1] - bounds[1][0];
762                          if (d1 <= 90.+FTINY)
# Line 1139 | Line 1145 | cvgeometry(
1145          strcpy(buf, "mgf2rad ");                /* build mgf2rad command */
1146          cp = buf+8;
1147          if (!FEQ(sinf->mult, 1.0)) {
1148 <                sprintf(cp, "-m %f ", sinf->mult);
1148 >                sprintf(cp, "-e %f ", sinf->mult);
1149                  cp += strlen(cp);
1150          }
1151          sprintf(cp, "-g %f %s ",

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines