diff options
-rw-r--r-- | samplecode/SamplePicture.cpp | 1 | ||||
-rw-r--r-- | samplecode/SamplePoints.cpp | 1 | ||||
-rw-r--r-- | samplecode/SampleShaders.cpp | 2 | ||||
-rw-r--r-- | samplecode/SampleStrokeText.cpp | 1 | ||||
-rw-r--r-- | samplecode/SampleText.cpp | 3 | ||||
-rw-r--r-- | samplecode/SampleTextAlpha.cpp | 1 | ||||
-rw-r--r-- | samplecode/SampleTextEffects.cpp | 1 | ||||
-rw-r--r-- | samplecode/SampleTextOnPath.cpp | 1 | ||||
-rw-r--r-- | samplecode/SampleTiling.cpp | 1 | ||||
-rw-r--r-- | samplecode/SampleTypeface.cpp | 1 | ||||
-rw-r--r-- | samplecode/SampleVertices.cpp | 1 | ||||
-rw-r--r-- | samplecode/SampleXfermodes.cpp | 1 | ||||
-rwxr-xr-x | src/ports/SkFontHost_mac.cpp | 1 | ||||
-rw-r--r-- | xcode/sampleapp/SampleApp.xcodeproj/project.pbxproj | 54 |
14 files changed, 56 insertions, 14 deletions
diff --git a/samplecode/SamplePicture.cpp b/samplecode/SamplePicture.cpp index 48de7dfdcb..dfc155566c 100644 --- a/samplecode/SamplePicture.cpp +++ b/samplecode/SamplePicture.cpp @@ -12,7 +12,6 @@ #include "SkRegion.h" #include "SkShader.h" #include "SkUtils.h" -#include "SkShaderExtras.h" #include "SkColorPriv.h" #include "SkColorFilter.h" #include "SkTime.h" diff --git a/samplecode/SamplePoints.cpp b/samplecode/SamplePoints.cpp index 2c19658355..7dc98f354f 100644 --- a/samplecode/SamplePoints.cpp +++ b/samplecode/SamplePoints.cpp @@ -11,7 +11,6 @@ #include "SkRegion.h" #include "SkShader.h" #include "SkUtils.h" -#include "SkShaderExtras.h" #include "SkColorPriv.h" #include "SkColorFilter.h" #include "SkTime.h" diff --git a/samplecode/SampleShaders.cpp b/samplecode/SampleShaders.cpp index 4d82182846..f5ddca9a76 100644 --- a/samplecode/SampleShaders.cpp +++ b/samplecode/SampleShaders.cpp @@ -10,7 +10,7 @@ #include "SkShader.h" #include "SkUtils.h" #include "SkXfermode.h" -#include "SkShaderExtras.h" +#include "SkComposeShader.h" #include "SkColorPriv.h" #include "SkColorFilter.h" #include "SkTime.h" diff --git a/samplecode/SampleStrokeText.cpp b/samplecode/SampleStrokeText.cpp index 8b78585939..0627d51e97 100644 --- a/samplecode/SampleStrokeText.cpp +++ b/samplecode/SampleStrokeText.cpp @@ -11,7 +11,6 @@ #include "SkRegion.h" #include "SkShader.h" #include "SkUtils.h" -#include "SkShaderExtras.h" #include "SkColorPriv.h" #include "SkColorFilter.h" #include "SkTime.h" diff --git a/samplecode/SampleText.cpp b/samplecode/SampleText.cpp index 9fc3708ba1..60e015aa5f 100644 --- a/samplecode/SampleText.cpp +++ b/samplecode/SampleText.cpp @@ -11,7 +11,6 @@ #include "SkRegion.h" #include "SkShader.h" #include "SkUtils.h" -#include "SkShaderExtras.h" #include "SkColorPriv.h" #include "SkColorFilter.h" #include "SkTime.h" @@ -96,9 +95,11 @@ static void test_typefaceCache() SkTypeface* t2 = SkTypeface::Create("arial", SkTypeface::kNormal); SkTypeface* t3 = SkTypeface::Create("helvetica", SkTypeface::kItalic); +#ifndef SK_BUILD_FOR_MAC SkASSERT(t0 == t1); SkASSERT(t0 == t2); SkASSERT(t0 == t3); +#endif } static void test_breakText() diff --git a/samplecode/SampleTextAlpha.cpp b/samplecode/SampleTextAlpha.cpp index f2a653064b..d695f235d3 100644 --- a/samplecode/SampleTextAlpha.cpp +++ b/samplecode/SampleTextAlpha.cpp @@ -12,7 +12,6 @@ #include "SkShader.h" #include "SkUtils.h" #include "SkXfermode.h" -#include "SkShaderExtras.h" #include "SkColorPriv.h" #include "SkColorFilter.h" #include "SkTime.h" diff --git a/samplecode/SampleTextEffects.cpp b/samplecode/SampleTextEffects.cpp index e33534359e..2293a043ae 100644 --- a/samplecode/SampleTextEffects.cpp +++ b/samplecode/SampleTextEffects.cpp @@ -6,7 +6,6 @@ #include "SkRegion.h" #include "SkShader.h" #include "SkUtils.h" -#include "SkShaderExtras.h" #include "SkColorPriv.h" #include "SkColorFilter.h" #include "SkTypeface.h" diff --git a/samplecode/SampleTextOnPath.cpp b/samplecode/SampleTextOnPath.cpp index 382b4d9d6e..97b4e8e340 100644 --- a/samplecode/SampleTextOnPath.cpp +++ b/samplecode/SampleTextOnPath.cpp @@ -11,7 +11,6 @@ #include "SkRegion.h" #include "SkShader.h" #include "SkUtils.h" -#include "SkShaderExtras.h" #include "SkColorPriv.h" #include "SkColorFilter.h" #include "SkTypeface.h" diff --git a/samplecode/SampleTiling.cpp b/samplecode/SampleTiling.cpp index 559d9d4914..759c17ca7d 100644 --- a/samplecode/SampleTiling.cpp +++ b/samplecode/SampleTiling.cpp @@ -12,7 +12,6 @@ // effects #include "SkGradientShader.h" -#include "SkShaderExtras.h" #include "SkUnitMappers.h" #include "SkBlurDrawLooper.h" diff --git a/samplecode/SampleTypeface.cpp b/samplecode/SampleTypeface.cpp index e78c52555b..94023b73ac 100644 --- a/samplecode/SampleTypeface.cpp +++ b/samplecode/SampleTypeface.cpp @@ -6,7 +6,6 @@ #include "SkRegion.h" #include "SkShader.h" #include "SkUtils.h" -#include "SkShaderExtras.h" #include "Sk1DPathEffect.h" #include "SkCornerPathEffect.h" #include "SkPathMeasure.h" diff --git a/samplecode/SampleVertices.cpp b/samplecode/SampleVertices.cpp index 54dada26a2..637c66182b 100644 --- a/samplecode/SampleVertices.cpp +++ b/samplecode/SampleVertices.cpp @@ -11,7 +11,6 @@ #include "SkShader.h" #include "SkUtils.h" #include "SkXfermode.h" -#include "SkShaderExtras.h" #include "SkColorPriv.h" #include "SkColorFilter.h" #include "SkTime.h" diff --git a/samplecode/SampleXfermodes.cpp b/samplecode/SampleXfermodes.cpp index 5a05fc8868..1dbfc95605 100644 --- a/samplecode/SampleXfermodes.cpp +++ b/samplecode/SampleXfermodes.cpp @@ -12,7 +12,6 @@ #include "SkRegion.h" #include "SkShader.h" #include "SkUtils.h" -#include "SkShaderExtras.h" #include "SkColorPriv.h" #include "SkColorFilter.h" #include "SkTime.h" diff --git a/src/ports/SkFontHost_mac.cpp b/src/ports/SkFontHost_mac.cpp index 1720e10677..4f51dea9da 100755 --- a/src/ports/SkFontHost_mac.cpp +++ b/src/ports/SkFontHost_mac.cpp @@ -491,7 +491,6 @@ SkTypeface* SkFontHost::CreateTypeface(SkStream* stream) { SkTypeface* SkFontHost::CreateTypefaceFromFile(const char path[]) { // TODO - SkASSERT(false); return CreateTypeface_(gDefaultfont,SkTypeface::kNormal); } diff --git a/xcode/sampleapp/SampleApp.xcodeproj/project.pbxproj b/xcode/sampleapp/SampleApp.xcodeproj/project.pbxproj index ce1d857f00..f37421b5bf 100644 --- a/xcode/sampleapp/SampleApp.xcodeproj/project.pbxproj +++ b/xcode/sampleapp/SampleApp.xcodeproj/project.pbxproj @@ -54,6 +54,19 @@ 0041CE480F00A12400695E8C /* SampleOverflow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0041CE320F00A12400695E8C /* SampleOverflow.cpp */; }; 0041CE4A0F00A12400695E8C /* SamplePatch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0041CE340F00A12400695E8C /* SamplePatch.cpp */; }; 007A7BE40F01424500A2D6EE /* SkImageDecoder_CG.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 007A7BE30F01424500A2D6EE /* SkImageDecoder_CG.cpp */; }; + 007A7CB30F01658C00A2D6EE /* SamplePicture.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 007A7CA40F01658C00A2D6EE /* SamplePicture.cpp */; }; + 007A7CB40F01658C00A2D6EE /* SamplePoints.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 007A7CA50F01658C00A2D6EE /* SamplePoints.cpp */; }; + 007A7CB60F01658C00A2D6EE /* SampleRegion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 007A7CA70F01658C00A2D6EE /* SampleRegion.cpp */; }; + 007A7CB70F01658C00A2D6EE /* SampleShaders.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 007A7CA80F01658C00A2D6EE /* SampleShaders.cpp */; }; + 007A7CB80F01658C00A2D6EE /* SampleStrokeText.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 007A7CA90F01658C00A2D6EE /* SampleStrokeText.cpp */; }; + 007A7CBA0F01658C00A2D6EE /* SampleText.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 007A7CAB0F01658C00A2D6EE /* SampleText.cpp */; }; + 007A7CBB0F01658C00A2D6EE /* SampleTextAlpha.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 007A7CAC0F01658C00A2D6EE /* SampleTextAlpha.cpp */; }; + 007A7CBC0F01658C00A2D6EE /* SampleTextEffects.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 007A7CAD0F01658C00A2D6EE /* SampleTextEffects.cpp */; }; + 007A7CBD0F01658C00A2D6EE /* SampleTextOnPath.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 007A7CAE0F01658C00A2D6EE /* SampleTextOnPath.cpp */; }; + 007A7CBE0F01658C00A2D6EE /* SampleTiling.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 007A7CAF0F01658C00A2D6EE /* SampleTiling.cpp */; }; + 007A7CBF0F01658C00A2D6EE /* SampleTypeface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 007A7CB00F01658C00A2D6EE /* SampleTypeface.cpp */; }; + 007A7CC00F01658C00A2D6EE /* SampleVertices.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 007A7CB10F01658C00A2D6EE /* SampleVertices.cpp */; }; + 007A7CC10F01658C00A2D6EE /* SampleXfermodes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 007A7CB20F01658C00A2D6EE /* SampleXfermodes.cpp */; }; 00A41E4B0EFC312F00C9CBEB /* SampleArc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00A41E4A0EFC312F00C9CBEB /* SampleArc.cpp */; }; 0156F80407C56A3000C6122B /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0156F80307C56A3000C6122B /* Foundation.framework */; }; 01FC44D507BD3BB800D228F4 /* Quartz.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 01FC44D407BD3BB800D228F4 /* Quartz.framework */; }; @@ -156,6 +169,19 @@ 0041CE320F00A12400695E8C /* SampleOverflow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SampleOverflow.cpp; path = ../../samplecode/SampleOverflow.cpp; sourceTree = SOURCE_ROOT; }; 0041CE340F00A12400695E8C /* SamplePatch.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SamplePatch.cpp; path = ../../samplecode/SamplePatch.cpp; sourceTree = SOURCE_ROOT; }; 007A7BE30F01424500A2D6EE /* SkImageDecoder_CG.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SkImageDecoder_CG.cpp; path = ../../src/ports/SkImageDecoder_CG.cpp; sourceTree = SOURCE_ROOT; }; + 007A7CA40F01658C00A2D6EE /* SamplePicture.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SamplePicture.cpp; path = ../../samplecode/SamplePicture.cpp; sourceTree = SOURCE_ROOT; }; + 007A7CA50F01658C00A2D6EE /* SamplePoints.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SamplePoints.cpp; path = ../../samplecode/SamplePoints.cpp; sourceTree = SOURCE_ROOT; }; + 007A7CA70F01658C00A2D6EE /* SampleRegion.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SampleRegion.cpp; path = ../../samplecode/SampleRegion.cpp; sourceTree = SOURCE_ROOT; }; + 007A7CA80F01658C00A2D6EE /* SampleShaders.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SampleShaders.cpp; path = ../../samplecode/SampleShaders.cpp; sourceTree = SOURCE_ROOT; }; + 007A7CA90F01658C00A2D6EE /* SampleStrokeText.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SampleStrokeText.cpp; path = ../../samplecode/SampleStrokeText.cpp; sourceTree = SOURCE_ROOT; }; + 007A7CAB0F01658C00A2D6EE /* SampleText.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SampleText.cpp; path = ../../samplecode/SampleText.cpp; sourceTree = SOURCE_ROOT; }; + 007A7CAC0F01658C00A2D6EE /* SampleTextAlpha.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SampleTextAlpha.cpp; path = ../../samplecode/SampleTextAlpha.cpp; sourceTree = SOURCE_ROOT; }; + 007A7CAD0F01658C00A2D6EE /* SampleTextEffects.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SampleTextEffects.cpp; path = ../../samplecode/SampleTextEffects.cpp; sourceTree = SOURCE_ROOT; }; + 007A7CAE0F01658C00A2D6EE /* SampleTextOnPath.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SampleTextOnPath.cpp; path = ../../samplecode/SampleTextOnPath.cpp; sourceTree = SOURCE_ROOT; }; + 007A7CAF0F01658C00A2D6EE /* SampleTiling.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SampleTiling.cpp; path = ../../samplecode/SampleTiling.cpp; sourceTree = SOURCE_ROOT; }; + 007A7CB00F01658C00A2D6EE /* SampleTypeface.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SampleTypeface.cpp; path = ../../samplecode/SampleTypeface.cpp; sourceTree = SOURCE_ROOT; }; + 007A7CB10F01658C00A2D6EE /* SampleVertices.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SampleVertices.cpp; path = ../../samplecode/SampleVertices.cpp; sourceTree = SOURCE_ROOT; }; + 007A7CB20F01658C00A2D6EE /* SampleXfermodes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SampleXfermodes.cpp; path = ../../samplecode/SampleXfermodes.cpp; sourceTree = SOURCE_ROOT; }; 00A41E4A0EFC312F00C9CBEB /* SampleArc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SampleArc.cpp; path = ../../samplecode/SampleArc.cpp; sourceTree = SOURCE_ROOT; }; 0156F80307C56A3000C6122B /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; }; 01FC44D407BD3BB800D228F4 /* Quartz.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Quartz.framework; path = /System/Library/Frameworks/Quartz.framework; sourceTree = "<absolute>"; }; @@ -189,6 +215,19 @@ 00003C610EFC2287000FF73A /* samples */ = { isa = PBXGroup; children = ( + 007A7CA40F01658C00A2D6EE /* SamplePicture.cpp */, + 007A7CA50F01658C00A2D6EE /* SamplePoints.cpp */, + 007A7CA70F01658C00A2D6EE /* SampleRegion.cpp */, + 007A7CA80F01658C00A2D6EE /* SampleShaders.cpp */, + 007A7CA90F01658C00A2D6EE /* SampleStrokeText.cpp */, + 007A7CAB0F01658C00A2D6EE /* SampleText.cpp */, + 007A7CAC0F01658C00A2D6EE /* SampleTextAlpha.cpp */, + 007A7CAD0F01658C00A2D6EE /* SampleTextEffects.cpp */, + 007A7CAE0F01658C00A2D6EE /* SampleTextOnPath.cpp */, + 007A7CAF0F01658C00A2D6EE /* SampleTiling.cpp */, + 007A7CB00F01658C00A2D6EE /* SampleTypeface.cpp */, + 007A7CB10F01658C00A2D6EE /* SampleVertices.cpp */, + 007A7CB20F01658C00A2D6EE /* SampleXfermodes.cpp */, 0041CE1E0F00A12400695E8C /* SampleBitmapRect.cpp */, 0041CE1F0F00A12400695E8C /* SampleCamera.cpp */, 0041CE200F00A12400695E8C /* SampleCircle.cpp */, @@ -452,7 +491,6 @@ 0041CE390F00A12400695E8C /* SampleDither.cpp in Sources */, 0041CE3A0F00A12400695E8C /* SampleDrawLooper.cpp in Sources */, 0041CE3B0F00A12400695E8C /* SampleEmboss.cpp in Sources */, - 0041CE3C0F00A12400695E8C /* SampleEncode.cpp in Sources */, 0041CE3D0F00A12400695E8C /* SampleFillType.cpp in Sources */, 0041CE3E0F00A12400695E8C /* SampleFilter.cpp in Sources */, 0041CE3F0F00A12400695E8C /* SampleFilter2.cpp in Sources */, @@ -465,6 +503,20 @@ 0041CE4A0F00A12400695E8C /* SamplePatch.cpp in Sources */, 0041CE470F00A12400695E8C /* SampleNinePatch.cpp in Sources */, 007A7BE40F01424500A2D6EE /* SkImageDecoder_CG.cpp in Sources */, + 007A7CB30F01658C00A2D6EE /* SamplePicture.cpp in Sources */, + 007A7CB40F01658C00A2D6EE /* SamplePoints.cpp in Sources */, + 007A7CB60F01658C00A2D6EE /* SampleRegion.cpp in Sources */, + 007A7CB70F01658C00A2D6EE /* SampleShaders.cpp in Sources */, + 007A7CB80F01658C00A2D6EE /* SampleStrokeText.cpp in Sources */, + 007A7CBA0F01658C00A2D6EE /* SampleText.cpp in Sources */, + 007A7CBB0F01658C00A2D6EE /* SampleTextAlpha.cpp in Sources */, + 007A7CBC0F01658C00A2D6EE /* SampleTextEffects.cpp in Sources */, + 007A7CBD0F01658C00A2D6EE /* SampleTextOnPath.cpp in Sources */, + 007A7CBE0F01658C00A2D6EE /* SampleTiling.cpp in Sources */, + 007A7CBF0F01658C00A2D6EE /* SampleTypeface.cpp in Sources */, + 007A7CC00F01658C00A2D6EE /* SampleVertices.cpp in Sources */, + 007A7CC10F01658C00A2D6EE /* SampleXfermodes.cpp in Sources */, + 0041CE3C0F00A12400695E8C /* SampleEncode.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; |