| Index: src/core/SkBitmapProcShader.cpp
|
| diff --git a/src/core/SkBitmapProcShader.cpp b/src/core/SkBitmapProcShader.cpp
|
| index f88729e30512f1c219a45ec27c300c4263546252..e140f0feb04bc89f53549718f31fa69999351f9f 100644
|
| --- a/src/core/SkBitmapProcShader.cpp
|
| +++ b/src/core/SkBitmapProcShader.cpp
|
| @@ -412,7 +412,8 @@ void SkBitmapProcShader::toString(SkString* str) const {
|
|
|
| const GrFragmentProcessor* SkBitmapProcShader::asFragmentProcessor(GrContext* context,
|
| const SkMatrix& viewM, const SkMatrix* localMatrix,
|
| - SkFilterQuality filterQuality) const {
|
| + SkFilterQuality filterQuality,
|
| + SkSourceGammaTreatment gammaTreatment) const {
|
| SkMatrix matrix;
|
| matrix.setIDiv(fRawBitmap.width(), fRawBitmap.height());
|
|
|
| @@ -443,7 +444,8 @@ const GrFragmentProcessor* SkBitmapProcShader::asFragmentProcessor(GrContext* co
|
| GrSkFilterQualityToGrFilterMode(filterQuality, viewM, this->getLocalMatrix(),
|
| &doBicubic);
|
| GrTextureParams params(tm, textureFilterMode);
|
| - SkAutoTUnref<GrTexture> texture(GrRefCachedBitmapTexture(context, fRawBitmap, params));
|
| + SkAutoTUnref<GrTexture> texture(GrRefCachedBitmapTexture(context, fRawBitmap, params,
|
| + gammaTreatment));
|
|
|
| if (!texture) {
|
| SkErrorInternals::SetError( kInternalError_SkError,
|
|
|