ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/px/pcomb.c
Revision 2.52 - (view) (download) (annotate) - [select for diffs]
Wed Apr 3 20:16:31 2019 UTC (5 years, 7 months ago) by greg
Branch: MAIN
CVS Tags: rad5R3
Changes since 2.51: +6 -6 lines
Diff to previous 2.51
Changed common view parameters to a pointer

Revision 2.51 - (view) (download) (annotate) - [select for diffs]
Thu Aug 2 18:33:43 2018 UTC (6 years, 3 months ago) by greg
Branch: MAIN
CVS Tags: rad5R2
Changes since 2.50: +2 -2 lines
Diff to previous 2.50
Created MAXFMTLEN to guard against buffer overrun attacks in header input

Revision 2.50 - (view) (download) (annotate) - [select for diffs]
Fri May 4 23:56:49 2018 UTC (6 years, 6 months ago) by greg
Branch: MAIN
Changes since 2.49: +11 -2 lines
Diff to previous 2.49
Added search to -f for genrev, gensurf, genworm, bsdf2klems, bsdf2ttree, & pcomb

Revision 2.49 - (view) (download) (annotate) - [select for diffs]
Mon Feb 5 20:07:17 2018 UTC (6 years, 9 months ago) by greg
Branch: MAIN
Changes since 2.48: +10 -1 lines
Diff to previous 2.48
Decided to share first input view in the output of pcomb

Revision 2.48 - (view) (download) (annotate) - [select for diffs]
Sat Jan 13 00:35:55 2018 UTC (6 years, 9 months ago) by greg
Branch: MAIN
Changes since 2.47: +5 -6 lines
Diff to previous 2.47
Fixed issue introduced with xres and yres definitions

Revision 2.47 - (view) (download) (annotate) - [select for diffs]
Fri Jan 12 00:50:17 2018 UTC (6 years, 10 months ago) by greg
Branch: MAIN
Changes since 2.46: +15 -12 lines
Diff to previous 2.46
Added missing esupport settings for constant expression reduction

Revision 2.46 - (view) (download) (annotate) - [select for diffs]
Mon Aug 1 00:08:53 2016 UTC (8 years, 3 months ago) by greg
Branch: MAIN
CVS Tags: rad5R1
Changes since 2.45: +2 -2 lines
Diff to previous 2.45
Increased scanline buffer size

Revision 2.45 - (view) (download) (annotate) - [select for diffs]
Tue Feb 2 18:02:32 2016 UTC (8 years, 9 months ago) by greg
Branch: MAIN
Changes since 2.44: +2 -2 lines
Diff to previous 2.44
Moved declaration of popen to paths.h and put convert_command() into module

Revision 2.44 - (view) (download) (annotate) - [select for diffs]
Mon Aug 10 04:26:38 2009 UTC (15 years, 3 months ago) by greg
Branch: MAIN
CVS Tags: rad4R0, rad4R1, rad4R2, rad4R2P1, rad4R2P2, rad5R0
Changes since 2.43: +2 -2 lines
Diff to previous 2.43
Upped limit on open files to 1024

Revision 2.43 - (view) (download) (annotate) - [select for diffs]
Mon Nov 10 19:08:19 2008 UTC (16 years ago) by greg
Branch: MAIN
Changes since 2.42: +2 -2 lines
Diff to previous 2.42
Changed ".pic" extension to ".hdr" throughout

Revision 2.42 - (view) (download) (annotate) - [select for diffs]
Wed Nov 7 05:40:06 2007 UTC (17 years ago) by greg
Branch: MAIN
CVS Tags: rad3R9
Changes since 2.41: +39 -18 lines
Diff to previous 2.41
Fixed problem in last change -- pixel position should work, now

Revision 2.41 - (view) (download) (annotate) - [select for diffs]
Mon Nov 5 23:40:26 2007 UTC (17 years ago) by greg
Branch: MAIN
Changes since 2.40: +3 -3 lines
Diff to previous 2.40
Corrected pixel alignment for downsampling & upsampling in pcomb

