Changeset 5798

Timestamp:

May 10, 2008, 2:05:25 PM (14 years ago)

Author:

livings124

Message:

(1.2x) revert the upgrade of CTGradient

Location:

branches/1.2x/macosx/CTGradient

Files:

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

branches/1.2x/macosx/CTGradient/CTGradient.h

@@ -3 +3 @@
 //
 //  Created by Chad Weider on 2/14/07.
-//  Writtin by Chad Weider.
+//  Copyright (c) 2007 Chad Weider.
+//  Some rights reserved: <http://creativecommons.org/licenses/by/2.5/>
 //
-//  Released into public domain on 4/10/08.
-//  
-//  Version: 1.8
+//  Version: 1.6
 
 #import <Cocoa/Cocoa.h>
@@ -54 +53 @@
 - (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;

branches/1.2x/macosx/CTGradient/CTGradient.m

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