Changeset 5785

Timestamp:

May 9, 2008, 1:50:15 PM (14 years ago)

Author:

livings124

Message:

update CTGradient to 1.8

Location:

trunk/macosx/CTGradient

Files:

• CTGradient.h (modified) (2 diffs)
• CTGradient.m (modified) (8 diffs)

trunk/macosx/CTGradient/CTGradient.h

@@ -3 +3 @@
 //
 //  Created by Chad Weider on 2/14/07.
-//  Copyright (c) 2007 Chad Weider.
-//  Some rights reserved: <http://creativecommons.org/licenses/by/2.5/>
+//  Writtin by Chad Weider.
 //
-//  Version: 1.6
+//  Released into public domain on 4/10/08.
+//  
+//  Version: 1.8
 
 #import <Cocoa/Cocoa.h>
@@ -53 +54 @@
 - (CTGradient *)gradientWithAlphaComponent:(float)alpha;
 
-- (void)addElement:(CTGradientElement*)newElement;
-
 - (CTGradient *)addColorStop:(NSColor *)color atPosition:(float)position;       //positions given relative to [0,1]
 - (CTGradient *)removeColorStopAtIndex:(unsigned)index;

trunk/macosx/CTGradient/CTGradient.m

@@ -3 +3 @@
 //
 //  Created by Chad Weider on 2/14/07.
-//  Copyright (c) 2007 Chad Weider.
-//  Some rights reserved: <http://creativecommons.org/licenses/by/2.5/>
+//  Writtin by Chad Weider.
 //
-//  Version: 1.6
+//  Released into public domain on 4/10/08.
+//
+//  Version: 1.8
 
 #import "CTGradient.h"
@@ -608 +609 @@
   
   
-  return [NSColor colorWithCalibratedRed:components[0]
-                                                                   green:components[1]
-                                                                    blue:components[2]
+  return [NSColor colorWithCalibratedRed:components[0]/components[3]    //undo premultiplication that CG requires
+                                                                   green:components[1]/components[3]
+                                                                    blue:components[2]/components[3]
                                                                    alpha:components[3]];
   }
@@ -686 +687 @@
   CGContextRef currentContext = (CGContextRef)[[NSGraphicsContext currentContext] graphicsPort];
   CGContextSaveGState(currentContext);
-          #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
+          #if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_4
                 CGColorSpaceRef colorspace = CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB);
           #else
@@ -703 +704 @@
 - (void)radialFillRect:(NSRect)rect
   {
-  CGPoint startPoint , endPoint;
+  CGPoint startPoint, endPoint;
   float startRadius, endRadius;
   float scalex, scaley, transx, transy;
@@ -809 +810 @@
 
 - (void)addElement:(CTGradientElement *)newElement
-{
+  {
   if(elementList == nil || newElement->position < elementList->position)        //inserting at beginning of list
         {
@@ -1008 +1009 @@
         out[2] = (color2->blue  - color1->blue )*position + color1->blue;
         out[3] = (color2->alpha - color1->alpha)*position + color1->alpha;
-        }
+        }
+  
+  //Premultiply the color by the alpha.
+  out[0] *= out[3];
+  out[1] *= out[3];
+  out[2] *= out[3];
   }
 
@@ -1097 +1103 @@
     
   transformHSV_RGB(out);
+  
+  //Premultiply the color by the alpha.
+  out[0] *= out[3];
+  out[1] *= out[3];
+  out[2] *= out[3];
   }
 
@@ -1179 +1190 @@
     
   transformHSV_RGB(out);
-  }
-
+  
+  //Premultiply the color by the alpha.
+  out[0] *= out[3];
+  out[1] *= out[3];
+  out[2] *= out[3];
+  }