Permalink
Browse files

Rasterizer performance improvements, renamed KGColor to O2Color

git-svn-id: http://cocotron.googlecode.com/svn/trunk@580 43251c19-cd1f-0410-9ec0-95c558c233a8
  • Loading branch information...
1 parent 13bfd8a commit 5b1d9a0fce51085033d4b933761e126d889a839a cocotron committed Aug 6, 2009
@@ -308,7 +308,7 @@
C889752E0EA0BF3100D0A0A2 /* KGPDFxref.h in Headers */ = {isa = PBXBuildFile; fileRef = FE64B8DB0B81239D007EE513 /* KGPDFxref.h */; };
C889752F0EA0BF3100D0A0A2 /* KGPDFxrefEntry.h in Headers */ = {isa = PBXBuildFile; fileRef = FE64B8DD0B81239D007EE513 /* KGPDFxrefEntry.h */; };
C88975300EA0BF3100D0A0A2 /* KGShading.h in Headers */ = {isa = PBXBuildFile; fileRef = FE64B8DF0B81239D007EE513 /* KGShading.h */; settings = {ATTRIBUTES = (Private, ); }; };
- C88975310EA0BF3100D0A0A2 /* KGColor.h in Headers */ = {isa = PBXBuildFile; fileRef = FE064ABB0B8B805000853FBB /* KGColor.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ C88975310EA0BF3100D0A0A2 /* O2Color.h in Headers */ = {isa = PBXBuildFile; fileRef = FE064ABB0B8B805000853FBB /* O2Color.h */; settings = {ATTRIBUTES = (Private, ); }; };
C88975320EA0BF3100D0A0A2 /* KGLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = FE064AC10B8B805000853FBB /* KGLayer.h */; settings = {ATTRIBUTES = (Private, ); }; };
C88975330EA0BF3100D0A0A2 /* O2Path.h in Headers */ = {isa = PBXBuildFile; fileRef = FE064AC30B8B805000853FBB /* O2Path.h */; settings = {ATTRIBUTES = (Private, ); }; };
C88975340EA0BF3100D0A0A2 /* KGPattern.h in Headers */ = {isa = PBXBuildFile; fileRef = FE064AC50B8B805000853FBB /* KGPattern.h */; };
@@ -618,7 +618,7 @@
C88976900EA0BF3100D0A0A2 /* CGPath.m in Sources */ = {isa = PBXBuildFile; fileRef = FE064AB60B8B805000853FBB /* CGPath.m */; };
C88976910EA0BF3100D0A0A2 /* CGPattern.m in Sources */ = {isa = PBXBuildFile; fileRef = FE064AB80B8B805000853FBB /* CGPattern.m */; };
C88976920EA0BF3100D0A0A2 /* CGShading.m in Sources */ = {isa = PBXBuildFile; fileRef = FE064ABA0B8B805000853FBB /* CGShading.m */; };
- C88976930EA0BF3100D0A0A2 /* KGColor.m in Sources */ = {isa = PBXBuildFile; fileRef = FE064ABC0B8B805000853FBB /* KGColor.m */; };
+ C88976930EA0BF3100D0A0A2 /* O2Color.m in Sources */ = {isa = PBXBuildFile; fileRef = FE064ABC0B8B805000853FBB /* O2Color.m */; };
C88976940EA0BF3100D0A0A2 /* KGLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = FE064AC20B8B805000853FBB /* KGLayer.m */; };
C88976950EA0BF3100D0A0A2 /* O2Path.m in Sources */ = {isa = PBXBuildFile; fileRef = FE064AC40B8B805000853FBB /* O2Path.m */; };
C88976960EA0BF3100D0A0A2 /* KGPattern.m in Sources */ = {isa = PBXBuildFile; fileRef = FE064AC60B8B805000853FBB /* KGPattern.m */; };
@@ -984,7 +984,7 @@
C8A2E3AF0F07EA1F0054397C /* KGPDFxref.h in Headers */ = {isa = PBXBuildFile; fileRef = FE64B8DB0B81239D007EE513 /* KGPDFxref.h */; };
C8A2E3B00F07EA1F0054397C /* KGPDFxrefEntry.h in Headers */ = {isa = PBXBuildFile; fileRef = FE64B8DD0B81239D007EE513 /* KGPDFxrefEntry.h */; };
C8A2E3B10F07EA1F0054397C /* KGShading.h in Headers */ = {isa = PBXBuildFile; fileRef = FE64B8DF0B81239D007EE513 /* KGShading.h */; settings = {ATTRIBUTES = (Private, ); }; };
- C8A2E3B20F07EA1F0054397C /* KGColor.h in Headers */ = {isa = PBXBuildFile; fileRef = FE064ABB0B8B805000853FBB /* KGColor.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ C8A2E3B20F07EA1F0054397C /* O2Color.h in Headers */ = {isa = PBXBuildFile; fileRef = FE064ABB0B8B805000853FBB /* O2Color.h */; settings = {ATTRIBUTES = (Private, ); }; };
C8A2E3B30F07EA1F0054397C /* KGLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = FE064AC10B8B805000853FBB /* KGLayer.h */; settings = {ATTRIBUTES = (Private, ); }; };
C8A2E3B40F07EA1F0054397C /* O2Path.h in Headers */ = {isa = PBXBuildFile; fileRef = FE064AC30B8B805000853FBB /* O2Path.h */; settings = {ATTRIBUTES = (Private, ); }; };
C8A2E3B50F07EA1F0054397C /* KGPattern.h in Headers */ = {isa = PBXBuildFile; fileRef = FE064AC50B8B805000853FBB /* KGPattern.h */; };
@@ -1300,7 +1300,7 @@
C8A2E4F70F07EA1F0054397C /* CGPath.m in Sources */ = {isa = PBXBuildFile; fileRef = FE064AB60B8B805000853FBB /* CGPath.m */; };
C8A2E4F80F07EA1F0054397C /* CGPattern.m in Sources */ = {isa = PBXBuildFile; fileRef = FE064AB80B8B805000853FBB /* CGPattern.m */; };
C8A2E4F90F07EA1F0054397C /* CGShading.m in Sources */ = {isa = PBXBuildFile; fileRef = FE064ABA0B8B805000853FBB /* CGShading.m */; };
- C8A2E4FA0F07EA1F0054397C /* KGColor.m in Sources */ = {isa = PBXBuildFile; fileRef = FE064ABC0B8B805000853FBB /* KGColor.m */; };
+ C8A2E4FA0F07EA1F0054397C /* O2Color.m in Sources */ = {isa = PBXBuildFile; fileRef = FE064ABC0B8B805000853FBB /* O2Color.m */; };
C8A2E4FB0F07EA1F0054397C /* KGLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = FE064AC20B8B805000853FBB /* KGLayer.m */; };
C8A2E4FC0F07EA1F0054397C /* O2Path.m in Sources */ = {isa = PBXBuildFile; fileRef = FE064AC40B8B805000853FBB /* O2Path.m */; };
C8A2E4FD0F07EA1F0054397C /* KGPattern.m in Sources */ = {isa = PBXBuildFile; fileRef = FE064AC60B8B805000853FBB /* KGPattern.m */; };
@@ -1701,7 +1701,7 @@
FE01A9200C5D9BCB00AEA51A /* KGPDFxref.h in Headers */ = {isa = PBXBuildFile; fileRef = FE64B8DB0B81239D007EE513 /* KGPDFxref.h */; };
FE01A9210C5D9BCB00AEA51A /* KGPDFxrefEntry.h in Headers */ = {isa = PBXBuildFile; fileRef = FE64B8DD0B81239D007EE513 /* KGPDFxrefEntry.h */; };
FE01A9220C5D9BCB00AEA51A /* KGShading.h in Headers */ = {isa = PBXBuildFile; fileRef = FE64B8DF0B81239D007EE513 /* KGShading.h */; settings = {ATTRIBUTES = (Private, ); }; };
- FE01A92C0C5D9BCB00AEA51A /* KGColor.h in Headers */ = {isa = PBXBuildFile; fileRef = FE064ABB0B8B805000853FBB /* KGColor.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ FE01A92C0C5D9BCB00AEA51A /* O2Color.h in Headers */ = {isa = PBXBuildFile; fileRef = FE064ABB0B8B805000853FBB /* O2Color.h */; settings = {ATTRIBUTES = (Private, ); }; };
FE01A92D0C5D9BCB00AEA51A /* KGLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = FE064AC10B8B805000853FBB /* KGLayer.h */; settings = {ATTRIBUTES = (Private, ); }; };
FE01A92E0C5D9BCB00AEA51A /* O2Path.h in Headers */ = {isa = PBXBuildFile; fileRef = FE064AC30B8B805000853FBB /* O2Path.h */; settings = {ATTRIBUTES = (Private, ); }; };
FE01A92F0C5D9BCB00AEA51A /* KGPattern.h in Headers */ = {isa = PBXBuildFile; fileRef = FE064AC50B8B805000853FBB /* KGPattern.h */; };
@@ -2004,7 +2004,7 @@
FE01AA6B0C5D9BCB00AEA51A /* CGPath.m in Sources */ = {isa = PBXBuildFile; fileRef = FE064AB60B8B805000853FBB /* CGPath.m */; };
FE01AA6C0C5D9BCB00AEA51A /* CGPattern.m in Sources */ = {isa = PBXBuildFile; fileRef = FE064AB80B8B805000853FBB /* CGPattern.m */; };
FE01AA6D0C5D9BCB00AEA51A /* CGShading.m in Sources */ = {isa = PBXBuildFile; fileRef = FE064ABA0B8B805000853FBB /* CGShading.m */; };
- FE01AA6E0C5D9BCB00AEA51A /* KGColor.m in Sources */ = {isa = PBXBuildFile; fileRef = FE064ABC0B8B805000853FBB /* KGColor.m */; };
+ FE01AA6E0C5D9BCB00AEA51A /* O2Color.m in Sources */ = {isa = PBXBuildFile; fileRef = FE064ABC0B8B805000853FBB /* O2Color.m */; };
FE01AA6F0C5D9BCB00AEA51A /* KGLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = FE064AC20B8B805000853FBB /* KGLayer.m */; };
FE01AA700C5D9BCB00AEA51A /* O2Path.m in Sources */ = {isa = PBXBuildFile; fileRef = FE064AC40B8B805000853FBB /* O2Path.m */; };
FE01AA710C5D9BCB00AEA51A /* KGPattern.m in Sources */ = {isa = PBXBuildFile; fileRef = FE064AC60B8B805000853FBB /* KGPattern.m */; };
@@ -3410,8 +3410,8 @@
FE064AB60B8B805000853FBB /* CGPath.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = CGPath.m; sourceTree = "<group>"; };
FE064AB80B8B805000853FBB /* CGPattern.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = CGPattern.m; sourceTree = "<group>"; };
FE064ABA0B8B805000853FBB /* CGShading.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = CGShading.m; sourceTree = "<group>"; };
- FE064ABB0B8B805000853FBB /* KGColor.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = KGColor.h; sourceTree = "<group>"; };
- FE064ABC0B8B805000853FBB /* KGColor.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = KGColor.m; sourceTree = "<group>"; };
+ FE064ABB0B8B805000853FBB /* O2Color.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = O2Color.h; sourceTree = "<group>"; };
+ FE064ABC0B8B805000853FBB /* O2Color.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = O2Color.m; sourceTree = "<group>"; };
FE064AC10B8B805000853FBB /* KGLayer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = KGLayer.h; sourceTree = "<group>"; };
FE064AC20B8B805000853FBB /* KGLayer.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = KGLayer.m; sourceTree = "<group>"; };
FE064AC30B8B805000853FBB /* O2Path.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = O2Path.h; sourceTree = "<group>"; };
@@ -4291,8 +4291,8 @@
6E2B55C20976075300DA0954 /* CGWindow.m */,
FE267EB50B8BD2690000DDC0 /* KGBitmapContext.h */,
FE267EB60B8BD2690000DDC0 /* KGBitmapContext.m */,
- FE064ABB0B8B805000853FBB /* KGColor.h */,
- FE064ABC0B8B805000853FBB /* KGColor.m */,
+ FE064ABB0B8B805000853FBB /* O2Color.h */,
+ FE064ABC0B8B805000853FBB /* O2Color.m */,
FE64B8A70B81239D007EE513 /* KGColorSpace.h */,
FE64B8A80B81239D007EE513 /* KGColorSpace.m */,
FE64B8A90B81239D007EE513 /* KGContext.h */,
@@ -5121,7 +5121,7 @@
C889752E0EA0BF3100D0A0A2 /* KGPDFxref.h in Headers */,
C889752F0EA0BF3100D0A0A2 /* KGPDFxrefEntry.h in Headers */,
C88975300EA0BF3100D0A0A2 /* KGShading.h in Headers */,
- C88975310EA0BF3100D0A0A2 /* KGColor.h in Headers */,
+ C88975310EA0BF3100D0A0A2 /* O2Color.h in Headers */,
C88975320EA0BF3100D0A0A2 /* KGLayer.h in Headers */,
C88975330EA0BF3100D0A0A2 /* O2Path.h in Headers */,
C88975340EA0BF3100D0A0A2 /* KGPattern.h in Headers */,
@@ -5488,7 +5488,7 @@
C8A2E3AF0F07EA1F0054397C /* KGPDFxref.h in Headers */,
C8A2E3B00F07EA1F0054397C /* KGPDFxrefEntry.h in Headers */,
C8A2E3B10F07EA1F0054397C /* KGShading.h in Headers */,
- C8A2E3B20F07EA1F0054397C /* KGColor.h in Headers */,
+ C8A2E3B20F07EA1F0054397C /* O2Color.h in Headers */,
C8A2E3B30F07EA1F0054397C /* KGLayer.h in Headers */,
C8A2E3B40F07EA1F0054397C /* O2Path.h in Headers */,
C8A2E3B50F07EA1F0054397C /* KGPattern.h in Headers */,
@@ -5853,7 +5853,7 @@
FE01A9200C5D9BCB00AEA51A /* KGPDFxref.h in Headers */,
FE01A9210C5D9BCB00AEA51A /* KGPDFxrefEntry.h in Headers */,
FE01A9220C5D9BCB00AEA51A /* KGShading.h in Headers */,
- FE01A92C0C5D9BCB00AEA51A /* KGColor.h in Headers */,
+ FE01A92C0C5D9BCB00AEA51A /* O2Color.h in Headers */,
FE01A92D0C5D9BCB00AEA51A /* KGLayer.h in Headers */,
FE01A92E0C5D9BCB00AEA51A /* O2Path.h in Headers */,
FE01A92F0C5D9BCB00AEA51A /* KGPattern.h in Headers */,
@@ -6902,7 +6902,7 @@
C88976900EA0BF3100D0A0A2 /* CGPath.m in Sources */,
C88976910EA0BF3100D0A0A2 /* CGPattern.m in Sources */,
C88976920EA0BF3100D0A0A2 /* CGShading.m in Sources */,
- C88976930EA0BF3100D0A0A2 /* KGColor.m in Sources */,
+ C88976930EA0BF3100D0A0A2 /* O2Color.m in Sources */,
C88976940EA0BF3100D0A0A2 /* KGLayer.m in Sources */,
C88976950EA0BF3100D0A0A2 /* O2Path.m in Sources */,
C88976960EA0BF3100D0A0A2 /* KGPattern.m in Sources */,
@@ -7237,7 +7237,7 @@
C8A2E4F70F07EA1F0054397C /* CGPath.m in Sources */,
C8A2E4F80F07EA1F0054397C /* CGPattern.m in Sources */,
C8A2E4F90F07EA1F0054397C /* CGShading.m in Sources */,
- C8A2E4FA0F07EA1F0054397C /* KGColor.m in Sources */,
+ C8A2E4FA0F07EA1F0054397C /* O2Color.m in Sources */,
C8A2E4FB0F07EA1F0054397C /* KGLayer.m in Sources */,
C8A2E4FC0F07EA1F0054397C /* O2Path.m in Sources */,
C8A2E4FD0F07EA1F0054397C /* KGPattern.m in Sources */,
@@ -7603,7 +7603,7 @@
FE01AA6B0C5D9BCB00AEA51A /* CGPath.m in Sources */,
FE01AA6C0C5D9BCB00AEA51A /* CGPattern.m in Sources */,
FE01AA6D0C5D9BCB00AEA51A /* CGShading.m in Sources */,
- FE01AA6E0C5D9BCB00AEA51A /* KGColor.m in Sources */,
+ FE01AA6E0C5D9BCB00AEA51A /* O2Color.m in Sources */,
FE01AA6F0C5D9BCB00AEA51A /* KGLayer.m in Sources */,
FE01AA700C5D9BCB00AEA51A /* O2Path.m in Sources */,
FE01AA710C5D9BCB00AEA51A /* KGPattern.m in Sources */,
@@ -11,7 +11,7 @@
#import "KGDeviceContext_gdi.h"
#import "KGFont_gdi.h"
#import <CoreGraphics/KGColorSpace.h>
-#import <CoreGraphics/KGColor.h>
+#import <CoreGraphics/O2Color.h>
#import <AppKit/Win32Font.h>
@implementation KGContext_builtin_gdi
@@ -16,7 +16,7 @@
#import <CoreGraphics/KGGraphicsState.h>
#import <AppKit/KGDeviceContext_gdi.h>
#import <CoreGraphics/O2MutablePath.h>
-#import <CoreGraphics/KGColor.h>
+#import <CoreGraphics/O2Color.h>
#import <CoreGraphics/KGColorSpace.h>
#import <CoreGraphics/KGShading.h>
#import <CoreGraphics/KGFunction.h>
@@ -241,8 +241,8 @@ -(void)deviceClipToMask:(KGImage *)mask inRect:(NSRect)rect {
-(void)drawPathInDeviceSpace:(O2Path *)path drawingMode:(int)mode state:(KGGraphicsState *)state {
CGAffineTransform deviceTransform=state->_deviceSpaceTransform;
- KGColor *fillColor=state->_fillColor;
- KGColor *strokeColor=state->_strokeColor;
+ O2Color *fillColor=state->_fillColor;
+ O2Color *strokeColor=state->_strokeColor;
XFORM current;
XFORM userToDevice={deviceTransform.a,deviceTransform.b,deviceTransform.c,deviceTransform.d,deviceTransform.tx,
(deviceTransform.d<0.0)?deviceTransform.ty/*-1.0*/:deviceTransform.ty};
@@ -43,5 +43,5 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
@end
-COLORREF COLORREFFromColor(KGColor *color);
+COLORREF COLORREFFromColor(O2Color *color);
@@ -8,7 +8,7 @@
#import <AppKit/KGDeviceContext_gdi.h>
#import <CoreGraphics/O2Path.h>
-#import <CoreGraphics/KGColor.h>
+#import <CoreGraphics/O2Color.h>
#import <CoreGraphics/KGColorSpace.h>
static inline void CMYKAToRGBA(float *input,float *output){
@@ -41,7 +41,7 @@ static COLORREF gammaAdjustedRGBFromComponents(float r,float g,float b){
return RGB(r*255,g*255,b*255);
}
-COLORREF COLORREFFromColor(KGColor *color){
+COLORREF COLORREFFromColor(O2Color *color){
KGColorSpace *colorSpace=[color colorSpace];
float *components=[color components];
@@ -9,7 +9,7 @@
#import <AppKit/CairoContext.h>
#import <AppKit/X11Display.h>
#import <CoreGraphics/O2MutablePath.h>
-#import <CoreGraphics/KGColor.h>
+#import <CoreGraphics/O2Color.h>
#import <Foundation/NSException.h>
#import <CoreGraphics/KGGraphicsState.h>
#import <AppKit/TTFFont.h>
@@ -93,7 +93,7 @@ -(void)deviceClipReset {
cairo_reset_clip(_context);
}
--(void)setCurrentColor:(KGColor*)color
+-(void)setCurrentColor:(O2Color*)color
{
float *c=[color components];
int count=[color numberOfComponents];
@@ -285,8 +285,8 @@
isa = PBXGroup;
children = (
FECF921F0FFB222D007AECF1 /* CoreText.framework */,
- FECF92540FFB2A2B007AECF1 /* CoreGraphics.framework */,
- FECF92560FFB2A2B007AECF1 /* CoreGraphics.framework */,
+ FECF92540FFB2A2B007AECF1 /* CoreText.framework */,
+ FECF92560FFB2A2B007AECF1 /* CoreText.framework */,
);
name = Products;
sourceTree = "<group>";
@@ -496,14 +496,14 @@
remoteRef = FECF921E0FFB222D007AECF1 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- FECF92540FFB2A2B007AECF1 /* CoreGraphics.framework */ = {
+ FECF92540FFB2A2B007AECF1 /* CoreText.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = CoreText.framework;
remoteRef = FECF92530FFB2A2B007AECF1 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- FECF92560FFB2A2B007AECF1 /* CoreGraphics.framework */ = {
+ FECF92560FFB2A2B007AECF1 /* CoreText.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = CoreText.framework;
@@ -9,9 +9,9 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
#import <Foundation/NSObject.h>
#import <CoreGraphics/CoreGraphicsExport.h>
-@class KGColor;
+@class O2Color;
-typedef KGColor *CGColorRef;
+typedef O2Color *CGColorRef;
#import "CGGeometry.h"
#import "CGColorSpace.h"
@@ -7,7 +7,7 @@
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
#import <CoreGraphics/CGColor.h>
-#import "KGColor.h"
+#import "O2Color.h"
#import "KGColorSpace.h"
CGColorRef CGColorRetain(CGColorRef self) {
@@ -19,23 +19,23 @@ void CGColorRelease(CGColorRef self) {
}
CGColorRef CGColorCreate(CGColorSpaceRef colorSpace,const CGFloat *components) {
- return [[KGColor alloc] initWithColorSpace:colorSpace components:components];
+ return [[O2Color alloc] initWithColorSpace:colorSpace components:components];
}
CGColorRef CGColorCreateGenericGray(CGFloat gray,CGFloat a) {
- return [[KGColor alloc] initWithDeviceGray:gray alpha:a];
+ return [[O2Color alloc] initWithDeviceGray:gray alpha:a];
}
CGColorRef CGColorCreateGenericRGB(CGFloat r,CGFloat g,CGFloat b,CGFloat a) {
- return [[KGColor alloc] initWithDeviceRed:r green:g blue:b alpha:a];
+ return [[O2Color alloc] initWithDeviceRed:r green:g blue:b alpha:a];
}
CGColorRef CGColorCreateGenericCMYK(CGFloat c,CGFloat m,CGFloat y,CGFloat k,CGFloat a) {
- return [[KGColor alloc] initWithDeviceCyan:c magenta:m yellow:y black:k alpha:a];
+ return [[O2Color alloc] initWithDeviceCyan:c magenta:m yellow:y black:k alpha:a];
}
CGColorRef CGColorCreateWithPattern(CGColorSpaceRef colorSpace,CGPatternRef pattern,const CGFloat *components) {
- return [[KGColor alloc] initWithColorSpace:colorSpace pattern:pattern components:components];
+ return [[O2Color alloc] initWithColorSpace:colorSpace pattern:pattern components:components];
}
CGColorRef CGColorCreateCopy(CGColorRef self) {
Oops, something went wrong. Retry.

0 comments on commit 5b1d9a0

Please sign in to comment.