[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [61220] trunk/blender/source/blender/imbuf /intern/cineon: mistake in last commit

Campbell Barton ideasman42 at gmail.com
Sun Nov 10 13:29:15 CET 2013


Revision: 61220
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=61220
Author:   campbellbarton
Date:     2013-11-10 12:29:15 +0000 (Sun, 10 Nov 2013)
Log Message:
-----------
mistake in last commit

Modified Paths:
--------------
    trunk/blender/source/blender/imbuf/intern/cineon/cineonlib.c
    trunk/blender/source/blender/imbuf/intern/cineon/dpxlib.c

Modified: trunk/blender/source/blender/imbuf/intern/cineon/cineonlib.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/cineon/cineonlib.c	2013-11-10 12:26:03 UTC (rev 61219)
+++ trunk/blender/source/blender/imbuf/intern/cineon/cineonlib.c	2013-11-10 12:29:15 UTC (rev 61220)
@@ -277,10 +277,10 @@
 				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))

Modified: trunk/blender/source/blender/imbuf/intern/cineon/dpxlib.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/cineon/dpxlib.c	2013-11-10 12:26:03 UTC (rev 61219)
+++ trunk/blender/source/blender/imbuf/intern/cineon/dpxlib.c	2013-11-10 12:29:15 UTC (rev 61220)
@@ -300,10 +300,10 @@
 			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 @@
 			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))




More information about the Bf-blender-cvs mailing list