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

Comparing ray/src/util/cmatrix.h (file contents):
Revision 2.3 by greg, Mon Jan 20 22:18:29 2014 UTC vs.
Revision 2.15 by greg, Fri Apr 4 18:06:48 2025 UTC

# Line 8 | Line 8
8   #ifndef _RAD_CMATRIX_H_
9   #define _RAD_CMATRIX_H_
10  
11 + #include  <sys/types.h>
12   #include "color.h"
13  
14   #ifdef __cplusplus
15   extern "C" {
16   #endif
17  
18 < /* Data types for file loading */
19 < enum {DTfromHeader, DTascii, DTfloat, DTdouble, DTrgbe, DTxyze};
18 > /* Data types for file loading (used to be an enum) */
19 > #define DTfromHeader    0
20 > #define DTrgbe          1
21 > #define DTxyze          2
22 > #define DTspec          3
23 > #define DTfloat         4
24 > #define DTascii         5
25 > #define DTdouble        6
26 > #define DTend           7
27  
28 + extern const char       stdin_name[];
29 + extern const char       *cm_fmt_id[];
30 + extern const int        cm_elem_size[];
31 +
32   /* A color coefficient matrix -- vectors have ncols==1 */
33   typedef struct {
34          int     nrows, ncols;
# Line 25 | Line 37 | typedef struct {
37  
38   #define COLSPEC (sizeof(COLORV)==sizeof(float) ? "%f %f %f" : "%lf %lf %lf")
39  
40 < #define cm_lval(cm,r,c) ((cm)->cmem + 3*((r)*(cm)->ncols + (c)))
40 > #define cm_lval(cm,r,c) ((cm)->cmem + 3*((size_t)(r)*(cm)->ncols + (c)))
41  
42   #define cv_lval(cm,i)   ((cm)->cmem + 3*(i))
43  
44   /* Allocate a color coefficient matrix */
45 < extern CMATRIX *cm_alloc(int nrows, int ncols);
45 > extern CMATRIX  *cm_alloc(int nrows, int ncols);
46  
47   /* Resize color coefficient matrix */
48 < extern CMATRIX *cm_resize(CMATRIX *cm, int nrows);
48 > extern CMATRIX  *cm_resize(CMATRIX *cm, int nrows);
49  
50   #define cm_free(cm)     free(cm)
51  
52 < /* Load header to obtain data type */
53 < extern int getDTfromHeader(FILE *fp);
52 > /* Load header to obtain/check data type and matrix dimensions */
53 > extern char     *cm_getheader(int *dt, int *nr, int *nc,
54 >                                int *swp, COLOR scale, FILE *fp);
55  
56 < /* Allocate and load a matrix from the given file (or stdin if NULL) */
57 < extern CMATRIX *cm_load(const char *fname, int nrows, int ncols, int dtype);
56 > /* Allocate and load a matrix from the given input (or stdin if NULL) */
57 > extern CMATRIX  *cm_load(const char *inspec, int nrows, int ncols, int dtype);
58  
59   /* Extract a column vector from a matrix */
60 < extern CMATRIX *cm_column(const CMATRIX *cm, int c);
60 > extern CMATRIX  *cm_column(const CMATRIX *cm, int c);
61  
49 /* Scale a matrix by a single value */
50 extern CMATRIX *cm_scale(const CMATRIX *cm1, const COLOR sca);
51
62   /* Multiply two matrices (or a matrix and a vector) and allocate the result */
63 < extern CMATRIX *cm_multiply(const CMATRIX *cm1, const CMATRIX *cm2);
63 > extern CMATRIX  *cm_multiply(const CMATRIX *cm1, const CMATRIX *cm2);
64  
65 < /* print out matrix as ASCII text -- no header */
66 < extern void cm_print(const CMATRIX *cm, FILE *fp);
65 > /* write out matrix to file (precede by resolution string if picture) */
66 > extern int      cm_write(const CMATRIX *cm, int dtype, FILE *fp);
67  
68   /* Load and convert a matrix BTDF from the given XML file */
69 < extern CMATRIX *cm_loadBTDF(char *fname);
69 > extern CMATRIX  *cm_loadBTDF(const char *fname);
70 >
71 > /* Load and convert a matrix BRDF from the given XML file */
72 > extern CMATRIX  *cm_loadBRDF(const char *fname, int backside);
73  
74   #ifdef __cplusplus
75   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines