- switch to Onyx as default window contents renderer, to use GDI, set default CGBackingRasterizer to "GDI"

- rename NSTIFFImageFileDirectory to O2TIFFImageDirectory
- cleanup warnings for Onyx2D MacOS target
This commit is contained in:
Christopher Lloyd 2010-04-01 22:51:31 -04:00
parent feb7609c6d
commit 508451c124
18 changed files with 96 additions and 103 deletions

View File

@ -233,7 +233,7 @@
C88974E70EA0BF3100D0A0A2 /* NSToolbarCustomizationView.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E2B57330976075500DA0954 /* NSToolbarCustomizationView.h */; settings = {ATTRIBUTES = (Private, ); }; };
C88974EA0EA0BF3100D0A0A2 /* NSDrawer.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E2B574D0976075500DA0954 /* NSDrawer.h */; settings = {ATTRIBUTES = (Project, Private, ); }; };
C88974EB0EA0BF3100D0A0A2 /* NSDrawerWindow.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E2B574F0976075500DA0954 /* NSDrawerWindow.h */; settings = {ATTRIBUTES = (Project, Private, ); }; };
C88974EC0EA0BF3100D0A0A2 /* NSTIFFImageFileDirectory.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E14EC6509A3C40F009C8693 /* NSTIFFImageFileDirectory.h */; settings = {ATTRIBUTES = (Private, ); }; };
C88974EC0EA0BF3100D0A0A2 /* O2TIFFImageDirectory.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E14EC6509A3C40F009C8693 /* O2TIFFImageDirectory.h */; settings = {ATTRIBUTES = (Private, ); }; };
C88974ED0EA0BF3100D0A0A2 /* O2Decoder_TIFF.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E14EC6709A3C40F009C8693 /* O2Decoder_TIFF.h */; settings = {ATTRIBUTES = (Private, ); }; };
C88974EE0EA0BF3100D0A0A2 /* NSIBObjectData.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EC4AC350A35D0C200E8D6CA /* NSIBObjectData.h */; };
C88974EF0EA0BF3100D0A0A2 /* NSCustomObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EC4AC670A35D47800E8D6CA /* NSCustomObject.h */; settings = {ATTRIBUTES = (Public, ); }; };
@ -528,7 +528,7 @@
C88976400EA0BF3100D0A0A2 /* NSToolbarCustomizationView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E2B571E0976075400DA0954 /* NSToolbarCustomizationView.m */; settings = {ATTRIBUTES = (); }; };
C88976430EA0BF3100D0A0A2 /* NSDrawer.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E2B57480976075500DA0954 /* NSDrawer.m */; settings = {ATTRIBUTES = (); }; };
C88976440EA0BF3100D0A0A2 /* NSDrawerWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E2B574A0976075500DA0954 /* NSDrawerWindow.m */; settings = {ATTRIBUTES = (); }; };
C88976450EA0BF3100D0A0A2 /* NSTIFFImageFileDirectory.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E14EC6609A3C40F009C8693 /* NSTIFFImageFileDirectory.m */; };
C88976450EA0BF3100D0A0A2 /* O2TIFFImageDirectory.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E14EC6609A3C40F009C8693 /* O2TIFFImageDirectory.m */; };
C88976460EA0BF3100D0A0A2 /* O2Decoder_TIFF.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E14EC6809A3C40F009C8693 /* O2Decoder_TIFF.m */; };
C88976470EA0BF3100D0A0A2 /* NSIBObjectData.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EC4AC360A35D0C200E8D6CA /* NSIBObjectData.m */; };
C88976480EA0BF3100D0A0A2 /* NSCustomObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EC4AC680A35D47800E8D6CA /* NSCustomObject.m */; };
@ -895,7 +895,7 @@
C8A2E3680F07EA1F0054397C /* NSToolbarCustomizationView.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E2B57330976075500DA0954 /* NSToolbarCustomizationView.h */; settings = {ATTRIBUTES = (Private, ); }; };
C8A2E36B0F07EA1F0054397C /* NSDrawer.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E2B574D0976075500DA0954 /* NSDrawer.h */; settings = {ATTRIBUTES = (Project, Private, ); }; };
C8A2E36C0F07EA1F0054397C /* NSDrawerWindow.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E2B574F0976075500DA0954 /* NSDrawerWindow.h */; settings = {ATTRIBUTES = (Project, Private, ); }; };
C8A2E36D0F07EA1F0054397C /* NSTIFFImageFileDirectory.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E14EC6509A3C40F009C8693 /* NSTIFFImageFileDirectory.h */; settings = {ATTRIBUTES = (Private, ); }; };
C8A2E36D0F07EA1F0054397C /* O2TIFFImageDirectory.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E14EC6509A3C40F009C8693 /* O2TIFFImageDirectory.h */; settings = {ATTRIBUTES = (Private, ); }; };
C8A2E36E0F07EA1F0054397C /* O2Decoder_TIFF.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E14EC6709A3C40F009C8693 /* O2Decoder_TIFF.h */; settings = {ATTRIBUTES = (Private, ); }; };
C8A2E36F0F07EA1F0054397C /* NSIBObjectData.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EC4AC350A35D0C200E8D6CA /* NSIBObjectData.h */; };
C8A2E3700F07EA1F0054397C /* NSCustomObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EC4AC670A35D47800E8D6CA /* NSCustomObject.h */; settings = {ATTRIBUTES = (Public, ); }; };
@ -1196,7 +1196,7 @@
C8A2E4A80F07EA1F0054397C /* NSToolbarCustomizationView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E2B571E0976075400DA0954 /* NSToolbarCustomizationView.m */; settings = {ATTRIBUTES = (); }; };
C8A2E4AB0F07EA1F0054397C /* NSDrawer.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E2B57480976075500DA0954 /* NSDrawer.m */; settings = {ATTRIBUTES = (); }; };
C8A2E4AC0F07EA1F0054397C /* NSDrawerWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E2B574A0976075500DA0954 /* NSDrawerWindow.m */; settings = {ATTRIBUTES = (); }; };
C8A2E4AD0F07EA1F0054397C /* NSTIFFImageFileDirectory.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E14EC6609A3C40F009C8693 /* NSTIFFImageFileDirectory.m */; };
C8A2E4AD0F07EA1F0054397C /* O2TIFFImageDirectory.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E14EC6609A3C40F009C8693 /* O2TIFFImageDirectory.m */; };
C8A2E4AE0F07EA1F0054397C /* O2Decoder_TIFF.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E14EC6809A3C40F009C8693 /* O2Decoder_TIFF.m */; };
C8A2E4AF0F07EA1F0054397C /* NSIBObjectData.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EC4AC360A35D0C200E8D6CA /* NSIBObjectData.m */; };
C8A2E4B00F07EA1F0054397C /* NSCustomObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EC4AC680A35D47800E8D6CA /* NSCustomObject.m */; };
@ -1589,7 +1589,7 @@
FE01A8D90C5D9BCB00AEA51A /* NSToolbarCustomizationView.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E2B57330976075500DA0954 /* NSToolbarCustomizationView.h */; settings = {ATTRIBUTES = (Private, ); }; };
FE01A8DC0C5D9BCB00AEA51A /* NSDrawer.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E2B574D0976075500DA0954 /* NSDrawer.h */; settings = {ATTRIBUTES = (Project, Private, ); }; };
FE01A8DD0C5D9BCB00AEA51A /* NSDrawerWindow.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E2B574F0976075500DA0954 /* NSDrawerWindow.h */; settings = {ATTRIBUTES = (Project, Private, ); }; };
FE01A8DE0C5D9BCB00AEA51A /* NSTIFFImageFileDirectory.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E14EC6509A3C40F009C8693 /* NSTIFFImageFileDirectory.h */; settings = {ATTRIBUTES = (Private, ); }; };
FE01A8DE0C5D9BCB00AEA51A /* O2TIFFImageDirectory.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E14EC6509A3C40F009C8693 /* O2TIFFImageDirectory.h */; settings = {ATTRIBUTES = (Private, ); }; };
FE01A8DF0C5D9BCB00AEA51A /* O2Decoder_TIFF.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E14EC6709A3C40F009C8693 /* O2Decoder_TIFF.h */; settings = {ATTRIBUTES = (Private, ); }; };
FE01A8E00C5D9BCB00AEA51A /* NSIBObjectData.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EC4AC350A35D0C200E8D6CA /* NSIBObjectData.h */; };
FE01A8E10C5D9BCB00AEA51A /* NSCustomObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EC4AC670A35D47800E8D6CA /* NSCustomObject.h */; settings = {ATTRIBUTES = (Public, ); }; };
@ -1877,7 +1877,7 @@
FE01AA1B0C5D9BCB00AEA51A /* NSToolbarCustomizationView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E2B571E0976075400DA0954 /* NSToolbarCustomizationView.m */; settings = {ATTRIBUTES = (); }; };
FE01AA1E0C5D9BCB00AEA51A /* NSDrawer.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E2B57480976075500DA0954 /* NSDrawer.m */; settings = {ATTRIBUTES = (); }; };
FE01AA1F0C5D9BCB00AEA51A /* NSDrawerWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E2B574A0976075500DA0954 /* NSDrawerWindow.m */; settings = {ATTRIBUTES = (); }; };
FE01AA200C5D9BCB00AEA51A /* NSTIFFImageFileDirectory.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E14EC6609A3C40F009C8693 /* NSTIFFImageFileDirectory.m */; };
FE01AA200C5D9BCB00AEA51A /* O2TIFFImageDirectory.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E14EC6609A3C40F009C8693 /* O2TIFFImageDirectory.m */; };
FE01AA210C5D9BCB00AEA51A /* O2Decoder_TIFF.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E14EC6809A3C40F009C8693 /* O2Decoder_TIFF.m */; };
FE01AA220C5D9BCB00AEA51A /* NSIBObjectData.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EC4AC360A35D0C200E8D6CA /* NSIBObjectData.m */; };
FE01AA230C5D9BCB00AEA51A /* NSCustomObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EC4AC680A35D47800E8D6CA /* NSCustomObject.m */; };
@ -2369,7 +2369,7 @@
FE5A899B10C6F50E005E348A /* NSToolbarCustomizationView.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E2B57330976075500DA0954 /* NSToolbarCustomizationView.h */; settings = {ATTRIBUTES = (Private, ); }; };
FE5A899C10C6F50E005E348A /* NSDrawer.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E2B574D0976075500DA0954 /* NSDrawer.h */; settings = {ATTRIBUTES = (Project, Private, ); }; };
FE5A899D10C6F50E005E348A /* NSDrawerWindow.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E2B574F0976075500DA0954 /* NSDrawerWindow.h */; settings = {ATTRIBUTES = (Project, Private, ); }; };
FE5A899E10C6F50E005E348A /* NSTIFFImageFileDirectory.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E14EC6509A3C40F009C8693 /* NSTIFFImageFileDirectory.h */; settings = {ATTRIBUTES = (Private, ); }; };
FE5A899E10C6F50E005E348A /* O2TIFFImageDirectory.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E14EC6509A3C40F009C8693 /* O2TIFFImageDirectory.h */; settings = {ATTRIBUTES = (Private, ); }; };
FE5A899F10C6F50E005E348A /* O2Decoder_TIFF.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E14EC6709A3C40F009C8693 /* O2Decoder_TIFF.h */; settings = {ATTRIBUTES = (Private, ); }; };
FE5A89A010C6F50E005E348A /* NSIBObjectData.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EC4AC350A35D0C200E8D6CA /* NSIBObjectData.h */; };
FE5A89A110C6F50E005E348A /* NSCustomObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EC4AC670A35D47800E8D6CA /* NSCustomObject.h */; settings = {ATTRIBUTES = (Public, ); }; };
@ -2704,7 +2704,7 @@
FE5A8AF510C6F50E005E348A /* NSToolbarCustomizationView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E2B571E0976075400DA0954 /* NSToolbarCustomizationView.m */; settings = {ATTRIBUTES = (); }; };
FE5A8AF610C6F50E005E348A /* NSDrawer.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E2B57480976075500DA0954 /* NSDrawer.m */; settings = {ATTRIBUTES = (); }; };
FE5A8AF710C6F50E005E348A /* NSDrawerWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E2B574A0976075500DA0954 /* NSDrawerWindow.m */; settings = {ATTRIBUTES = (); }; };
FE5A8AF810C6F50E005E348A /* NSTIFFImageFileDirectory.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E14EC6609A3C40F009C8693 /* NSTIFFImageFileDirectory.m */; };
FE5A8AF810C6F50E005E348A /* O2TIFFImageDirectory.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E14EC6609A3C40F009C8693 /* O2TIFFImageDirectory.m */; };
FE5A8AF910C6F50E005E348A /* O2Decoder_TIFF.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E14EC6809A3C40F009C8693 /* O2Decoder_TIFF.m */; };
FE5A8AFA10C6F50E005E348A /* NSIBObjectData.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EC4AC360A35D0C200E8D6CA /* NSIBObjectData.m */; };
FE5A8AFB10C6F50E005E348A /* NSCustomObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EC4AC680A35D47800E8D6CA /* NSCustomObject.m */; };
@ -3916,8 +3916,8 @@
/* Begin PBXFileReference section */
36570F980E818CD5008FE1BE /* NSGradient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSGradient.h; sourceTree = "<group>"; };
36570F990E818CD5008FE1BE /* NSGradient.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSGradient.m; sourceTree = "<group>"; };
6E14EC6509A3C40F009C8693 /* NSTIFFImageFileDirectory.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = NSTIFFImageFileDirectory.h; sourceTree = "<group>"; };
6E14EC6609A3C40F009C8693 /* NSTIFFImageFileDirectory.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = NSTIFFImageFileDirectory.m; sourceTree = "<group>"; };
6E14EC6509A3C40F009C8693 /* O2TIFFImageDirectory.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = O2TIFFImageDirectory.h; sourceTree = "<group>"; };
6E14EC6609A3C40F009C8693 /* O2TIFFImageDirectory.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = O2TIFFImageDirectory.m; sourceTree = "<group>"; };
6E14EC6709A3C40F009C8693 /* O2Decoder_TIFF.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = O2Decoder_TIFF.h; sourceTree = "<group>"; };
6E14EC6809A3C40F009C8693 /* O2Decoder_TIFF.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = O2Decoder_TIFF.m; sourceTree = "<group>"; };
6E2B53250976075200DA0954 /* NSActionCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NSActionCell.m; sourceTree = "<group>"; };
@ -5730,8 +5730,8 @@
FE33952C0DB92D25009AB3E0 /* O2Blending.h */,
FE669C8C0F12B1A600534F46 /* gif_lib.h */,
FE669C840F12B1A600534F46 /* gif_lib.m */,
6E14EC6509A3C40F009C8693 /* NSTIFFImageFileDirectory.h */,
6E14EC6609A3C40F009C8693 /* NSTIFFImageFileDirectory.m */,
6E14EC6509A3C40F009C8693 /* O2TIFFImageDirectory.h */,
6E14EC6609A3C40F009C8693 /* O2TIFFImageDirectory.m */,
6E14EC6709A3C40F009C8693 /* O2Decoder_TIFF.h */,
6E14EC6809A3C40F009C8693 /* O2Decoder_TIFF.m */,
FE8C01D610C59B0600FE4072 /* O2Encoder_TIFF.h */,
@ -6167,7 +6167,7 @@
C88974E70EA0BF3100D0A0A2 /* NSToolbarCustomizationView.h in Headers */,
C88974EA0EA0BF3100D0A0A2 /* NSDrawer.h in Headers */,
C88974EB0EA0BF3100D0A0A2 /* NSDrawerWindow.h in Headers */,
C88974EC0EA0BF3100D0A0A2 /* NSTIFFImageFileDirectory.h in Headers */,
C88974EC0EA0BF3100D0A0A2 /* O2TIFFImageDirectory.h in Headers */,
C88974ED0EA0BF3100D0A0A2 /* O2Decoder_TIFF.h in Headers */,
C88974EE0EA0BF3100D0A0A2 /* NSIBObjectData.h in Headers */,
C88974EF0EA0BF3100D0A0A2 /* NSCustomObject.h in Headers */,
@ -6546,7 +6546,7 @@
C8A2E3680F07EA1F0054397C /* NSToolbarCustomizationView.h in Headers */,
C8A2E36B0F07EA1F0054397C /* NSDrawer.h in Headers */,
C8A2E36C0F07EA1F0054397C /* NSDrawerWindow.h in Headers */,
C8A2E36D0F07EA1F0054397C /* NSTIFFImageFileDirectory.h in Headers */,
C8A2E36D0F07EA1F0054397C /* O2TIFFImageDirectory.h in Headers */,
C8A2E36E0F07EA1F0054397C /* O2Decoder_TIFF.h in Headers */,
C8A2E36F0F07EA1F0054397C /* NSIBObjectData.h in Headers */,
C8A2E3700F07EA1F0054397C /* NSCustomObject.h in Headers */,
@ -6924,7 +6924,7 @@
FE01A8D90C5D9BCB00AEA51A /* NSToolbarCustomizationView.h in Headers */,
FE01A8DC0C5D9BCB00AEA51A /* NSDrawer.h in Headers */,
FE01A8DD0C5D9BCB00AEA51A /* NSDrawerWindow.h in Headers */,
FE01A8DE0C5D9BCB00AEA51A /* NSTIFFImageFileDirectory.h in Headers */,
FE01A8DE0C5D9BCB00AEA51A /* O2TIFFImageDirectory.h in Headers */,
FE01A8DF0C5D9BCB00AEA51A /* O2Decoder_TIFF.h in Headers */,
FE01A8E00C5D9BCB00AEA51A /* NSIBObjectData.h in Headers */,
FE01A8E10C5D9BCB00AEA51A /* NSCustomObject.h in Headers */,
@ -7295,7 +7295,7 @@
FE5A899B10C6F50E005E348A /* NSToolbarCustomizationView.h in Headers */,
FE5A899C10C6F50E005E348A /* NSDrawer.h in Headers */,
FE5A899D10C6F50E005E348A /* NSDrawerWindow.h in Headers */,
FE5A899E10C6F50E005E348A /* NSTIFFImageFileDirectory.h in Headers */,
FE5A899E10C6F50E005E348A /* O2TIFFImageDirectory.h in Headers */,
FE5A899F10C6F50E005E348A /* O2Decoder_TIFF.h in Headers */,
FE5A89A010C6F50E005E348A /* NSIBObjectData.h in Headers */,
FE5A89A110C6F50E005E348A /* NSCustomObject.h in Headers */,
@ -8528,7 +8528,7 @@
C88976400EA0BF3100D0A0A2 /* NSToolbarCustomizationView.m in Sources */,
C88976430EA0BF3100D0A0A2 /* NSDrawer.m in Sources */,
C88976440EA0BF3100D0A0A2 /* NSDrawerWindow.m in Sources */,
C88976450EA0BF3100D0A0A2 /* NSTIFFImageFileDirectory.m in Sources */,
C88976450EA0BF3100D0A0A2 /* O2TIFFImageDirectory.m in Sources */,
C88976460EA0BF3100D0A0A2 /* O2Decoder_TIFF.m in Sources */,
C88976470EA0BF3100D0A0A2 /* NSIBObjectData.m in Sources */,
C88976480EA0BF3100D0A0A2 /* NSCustomObject.m in Sources */,
@ -8880,7 +8880,7 @@
C8A2E4A80F07EA1F0054397C /* NSToolbarCustomizationView.m in Sources */,
C8A2E4AB0F07EA1F0054397C /* NSDrawer.m in Sources */,
C8A2E4AC0F07EA1F0054397C /* NSDrawerWindow.m in Sources */,
C8A2E4AD0F07EA1F0054397C /* NSTIFFImageFileDirectory.m in Sources */,
C8A2E4AD0F07EA1F0054397C /* O2TIFFImageDirectory.m in Sources */,
C8A2E4AE0F07EA1F0054397C /* O2Decoder_TIFF.m in Sources */,
C8A2E4AF0F07EA1F0054397C /* NSIBObjectData.m in Sources */,
C8A2E4B00F07EA1F0054397C /* NSCustomObject.m in Sources */,
@ -9262,7 +9262,7 @@
FE01AA1B0C5D9BCB00AEA51A /* NSToolbarCustomizationView.m in Sources */,
FE01AA1E0C5D9BCB00AEA51A /* NSDrawer.m in Sources */,
FE01AA1F0C5D9BCB00AEA51A /* NSDrawerWindow.m in Sources */,
FE01AA200C5D9BCB00AEA51A /* NSTIFFImageFileDirectory.m in Sources */,
FE01AA200C5D9BCB00AEA51A /* O2TIFFImageDirectory.m in Sources */,
FE01AA210C5D9BCB00AEA51A /* O2Decoder_TIFF.m in Sources */,
FE01AA220C5D9BCB00AEA51A /* NSIBObjectData.m in Sources */,
FE01AA230C5D9BCB00AEA51A /* NSCustomObject.m in Sources */,
@ -9610,7 +9610,7 @@
FE5A8AF510C6F50E005E348A /* NSToolbarCustomizationView.m in Sources */,
FE5A8AF610C6F50E005E348A /* NSDrawer.m in Sources */,
FE5A8AF710C6F50E005E348A /* NSDrawerWindow.m in Sources */,
FE5A8AF810C6F50E005E348A /* NSTIFFImageFileDirectory.m in Sources */,
FE5A8AF810C6F50E005E348A /* O2TIFFImageDirectory.m in Sources */,
FE5A8AF910C6F50E005E348A /* O2Decoder_TIFF.m in Sources */,
FE5A8AFA10C6F50E005E348A /* NSIBObjectData.m in Sources */,
FE5A8AFB10C6F50E005E348A /* NSCustomObject.m in Sources */,

View File

@ -208,7 +208,10 @@ static const char *Win32ClassNameForStyleMask(unsigned styleMask) {
_ignoreMinMaxMessage=NO;
_sentBeginSizing=NO;
_deviceDictionary=[NSMutableDictionary new];
NSString *check=[[NSUserDefaults standardUserDefaults] stringForKey:@"CGBackingRasterizer"];
if([check isEqual:@"Onyx"] || [check isEqual:@"GDI"])
[_deviceDictionary setObject:check forKey:@"CGContext"];
return self;
}

View File

@ -106,7 +106,7 @@
FE5A87D010C6F286005E348A /* O2Shading.h in Headers */ = {isa = PBXBuildFile; fileRef = FEC11AD70FD4B4D600082282 /* O2Shading.h */; settings = {ATTRIBUTES = (Private, ); }; };
FE5A87D110C6F286005E348A /* O2Surface.h in Headers */ = {isa = PBXBuildFile; fileRef = FEC11AD90FD4B4D600082282 /* O2Surface.h */; settings = {ATTRIBUTES = (Private, ); }; };
FE5A87D210C6F286005E348A /* O2zlib.h in Headers */ = {isa = PBXBuildFile; fileRef = FEC11ADB0FD4B4D600082282 /* O2zlib.h */; settings = {ATTRIBUTES = (Private, ); }; };
FE5A87D310C6F286005E348A /* NSTIFFImageFileDirectory.h in Headers */ = {isa = PBXBuildFile; fileRef = FEC11AE10FD4B4D600082282 /* NSTIFFImageFileDirectory.h */; settings = {ATTRIBUTES = (Private, ); }; };
FE5A87D310C6F286005E348A /* O2TIFFImageDirectory.h in Headers */ = {isa = PBXBuildFile; fileRef = FEC11AE10FD4B4D600082282 /* O2TIFFImageDirectory.h */; settings = {ATTRIBUTES = (Private, ); }; };
FE5A87D410C6F286005E348A /* O2Decoder_TIFF.h in Headers */ = {isa = PBXBuildFile; fileRef = FEC11AE30FD4B4D600082282 /* O2Decoder_TIFF.h */; settings = {ATTRIBUTES = (Private, ); }; };
FE5A87D510C6F286005E348A /* VGmath.h in Headers */ = {isa = PBXBuildFile; fileRef = FEC11AE50FD4B4D600082282 /* VGmath.h */; settings = {ATTRIBUTES = (Private, ); }; };
FE5A87D610C6F286005E348A /* VGPath.h in Headers */ = {isa = PBXBuildFile; fileRef = FEC11AE60FD4B4D600082282 /* VGPath.h */; settings = {ATTRIBUTES = (Private, ); }; };
@ -200,7 +200,7 @@
FE5A883010C6F286005E348A /* O2Shading.m in Sources */ = {isa = PBXBuildFile; fileRef = FEC11AD80FD4B4D600082282 /* O2Shading.m */; };
FE5A883110C6F286005E348A /* O2Surface.m in Sources */ = {isa = PBXBuildFile; fileRef = FEC11ADA0FD4B4D600082282 /* O2Surface.m */; };
FE5A883210C6F286005E348A /* O2zlib.m in Sources */ = {isa = PBXBuildFile; fileRef = FEC11ADC0FD4B4D600082282 /* O2zlib.m */; };
FE5A883310C6F286005E348A /* NSTIFFImageFileDirectory.m in Sources */ = {isa = PBXBuildFile; fileRef = FEC11AE20FD4B4D600082282 /* NSTIFFImageFileDirectory.m */; };
FE5A883310C6F286005E348A /* O2TIFFImageDirectory.m in Sources */ = {isa = PBXBuildFile; fileRef = FEC11AE20FD4B4D600082282 /* O2TIFFImageDirectory.m */; };
FE5A883410C6F286005E348A /* O2Decoder_TIFF.m in Sources */ = {isa = PBXBuildFile; fileRef = FEC11AE40FD4B4D600082282 /* O2Decoder_TIFF.m */; };
FE5A883510C6F286005E348A /* VGPath.m in Sources */ = {isa = PBXBuildFile; fileRef = FEC11AE70FD4B4D600082282 /* VGPath.m */; };
FE5A883610C6F286005E348A /* CGDataConsumer.m in Sources */ = {isa = PBXBuildFile; fileRef = FE9DB4600FD6C38300A1CE17 /* CGDataConsumer.m */; };
@ -297,7 +297,7 @@
FE6F7B4B0FD554A800C3244F /* O2Shading.h in Headers */ = {isa = PBXBuildFile; fileRef = FEC11AD70FD4B4D600082282 /* O2Shading.h */; settings = {ATTRIBUTES = (Private, ); }; };
FE6F7B4C0FD554A800C3244F /* O2Surface.h in Headers */ = {isa = PBXBuildFile; fileRef = FEC11AD90FD4B4D600082282 /* O2Surface.h */; settings = {ATTRIBUTES = (Private, ); }; };
FE6F7B4D0FD554A800C3244F /* O2zlib.h in Headers */ = {isa = PBXBuildFile; fileRef = FEC11ADB0FD4B4D600082282 /* O2zlib.h */; settings = {ATTRIBUTES = (Private, ); }; };
FE6F7B500FD554A800C3244F /* NSTIFFImageFileDirectory.h in Headers */ = {isa = PBXBuildFile; fileRef = FEC11AE10FD4B4D600082282 /* NSTIFFImageFileDirectory.h */; settings = {ATTRIBUTES = (Private, ); }; };
FE6F7B500FD554A800C3244F /* O2TIFFImageDirectory.h in Headers */ = {isa = PBXBuildFile; fileRef = FEC11AE10FD4B4D600082282 /* O2TIFFImageDirectory.h */; settings = {ATTRIBUTES = (Private, ); }; };
FE6F7B510FD554A800C3244F /* O2Decoder_TIFF.h in Headers */ = {isa = PBXBuildFile; fileRef = FEC11AE30FD4B4D600082282 /* O2Decoder_TIFF.h */; settings = {ATTRIBUTES = (Private, ); }; };
FE6F7B520FD554A800C3244F /* VGmath.h in Headers */ = {isa = PBXBuildFile; fileRef = FEC11AE50FD4B4D600082282 /* VGmath.h */; settings = {ATTRIBUTES = (Private, ); }; };
FE6F7B530FD554A800C3244F /* VGPath.h in Headers */ = {isa = PBXBuildFile; fileRef = FEC11AE60FD4B4D600082282 /* VGPath.h */; settings = {ATTRIBUTES = (Private, ); }; };
@ -381,7 +381,7 @@
FE6F7BA60FD554A800C3244F /* O2Shading.m in Sources */ = {isa = PBXBuildFile; fileRef = FEC11AD80FD4B4D600082282 /* O2Shading.m */; };
FE6F7BA70FD554A800C3244F /* O2Surface.m in Sources */ = {isa = PBXBuildFile; fileRef = FEC11ADA0FD4B4D600082282 /* O2Surface.m */; };
FE6F7BA80FD554A800C3244F /* O2zlib.m in Sources */ = {isa = PBXBuildFile; fileRef = FEC11ADC0FD4B4D600082282 /* O2zlib.m */; };
FE6F7BAB0FD554A800C3244F /* NSTIFFImageFileDirectory.m in Sources */ = {isa = PBXBuildFile; fileRef = FEC11AE20FD4B4D600082282 /* NSTIFFImageFileDirectory.m */; };
FE6F7BAB0FD554A800C3244F /* O2TIFFImageDirectory.m in Sources */ = {isa = PBXBuildFile; fileRef = FEC11AE20FD4B4D600082282 /* O2TIFFImageDirectory.m */; };
FE6F7BAC0FD554A800C3244F /* O2Decoder_TIFF.m in Sources */ = {isa = PBXBuildFile; fileRef = FEC11AE40FD4B4D600082282 /* O2Decoder_TIFF.m */; };
FE6F7BAD0FD554A800C3244F /* VGPath.m in Sources */ = {isa = PBXBuildFile; fileRef = FEC11AE70FD4B4D600082282 /* VGPath.m */; };
FE6F7BAF0FD554A800C3244F /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0867D69BFE84028FC02AAC07 /* Foundation.framework */; };
@ -469,7 +469,7 @@
FE6F7C300FD55FA300C3244F /* O2Shading.h in Headers */ = {isa = PBXBuildFile; fileRef = FEC11AD70FD4B4D600082282 /* O2Shading.h */; settings = {ATTRIBUTES = (Private, ); }; };
FE6F7C310FD55FA300C3244F /* O2Surface.h in Headers */ = {isa = PBXBuildFile; fileRef = FEC11AD90FD4B4D600082282 /* O2Surface.h */; settings = {ATTRIBUTES = (Private, ); }; };
FE6F7C320FD55FA300C3244F /* O2zlib.h in Headers */ = {isa = PBXBuildFile; fileRef = FEC11ADB0FD4B4D600082282 /* O2zlib.h */; settings = {ATTRIBUTES = (Private, ); }; };
FE6F7C350FD55FA300C3244F /* NSTIFFImageFileDirectory.h in Headers */ = {isa = PBXBuildFile; fileRef = FEC11AE10FD4B4D600082282 /* NSTIFFImageFileDirectory.h */; settings = {ATTRIBUTES = (Private, ); }; };
FE6F7C350FD55FA300C3244F /* O2TIFFImageDirectory.h in Headers */ = {isa = PBXBuildFile; fileRef = FEC11AE10FD4B4D600082282 /* O2TIFFImageDirectory.h */; settings = {ATTRIBUTES = (Private, ); }; };
FE6F7C360FD55FA300C3244F /* O2Decoder_TIFF.h in Headers */ = {isa = PBXBuildFile; fileRef = FEC11AE30FD4B4D600082282 /* O2Decoder_TIFF.h */; settings = {ATTRIBUTES = (Private, ); }; };
FE6F7C370FD55FA300C3244F /* VGmath.h in Headers */ = {isa = PBXBuildFile; fileRef = FEC11AE50FD4B4D600082282 /* VGmath.h */; settings = {ATTRIBUTES = (Private, ); }; };
FE6F7C380FD55FA300C3244F /* VGPath.h in Headers */ = {isa = PBXBuildFile; fileRef = FEC11AE60FD4B4D600082282 /* VGPath.h */; settings = {ATTRIBUTES = (Private, ); }; };
@ -553,7 +553,7 @@
FE6F7C8B0FD55FA300C3244F /* O2Shading.m in Sources */ = {isa = PBXBuildFile; fileRef = FEC11AD80FD4B4D600082282 /* O2Shading.m */; };
FE6F7C8C0FD55FA300C3244F /* O2Surface.m in Sources */ = {isa = PBXBuildFile; fileRef = FEC11ADA0FD4B4D600082282 /* O2Surface.m */; };
FE6F7C8D0FD55FA300C3244F /* O2zlib.m in Sources */ = {isa = PBXBuildFile; fileRef = FEC11ADC0FD4B4D600082282 /* O2zlib.m */; };
FE6F7C900FD55FA300C3244F /* NSTIFFImageFileDirectory.m in Sources */ = {isa = PBXBuildFile; fileRef = FEC11AE20FD4B4D600082282 /* NSTIFFImageFileDirectory.m */; };
FE6F7C900FD55FA300C3244F /* O2TIFFImageDirectory.m in Sources */ = {isa = PBXBuildFile; fileRef = FEC11AE20FD4B4D600082282 /* O2TIFFImageDirectory.m */; };
FE6F7C910FD55FA300C3244F /* O2Decoder_TIFF.m in Sources */ = {isa = PBXBuildFile; fileRef = FEC11AE40FD4B4D600082282 /* O2Decoder_TIFF.m */; };
FE6F7C920FD55FA300C3244F /* VGPath.m in Sources */ = {isa = PBXBuildFile; fileRef = FEC11AE70FD4B4D600082282 /* VGPath.m */; };
FE6F7C940FD55FA300C3244F /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0867D69BFE84028FC02AAC07 /* Foundation.framework */; };
@ -763,8 +763,8 @@
FEC11B8A0FD4B4D600082282 /* O2Surface.m in Sources */ = {isa = PBXBuildFile; fileRef = FEC11ADA0FD4B4D600082282 /* O2Surface.m */; };
FEC11B8B0FD4B4D600082282 /* O2zlib.h in Headers */ = {isa = PBXBuildFile; fileRef = FEC11ADB0FD4B4D600082282 /* O2zlib.h */; settings = {ATTRIBUTES = (Private, ); }; };
FEC11B8C0FD4B4D600082282 /* O2zlib.m in Sources */ = {isa = PBXBuildFile; fileRef = FEC11ADC0FD4B4D600082282 /* O2zlib.m */; };
FEC11B910FD4B4D600082282 /* NSTIFFImageFileDirectory.h in Headers */ = {isa = PBXBuildFile; fileRef = FEC11AE10FD4B4D600082282 /* NSTIFFImageFileDirectory.h */; settings = {ATTRIBUTES = (Private, ); }; };
FEC11B920FD4B4D600082282 /* NSTIFFImageFileDirectory.m in Sources */ = {isa = PBXBuildFile; fileRef = FEC11AE20FD4B4D600082282 /* NSTIFFImageFileDirectory.m */; };
FEC11B910FD4B4D600082282 /* O2TIFFImageDirectory.h in Headers */ = {isa = PBXBuildFile; fileRef = FEC11AE10FD4B4D600082282 /* O2TIFFImageDirectory.h */; settings = {ATTRIBUTES = (Private, ); }; };
FEC11B920FD4B4D600082282 /* O2TIFFImageDirectory.m in Sources */ = {isa = PBXBuildFile; fileRef = FEC11AE20FD4B4D600082282 /* O2TIFFImageDirectory.m */; };
FEC11B930FD4B4D600082282 /* O2Decoder_TIFF.h in Headers */ = {isa = PBXBuildFile; fileRef = FEC11AE30FD4B4D600082282 /* O2Decoder_TIFF.h */; settings = {ATTRIBUTES = (Private, ); }; };
FEC11B940FD4B4D600082282 /* O2Decoder_TIFF.m in Sources */ = {isa = PBXBuildFile; fileRef = FEC11AE40FD4B4D600082282 /* O2Decoder_TIFF.m */; };
FEC11B950FD4B4D600082282 /* VGmath.h in Headers */ = {isa = PBXBuildFile; fileRef = FEC11AE50FD4B4D600082282 /* VGmath.h */; settings = {ATTRIBUTES = (Private, ); }; };
@ -1209,8 +1209,8 @@
FEC11ADA0FD4B4D600082282 /* O2Surface.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = O2Surface.m; path = ../Onyx2D/O2Surface.m; sourceTree = "<group>"; };
FEC11ADB0FD4B4D600082282 /* O2zlib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = O2zlib.h; path = ../Onyx2D/O2zlib.h; sourceTree = "<group>"; };
FEC11ADC0FD4B4D600082282 /* O2zlib.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = O2zlib.m; path = ../Onyx2D/O2zlib.m; sourceTree = "<group>"; };
FEC11AE10FD4B4D600082282 /* NSTIFFImageFileDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NSTIFFImageFileDirectory.h; path = ../Onyx2D/NSTIFFImageFileDirectory.h; sourceTree = "<group>"; };
FEC11AE20FD4B4D600082282 /* NSTIFFImageFileDirectory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NSTIFFImageFileDirectory.m; path = ../Onyx2D/NSTIFFImageFileDirectory.m; sourceTree = "<group>"; };
FEC11AE10FD4B4D600082282 /* O2TIFFImageDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = O2TIFFImageDirectory.h; path = ../Onyx2D/O2TIFFImageDirectory.h; sourceTree = "<group>"; };
FEC11AE20FD4B4D600082282 /* O2TIFFImageDirectory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = O2TIFFImageDirectory.m; path = ../Onyx2D/O2TIFFImageDirectory.m; sourceTree = "<group>"; };
FEC11AE30FD4B4D600082282 /* O2Decoder_TIFF.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = O2Decoder_TIFF.h; path = ../Onyx2D/O2Decoder_TIFF.h; sourceTree = "<group>"; };
FEC11AE40FD4B4D600082282 /* O2Decoder_TIFF.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = O2Decoder_TIFF.m; path = ../Onyx2D/O2Decoder_TIFF.m; sourceTree = "<group>"; };
FEC11AE50FD4B4D600082282 /* VGmath.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VGmath.h; path = ../Onyx2D/VGmath.h; sourceTree = "<group>"; };
@ -1366,8 +1366,8 @@
children = (
FEC11A630FD4B4D600082282 /* gif_lib.h */,
FEC11A640FD4B4D600082282 /* gif_lib.m */,
FEC11AE10FD4B4D600082282 /* NSTIFFImageFileDirectory.h */,
FEC11AE20FD4B4D600082282 /* NSTIFFImageFileDirectory.m */,
FEC11AE10FD4B4D600082282 /* O2TIFFImageDirectory.h */,
FEC11AE20FD4B4D600082282 /* O2TIFFImageDirectory.m */,
FE3C8539108779410018252A /* O2AffineTransform.h */,
FE3C853A108779410018252A /* O2AffineTransform.m */,
FEC11A650FD4B4D600082282 /* O2BitmapContext.h */,
@ -1640,7 +1640,7 @@
FEC11B870FD4B4D600082282 /* O2Shading.h in Headers */,
FEC11B890FD4B4D600082282 /* O2Surface.h in Headers */,
FEC11B8B0FD4B4D600082282 /* O2zlib.h in Headers */,
FEC11B910FD4B4D600082282 /* NSTIFFImageFileDirectory.h in Headers */,
FEC11B910FD4B4D600082282 /* O2TIFFImageDirectory.h in Headers */,
FEC11B930FD4B4D600082282 /* O2Decoder_TIFF.h in Headers */,
FEC11B950FD4B4D600082282 /* VGmath.h in Headers */,
FEC11B960FD4B4D600082282 /* VGPath.h in Headers */,
@ -1745,7 +1745,7 @@
FE5A87D010C6F286005E348A /* O2Shading.h in Headers */,
FE5A87D110C6F286005E348A /* O2Surface.h in Headers */,
FE5A87D210C6F286005E348A /* O2zlib.h in Headers */,
FE5A87D310C6F286005E348A /* NSTIFFImageFileDirectory.h in Headers */,
FE5A87D310C6F286005E348A /* O2TIFFImageDirectory.h in Headers */,
FE5A87D410C6F286005E348A /* O2Decoder_TIFF.h in Headers */,
FE5A87D510C6F286005E348A /* VGmath.h in Headers */,
FE5A87D610C6F286005E348A /* VGPath.h in Headers */,
@ -1850,7 +1850,7 @@
FE6F7B4B0FD554A800C3244F /* O2Shading.h in Headers */,
FE6F7B4C0FD554A800C3244F /* O2Surface.h in Headers */,
FE6F7B4D0FD554A800C3244F /* O2zlib.h in Headers */,
FE6F7B500FD554A800C3244F /* NSTIFFImageFileDirectory.h in Headers */,
FE6F7B500FD554A800C3244F /* O2TIFFImageDirectory.h in Headers */,
FE6F7B510FD554A800C3244F /* O2Decoder_TIFF.h in Headers */,
FE6F7B520FD554A800C3244F /* VGmath.h in Headers */,
FE6F7B530FD554A800C3244F /* VGPath.h in Headers */,
@ -1955,7 +1955,7 @@
FE6F7C300FD55FA300C3244F /* O2Shading.h in Headers */,
FE6F7C310FD55FA300C3244F /* O2Surface.h in Headers */,
FE6F7C320FD55FA300C3244F /* O2zlib.h in Headers */,
FE6F7C350FD55FA300C3244F /* NSTIFFImageFileDirectory.h in Headers */,
FE6F7C350FD55FA300C3244F /* O2TIFFImageDirectory.h in Headers */,
FE6F7C360FD55FA300C3244F /* O2Decoder_TIFF.h in Headers */,
FE6F7C370FD55FA300C3244F /* VGmath.h in Headers */,
FE6F7C380FD55FA300C3244F /* VGPath.h in Headers */,
@ -2352,7 +2352,7 @@
FEC11B880FD4B4D600082282 /* O2Shading.m in Sources */,
FEC11B8A0FD4B4D600082282 /* O2Surface.m in Sources */,
FEC11B8C0FD4B4D600082282 /* O2zlib.m in Sources */,
FEC11B920FD4B4D600082282 /* NSTIFFImageFileDirectory.m in Sources */,
FEC11B920FD4B4D600082282 /* O2TIFFImageDirectory.m in Sources */,
FEC11B940FD4B4D600082282 /* O2Decoder_TIFF.m in Sources */,
FEC11B970FD4B4D600082282 /* VGPath.m in Sources */,
FE9DB4620FD6C38300A1CE17 /* CGDataConsumer.m in Sources */,
@ -2451,7 +2451,7 @@
FE5A883010C6F286005E348A /* O2Shading.m in Sources */,
FE5A883110C6F286005E348A /* O2Surface.m in Sources */,
FE5A883210C6F286005E348A /* O2zlib.m in Sources */,
FE5A883310C6F286005E348A /* NSTIFFImageFileDirectory.m in Sources */,
FE5A883310C6F286005E348A /* O2TIFFImageDirectory.m in Sources */,
FE5A883410C6F286005E348A /* O2Decoder_TIFF.m in Sources */,
FE5A883510C6F286005E348A /* VGPath.m in Sources */,
FE5A883610C6F286005E348A /* CGDataConsumer.m in Sources */,
@ -2550,7 +2550,7 @@
FE6F7BA60FD554A800C3244F /* O2Shading.m in Sources */,
FE6F7BA70FD554A800C3244F /* O2Surface.m in Sources */,
FE6F7BA80FD554A800C3244F /* O2zlib.m in Sources */,
FE6F7BAB0FD554A800C3244F /* NSTIFFImageFileDirectory.m in Sources */,
FE6F7BAB0FD554A800C3244F /* O2TIFFImageDirectory.m in Sources */,
FE6F7BAC0FD554A800C3244F /* O2Decoder_TIFF.m in Sources */,
FE6F7BAD0FD554A800C3244F /* VGPath.m in Sources */,
FE9DB4640FD6C38300A1CE17 /* CGDataConsumer.m in Sources */,
@ -2649,7 +2649,7 @@
FE6F7C8B0FD55FA300C3244F /* O2Shading.m in Sources */,
FE6F7C8C0FD55FA300C3244F /* O2Surface.m in Sources */,
FE6F7C8D0FD55FA300C3244F /* O2zlib.m in Sources */,
FE6F7C900FD55FA300C3244F /* NSTIFFImageFileDirectory.m in Sources */,
FE6F7C900FD55FA300C3244F /* O2TIFFImageDirectory.m in Sources */,
FE6F7C910FD55FA300C3244F /* O2Decoder_TIFF.m in Sources */,
FE6F7C920FD55FA300C3244F /* VGPath.m in Sources */,
FE9DB4660FD6C38300A1CE17 /* CGDataConsumer.m in Sources */,

