move CreateTypefaceFromFile into fonthost porting layer, so we don't force a given port to have mmap access.
update core.proj as some headers have changed location git-svn-id: http://skia.googlecode.com/svn/trunk@43 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
reed@android.com
parent
2b26cac4fd
commit
03ca3d19c4
@ -71,7 +71,13 @@ public:
|
||||
responsible for unref-ing the returned typeface (if it is not null).
|
||||
*/
|
||||
static SkTypeface* CreateTypeface(SkStream*);
|
||||
|
||||
|
||||
/** Return a new typeface from the specified file path. If the file does not
|
||||
represent a valid font, this returns null. If a typeface is returned,
|
||||
the caller is responsible for calling unref() when it is no longer used.
|
||||
*/
|
||||
static SkTypeface* CreateTypefaceFromFile(const char path[]);
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////
|
||||
|
||||
/** Write a unique identifier to the stream, so that the same typeface can
|
||||
|
||||
@ -43,10 +43,9 @@ SkTypeface* SkTypeface::CreateFromStream(SkStream* stream)
|
||||
return SkFontHost::CreateTypeface(stream);
|
||||
}
|
||||
|
||||
#include "SkMMapStream.h"
|
||||
SkTypeface* SkTypeface::CreateFromFile(const char path[])
|
||||
{
|
||||
return SkFontHost::CreateTypeface(SkNEW_ARGS(SkMMAPStream, (path)));
|
||||
return SkFontHost::CreateTypefaceFromFile(path);
|
||||
}
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
@ -23,14 +23,12 @@
|
||||
const char* gDefaultfont = "Arial"; // hard code for now
|
||||
static SkMutex gFTMutex;
|
||||
|
||||
inline SkPoint F32PtToSkPoint(const Float32Point p)
|
||||
{
|
||||
SkPoint sp = { SkFloatToFixed(p.x),SkFloatToFixed(p.y) };
|
||||
static inline SkPoint F32PtToSkPoint(const Float32Point p) {
|
||||
SkPoint sp = { SkFloatToScalar(p.x), SkFloatToScalar(p.y) };
|
||||
return sp;
|
||||
}
|
||||
|
||||
static inline uint32_t _rotl(uint32_t v, uint32_t r)
|
||||
{
|
||||
static inline uint32_t _rotl(uint32_t v, uint32_t r) {
|
||||
return (v << r | v >> (32 - r));
|
||||
}
|
||||
|
||||
@ -341,7 +339,8 @@ void SkScalerContext_Mac::generateAdvance(SkGlyph* glyph) {
|
||||
void SkScalerContext_Mac::generateMetrics(SkGlyph* glyph)
|
||||
{
|
||||
GlyphID glyphID = glyph->fID;
|
||||
ATSGlyphScreenMetrics metrics= { 0 };
|
||||
|
||||
ATSGlyphScreenMetrics metrics;
|
||||
|
||||
glyph->fRsbDelta = 0;
|
||||
glyph->fLsbDelta = 0;
|
||||
@ -349,18 +348,22 @@ void SkScalerContext_Mac::generateMetrics(SkGlyph* glyph)
|
||||
OSStatus err = ATSUGlyphGetScreenMetrics(fStyle,1,&glyphID,0,true,true,&metrics);
|
||||
if (err == noErr) {
|
||||
glyph->fAdvanceX = SkFloatToFixed(metrics.deviceAdvance.x);
|
||||
glyph->fAdvanceY = SkFloatToFixed(metrics.deviceAdvance.y);
|
||||
//glyph->fWidth = metrics.width;
|
||||
//glyph->fHeight = metrics.height;
|
||||
glyph->fWidth = metrics.width + ceil(metrics.sideBearing.x - metrics.otherSideBearing.x);
|
||||
glyph->fHeight = metrics.height + ceil(metrics.sideBearing.y - metrics.otherSideBearing.y) + 1;
|
||||
|
||||
glyph->fTop = -metrics.topLeft.y;
|
||||
glyph->fLeft = metrics.topLeft.x;
|
||||
glyph->fAdvanceY = -SkFloatToFixed(metrics.deviceAdvance.y);
|
||||
glyph->fWidth = metrics.width;
|
||||
glyph->fHeight = metrics.height;
|
||||
glyph->fTop = -SkFloatToFixed(metrics.topLeft.y);
|
||||
glyph->fLeft = SkFloatToFixed(metrics.topLeft.x);
|
||||
}
|
||||
}
|
||||
|
||||
void SkScalerContext_Mac::generateFontMetrics(SkPaint::FontMetrics* mx, SkPaint::FontMetrics* my) {
|
||||
#if 0
|
||||
OSStatus ATSFontGetVerticalMetrics (
|
||||
ATSFontRef iFont,
|
||||
ATSOptionFlags iOptions,
|
||||
ATSFontMetrics *oMetrics
|
||||
);
|
||||
#endif
|
||||
//SkASSERT(false);
|
||||
if (mx)
|
||||
memset(mx, 0, sizeof(SkPaint::FontMetrics));
|
||||
@ -448,9 +451,13 @@ OSStatus SkScalerContext_Mac::Line(const Float32Point *pt, void *cb)
|
||||
return noErr;
|
||||
}
|
||||
|
||||
OSStatus SkScalerContext_Mac::Curve(const Float32Point *pt1, const Float32Point *pt2, const Float32Point *pt3, void *cb)
|
||||
OSStatus SkScalerContext_Mac::Curve(const Float32Point *pt1,
|
||||
const Float32Point *pt2,
|
||||
const Float32Point *pt3, void *cb)
|
||||
{
|
||||
reinterpret_cast<SkPath*>(cb)->cubicTo(F32PtToSkPoint(*pt1),F32PtToSkPoint(*pt2),F32PtToSkPoint(*pt3));
|
||||
reinterpret_cast<SkPath*>(cb)->cubicTo(F32PtToSkPoint(*pt1),
|
||||
F32PtToSkPoint(*pt2),
|
||||
F32PtToSkPoint(*pt3));
|
||||
return noErr;
|
||||
}
|
||||
|
||||
@ -472,12 +479,18 @@ SkTypeface* SkFontHost::Deserialize(SkStream* stream) {
|
||||
}
|
||||
|
||||
SkTypeface* SkFontHost::CreateTypeface(SkStream* stream) {
|
||||
|
||||
|
||||
//Should not be used on Mac, keep linker happy
|
||||
SkASSERT(false);
|
||||
return CreateTypeface_(gDefaultfont,SkTypeface::kNormal);
|
||||
}
|
||||
|
||||
SkTypeface* SkFontHost::CreateTypefaceFromFile(const char path[]) {
|
||||
// TODO
|
||||
SkASSERT(false);
|
||||
return CreateTypeface_(gDefaultfont,SkTypeface::kNormal);
|
||||
}
|
||||
|
||||
SkScalerContext* SkFontHost::CreateScalerContext(const SkDescriptor* desc)
|
||||
{
|
||||
return new SkScalerContext_Mac(desc);
|
||||
|
||||
@ -13,7 +13,6 @@
|
||||
005F25700EF94F7900582A90 /* Sk64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 005F24F70EF94F7900582A90 /* Sk64.cpp */; };
|
||||
005F25710EF94F7900582A90 /* SkAlphaRuns.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 005F24F80EF94F7900582A90 /* SkAlphaRuns.cpp */; };
|
||||
005F25720EF94F7900582A90 /* SkAntiRun.h in Headers */ = {isa = PBXBuildFile; fileRef = 005F24F90EF94F7900582A90 /* SkAntiRun.h */; };
|
||||
005F25730EF94F7900582A90 /* SkAutoKern.h in Headers */ = {isa = PBXBuildFile; fileRef = 005F24FA0EF94F7900582A90 /* SkAutoKern.h */; };
|
||||
005F25740EF94F7900582A90 /* SkBitmap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 005F24FB0EF94F7900582A90 /* SkBitmap.cpp */; };
|
||||
005F25750EF94F7900582A90 /* SkBitmap_scroll.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 005F24FC0EF94F7900582A90 /* SkBitmap_scroll.cpp */; };
|
||||
005F25760EF94F7900582A90 /* SkBitmapProcShader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 005F24FD0EF94F7900582A90 /* SkBitmapProcShader.cpp */; };
|
||||
@ -35,7 +34,6 @@
|
||||
005F25860EF94F7900582A90 /* SkBlitRow_D16.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 005F250D0EF94F7900582A90 /* SkBlitRow_D16.cpp */; };
|
||||
005F25870EF94F7900582A90 /* SkBlitRow_D4444.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 005F250E0EF94F7900582A90 /* SkBlitRow_D4444.cpp */; };
|
||||
005F25880EF94F7900582A90 /* SkBlitter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 005F250F0EF94F7900582A90 /* SkBlitter.cpp */; };
|
||||
005F25890EF94F7900582A90 /* SkBlitter.h in Headers */ = {isa = PBXBuildFile; fileRef = 005F25100EF94F7900582A90 /* SkBlitter.h */; };
|
||||
005F258A0EF94F7900582A90 /* SkBlitter_4444.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 005F25110EF94F7900582A90 /* SkBlitter_4444.cpp */; };
|
||||
005F258B0EF94F7900582A90 /* SkBlitter_A1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 005F25120EF94F7900582A90 /* SkBlitter_A1.cpp */; };
|
||||
005F258C0EF94F7900582A90 /* SkBlitter_A8.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 005F25130EF94F7900582A90 /* SkBlitter_A8.cpp */; };
|
||||
@ -68,7 +66,6 @@
|
||||
005F25A70EF94F7900582A90 /* SkFloatBits.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 005F252E0EF94F7900582A90 /* SkFloatBits.cpp */; };
|
||||
005F25A80EF94F7900582A90 /* SkFP.h in Headers */ = {isa = PBXBuildFile; fileRef = 005F252F0EF94F7900582A90 /* SkFP.h */; };
|
||||
005F25A90EF94F7900582A90 /* SkGeometry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 005F25300EF94F7900582A90 /* SkGeometry.cpp */; };
|
||||
005F25AA0EF94F7900582A90 /* SkGeometry.h in Headers */ = {isa = PBXBuildFile; fileRef = 005F25310EF94F7900582A90 /* SkGeometry.h */; };
|
||||
005F25AB0EF94F7900582A90 /* SkGlobals.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 005F25320EF94F7900582A90 /* SkGlobals.cpp */; };
|
||||
005F25AC0EF94F7900582A90 /* SkGlyphCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 005F25330EF94F7900582A90 /* SkGlyphCache.cpp */; };
|
||||
005F25AD0EF94F7900582A90 /* SkGlyphCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 005F25340EF94F7900582A90 /* SkGlyphCache.h */; };
|
||||
@ -104,7 +101,6 @@
|
||||
005F25CD0EF94F7900582A90 /* SkRegionPriv.h in Headers */ = {isa = PBXBuildFile; fileRef = 005F25540EF94F7900582A90 /* SkRegionPriv.h */; };
|
||||
005F25CE0EF94F7900582A90 /* SkScalerContext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 005F25550EF94F7900582A90 /* SkScalerContext.cpp */; };
|
||||
005F25CF0EF94F7900582A90 /* SkScan.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 005F25560EF94F7900582A90 /* SkScan.cpp */; };
|
||||
005F25D00EF94F7900582A90 /* SkScan.h in Headers */ = {isa = PBXBuildFile; fileRef = 005F25570EF94F7900582A90 /* SkScan.h */; };
|
||||
005F25D10EF94F7900582A90 /* SkScan_Antihair.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 005F25580EF94F7900582A90 /* SkScan_Antihair.cpp */; };
|
||||
005F25D20EF94F7900582A90 /* SkScan_AntiPath.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 005F25590EF94F7900582A90 /* SkScan_AntiPath.cpp */; };
|
||||
005F25D30EF94F7900582A90 /* SkScan_Hairline.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 005F255A0EF94F7900582A90 /* SkScan_Hairline.cpp */; };
|
||||
@ -138,7 +134,6 @@
|
||||
005F24F70EF94F7900582A90 /* Sk64.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Sk64.cpp; path = ../../src/core/Sk64.cpp; sourceTree = SOURCE_ROOT; };
|
||||
005F24F80EF94F7900582A90 /* SkAlphaRuns.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SkAlphaRuns.cpp; path = ../../src/core/SkAlphaRuns.cpp; sourceTree = SOURCE_ROOT; };
|
||||
005F24F90EF94F7900582A90 /* SkAntiRun.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SkAntiRun.h; path = ../../src/core/SkAntiRun.h; sourceTree = SOURCE_ROOT; };
|
||||
005F24FA0EF94F7900582A90 /* SkAutoKern.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SkAutoKern.h; path = ../../src/core/SkAutoKern.h; sourceTree = SOURCE_ROOT; };
|
||||
005F24FB0EF94F7900582A90 /* SkBitmap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SkBitmap.cpp; path = ../../src/core/SkBitmap.cpp; sourceTree = SOURCE_ROOT; };
|
||||
005F24FC0EF94F7900582A90 /* SkBitmap_scroll.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SkBitmap_scroll.cpp; path = ../../src/core/SkBitmap_scroll.cpp; sourceTree = SOURCE_ROOT; };
|
||||
005F24FD0EF94F7900582A90 /* SkBitmapProcShader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SkBitmapProcShader.cpp; path = ../../src/core/SkBitmapProcShader.cpp; sourceTree = SOURCE_ROOT; };
|
||||
@ -160,7 +155,6 @@
|
||||
005F250D0EF94F7900582A90 /* SkBlitRow_D16.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SkBlitRow_D16.cpp; path = ../../src/core/SkBlitRow_D16.cpp; sourceTree = SOURCE_ROOT; };
|
||||
005F250E0EF94F7900582A90 /* SkBlitRow_D4444.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SkBlitRow_D4444.cpp; path = ../../src/core/SkBlitRow_D4444.cpp; sourceTree = SOURCE_ROOT; };
|
||||
005F250F0EF94F7900582A90 /* SkBlitter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SkBlitter.cpp; path = ../../src/core/SkBlitter.cpp; sourceTree = SOURCE_ROOT; };
|
||||
005F25100EF94F7900582A90 /* SkBlitter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SkBlitter.h; path = ../../src/core/SkBlitter.h; sourceTree = SOURCE_ROOT; };
|
||||
005F25110EF94F7900582A90 /* SkBlitter_4444.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SkBlitter_4444.cpp; path = ../../src/core/SkBlitter_4444.cpp; sourceTree = SOURCE_ROOT; };
|
||||
005F25120EF94F7900582A90 /* SkBlitter_A1.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SkBlitter_A1.cpp; path = ../../src/core/SkBlitter_A1.cpp; sourceTree = SOURCE_ROOT; };
|
||||
005F25130EF94F7900582A90 /* SkBlitter_A8.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SkBlitter_A8.cpp; path = ../../src/core/SkBlitter_A8.cpp; sourceTree = SOURCE_ROOT; };
|
||||
@ -193,7 +187,6 @@
|
||||
005F252E0EF94F7900582A90 /* SkFloatBits.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SkFloatBits.cpp; path = ../../src/core/SkFloatBits.cpp; sourceTree = SOURCE_ROOT; };
|
||||
005F252F0EF94F7900582A90 /* SkFP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SkFP.h; path = ../../src/core/SkFP.h; sourceTree = SOURCE_ROOT; };
|
||||
005F25300EF94F7900582A90 /* SkGeometry.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SkGeometry.cpp; path = ../../src/core/SkGeometry.cpp; sourceTree = SOURCE_ROOT; };
|
||||
005F25310EF94F7900582A90 /* SkGeometry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SkGeometry.h; path = ../../src/core/SkGeometry.h; sourceTree = SOURCE_ROOT; };
|
||||
005F25320EF94F7900582A90 /* SkGlobals.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SkGlobals.cpp; path = ../../src/core/SkGlobals.cpp; sourceTree = SOURCE_ROOT; };
|
||||
005F25330EF94F7900582A90 /* SkGlyphCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SkGlyphCache.cpp; path = ../../src/core/SkGlyphCache.cpp; sourceTree = SOURCE_ROOT; };
|
||||
005F25340EF94F7900582A90 /* SkGlyphCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SkGlyphCache.h; path = ../../src/core/SkGlyphCache.h; sourceTree = SOURCE_ROOT; };
|
||||
@ -229,7 +222,6 @@
|
||||
005F25540EF94F7900582A90 /* SkRegionPriv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SkRegionPriv.h; path = ../../src/core/SkRegionPriv.h; sourceTree = SOURCE_ROOT; };
|
||||
005F25550EF94F7900582A90 /* SkScalerContext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SkScalerContext.cpp; path = ../../src/core/SkScalerContext.cpp; sourceTree = SOURCE_ROOT; };
|
||||
005F25560EF94F7900582A90 /* SkScan.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SkScan.cpp; path = ../../src/core/SkScan.cpp; sourceTree = SOURCE_ROOT; };
|
||||
005F25570EF94F7900582A90 /* SkScan.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SkScan.h; path = ../../src/core/SkScan.h; sourceTree = SOURCE_ROOT; };
|
||||
005F25580EF94F7900582A90 /* SkScan_Antihair.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SkScan_Antihair.cpp; path = ../../src/core/SkScan_Antihair.cpp; sourceTree = SOURCE_ROOT; };
|
||||
005F25590EF94F7900582A90 /* SkScan_AntiPath.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SkScan_AntiPath.cpp; path = ../../src/core/SkScan_AntiPath.cpp; sourceTree = SOURCE_ROOT; };
|
||||
005F255A0EF94F7900582A90 /* SkScan_Hairline.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SkScan_Hairline.cpp; path = ../../src/core/SkScan_Hairline.cpp; sourceTree = SOURCE_ROOT; };
|
||||
@ -288,7 +280,6 @@
|
||||
005F24F70EF94F7900582A90 /* Sk64.cpp */,
|
||||
005F24F80EF94F7900582A90 /* SkAlphaRuns.cpp */,
|
||||
005F24F90EF94F7900582A90 /* SkAntiRun.h */,
|
||||
005F24FA0EF94F7900582A90 /* SkAutoKern.h */,
|
||||
005F24FB0EF94F7900582A90 /* SkBitmap.cpp */,
|
||||
005F24FC0EF94F7900582A90 /* SkBitmap_scroll.cpp */,
|
||||
005F24FD0EF94F7900582A90 /* SkBitmapProcShader.cpp */,
|
||||
@ -310,7 +301,6 @@
|
||||
005F250D0EF94F7900582A90 /* SkBlitRow_D16.cpp */,
|
||||
005F250E0EF94F7900582A90 /* SkBlitRow_D4444.cpp */,
|
||||
005F250F0EF94F7900582A90 /* SkBlitter.cpp */,
|
||||
005F25100EF94F7900582A90 /* SkBlitter.h */,
|
||||
005F25110EF94F7900582A90 /* SkBlitter_4444.cpp */,
|
||||
005F25120EF94F7900582A90 /* SkBlitter_A1.cpp */,
|
||||
005F25130EF94F7900582A90 /* SkBlitter_A8.cpp */,
|
||||
@ -343,7 +333,6 @@
|
||||
005F252E0EF94F7900582A90 /* SkFloatBits.cpp */,
|
||||
005F252F0EF94F7900582A90 /* SkFP.h */,
|
||||
005F25300EF94F7900582A90 /* SkGeometry.cpp */,
|
||||
005F25310EF94F7900582A90 /* SkGeometry.h */,
|
||||
005F25320EF94F7900582A90 /* SkGlobals.cpp */,
|
||||
005F25330EF94F7900582A90 /* SkGlyphCache.cpp */,
|
||||
005F25340EF94F7900582A90 /* SkGlyphCache.h */,
|
||||
@ -379,7 +368,6 @@
|
||||
005F25540EF94F7900582A90 /* SkRegionPriv.h */,
|
||||
005F25550EF94F7900582A90 /* SkScalerContext.cpp */,
|
||||
005F25560EF94F7900582A90 /* SkScan.cpp */,
|
||||
005F25570EF94F7900582A90 /* SkScan.h */,
|
||||
005F25580EF94F7900582A90 /* SkScan_Antihair.cpp */,
|
||||
005F25590EF94F7900582A90 /* SkScan_AntiPath.cpp */,
|
||||
005F255A0EF94F7900582A90 /* SkScan_Hairline.cpp */,
|
||||
@ -431,7 +419,6 @@
|
||||
files = (
|
||||
005F256F0EF94F7900582A90 /* ARGB32_Clamp_Bilinear_BitmapShader.h in Headers */,
|
||||
005F25720EF94F7900582A90 /* SkAntiRun.h in Headers */,
|
||||
005F25730EF94F7900582A90 /* SkAutoKern.h in Headers */,
|
||||
005F25770EF94F7900582A90 /* SkBitmapProcShader.h in Headers */,
|
||||
005F25790EF94F7900582A90 /* SkBitmapProcState.h in Headers */,
|
||||
005F257A0EF94F7900582A90 /* SkBitmapProcState_matrix.h in Headers */,
|
||||
@ -443,7 +430,6 @@
|
||||
005F25830EF94F7900582A90 /* SkBitmapShaderTemplate.h in Headers */,
|
||||
005F25840EF94F7900582A90 /* SkBlitBWMaskTemplate.h in Headers */,
|
||||
005F25850EF94F7900582A90 /* SkBlitRow.h in Headers */,
|
||||
005F25890EF94F7900582A90 /* SkBlitter.h in Headers */,
|
||||
005F25970EF94F7900582A90 /* SkCordic.h in Headers */,
|
||||
005F25980EF94F7900582A90 /* SkCoreBlitters.h in Headers */,
|
||||
005F259F0EF94F7900582A90 /* SkDrawProcs.h in Headers */,
|
||||
@ -451,14 +437,12 @@
|
||||
005F25A30EF94F7900582A90 /* SkFilterProc.h in Headers */,
|
||||
005F25A60EF94F7900582A90 /* SkFloat.h in Headers */,
|
||||
005F25A80EF94F7900582A90 /* SkFP.h in Headers */,
|
||||
005F25AA0EF94F7900582A90 /* SkGeometry.h in Headers */,
|
||||
005F25AD0EF94F7900582A90 /* SkGlyphCache.h in Headers */,
|
||||
005F25BB0EF94F7900582A90 /* SkPathHeap.h in Headers */,
|
||||
005F25BF0EF94F7900582A90 /* SkPictureFlat.h in Headers */,
|
||||
005F25C10EF94F7900582A90 /* SkPicturePlayback.h in Headers */,
|
||||
005F25C30EF94F7900582A90 /* SkPictureRecord.h in Headers */,
|
||||
005F25CD0EF94F7900582A90 /* SkRegionPriv.h in Headers */,
|
||||
005F25D00EF94F7900582A90 /* SkScan.h in Headers */,
|
||||
005F25D50EF94F7900582A90 /* SkScanPriv.h in Headers */,
|
||||
005F25D70EF94F7900582A90 /* SkSinTable.h in Headers */,
|
||||
005F25D80EF94F7900582A90 /* SkSpriteBlitter.h in Headers */,
|
||||
@ -495,6 +479,7 @@
|
||||
08FB7793FE84155DC02AAC07 /* Project object */ = {
|
||||
isa = PBXProject;
|
||||
buildConfigurationList = 1DEB91EF08733DB70010E9CD /* Build configuration list for PBXProject "core" */;
|
||||
compatibilityVersion = "Xcode 2.4";
|
||||
hasScannedForEncodings = 1;
|
||||
mainGroup = 08FB7794FE84155DC02AAC07 /* core */;
|
||||
projectDirPath = "";
|
||||
|
||||
@ -186,6 +186,7 @@
|
||||
20286C28FDCF999611CA2CEA /* Project object */ = {
|
||||
isa = PBXProject;
|
||||
buildConfigurationList = 01E2163D09EDAC6600E66AF8 /* Build configuration list for PBXProject "CICarbonSample" */;
|
||||
compatibilityVersion = "Xcode 2.4";
|
||||
hasScannedForEncodings = 1;
|
||||
mainGroup = 20286C29FDCF999611CA2CEA /* CICarbonSample */;
|
||||
projectDirPath = "";
|
||||
|
||||
@ -280,6 +280,7 @@
|
||||
20286C28FDCF999611CA2CEA /* Project object */ = {
|
||||
isa = PBXProject;
|
||||
buildConfigurationList = 01E2163D09EDAC6600E66AF8 /* Build configuration list for PBXProject "SampleApp" */;
|
||||
compatibilityVersion = "Xcode 2.4";
|
||||
hasScannedForEncodings = 1;
|
||||
mainGroup = 20286C29FDCF999611CA2CEA /* CICarbonSample */;
|
||||
projectDirPath = "";
|
||||
|
||||
Loading…
Reference in New Issue
Block a user