Changeset 370 for trunk/Cocoa/AntiRSI/CTBadge

Timestamp:

12/08/07 06:07:14 (16 years ago)

Author:

Nicholas Riley

Message:

Apparently in Xcode, 'Commit Entire Project' doesn't. See the log message from [369].

File:

• trunk/Cocoa/AntiRSI/CTBadge/CTGradient.m (modified) (5 diffs)

trunk/Cocoa/AntiRSI/CTBadge/CTGradient.m

@@ -779 +779 @@
 - (void)setBlendingMode:(CTGradientBlendingMode)mode;
   {
-  blendingMode = mode;
-  
   //Choose what blending function to use
   void *evaluationFunction;
-  switch(blendingMode)
+  switch(mode)
         {
         case CTLinearBlendingMode:
@@ -791 +789 @@
         case CTInverseChromaticBlendingMode:
                  evaluationFunction = &inverseChromaticEvaluation;      break;
-        }
-  
+        default:
+                 NSParameterAssert("blending mode not supported" && NO);
+                 return; // unreachable, satisfy compiler
+        }
+
+  blendingMode = mode;
+
   //replace the current CoreGraphics Function with new one
   if(gradientFunction != NULL)
@@ -1183 +1186 @@
 
 
-void transformRGB_HSV(float *components) //H,S,B -> R,G,B
-        {
-        float H, S, V;
+void transformRGB_HSV(float *components) //H,S,B <- R,G,B
+        {
         float R = components[0],
                   G = components[1],
@@ -1193 +1195 @@
               MIN = R < G ? (R < B ? R : B) : (G < B ? G : B);
         
-        if(MAX == MIN)
-                H = NAN;
-        else if(MAX == R)
-                if(G >= B)
-                        H = 60*(G-B)/(MAX-MIN)+0;
-                else
-                        H = 60*(G-B)/(MAX-MIN)+360;
-        else if(MAX == G)
-                H = 60*(B-R)/(MAX-MIN)+120;
-        else if(MAX == B)
-                H = 60*(R-G)/(MAX-MIN)+240;
-        
-        S = MAX == 0 ? 0 : 1 - MIN/MAX;
-        V = MAX;
+        float H = NAN;
+
+        if(MAX != MIN)
+          {
+          if(MAX == R)
+                  if(G >= B)
+                          H = 60*(G-B)/(MAX-MIN)+0;
+                  else
+                          H = 60*(G-B)/(MAX-MIN)+360;
+          else if(MAX == G)
+                  H = 60*(B-R)/(MAX-MIN)+120;
+          else if(MAX == B)
+                  H = 60*(R-G)/(MAX-MIN)+240;
+          }
+        
+        float S = MAX == 0 ? 0 : 1 - MIN/MAX;
+        float V = MAX;
         
         components[0] = H;
@@ -1234 +1239 @@
                 case 4: R=t;G=p;B=V;    break;
                 case 5: R=V;G=p;B=q;    break;
+                default: R=0;G=0;B=0;   // unreachable, satisfy compiler
                 }