Revision 2.40 - (view) (download) (annotate) - [select for diffs]
Mon Oct 22 17:56:36 2007 UTC (17 years ago) by greg
Branch: MAIN
Changes since 2.39: +3 -1 lines
Diff to previous 2.39
Fixed bug in -h option

Revision 2.39 - (view) (download) (annotate) - [select for diffs]
Fri Sep 8 21:38:25 2006 UTC (18 years, 2 months ago) by greg
Branch: MAIN
CVS Tags: rad3R8
Changes since 2.38: +19 -10 lines
Diff to previous 2.38
Added -h option to pcompos and pcomb to avoid uncontrolled header growth

Revision 2.38 - (view) (download) (annotate) - [select for diffs]
Wed May 25 04:44:25 2005 UTC (19 years, 5 months ago) by greg
Branch: MAIN
CVS Tags: rad3R7P1, rad3R7P2
Changes since 2.37: +2 -2 lines
Diff to previous 2.37
Created rtcontrib program for computing ray contributions and coefficients

Revision 2.37 - (view) (download) (annotate) - [select for diffs]
Tue Mar 1 23:16:42 2005 UTC (19 years, 8 months ago) by greg
Branch: MAIN
Changes since 2.36: +3 -6 lines
Diff to previous 2.36
Removed wasteful test for unit multiplier coefficient

Revision 2.36 - (view) (download) (annotate) - [select for diffs]
Wed Feb 16 03:26:33 2005 UTC (19 years, 8 months ago) by greg
Branch: MAIN
Changes since 2.35: +2 -2 lines
Diff to previous 2.35
Last minor change broke solid angle calculation -- fixed

Revision 2.35 - (view) (download) (annotate) - [select for diffs]
Mon Jan 24 19:29:39 2005 UTC (19 years, 9 months ago) by greg
Branch: MAIN
Changes since 2.34: +5 -5 lines
Diff to previous 2.34
Minor fixes to solid angle math

Revision 2.34 - (view) (download) (annotate) - [select for diffs]
Tue Aug 31 18:52:27 2004 UTC (20 years, 2 months ago) by greg
Branch: MAIN
CVS Tags: rad3R6, rad3R6P1
Changes since 2.33: +1 -3 lines
Diff to previous 2.33
Removed redundant function declarations

Revision 2.33 - (view) (download) (annotate) - [select for diffs]
Tue Jun 8 19:48:30 2004 UTC (20 years, 5 months ago) by greg
Branch: MAIN
Changes since 2.32: +2 -3 lines
Diff to previous 2.32
Removed redundant #include's and fixed ordering on some headers

Revision 2.32 - (view) (download) (annotate) - [select for diffs]
Sun Mar 28 20:33:14 2004 UTC (20 years, 7 months ago) by schorsch
Branch: MAIN
Changes since 2.31: +55 -29 lines
Diff to previous 2.31
Continued ANSIfication, and other fixes and clarifications.

Revision 2.31 - (view) (download) (annotate) - [select for diffs]
Mon Mar 15 21:16:54 2004 UTC (20 years, 8 months ago) by greg
Branch: MAIN
Changes since 2.30: +3 -2 lines
Diff to previous 2.30
Made it so pcompos does not cut off input command streams abruptly

Revision 2.30 - (view) (download) (annotate) - [select for diffs]
Fri Jan 2 12:47:01 2004 UTC (20 years, 10 months ago) by schorsch
Branch: MAIN
Changes since 2.29: +7 -3 lines
Diff to previous 2.29
Fixed typing/prototype of getheader() and its callback.

Revision 2.29 - (view) (download) (annotate) - [select for diffs]
Mon Oct 27 10:24:51 2003 UTC (21 years ago) by schorsch
Branch: MAIN
Changes since 2.28: +9 -12 lines
Diff to previous 2.28
Various compatibility fixes.

