| 59 |
|
MEM_PTR malloc(); |
| 60 |
|
MEM_PTR calloc(); |
| 61 |
|
#endif |
| 62 |
< |
extern int tmErrorReturn(char*, int); |
| 62 |
> |
extern int tmErrorReturn(char *, TMstruct *, int); |
| 63 |
|
|
| 64 |
|
/* lookup for mesopic scaling */ |
| 65 |
|
extern BYTE tmMesofact[BMESUPPER-BMESLOWER]; |
| 66 |
|
|
| 67 |
|
extern void tmMkMesofact(void); /* build tmMesofact */ |
| 68 |
|
|
| 69 |
< |
#define returnErr(code) return(tmErrorReturn(funcName,code)) |
| 69 |
> |
#define returnErr(code) return(tmErrorReturn(funcName,tms,code)) |
| 70 |
|
#define returnOK return(TM_E_OK) |
| 71 |
|
|
| 72 |
|
#define FEQ(a,b) ((a) < (b)+1e-5 && (b) < (a)+1e-5) |
| 75 |
|
&&FEQ((p1)[1][0],(p2)[1][0])&&FEQ((p1)[1][1],(p2)[1][1])\ |
| 76 |
|
&&FEQ((p1)[2][0],(p2)[2][0])&&FEQ((p1)[2][1],(p2)[2][1])\ |
| 77 |
|
&&FEQ((p1)[3][0],(p2)[3][0])&&FEQ((p1)[3][1],(p2)[3][1])) |
| 78 |
– |
|
| 78 |
|
|
| 79 |
|
#ifdef __cplusplus |
| 80 |
|
} |
