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

Comparing src/util/pictool.c (file contents):
Revision 2.2 by greg, Tue Aug 18 15:02:53 2015 UTC vs.
Revision 2.7 by greg, Thu May 14 20:58:03 2020 UTC

# Line 4 | Line 4 | static const char RCSid[] = "$Id$";
4   #include "pictool.h"
5   #include "g3sphere.h"
6   #include <math.h>
7 < #include <string.h>
7 > #include "rtio.h"
8  
9   #define        index                  strchr
10  
# Line 87 | Line 87 | void   pict_free(pict* p)
87   }
88   static int      exp_headline(char* s,void* exparg) {
89          double* exposure;
90 +        if(strstr(s, EXPOSSTR) != NULL )  {
91 +                fprintf(stderr,"EXP AND tab\n");
92 +                }
93  
94          exposure = (double*) exparg;
95          if (isexpos(s)) {
# Line 213 | Line 216 | gethinfo(                              /* get view from header */
216          void  *v
217   )
218   {
219 +        if(strstr(s, EXPOSSTR) != NULL && strstr(s, "\t") != NULL)  {
220 +                
221 +                fprintf(stderr,"error: header contains invalid exposure entry!!!!\n");
222 +                fprintf(stderr,"check exposure and correct header setting !\n");
223 +                
224 +                
225 +                fprintf(stderr,"stopping !!!!\n");
226 +                exit(1);
227 +                }
228          if (isview(s) && sscanview(((struct hinfo*)v)->hv, s) > 0) {
229                  ((struct hinfo*)v)->ok++;
230          } else if (isexpos(s)) {
# Line 677 | Line 689 | int            pict_locate(pict* p,FVECT pt,int* x,int* y)
689                  return 0;
690          }
691  
692 <        viewloc(pp,&(p->view),pt);
681 <        if (pp[2] < 0)
692 >        if (viewloc(pp,&(p->view),pt) != VL_GOOD)
693                  return 0;
694          loc2pix(res,&(p->resol),pp[0],pp[1]);
695          *x = res[0];

Diff Legend

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