Revision 2.28 - (view) (download) (annotate) - [select for diffs]
Wed Oct 22 02:06:35 2003 UTC (21 years ago) by greg
Branch: MAIN
Changes since 2.27: +2 -2 lines
Diff to previous 2.27
Fewer complaints if "platform.h" precedes "standard.h"

Revision 2.27 - (view) (download) (annotate) - [select for diffs]
Mon Aug 4 22:37:53 2003 UTC (21 years, 3 months ago) by greg
Branch: MAIN
Changes since 2.26: +5 -4 lines
Diff to previous 2.26
Added prototype for LIBR function pointer in calcomp.h

Revision 2.26 - (view) (download) (annotate) - [select for diffs]
Mon Jul 21 22:30:18 2003 UTC (21 years, 3 months ago) by schorsch
Branch: MAIN
Changes since 2.25: +2 -2 lines
Diff to previous 2.25
Eliminated copystruct() macro, which is unnecessary in ANSI.
Reduced ambiguity warnings for nested if/if/else clauses.

Revision 2.25 - (view) (download) (annotate) - [select for diffs]
Thu Jun 26 00:58:10 2003 UTC (21 years, 4 months ago) by schorsch
Branch: MAIN
Changes since 2.24: +3 -3 lines
Diff to previous 2.24
Abstracted process and path handling for Windows.
Renamed FLOAT to RREAL because of conflict on Windows.
Added conditional compiles for some signal handlers.

Revision 2.24 - (view) (download) (annotate) - [select for diffs]
Sun Jun 8 12:03:10 2003 UTC (21 years, 5 months ago) by schorsch
Branch: MAIN
Changes since 2.23: +2 -1 lines
Diff to previous 2.23
Reduced compile warnings/errors on Windows.

Revision 2.23 - (view) (download) (annotate) - [select for diffs]
Thu Jun 5 19:29:34 2003 UTC (21 years, 5 months ago) by schorsch
Branch: MAIN
Changes since 2.22: +4 -10 lines
Diff to previous 2.22
Macros for setting binary file mode. Replacing MSDOS by _WIN32.

Revision 2.22 - (view) (download) (annotate) - [select for diffs]
Sat Feb 22 02:07:27 2003 UTC (21 years, 8 months ago) by greg
Branch: MAIN
CVS Tags: rad3R5
Changes since 2.21: +20 -16 lines
Diff to previous 2.21
Changes and check-in for 3.5 release
Includes new source files and modifications not recorded for many years
See ray/doc/notes/ReleaseNotes for notes between 3.1 and 3.5 release

Revision 2.21 - (view) (download) (annotate) - [select for diffs]
Tue Oct 27 09:08:25 1998 UTC (26 years ago) by gwlarson
Branch: MAIN
Changes since 2.20: +3 -3 lines
Diff to previous 2.20
changed getheader() to listen to return value of passed function

Revision 2.20 - (view) (download) (annotate) - [select for diffs]
Thu Sep 19 12:10:46 1996 UTC (28 years, 1 month ago) by greg
Branch: MAIN
Changes since 2.19: +1 -0 lines
Diff to previous 2.19
added default value of -1 to T(n) for pictures w/o view parameters

Revision 2.19 - (view) (download) (annotate) - [select for diffs]
Thu Sep 5 10:38:53 1996 UTC (28 years, 2 months ago) by greg
Branch: MAIN
Changes since 2.18: +1 -0 lines
Diff to previous 2.18
added definition of constant PI

Revision 2.18 - (view) (download) (annotate) - [select for diffs]
Tue Sep 3 11:30:37 1996 UTC (28 years, 2 months ago) by greg
Branch: MAIN
Changes since 2.17: +58 -48 lines
Diff to previous 2.17
fixed S(n) function and added T(n) function and pa(n) and WE constants

Revision 2.17 - (view) (download) (annotate) - [select for diffs]
Fri Aug 30 17:39:39 1996 UTC (28 years, 2 months ago) by greg
Branch: MAIN
Changes since 2.16: +57 -2 lines
Diff to previous 2.16
added computation of pixel solid angle ("S" variable)

