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

Comparing ray/src/util/evalglare.c (file contents):
Revision 3.06 by greg, Mon Sep 15 20:21:24 2025 UTC vs.
Revision 3.08 by greg, Wed Oct 1 17:48:15 2025 UTC

# Line 1 | Line 1
1   #ifndef lint
2   static const char RCSid[] = "$Id$";
3   #endif
4 < /* EVALGLARE V3.05
4 > /* EVALGLARE V3.06
5   * Evalglare Software License, Version 3.0x
6   *
7   * Copyright (c) 1995 - 2022 Fraunhofer ISE, EPFL.
# Line 401 | Line 401 | syntax now: -Q n_images n_extrascans_per_image n_image
401   - changing abs_max,Lveil from float to double
402    */
403  
404 + /* evalglare.c, v3.06  2024/06/25
405 + - fix bug missing border pixel when cutting with -G
406 +  */
407  
408 +
409 +
410 +
411   #define EVALGLARE
412   #define PROGNAME "evalglare"
413 < #define VERSION "3.05 release 25.06.2024 by J.Wienold, EPFL"
413 > #define VERSION "3.06 release 01.10.2025 by J.Wienold, EPFL"
414   #define RELEASENAME PROGNAME " " VERSION
415  
416  
# Line 960 | Line 966 | void cut_view_1(pict*p)
966   {
967   int x,y;
968   double border,ang,teta,phi,phi2;
969 <                  for(x=0;x<pict_get_xsize(p)-1;x++)
970 <                   for(y=0;y<pict_get_ysize(p)-1;y++) {
969 >                  for(x=0;x<pict_get_xsize(p);x++)
970 >                   for(y=0;y<pict_get_ysize(p);y++) {
971                          if (pict_get_hangle(p,x,y,p->view.vdir,p->view.vup,&ang)) {
972                                  if (pict_is_validpixel(p, x, y)) {
973                                          pict_get_vangle(p,x,y,p->view.vdir,p->view.vup,&phi2);
# Line 1014 | Line 1020 | void cut_view_2(pict*p)
1020  
1021   int x,y;
1022   double border,ang,teta,phi,phi2;
1023 <                  for(x=0;x<pict_get_xsize(p)-1;x++)
1024 <                   for(y=0;y<pict_get_ysize(p)-1;y++) {
1023 >                  for(x=0;x<pict_get_xsize(p);x++)
1024 >                   for(y=0;y<pict_get_ysize(p);y++) {
1025                          if (pict_get_hangle(p,x,y,p->view.vdir,p->view.vup,&ang)) {
1026                                  if (pict_is_validpixel(p, x, y)) {
1027                                          pict_get_vangle(p,x,y,p->view.vdir,p->view.vup,&phi2);
# Line 1070 | Line 1076 | void cut_view_3(pict*p)
1076  
1077   int x,y;
1078   double border,ang,teta,phi,phi2,lum,newlum;
1079 <                  for(x=0;x<pict_get_xsize(p)-1;x++)
1080 <                   for(y=0;y<pict_get_ysize(p)-1;y++) {
1079 >                  for(x=0;x<pict_get_xsize(p);x++)
1080 >                   for(y=0;y<pict_get_ysize(p);y++) {
1081                          if (pict_get_hangle(p,x,y,p->view.vdir,p->view.vup,&ang)) {
1082                               if (DOT(pict_get_cached_dir(p,x,y),p->view.vdir) >= 0.0) {
1083                                          pict_get_vangle(p,x,y,p->view.vdir,p->view.vup,&phi2);
# Line 1557 | Line 1563 | int main(int argc, char **argv)
1563          char** temp_image_name;
1564          int *x_temp_img, *y_temp_img;
1565          double *scale_image_scans;
1566 +        int *new_gs_number = NULL;
1567          VIEW userview = STDVIEW;
1568          int gotuserview = 0;
1569          
# Line 1697 | Line 1704 | int main(int argc, char **argv)
1704          abs_max = 0;
1705          fixargv0(argv[0]);
1706          E_v_contr = 0.0;
1707 <        strcpy(version, "3.05 release 25.06.2024 by J.Wienold");
1707 >        strcpy(version, "3.06 release 01.10.2025 by J.Wienold");
1708          low_light_corr=1.0;
1709          output = 0;
1710          calc_vill = 0;
# Line 3077 | Line 3084 | if (calcfast ==1 || search_pix <= 1.0 || calcfast == 2
3084                  
3085          }
3086  
3087 < int new_gs_number[igs+1];
3087 > new_gs_number = (int *)malloc(sizeof(int)*(igs+1));
3088  
3089                  i = 0;
3090                  for (x = 0; x <= igs; x++) {

Diff Legend

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