| # | Line 18 | Line 18 | |
|---|---|---|
| 18 | #include "pmapdata.h" | |
| 19 | ||
| 20 | ||
| 21 | < | |
| 22 | < | #define min(a, b) ((a) < (b) ? (a) : (b)) |
| 23 | < | #define max(a, b) ((a) > (b) ? (a) : (b)) |
| 21 | > | #ifndef min |
| 22 | > | #define min(a, b) ((a) < (b) ? (a) : (b)) |
| 23 | > | #endif |
| 24 | > | |
| 25 | > | #ifndef max |
| 26 | > | #define max(a, b) ((a) > (b) ? (a) : (b)) |
| 27 | > | #endif |
| 28 | > | |
| 29 | #define sqr(a) ((a) * (a)) | |
| 30 | ||
| 31 | /* Average over colour channels */ | |
| – | Removed lines |
| + | Added lines |
| < | Changed lines |
| > | Changed lines |