Revision 2.16 - (view) (download) (annotate) - [select for diffs]
Mon Oct 16 12:04:33 1995 UTC (29 years, 1 month ago) by greg
Branch: MAIN
Changes since 2.15: +33 -4 lines
Diff to previous 2.15
added compatibility with Radiance XYZE picture format

Revision 2.15 - (view) (download) (annotate) - [select for diffs]
Fri Feb 17 18:37:20 1995 UTC (29 years, 9 months ago) by greg
Branch: MAIN
Changes since 2.14: +1 -1 lines
Diff to previous 2.14
fixed potential bug in eclock tracking

Revision 2.14 - (view) (download) (annotate) - [select for diffs]
Sun Feb 27 10:16:52 1994 UTC (30 years, 8 months ago) by greg
Branch: MAIN
Changes since 2.13: +4 -2 lines
Diff to previous 2.13
Added new ID to first line of header and changed use of formatval

Revision 2.13 - (view) (download) (annotate) - [select for diffs]
Mon Jun 14 15:59:46 1993 UTC (31 years, 5 months ago) by greg
Branch: MAIN
Changes since 2.12: +2 -2 lines
Diff to previous 2.12
increased default window to +/- 8 pixels instead of 4

Revision 2.12 - (view) (download) (annotate) - [select for diffs]
Mon May 3 12:13:03 1993 UTC (31 years, 6 months ago) by greg
Branch: MAIN
Changes since 2.11: +1 -1 lines
Diff to previous 2.11
changed a range error to a domain error in l_ray()

Revision 2.11 - (view) (download) (annotate) - [select for diffs]
Thu Apr 29 15:46:48 1993 UTC (31 years, 6 months ago) by greg
Branch: MAIN
Changes since 2.10: +1 -1 lines
Diff to previous 2.10
fixed bug in computation of image location in l_ray()

Revision 2.10 - (view) (download) (annotate) - [select for diffs]
Thu Apr 29 14:32:07 1993 UTC (31 years, 6 months ago) by greg
Branch: MAIN
Changes since 2.9: +66 -16 lines
Diff to previous 2.9
added origin and direction functions O[xyz](i), D[xyz](i)

Revision 2.9 - (view) (download) (annotate) - [select for diffs]
Fri Apr 9 09:49:36 1993 UTC (31 years, 7 months ago) by greg
Branch: MAIN
Changes since 2.8: +1 -1 lines
Diff to previous 2.8
fixed Usage message (added -o)

Revision 2.8 - (view) (download) (annotate) - [select for diffs]
Fri Oct 2 16:22:51 1992 UTC (32 years, 1 month ago) by greg
Branch: MAIN
Changes since 2.7: +3 -2 lines
Diff to previous 2.7
Removed problematic math function declarations

Revision 2.7 - (view) (download) (annotate) - [select for diffs]
Mon Sep 21 12:13:48 1992 UTC (32 years, 1 month ago) by greg
Branch: MAIN
Changes since 2.6: +12 -0 lines
Diff to previous 2.6
Changes for PC port

Revision 2.6 - (view) (download) (annotate) - [select for diffs]
Tue Sep 8 10:35:05 1992 UTC (32 years, 2 months ago) by greg
Branch: MAIN
Changes since 2.5: +7 -20 lines
Diff to previous 2.5
portability fixes

Revision 2.5 - (view) (download) (annotate) - [select for diffs]
Fri Aug 28 21:41:49 1992 UTC (32 years, 2 months ago) by greg
Branch: MAIN
Changes since 2.4: +5 -8 lines
Diff to previous 2.4
slight change to quit() routine

Revision 2.4 - (view) (download) (annotate) - [select for diffs]
Thu Aug 13 10:49:08 1992 UTC (32 years, 3 months ago) by greg
Branch: MAIN
Changes since 2.3: +30 -8 lines
Diff to previous 2.3
improved reaping of child processes

