mistake in last commit
authorCampbell Barton <ideasman42@gmail.com>
Sun, 10 Nov 2013 12:29:15 +0000 (12:29 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 10 Nov 2013 12:29:15 +0000 (12:29 +0000)
source/blender/imbuf/intern/cineon/cineonlib.c
source/blender/imbuf/intern/cineon/dpxlib.c

index 3c3bdcfbf2c9c74d02452355a8ebfb6442db9403..fddfa2618c2c2b245ef08f613082159ab76443f3 100644 (file)
@@ -277,10 +277,10 @@ LogImageFile *cineonOpen(const unsigned char *byteStuff, int fromMemory, size_t
                                return NULL;
                }
 
-               if (cineon->element[i].refLowData == CINEON_UNDEFINED_U32 || cineon->element[i].refLowData)
+               if (cineon->element[i].refLowData == CINEON_UNDEFINED_U32)
                        cineon->element[i].refLowData = 0;
 
-               if (cineon->element[i].refHighData == CINEON_UNDEFINED_U32 || cineon->element[i].refHighData)
+               if (cineon->element[i].refHighData == CINEON_UNDEFINED_U32)
                        cineon->element[i].refHighData = (unsigned int)cineon->element[i].maxValue;
 
                if (cineon->element[i].refLowQuantity == CINEON_UNDEFINED_R32 || isnan(cineon->element[i].refLowQuantity))
index 006236e647ef7936c5a390453daefb7b25504b3a..e839c2fce907162b17af83bfe24fc1bc5b7accf9 100644 (file)
@@ -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 || dpx->element[i].refLowData)
+                               if (dpx->element[i].refLowData == DPX_UNDEFINED_U32)
                                        dpx->element[i].refLowData = 0;
 
-                               if (dpx->element[i].refHighData == DPX_UNDEFINED_U32 || dpx->element[i].refHighData)
+                               if (dpx->element[i].refHighData == DPX_UNDEFINED_U32)
                                        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 || dpx->element[i].refLowData)
+                               if (dpx->element[i].refLowData == DPX_UNDEFINED_U32)
                                        dpx->element[i].refLowData = 16.0f / 255.0f * dpx->element[i].maxValue;
 
-                               if (dpx->element[i].refHighData == DPX_UNDEFINED_U32 || dpx->element[i].refHighData)
+                               if (dpx->element[i].refHighData == DPX_UNDEFINED_U32)
                                        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))