[SCM] OCE packaging branch, upstream, updated. OCE-0.6.0-230-g17bea23

tpaviot tpaviot at gmail.com
Fri Feb 24 18:50:43 UTC 2012


The following commit has been merged in the upstream branch:
commit 8f561100e918b1228d236fcb0cfe62eddadea2b7
Author: tpaviot <tpaviot at gmail.com>
Date:   Thu Jan 12 21:41:07 2012 +0100

    [cppcheck-warning-fix][Redundant-assignement]
    
    [Quantity/Quantity_Color.cxx:471]: (warning) Redundant assignment of "R1" in switch
    [Quantity/Quantity_Color.cxx:471]: (warning) Redundant assignment of "R2" in switch
    [Quantity/Quantity_Color.cxx:471]: (warning) Redundant assignment of "R3" in switch

diff --git a/src/Quantity/Quantity_Color.cxx b/src/Quantity/Quantity_Color.cxx
index 8550be5..54f6bd8 100644
--- a/src/Quantity/Quantity_Color.cxx
+++ b/src/Quantity/Quantity_Color.cxx
@@ -468,8 +468,7 @@ Standard_ShortReal RB = 0 ;
 switch (AName) {
 
 	case Quantity_NOC_BLACK :
-		R1 = R2 = R3 = 0.0;
-		RR = R1 = 0.000000; RG = R2 = 0.000000; RB = R3 = 0.000000;
+		R1 = R2 = R3 = RR = RG = RB = 0.0;
 	break;
 	case Quantity_NOC_MATRAGRAY :
 		RR = R1 = (float ) 0.600000; RG = R2 = (float ) 0.600000; RB = R3 = (float ) 0.600000;

-- 
OCE packaging



More information about the debian-science-commits mailing list