| 1 |
|
#ifndef lint |
| 2 |
|
static const char RCSid[] = "$Id$"; |
| 3 |
|
#endif |
| 4 |
< |
/* EVALGLARE V2.07 |
| 4 |
> |
/* EVALGLARE V2.08 |
| 5 |
|
* Evalglare Software License, Version 2.0 |
| 6 |
|
* |
| 7 |
|
* Copyright (c) 1995 - 2016 Fraunhofer ISE, EPFL. |
| 334 |
|
change of default value of multiplier b to 5.0, if task options (-t or -T ) are activated AND -b NOT used. To be downward compatible when using the task method. |
| 335 |
|
*/ |
| 336 |
|
|
| 337 |
< |
/* evalglare.c, v2.07 2018/11/06 |
| 337 |
> |
/* evalglare.c, v2.07 2018/11/17 |
| 338 |
|
bugfix: correction of error in the equations of PGSV_con and PGSV_sat |
| 339 |
|
all three PGSV equations are calculated now |
| 340 |
|
illuminance from the masking area (E_v_mask) is also printed |
| 341 |
|
bugfix: in VCPs error fuction equation, value of 6.347 replaced by 6.374 |
| 342 |
|
*/ |
| 343 |
+ |
|
| 344 |
+ |
/* evalglare.c, v2.08 2018/11/27 |
| 345 |
+ |
bugfix: checkroutine for same image size for the masking corrected |
| 346 |
+ |
*/ |
| 347 |
+ |
|
| 348 |
+ |
|
| 349 |
|
|
| 350 |
|
#define EVALGLARE |
| 351 |
|
#define PROGNAME "evalglare" |
| 352 |
< |
#define VERSION "2.07 release 17.11.2018 by EPFL, J.Wienold" |
| 352 |
> |
#define VERSION "2.08 release 27.11.2018 by EPFL, J.Wienold" |
| 353 |
|
#define RELEASENAME PROGNAME " " VERSION |
| 354 |
|
|
| 355 |
|
|
| 1937 |
|
|
| 1938 |
|
if (masking == 1) { |
| 1939 |
|
|
| 1940 |
< |
if (!pict_get_xsize(p)==pict_get_xsize(pm) || !pict_get_ysize(p)==pict_get_ysize(pm)) { |
| 1940 |
> |
if (pict_get_xsize(p)!=pict_get_xsize(pm) || pict_get_ysize(p)!=pict_get_ysize(pm)) { |
| 1941 |
|
fprintf(stderr, "error: masking image has other resolution than main image ! \n"); |
| 1942 |
|
fprintf(stderr, "size must be identical \n"); |
| 1943 |
|
printf("resolution main image : %dx%d\n",pict_get_xsize(p),pict_get_ysize(p)); |
