| Index: samplecode/SampleFatBits.cpp
|
| diff --git a/samplecode/SampleFatBits.cpp b/samplecode/SampleFatBits.cpp
|
| index 6900fae3eb6583e9394fbae83a273d3e360566b7..3632c4810090f30a041268ef33fa66cdaf071b11 100644
|
| --- a/samplecode/SampleFatBits.cpp
|
| +++ b/samplecode/SampleFatBits.cpp
|
| @@ -43,13 +43,10 @@ static SkShader* createChecker() {
|
| bm.lockPixels();
|
| *bm.getAddr32(0, 0) = *bm.getAddr32(1, 1) = SkPreMultiplyColor(colors[0]);
|
| *bm.getAddr32(0, 1) = *bm.getAddr32(1, 0) = SkPreMultiplyColor(colors[1]);
|
| - SkShader* s = SkShader::CreateBitmapShader(bm, SkShader::kRepeat_TileMode,
|
| - SkShader::kRepeat_TileMode);
|
| -
|
| SkMatrix m;
|
| m.setScale(12, 12);
|
| - s->setLocalMatrix(m);
|
| - return s;
|
| + return SkShader::CreateBitmapShader(bm, SkShader::kRepeat_TileMode,
|
| + SkShader::kRepeat_TileMode, &m);
|
| }
|
|
|
| class FatBits {
|
| @@ -103,7 +100,7 @@ public:
|
| fBounds.set(0, 0, SkIntToScalar(width * zoom), SkIntToScalar(height * zoom));
|
| fMatrix.setScale(SkIntToScalar(zoom), SkIntToScalar(zoom));
|
| fInverse.setScale(SK_Scalar1 / zoom, SK_Scalar1 / zoom);
|
| - fShader->setLocalMatrix(fMatrix);
|
| + fShader.reset(SkShader::CreateLocalMatrixWrapper(fShader, fMatrix));
|
|
|
| SkImageInfo info = SkImageInfo::MakeN32Premul(width, height);
|
| fMinSurface.reset(SkSurface::NewRaster(info));
|
|
|