View File

@ -45,12 +45,6 @@ static inline O2GState *currentState(O2Context *self){
return [self->_stateStack lastObject];
}
static BOOL _isAvailable=NO;
+(void)initialize {
_isAvailable=[[NSUserDefaults standardUserDefaults] boolForKey:@"CGEnableBuiltin"];
}
+(BOOL)canInitBitmap {
return YES;
}
@ -59,12 +53,9 @@ static BOOL _isAvailable=NO;
NSString *name=[deviceDictionary objectForKey:@"CGContext"];
if(name==nil)
return _isAvailable;
if([name isEqual:@"Onyx"])
return YES;
return NO;
return [name isEqual:@"Onyx"];
}
-(void)reallocateForSurface {

View File

@ -35,7 +35,7 @@ O2DataProviderRef O2DataProviderCreateWithURL(NSURL *url);
O2DataProviderRef O2DataProviderCreateWithFilename(const char *pathCString);
O2DataProviderRef O2DataProviderRetain(O2DataProviderRef self);
void O2DataProviderRelease(O2DataProviderRef self);
NSData *O2DataProviderCopyData(O2DataProviderRef self);
CFDataRef O2DataProviderCopyData(O2DataProviderRef self);
size_t O2DataProviderRewind(O2DataProviderRef self);
size_t O2DataProviderGetBytesAtPosition(O2DataProviderRef self,void *buffer,size_t length,size_t position);

View File

@ -78,11 +78,11 @@ void O2DataProviderRelease(O2DataProviderRef self) {
CFRelease(self);
}
NSData *O2DataProviderCopyData(O2DataProviderRef self) {
CFDataRef O2DataProviderCopyData(O2DataProviderRef self) {
if(self->_data!=nil)
return [self->_data copy];
return (CFDataRef)[self->_data copy];
else
return [[NSData alloc] initWithContentsOfMappedFile:self->_path];
return (CFDataRef)[[NSData alloc] initWithContentsOfFile:self->_path];
}
-(void)dealloc {

View File

@ -7,7 +7,7 @@ The above copyright notice and this permission notice shall be included in all c
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 <Onyx2D/O2Decoder_TIFF.h>
#import "NSTIFFImageFileDirectory.h"
#import "O2TIFFImageDirectory.h"
@implementation O2Decoder_TIFF
@ -334,11 +334,11 @@ static void _decodeArrayOfUnsigned32(O2Decoder_TIFF *self,unsigned **valuesp,uns
}
-(unsigned)parseImageFileDirectoryAtOffset:(unsigned)offset {
NSTIFFImageFileDirectory *imageFileDirectory;
O2TIFFImageDirectory *imageFileDirectory;
seekToOffset(self,offset);
imageFileDirectory=[[[NSTIFFImageFileDirectory alloc] initWithTIFFReader:self] autorelease];
imageFileDirectory=[[[O2TIFFImageDirectory alloc] initWithTIFFReader:self] autorelease];
[_directory addObject:imageFileDirectory];

View File

@ -53,7 +53,8 @@ O2PDFArray *O2FontCreatePDFWidthsWithEncoding(O2FontRef self,O2Glyph encoding[25
}
-(const char *)pdfFontName {
return [[[self->_name componentsSeparatedByString:@" "] componentsJoinedByString:@","] cString];
// possibly wrong encoding
return [[[self->_name componentsSeparatedByString:@" "] componentsJoinedByString:@","] cStringUsingEncoding:NSISOLatin1StringEncoding];
}
-(O2PDFDictionary *)_pdfFontDescriptorWithSize:(CGFloat)size {

View File

@ -471,7 +471,7 @@ static inline const void *directBytes(O2Image *self){
self->_directLength=[self->_provider length];
}
else {
self->_directData=O2DataProviderCopyData(self->_provider);
self->_directData=(NSData *)O2DataProviderCopyData(self->_provider);
self->_directBytes=[self->_directData bytes];
self->_directLength=[self->_directData length];
}

View File

@ -413,7 +413,7 @@ stbi_uc *stbi_bmp_load_from_memory (const stbi_uc *buffer, int len, int *x, int
-initWithDataProvider:(O2DataProvider *)provider options:(NSDictionary *)options {
[super initWithDataProvider:provider options:options];
_bmp=O2DataProviderCopyData(provider);
_bmp=(NSData *)O2DataProviderCopyData(provider);
return self;
}

View File

@ -1073,7 +1073,7 @@ static unsigned char *stbi_jpeg_load_from_memory(jpeg *j,stbi_uc const *buffer,
-initWithDataProvider:(O2DataProvider *)provider options:(NSDictionary *)options {
[super initWithDataProvider:provider options:options];
_jpg=O2DataProviderCopyData(provider);
_jpg=(NSData *)O2DataProviderCopyData(provider);
return self;
}

View File

@ -521,7 +521,7 @@ unsigned char *stbi_png_load_from_memory(const unsigned char *buffer, int len, i
-initWithDataProvider:(O2DataProvider *)provider options:(NSDictionary *)options {
[super initWithDataProvider:provider options:options];
_png=O2DataProviderCopyData(provider);
_png=(NSData *)O2DataProviderCopyData(provider);
return self;
}

View File

@ -8,7 +8,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
#import <Onyx2D/O2ImageSource_TIFF.h>
#import <Onyx2D/O2Decoder_TIFF.h>
#import "NSTIFFImageFileDirectory.h"
#import "O2TIFFImageDirectory.h"
#import <Onyx2D/O2DataProvider.h>
#import <Onyx2D/O2ColorSpace.h>
#import <Onyx2D/O2Image.h>
@ -43,7 +43,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
-initWithDataProvider:(O2DataProvider *)provider options:(NSDictionary *)options {
[super initWithDataProvider:provider options:options];
NSData *data=O2DataProviderCopyData(provider);
NSData *data=(NSData *)O2DataProviderCopyData(provider);
_reader=[[O2Decoder_TIFF alloc] initWithData:data];
[data release];
@ -69,7 +69,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
if([entries count]<=index)
return nil;
NSTIFFImageFileDirectory *directory=[entries objectAtIndex:index];
O2TIFFImageDirectory *directory=[entries objectAtIndex:index];
return (CFDictionaryRef)[[directory properties] copy];
}
@ -81,7 +81,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
if([entries count]<=index)
return nil;
NSTIFFImageFileDirectory *directory=[entries objectAtIndex:index];
O2TIFFImageDirectory *directory=[entries objectAtIndex:index];
int width=[directory imageWidth];
int height=[directory imageLength];

View File

@ -10,7 +10,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
@class O2Decoder_TIFF;
@interface NSTIFFImageFileDirectory : NSObject {
@interface O2TIFFImageDirectory : NSObject {
NSString *_artist;
unsigned _sizeOfBitsPerSample;
unsigned *_bitsPerSample;

View File

@ -6,13 +6,13 @@ The above copyright notice and this permission notice shall be included in all c
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 "NSTIFFImageFileDirectory.h"
#import "O2TIFFImageDirectory.h"
#import <Onyx2D/O2Decoder_TIFF.h>
#import <Onyx2D/O2ImageSource.h>
#import <Onyx2D/O2LZW.h>
#import <Foundation/NSDebug.h>
@implementation NSTIFFImageFileDirectory
@implementation O2TIFFImageDirectory
-initWithTIFFReader:(O2Decoder_TIFF *)reader {
unsigned i,numberOfEntries=O2DecoderNextUnsigned16_TIFF(reader);

View File

@ -621,7 +621,7 @@ NSMapTable *O2TTFDecoderGetPostScriptNameMapTable(O2TTFDecoderRef self,int *numb
int O2TTFDecoderGetOffsetsAreLong(O2TTFDecoderRef self) {
if(!seekToTable(self,'head'))
return NULL;
return 0;
Fixed32 version=decode_Fixed32(self);
Fixed32 fontRevision=decode_Fixed32(self);

View File

@ -13,8 +13,8 @@
FE5C0A4C116297FA00065D1C /* VGPath.m in Sources */ = {isa = PBXBuildFile; fileRef = FE5C0A49116297FA00065D1C /* VGPath.m */; };
FE5C0ADD1162981200065D1C /* gif_lib.h in Headers */ = {isa = PBXBuildFile; fileRef = FE5C0A4D1162981100065D1C /* gif_lib.h */; settings = {ATTRIBUTES = (Private, ); }; };
FE5C0ADE1162981200065D1C /* gif_lib.m in Sources */ = {isa = PBXBuildFile; fileRef = FE5C0A4E1162981100065D1C /* gif_lib.m */; };
FE5C0ADF1162981200065D1C /* NSTIFFImageFileDirectory.h in Headers */ = {isa = PBXBuildFile; fileRef = FE5C0A4F1162981100065D1C /* NSTIFFImageFileDirectory.h */; settings = {ATTRIBUTES = (Private, ); }; };
FE5C0AE01162981200065D1C /* NSTIFFImageFileDirectory.m in Sources */ = {isa = PBXBuildFile; fileRef = FE5C0A501162981100065D1C /* NSTIFFImageFileDirectory.m */; };
FE5C0ADF1162981200065D1C /* O2TIFFImageDirectory.h in Headers */ = {isa = PBXBuildFile; fileRef = FE5C0A4F1162981100065D1C /* O2TIFFImageDirectory.h */; settings = {ATTRIBUTES = (Private, ); }; };
FE5C0AE01162981200065D1C /* O2TIFFImageDirectory.m in Sources */ = {isa = PBXBuildFile; fileRef = FE5C0A501162981100065D1C /* O2TIFFImageDirectory.m */; };
FE5C0AE11162981200065D1C /* O2AffineTransform.h in Headers */ = {isa = PBXBuildFile; fileRef = FE5C0A511162981100065D1C /* O2AffineTransform.h */; settings = {ATTRIBUTES = (Public, ); }; };
FE5C0AE21162981200065D1C /* O2AffineTransform.m in Sources */ = {isa = PBXBuildFile; fileRef = FE5C0A521162981100065D1C /* O2AffineTransform.m */; };
FE5C0AE31162981200065D1C /* O2BitmapContext.h in Headers */ = {isa = PBXBuildFile; fileRef = FE5C0A531162981100065D1C /* O2BitmapContext.h */; settings = {ATTRIBUTES = (Public, ); }; };
@ -157,7 +157,7 @@
FE5C0C0A1162A99A00065D1C /* VGmath.h in Headers */ = {isa = PBXBuildFile; fileRef = FE5C0A47116297FA00065D1C /* VGmath.h */; settings = {ATTRIBUTES = (Private, ); }; };
FE5C0C0B1162A99A00065D1C /* VGPath.h in Headers */ = {isa = PBXBuildFile; fileRef = FE5C0A48116297FA00065D1C /* VGPath.h */; settings = {ATTRIBUTES = (Private, ); }; };
FE5C0C0C1162A99A00065D1C /* gif_lib.h in Headers */ = {isa = PBXBuildFile; fileRef = FE5C0A4D1162981100065D1C /* gif_lib.h */; settings = {ATTRIBUTES = (Private, ); }; };
FE5C0C0D1162A99A00065D1C /* NSTIFFImageFileDirectory.h in Headers */ = {isa = PBXBuildFile; fileRef = FE5C0A4F1162981100065D1C /* NSTIFFImageFileDirectory.h */; settings = {ATTRIBUTES = (Private, ); }; };
FE5C0C0D1162A99A00065D1C /* O2TIFFImageDirectory.h in Headers */ = {isa = PBXBuildFile; fileRef = FE5C0A4F1162981100065D1C /* O2TIFFImageDirectory.h */; settings = {ATTRIBUTES = (Private, ); }; };
FE5C0C0E1162A99A00065D1C /* O2AffineTransform.h in Headers */ = {isa = PBXBuildFile; fileRef = FE5C0A511162981100065D1C /* O2AffineTransform.h */; settings = {ATTRIBUTES = (Public, ); }; };
FE5C0C0F1162A99A00065D1C /* O2BitmapContext.h in Headers */ = {isa = PBXBuildFile; fileRef = FE5C0A531162981100065D1C /* O2BitmapContext.h */; settings = {ATTRIBUTES = (Public, ); }; };
FE5C0C101162A99A00065D1C /* O2Blending.h in Headers */ = {isa = PBXBuildFile; fileRef = FE5C0A551162981100065D1C /* O2Blending.h */; };
@ -232,7 +232,7 @@
FE5C0C561162A99A00065D1C /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C1666FE841158C02AAC07 /* InfoPlist.strings */; };
FE5C0C581162A99A00065D1C /* VGPath.m in Sources */ = {isa = PBXBuildFile; fileRef = FE5C0A49116297FA00065D1C /* VGPath.m */; };
FE5C0C591162A99A00065D1C /* gif_lib.m in Sources */ = {isa = PBXBuildFile; fileRef = FE5C0A4E1162981100065D1C /* gif_lib.m */; };
FE5C0C5A1162A99A00065D1C /* NSTIFFImageFileDirectory.m in Sources */ = {isa = PBXBuildFile; fileRef = FE5C0A501162981100065D1C /* NSTIFFImageFileDirectory.m */; };
FE5C0C5A1162A99A00065D1C /* O2TIFFImageDirectory.m in Sources */ = {isa = PBXBuildFile; fileRef = FE5C0A501162981100065D1C /* O2TIFFImageDirectory.m */; };
FE5C0C5B1162A99A00065D1C /* O2AffineTransform.m in Sources */ = {isa = PBXBuildFile; fileRef = FE5C0A521162981100065D1C /* O2AffineTransform.m */; };
FE5C0C5C1162A99A00065D1C /* O2BitmapContext.m in Sources */ = {isa = PBXBuildFile; fileRef = FE5C0A541162981100065D1C /* O2BitmapContext.m */; };
FE5C0C5D1162A99A00065D1C /* O2ClipPhase.m in Sources */ = {isa = PBXBuildFile; fileRef = FE5C0A571162981100065D1C /* O2ClipPhase.m */; };
@ -304,7 +304,7 @@
FE5C0CAA1162A9AB00065D1C /* VGmath.h in Headers */ = {isa = PBXBuildFile; fileRef = FE5C0A47116297FA00065D1C /* VGmath.h */; settings = {ATTRIBUTES = (Private, ); }; };
FE5C0CAB1162A9AB00065D1C /* VGPath.h in Headers */ = {isa = PBXBuildFile; fileRef = FE5C0A48116297FA00065D1C /* VGPath.h */; settings = {ATTRIBUTES = (Private, ); }; };
FE5C0CAC1162A9AB00065D1C /* gif_lib.h in Headers */ = {isa = PBXBuildFile; fileRef = FE5C0A4D1162981100065D1C /* gif_lib.h */; settings = {ATTRIBUTES = (Private, ); }; };
FE5C0CAD1162A9AB00065D1C /* NSTIFFImageFileDirectory.h in Headers */ = {isa = PBXBuildFile; fileRef = FE5C0A4F1162981100065D1C /* NSTIFFImageFileDirectory.h */; settings = {ATTRIBUTES = (Private, ); }; };
FE5C0CAD1162A9AB00065D1C /* O2TIFFImageDirectory.h in Headers */ = {isa = PBXBuildFile; fileRef = FE5C0A4F1162981100065D1C /* O2TIFFImageDirectory.h */; settings = {ATTRIBUTES = (Private, ); }; };
FE5C0CAE1162A9AB00065D1C /* O2AffineTransform.h in Headers */ = {isa = PBXBuildFile; fileRef = FE5C0A511162981100065D1C /* O2AffineTransform.h */; settings = {ATTRIBUTES = (Public, ); }; };
FE5C0CAF1162A9AB00065D1C /* O2BitmapContext.h in Headers */ = {isa = PBXBuildFile; fileRef = FE5C0A531162981100065D1C /* O2BitmapContext.h */; settings = {ATTRIBUTES = (Public, ); }; };
FE5C0CB01162A9AB00065D1C /* O2Blending.h in Headers */ = {isa = PBXBuildFile; fileRef = FE5C0A551162981100065D1C /* O2Blending.h */; };
@ -379,7 +379,7 @@
FE5C0CF61162A9AB00065D1C /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C1666FE841158C02AAC07 /* InfoPlist.strings */; };
FE5C0CF81162A9AB00065D1C /* VGPath.m in Sources */ = {isa = PBXBuildFile; fileRef = FE5C0A49116297FA00065D1C /* VGPath.m */; };
FE5C0CF91162A9AB00065D1C /* gif_lib.m in Sources */ = {isa = PBXBuildFile; fileRef = FE5C0A4E1162981100065D1C /* gif_lib.m */; };
FE5C0CFA1162A9AB00065D1C /* NSTIFFImageFileDirectory.m in Sources */ = {isa = PBXBuildFile; fileRef = FE5C0A501162981100065D1C /* NSTIFFImageFileDirectory.m */; };
FE5C0CFA1162A9AB00065D1C /* O2TIFFImageDirectory.m in Sources */ = {isa = PBXBuildFile; fileRef = FE5C0A501162981100065D1C /* O2TIFFImageDirectory.m */; };
FE5C0CFB1162A9AB00065D1C /* O2AffineTransform.m in Sources */ = {isa = PBXBuildFile; fileRef = FE5C0A521162981100065D1C /* O2AffineTransform.m */; };
FE5C0CFC1162A9AB00065D1C /* O2BitmapContext.m in Sources */ = {isa = PBXBuildFile; fileRef = FE5C0A541162981100065D1C /* O2BitmapContext.m */; };
FE5C0CFD1162A9AB00065D1C /* O2ClipPhase.m in Sources */ = {isa = PBXBuildFile; fileRef = FE5C0A571162981100065D1C /* O2ClipPhase.m */; };
@ -449,7 +449,7 @@
FE5C0D3F1162A9AB00065D1C /* O2zlib.m in Sources */ = {isa = PBXBuildFile; fileRef = FE5C0ADC1162981200065D1C /* O2zlib.m */; };
FE5C0D411162A9AB00065D1C /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0867D69BFE84028FC02AAC07 /* Foundation.framework */; };
FE5C0D6F1162AEF500065D1C /* gif_lib.h in Headers */ = {isa = PBXBuildFile; fileRef = FE5C0A4D1162981100065D1C /* gif_lib.h */; settings = {ATTRIBUTES = (Private, ); }; };
FE5C0D701162AEF500065D1C /* NSTIFFImageFileDirectory.h in Headers */ = {isa = PBXBuildFile; fileRef = FE5C0A4F1162981100065D1C /* NSTIFFImageFileDirectory.h */; settings = {ATTRIBUTES = (Private, ); }; };
FE5C0D701162AEF500065D1C /* O2TIFFImageDirectory.h in Headers */ = {isa = PBXBuildFile; fileRef = FE5C0A4F1162981100065D1C /* O2TIFFImageDirectory.h */; settings = {ATTRIBUTES = (Private, ); }; };
FE5C0D711162AEF500065D1C /* O2AffineTransform.h in Headers */ = {isa = PBXBuildFile; fileRef = FE5C0A511162981100065D1C /* O2AffineTransform.h */; settings = {ATTRIBUTES = (Public, ); }; };
FE5C0D721162AEF500065D1C /* O2BitmapContext.h in Headers */ = {isa = PBXBuildFile; fileRef = FE5C0A531162981100065D1C /* O2BitmapContext.h */; settings = {ATTRIBUTES = (Public, ); }; };
FE5C0D731162AEF500065D1C /* O2Blending.h in Headers */ = {isa = PBXBuildFile; fileRef = FE5C0A551162981100065D1C /* O2Blending.h */; };
@ -524,7 +524,7 @@
FE5C0DB81162AEF500065D1C /* VGmath.h in Headers */ = {isa = PBXBuildFile; fileRef = FE5C0A47116297FA00065D1C /* VGmath.h */; settings = {ATTRIBUTES = (Private, ); }; };
FE5C0DB91162AEF500065D1C /* VGPath.h in Headers */ = {isa = PBXBuildFile; fileRef = FE5C0A48116297FA00065D1C /* VGPath.h */; settings = {ATTRIBUTES = (Private, ); }; };
FE5C0DBB1162AF0100065D1C /* gif_lib.m in Sources */ = {isa = PBXBuildFile; fileRef = FE5C0A4E1162981100065D1C /* gif_lib.m */; };
FE5C0DBC1162AF0100065D1C /* NSTIFFImageFileDirectory.m in Sources */ = {isa = PBXBuildFile; fileRef = FE5C0A501162981100065D1C /* NSTIFFImageFileDirectory.m */; };
FE5C0DBC1162AF0100065D1C /* O2TIFFImageDirectory.m in Sources */ = {isa = PBXBuildFile; fileRef = FE5C0A501162981100065D1C /* O2TIFFImageDirectory.m */; };
FE5C0DBD1162AF0100065D1C /* O2AffineTransform.m in Sources */ = {isa = PBXBuildFile; fileRef = FE5C0A521162981100065D1C /* O2AffineTransform.m */; };
FE5C0DBE1162AF0100065D1C /* O2BitmapContext.m in Sources */ = {isa = PBXBuildFile; fileRef = FE5C0A541162981100065D1C /* O2BitmapContext.m */; };
FE5C0DBF1162AF0100065D1C /* O2ClipPhase.m in Sources */ = {isa = PBXBuildFile; fileRef = FE5C0A571162981100065D1C /* O2ClipPhase.m */; };
@ -593,6 +593,8 @@
FE5C0DFF1162AF0100065D1C /* O2Surface.m in Sources */ = {isa = PBXBuildFile; fileRef = FE5C0AD81162981200065D1C /* O2Surface.m */; };
FE5C0E011162AF0100065D1C /* O2zlib.m in Sources */ = {isa = PBXBuildFile; fileRef = FE5C0ADC1162981200065D1C /* O2zlib.m */; };
FE5C0E021162AF0100065D1C /* VGPath.m in Sources */ = {isa = PBXBuildFile; fileRef = FE5C0A49116297FA00065D1C /* VGPath.m */; };
FE8EBE7B11658E5300BC0ED6 /* O2TTFDecoder.m in Sources */ = {isa = PBXBuildFile; fileRef = FE5C0ADA1162981200065D1C /* O2TTFDecoder.m */; };
FE8EBE7E11658E6200BC0ED6 /* O2Font_ttf.m in Sources */ = {isa = PBXBuildFile; fileRef = FE5C0A6C1162981100065D1C /* O2Font_ttf.m */; };
/* End PBXBuildFile section */
/* Begin PBXBuildRule section */
@ -633,8 +635,8 @@
FE5C0A49116297FA00065D1C /* VGPath.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VGPath.m; sourceTree = "<group>"; };
FE5C0A4D1162981100065D1C /* gif_lib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gif_lib.h; sourceTree = "<group>"; };
FE5C0A4E1162981100065D1C /* gif_lib.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = gif_lib.m; sourceTree = "<group>"; };
FE5C0A4F1162981100065D1C /* NSTIFFImageFileDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSTIFFImageFileDirectory.h; sourceTree = "<group>"; };
FE5C0A501162981100065D1C /* NSTIFFImageFileDirectory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSTIFFImageFileDirectory.m; sourceTree = "<group>"; };
FE5C0A4F1162981100065D1C /* O2TIFFImageDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = O2TIFFImageDirectory.h; sourceTree = "<group>"; };
FE5C0A501162981100065D1C /* O2TIFFImageDirectory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = O2TIFFImageDirectory.m; sourceTree = "<group>"; };
FE5C0A511162981100065D1C /* O2AffineTransform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = O2AffineTransform.h; sourceTree = "<group>"; };
FE5C0A521162981100065D1C /* O2AffineTransform.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = O2AffineTransform.m; sourceTree = "<group>"; };
FE5C0A531162981100065D1C /* O2BitmapContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = O2BitmapContext.h; sourceTree = "<group>"; };
@ -776,11 +778,8 @@
FE5C0ADB1162981200065D1C /* O2zlib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = O2zlib.h; sourceTree = "<group>"; };
FE5C0ADC1162981200065D1C /* O2zlib.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = O2zlib.m; sourceTree = "<group>"; };
FE5C0CA61162A99A00065D1C /* Onyx2D.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Onyx2D.framework; sourceTree = BUILT_PRODUCTS_DIR; };
FE5C0CA71162A99A00065D1C /* Info copy.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info copy.plist"; sourceTree = "<group>"; };
FE5C0D461162A9AB00065D1C /* Onyx2D.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Onyx2D.framework; sourceTree = BUILT_PRODUCTS_DIR; };
FE5C0D471162A9AB00065D1C /* Info copy 2.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info copy 2.plist"; sourceTree = "<group>"; };
FE5C0D571162A9D600065D1C /* Onyx2D.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Onyx2D.framework; sourceTree = BUILT_PRODUCTS_DIR; };
FE5C0D581162A9D600065D1C /* Onyx2D-MacOS-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Onyx2D-MacOS-Info.plist"; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@ -834,8 +833,8 @@
children = (
FE5C0A4D1162981100065D1C /* gif_lib.h */,
FE5C0A4E1162981100065D1C /* gif_lib.m */,
FE5C0A4F1162981100065D1C /* NSTIFFImageFileDirectory.h */,
FE5C0A501162981100065D1C /* NSTIFFImageFileDirectory.m */,
FE5C0A4F1162981100065D1C /* O2TIFFImageDirectory.h */,
FE5C0A501162981100065D1C /* O2TIFFImageDirectory.m */,
FE5C0A511162981100065D1C /* O2AffineTransform.h */,
FE5C0A521162981100065D1C /* O2AffineTransform.m */,
FE5C0A531162981100065D1C /* O2BitmapContext.h */,
@ -983,7 +982,6 @@
089C1665FE841158C02AAC07 /* Resources */,
0867D69AFE84028FC02AAC07 /* External Frameworks and Libraries */,
034768DFFF38A50411DB9C8B /* Products */,
FE5C0D581162A9D600065D1C /* Onyx2D-MacOS-Info.plist */,
);
name = Onyx2D;
sourceTree = "<group>";
@ -1002,8 +1000,6 @@
children = (
8DC2EF5A0486A6940098B216 /* Info.plist */,
089C1666FE841158C02AAC07 /* InfoPlist.strings */,
FE5C0CA71162A99A00065D1C /* Info copy.plist */,
FE5C0D471162A9AB00065D1C /* Info copy 2.plist */,
);
name = Resources;
sourceTree = "<group>";
@ -1041,7 +1037,7 @@
FE5C0A4A116297FA00065D1C /* VGmath.h in Headers */,
FE5C0A4B116297FA00065D1C /* VGPath.h in Headers */,
FE5C0ADD1162981200065D1C /* gif_lib.h in Headers */,
FE5C0ADF1162981200065D1C /* NSTIFFImageFileDirectory.h in Headers */,
FE5C0ADF1162981200065D1C /* O2TIFFImageDirectory.h in Headers */,
FE5C0AE11162981200065D1C /* O2AffineTransform.h in Headers */,
FE5C0AE31162981200065D1C /* O2BitmapContext.h in Headers */,
FE5C0AE51162981200065D1C /* O2Blending.h in Headers */,
@ -1123,7 +1119,7 @@
FE5C0C0A1162A99A00065D1C /* VGmath.h in Headers */,
FE5C0C0B1162A99A00065D1C /* VGPath.h in Headers */,
FE5C0C0C1162A99A00065D1C /* gif_lib.h in Headers */,
FE5C0C0D1162A99A00065D1C /* NSTIFFImageFileDirectory.h in Headers */,
FE5C0C0D1162A99A00065D1C /* O2TIFFImageDirectory.h in Headers */,
FE5C0C0E1162A99A00065D1C /* O2AffineTransform.h in Headers */,
FE5C0C0F1162A99A00065D1C /* O2BitmapContext.h in Headers */,
FE5C0C101162A99A00065D1C /* O2Blending.h in Headers */,
@ -1205,7 +1201,7 @@
FE5C0CAA1162A9AB00065D1C /* VGmath.h in Headers */,
FE5C0CAB1162A9AB00065D1C /* VGPath.h in Headers */,
FE5C0CAC1162A9AB00065D1C /* gif_lib.h in Headers */,
FE5C0CAD1162A9AB00065D1C /* NSTIFFImageFileDirectory.h in Headers */,
FE5C0CAD1162A9AB00065D1C /* O2TIFFImageDirectory.h in Headers */,
FE5C0CAE1162A9AB00065D1C /* O2AffineTransform.h in Headers */,
FE5C0CAF1162A9AB00065D1C /* O2BitmapContext.h in Headers */,
FE5C0CB01162A9AB00065D1C /* O2Blending.h in Headers */,
@ -1285,7 +1281,7 @@
buildActionMask = 2147483647;
files = (
FE5C0D6F1162AEF500065D1C /* gif_lib.h in Headers */,
FE5C0D701162AEF500065D1C /* NSTIFFImageFileDirectory.h in Headers */,
FE5C0D701162AEF500065D1C /* O2TIFFImageDirectory.h in Headers */,
FE5C0D711162AEF500065D1C /* O2AffineTransform.h in Headers */,
FE5C0D721162AEF500065D1C /* O2BitmapContext.h in Headers */,
FE5C0D731162AEF500065D1C /* O2Blending.h in Headers */,
@ -1505,7 +1501,7 @@
files = (
FE5C0A4C116297FA00065D1C /* VGPath.m in Sources */,
FE5C0ADE1162981200065D1C /* gif_lib.m in Sources */,
FE5C0AE01162981200065D1C /* NSTIFFImageFileDirectory.m in Sources */,
FE5C0AE01162981200065D1C /* O2TIFFImageDirectory.m in Sources */,
FE5C0AE21162981200065D1C /* O2AffineTransform.m in Sources */,
FE5C0AE41162981200065D1C /* O2BitmapContext.m in Sources */,
FE5C0AE71162981200065D1C /* O2ClipPhase.m in Sources */,
@ -1582,7 +1578,7 @@
files = (
FE5C0C581162A99A00065D1C /* VGPath.m in Sources */,
FE5C0C591162A99A00065D1C /* gif_lib.m in Sources */,
FE5C0C5A1162A99A00065D1C /* NSTIFFImageFileDirectory.m in Sources */,
FE5C0C5A1162A99A00065D1C /* O2TIFFImageDirectory.m in Sources */,
FE5C0C5B1162A99A00065D1C /* O2AffineTransform.m in Sources */,
FE5C0C5C1162A99A00065D1C /* O2BitmapContext.m in Sources */,
FE5C0C5D1162A99A00065D1C /* O2ClipPhase.m in Sources */,
@ -1659,7 +1655,7 @@
files = (
FE5C0CF81162A9AB00065D1C /* VGPath.m in Sources */,
FE5C0CF91162A9AB00065D1C /* gif_lib.m in Sources */,
FE5C0CFA1162A9AB00065D1C /* NSTIFFImageFileDirectory.m in Sources */,
FE5C0CFA1162A9AB00065D1C /* O2TIFFImageDirectory.m in Sources */,
FE5C0CFB1162A9AB00065D1C /* O2AffineTransform.m in Sources */,
FE5C0CFC1162A9AB00065D1C /* O2BitmapContext.m in Sources */,
FE5C0CFD1162A9AB00065D1C /* O2ClipPhase.m in Sources */,
@ -1735,7 +1731,7 @@
buildActionMask = 2147483647;
files = (
FE5C0DBB1162AF0100065D1C /* gif_lib.m in Sources */,
FE5C0DBC1162AF0100065D1C /* NSTIFFImageFileDirectory.m in Sources */,
FE5C0DBC1162AF0100065D1C /* O2TIFFImageDirectory.m in Sources */,
FE5C0DBD1162AF0100065D1C /* O2AffineTransform.m in Sources */,
FE5C0DBE1162AF0100065D1C /* O2BitmapContext.m in Sources */,
FE5C0DBF1162AF0100065D1C /* O2ClipPhase.m in Sources */,
@ -1804,6 +1800,8 @@
FE5C0DFF1162AF0100065D1C /* O2Surface.m in Sources */,
FE5C0E011162AF0100065D1C /* O2zlib.m in Sources */,
FE5C0E021162AF0100065D1C /* VGPath.m in Sources */,
FE8EBE7B11658E5300BC0ED6 /* O2TTFDecoder.m in Sources */,
FE8EBE7E11658E6200BC0ED6 /* O2Font_ttf.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};

View File

@ -40,35 +40,35 @@
isa = PBXContainerItemProxy;
containerPortal = FE5C0E2E1162E81000065D1C /* Onyx2D.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 8DC2EF5B0486A6940098B216 /* Onyx2D.framework */;
remoteGlobalIDString = 8DC2EF5B0486A6940098B216;
remoteInfo = "Onyx2D-Windows-i386";
};
FE5C0E371162E81000065D1C /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = FE5C0E2E1162E81000065D1C /* Onyx2D.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = FE5C0CA61162A99A00065D1C /* Onyx2D.framework */;
remoteGlobalIDString = FE5C0CA61162A99A00065D1C;
remoteInfo = "Onyx2D-Linux-i386";
};
FE5C0E391162E81000065D1C /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = FE5C0E2E1162E81000065D1C /* Onyx2D.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = FE5C0D461162A9AB00065D1C /* Onyx2D.framework */;
remoteGlobalIDString = FE5C0D461162A9AB00065D1C;
remoteInfo = "Onyx2D-FreeBSD-i386";
};
FE5C0E3B1162E81000065D1C /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = FE5C0E2E1162E81000065D1C /* Onyx2D.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = FE5C0D571162A9D600065D1C /* Onyx2D.framework */;
remoteGlobalIDString = FE5C0D571162A9D600065D1C;
remoteInfo = "Onyx2D-MacOS";
};
FE5C0E3D1162E81800065D1C /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = FE5C0E2E1162E81000065D1C /* Onyx2D.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = FE5C0D561162A9D600065D1C /* Onyx2D-MacOS */;
remoteGlobalIDString = FE5C0D561162A9D600065D1C;
remoteInfo = "Onyx2D-MacOS";
};
/* End PBXContainerItemProxy section */
@ -357,7 +357,7 @@
/System/Library/Frameworks/ApplicationServices.framework/Frameworks,
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
);
FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(DEVELOPER_DIR)/Cocotron/MacOS/Frameworks\"";
FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "/Developer/Cocotron/MacOS/Frameworks\"";
GCC_AUTO_VECTORIZATION = YES;
GCC_C_LANGUAGE_STANDARD = c99;
GCC_ENABLE_CPP_EXCEPTIONS = NO;