commit 0767e4742e3f8b7c87326abc5129da1e200f8ea1
author reed@android.com <reed@android.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Dec 23 16:06:51 2008 +0000
committer reed@android.com <reed@android.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Dec 23 16:06:51 2008 +0000
tree 15d7b6c7485dbc1f99c9b7dadf5f1034aede9b53
parent 76aa34bf8e6f25ff7bd59b63e63ebb754d09105e

add CG imagedecoder (still needs encoding)
update some sample files to not use obsolete SkShaderExtras.h



git-svn-id: http://skia.googlecode.com/svn/trunk@46 2bbb7eff-a529-9590-31e7-b0007b416f81

samplecode/SampleBitmapRect.cpp

diff --git a/samplecode/SampleBitmapRect.cpp b/samplecode/SampleBitmapRect.cpp
index 5919084..f164e06 100644
--- a/samplecode/SampleBitmapRect.cpp
+++ b/samplecode/SampleBitmapRect.cpp
@@ -10,7 +10,6 @@
 #include "SkShader.h"
 #include "SkUtils.h"
 #include "SkXfermode.h"
-#include "SkShaderExtras.h"
 #include "SkColorPriv.h"
 #include "SkColorFilter.h"
 #include "SkTime.h"

samplecode/SampleDither.cpp

diff --git a/samplecode/SampleDither.cpp b/samplecode/SampleDither.cpp
index 7f7877a..64af007 100644
--- a/samplecode/SampleDither.cpp
+++ b/samplecode/SampleDither.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"

samplecode/SampleEmboss.cpp

diff --git a/samplecode/SampleEmboss.cpp b/samplecode/SampleEmboss.cpp
index cdc8b47..d12074f 100644
--- a/samplecode/SampleEmboss.cpp
+++ b/samplecode/SampleEmboss.cpp
@@ -13,7 +13,6 @@
 #include "SkRegion.h"
 #include "SkShader.h"
 #include "SkUtils.h"
-#include "SkShaderExtras.h"
 #include "SkColorPriv.h"
 #include "SkColorFilter.h"
 #include "SkTime.h"

samplecode/SampleEncode.cpp

diff --git a/samplecode/SampleEncode.cpp b/samplecode/SampleEncode.cpp
index 221b6f8..e36ab42 100644
--- a/samplecode/SampleEncode.cpp
+++ b/samplecode/SampleEncode.cpp
@@ -10,7 +10,6 @@
 #include "SkShader.h"
 #include "SkUtils.h"
 #include "SkXfermode.h"
-#include "SkShaderExtras.h"
 #include "SkColorPriv.h"
 #include "SkColorFilter.h"
 #include "SkTime.h"

samplecode/SampleFilter.cpp

diff --git a/samplecode/SampleFilter.cpp b/samplecode/SampleFilter.cpp
index 8d26470..49d9c48 100644
--- a/samplecode/SampleFilter.cpp
+++ b/samplecode/SampleFilter.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"

samplecode/SampleFilter2.cpp

diff --git a/samplecode/SampleFilter2.cpp b/samplecode/SampleFilter2.cpp
index 30ac2bd..1800eb9 100644
--- a/samplecode/SampleFilter2.cpp
+++ b/samplecode/SampleFilter2.cpp
@@ -10,7 +10,6 @@
 #include "SkShader.h"
 #include "SkUtils.h"
 #include "SkXfermode.h"
-#include "SkShaderExtras.h"
 #include "SkColorPriv.h"
 #include "SkColorFilter.h"
 #include "SkTime.h"

samplecode/SampleGL.cpp

diff --git a/samplecode/SampleGL.cpp b/samplecode/SampleGL.cpp
index 7180e3e..d020b0e 100644
--- a/samplecode/SampleGL.cpp
+++ b/samplecode/SampleGL.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"

samplecode/SampleImage.cpp

diff --git a/samplecode/SampleImage.cpp b/samplecode/SampleImage.cpp
index b0f8656..4cefd27 100644
--- a/samplecode/SampleImage.cpp
+++ b/samplecode/SampleImage.cpp
@@ -10,7 +10,6 @@
 #include "SkShader.h"
 #include "SkUtils.h"
 #include "SkXfermode.h"
-#include "SkShaderExtras.h"
 #include "SkColorPriv.h"
 #include "SkColorFilter.h"
 #include "SkTime.h"

samplecode/SampleImageDir.cpp

diff --git a/samplecode/SampleImageDir.cpp b/samplecode/SampleImageDir.cpp
index 2c55ab0..32a719b 100644
--- a/samplecode/SampleImageDir.cpp
+++ b/samplecode/SampleImageDir.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"

samplecode/SampleLayers.cpp

diff --git a/samplecode/SampleLayers.cpp b/samplecode/SampleLayers.cpp
index fcf7107..8666745 100644
--- a/samplecode/SampleLayers.cpp
+++ b/samplecode/SampleLayers.cpp
@@ -13,7 +13,6 @@
 #include "SkPath.h"
 #include "SkRegion.h"
 #include "SkShader.h"
-#include "SkShaderExtras.h"
 #include "SkTime.h"
 #include "SkTypeface.h"
 #include "SkUtils.h"

samplecode/SampleLines.cpp

diff --git a/samplecode/SampleLines.cpp b/samplecode/SampleLines.cpp
index eed0e5a..a0238b0 100644
--- a/samplecode/SampleLines.cpp
+++ b/samplecode/SampleLines.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"

samplecode/SampleMeasure.cpp

diff --git a/samplecode/SampleMeasure.cpp b/samplecode/SampleMeasure.cpp
index 3cc0c81..70b8812 100644
--- a/samplecode/SampleMeasure.cpp
+++ b/samplecode/SampleMeasure.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"