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

Comparing ray/src/util/pictool.c (file contents):
Revision 2.3 by greg, Thu Jul 14 17:32:12 2016 UTC vs.
Revision 2.5 by greg, Wed Jan 24 04:39:52 2018 UTC

# Line 217 | Line 217 | gethinfo(                              /* get view from header */
217   )
218   {
219          if(strstr(s, EXPOSSTR) != NULL && strstr(s, "\t") != NULL)  {
220 <                fprintf(stderr,"error: header contains invalid exposure !!!!\n");
221 <                fprintf(stderr,"check exposure and remove tab !\n");
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                  }
# Line 686 | Line 689 | int            pict_locate(pict* p,FVECT pt,int* x,int* y)
689                  return 0;
690          }
691  
692 <        viewloc(pp,&(p->view),pt);
690 <        if (pp[2] < 0)
692 >        if (viewloc(pp,&(p->view),pt) <= 0)
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