Revision 2.3 - (view) (download) (annotate) - [select for diffs]
Mon Aug 10 12:10:26 1992 UTC (32 years, 3 months ago) by greg
Branch: MAIN
Changes since 2.2: +6 -0 lines
Diff to previous 2.2
added wait call to reap child processes

Revision 2.2 - (view) (download) (annotate) - [select for diffs]
Fri Mar 27 10:04:12 1992 UTC (32 years, 7 months ago) by greg
Branch: MAIN
Changes since 2.1: +7 -4 lines
Diff to previous 2.1
changed header information for commands

Revision 2.1 - (view) (download) (annotate) - [select for diffs]
Tue Nov 12 16:04:51 1991 UTC (33 years ago) by greg
Branch: MAIN
Changes since 1.23: +0 -0 lines
Diff to previous 1.23
updated revision number for release 2.0

Revision 1.23 - (view) (download) (annotate) - [select for diffs]
Mon Nov 11 14:01:24 1991 UTC (33 years ago) by greg
Branch: MAIN
Changes since 1.22: +4 -2 lines
Diff to previous 1.22
Improved handling of scanline ordering

Revision 1.22 - (view) (download) (annotate) - [select for diffs]
Mon Aug 19 13:43:33 1991 UTC (33 years, 3 months ago) by greg
Branch: MAIN
Changes since 1.21: +1 -1 lines
Diff to previous 1.21
bug fix

Revision 1.21 - (view) (download) (annotate) - [select for diffs]
Wed Aug 14 15:00:34 1991 UTC (33 years, 3 months ago) by greg
Branch: MAIN
Changes since 1.20: +5 -14 lines
Diff to previous 1.20
inconsequential changes

Revision 1.20 - (view) (download) (annotate) - [select for diffs]
Thu May 30 10:14:39 1991 UTC (33 years, 5 months ago) by greg
Branch: MAIN
Changes since 1.19: +1 -1 lines
Diff to previous 1.19
fixed outdated usages message

Revision 1.19 - (view) (download) (annotate) - [select for diffs]
Thu May 30 09:47:14 1991 UTC (33 years, 5 months ago) by greg
Branch: MAIN
Changes since 1.18: +6 -2 lines
Diff to previous 1.18
added ability to open commands as well as files

Revision 1.18 - (view) (download) (annotate) - [select for diffs]
Mon May 27 09:01:05 1991 UTC (33 years, 5 months ago) by greg
Branch: MAIN
Changes since 1.17: +91 -68 lines
Diff to previous 1.17
changed code for output resolution to allow changes from input

Revision 1.17 - (view) (download) (annotate) - [select for diffs]
Fri May 24 17:14:49 1991 UTC (33 years, 5 months ago) by greg
Branch: MAIN
Changes since 1.16: +36 -26 lines
Diff to previous 1.16
changed operation of -o option

Revision 1.16 - (view) (download) (annotate) - [select for diffs]
Fri May 24 15:47:53 1991 UTC (33 years, 5 months ago) by greg
Branch: MAIN
Changes since 1.15: +47 -37 lines
Diff to previous 1.15
bug fixes after last change

Revision 1.15 - (view) (download) (annotate) - [select for diffs]
Fri May 24 14:46:14 1991 UTC (33 years, 5 months ago) by greg
Branch: MAIN
Changes since 1.14: +141 -122 lines
Diff to previous 1.14
made it so constants are assigned before expressions are compiled
added rc, gc, bc, and lc functions for returning image coefficients

Revision 1.14 - (view) (download) (annotate) - [select for diffs]
Thu May 23 13:46:05 1991 UTC (33 years, 5 months ago) by greg
Branch: MAIN
Changes since 1.13: +94 -35 lines
Diff to previous 1.13
added access to adjacent pixels for filtering, etc.

Revision 1.13 - (view) (download) (annotate) - [select for diffs]
Wed May 22 14:56:51 1991 UTC (33 years, 5 months ago) by greg
Branch: MAIN
Changes since 1.12: +6 -6 lines
Diff to previous 1.12
changed assignment slightly for efficiency

