diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-11-10 16:26:03 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-11-10 16:26:03 +0400 |
| commit | 07534f05d5cc5ad7f31d6544da6e2aafb0051508 (patch) | |
| tree | cc3c7085326519187313b75dd1cccee4ec4f4e3f /source/blender/imbuf | |
| parent | bbcfadff35c8182dc3ccbb05d63b0362fddb3084 (diff) | |
no need to call isnan() on unsigned ints (causes error on freebsd/clang)
Diffstat (limited to 'source/blender/imbuf')
| -rw-r--r-- | source/blender/imbuf/intern/cineon/cineonlib.c | 4 | ||||
| -rw-r--r-- | source/blender/imbuf/intern/cineon/dpxlib.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/imbuf/intern/cineon/cineonlib.c b/source/blender/imbuf/intern/cineon/cineonlib.c index 1481b2aaa66..3c3bdcfbf2c 100644 --- a/source/blender/imbuf/intern/cineon/cineonlib.c +++ b/source/blender/imbuf/intern/cineon/cineonlib.c @@ -277,10 +277,10 @@ LogImageFile *cineonOpen(const unsigned char *byteStuff, int fromMemory, size_t return NULL; } - if (cineon->element[i].refLowData == CINEON_UNDEFINED_U32 || isnan(cineon->element[i].refLowData)) + if (cineon->element[i].refLowData == CINEON_UNDEFINED_U32 || cineon->element[i].refLowData) cineon->element[i].refLowData = 0; - if (cineon->element[i].refHighData == CINEON_UNDEFINED_U32 || isnan(cineon->element[i].refHighData)) + if (cineon->element[i].refHighData == CINEON_UNDEFINED_U32 || cineon->element[i].refHighData) cineon->element[i].refHighData = (unsigned int)cineon->element[i].maxValue; if (cineon->element[i].refLowQuantity == CINEON_UNDEFINED_R32 || isnan(cineon->element[i].refLowQuantity)) diff --git a/source/blender/imbuf/intern/cineon/dpxlib.c b/source/blender/imbuf/intern/cineon/dpxlib.c index 5a4371d84ba..006236e647e 100644 --- a/source/blender/imbuf/intern/cineon/dpxlib.c +++ b/source/blender/imbuf/intern/cineon/dpxlib.c @@ -300,10 +300,10 @@ LogImageFile *dpxOpen(const unsigned char *byteStuff, int fromMemory, size_t buf case descriptor_RGB: case descriptor_RGBA: case descriptor_ABGR: - if (dpx->element[i].refLowData == DPX_UNDEFINED_U32 || isnan(dpx->element[i].refLowData)) + if (dpx->element[i].refLowData == DPX_UNDEFINED_U32 || dpx->element[i].refLowData) dpx->element[i].refLowData = 0; - if (dpx->element[i].refHighData == DPX_UNDEFINED_U32 || isnan(dpx->element[i].refHighData)) + if (dpx->element[i].refHighData == DPX_UNDEFINED_U32 || dpx->element[i].refHighData) dpx->element[i].refHighData = (unsigned int)dpx->element[i].maxValue; if (dpx->element[i].refLowQuantity == DPX_UNDEFINED_R32 || isnan(dpx->element[i].refLowQuantity)) @@ -324,10 +324,10 @@ LogImageFile *dpxOpen(const unsigned char *byteStuff, int fromMemory, size_t buf case descriptor_CbYCr: case descriptor_CbYACrYA: case descriptor_CbYCrA: - if (dpx->element[i].refLowData == DPX_UNDEFINED_U32 || isnan(dpx->element[i].refLowData)) + if (dpx->element[i].refLowData == DPX_UNDEFINED_U32 || dpx->element[i].refLowData) dpx->element[i].refLowData = 16.0f / 255.0f * dpx->element[i].maxValue; - if (dpx->element[i].refHighData == DPX_UNDEFINED_U32 || isnan(dpx->element[i].refHighData)) + if (dpx->element[i].refHighData == DPX_UNDEFINED_U32 || dpx->element[i].refHighData) dpx->element[i].refHighData = 235.0f / 255.0f * dpx->element[i].maxValue; if (dpx->element[i].refLowQuantity == DPX_UNDEFINED_R32 || isnan(dpx->element[i].refLowQuantity)) |