Revision 1.12 - (view) (download) (annotate) - [select for diffs]
Tue Apr 23 15:49:53 1991 UTC (33 years, 6 months ago) by greg
Branch: MAIN
Changes since 1.11: +4 -4 lines
Diff to previous 1.11
changed parameters to funset() call

Revision 1.11 - (view) (download) (annotate) - [select for diffs]
Tue Apr 23 13:03:31 1991 UTC (33 years, 6 months ago) by greg
Branch: MAIN
Changes since 1.10: +5 -5 lines
Diff to previous 1.10
arguments to varset() changed

Revision 1.10 - (view) (download) (annotate) - [select for diffs]
Thu Apr 18 14:35:17 1991 UTC (33 years, 7 months ago) by greg
Branch: MAIN
Changes since 1.9: +20 -9 lines
Diff to previous 1.9
added format information to headers

Revision 1.9 - (view) (download) (annotate) - [select for diffs]
Thu Apr 18 10:19:48 1991 UTC (33 years, 7 months ago) by greg
Branch: MAIN
Changes since 1.8: +24 -2 lines
Diff to previous 1.8
added -o option for original values

Revision 1.8 - (view) (download) (annotate) - [select for diffs]
Thu Apr 18 08:05:57 1991 UTC (33 years, 7 months ago) by greg
Branch: MAIN
Changes since 1.7: +67 -30 lines
Diff to previous 1.7
added variables for luminance in and out, xres, yres, nfiles

Revision 1.7 - (view) (download) (annotate) - [select for diffs]
Fri Jul 20 14:38:06 1990 UTC (34 years, 4 months ago) by greg
Branch: MAIN
Changes since 1.6: +1 -1 lines
Diff to previous 1.6
changed arguments to scompile()

Revision 1.6 - (view) (download) (annotate) - [select for diffs]
Thu Sep 14 09:20:38 1989 UTC (35 years, 2 months ago) by greg
Branch: MAIN
Changes since 1.5: +3 -4 lines
Diff to previous 1.5
Increased maximum number of files -- let system say otherwise

Revision 1.5 - (view) (download) (annotate) - [select for diffs]
Tue Sep 12 13:04:22 1989 UTC (35 years, 2 months ago) by greg
Branch: MAIN
Changes since 1.4: +3 -2 lines
Diff to previous 1.4
added calls to get/put picture resolution (bug fix)

Revision 1.4 - (view) (download) (annotate) - [select for diffs]
Tue Jul 11 18:05:05 1989 UTC (35 years, 4 months ago) by greg
Branch: MAIN
Changes since 1.3: +13 -8 lines
Diff to previous 1.3
Changed variable evaluation to use pointer

Revision 1.3 - (view) (download) (annotate) - [select for diffs]
Tue Jul 11 17:13:44 1989 UTC (35 years, 4 months ago) by greg
Branch: MAIN
Changes since 1.2: +37 -11 lines
Diff to previous 1.2
Added coefficient for faster combination

Revision 1.2 - (view) (download) (annotate) - [select for diffs]
Tue May 9 10:07:04 1989 UTC (35 years, 6 months ago) by greg
Branch: MAIN
Changes since 1.1: +0 -1 lines
Diff to previous 1.1
Changed default from average to sum

Revision 1.1 - (view) (download) (annotate) - [select for diffs]
Thu Feb 2 10:49:22 1989 UTC (35 years, 9 months ago) by greg
Branch: MAIN
Initial revision

Convenience Links

Links to HEAD: (view) (download) (annotate) Links to rad5R3: (view) (download) (annotate)

Compare Revisions

This form allows you to request diffs between any two revisions of this file. For each of the two "sides" of the diff, select a symbolic revision name using the selection box, or choose 'Use Text Field' and enter a numeric revision.

  Diffs between and
  Type of Diff should be a