diff options
Diffstat (limited to 'src/shaders')
| -rw-r--r-- | src/shaders/SkImageShader.cpp | 5 | ||||
| -rw-r--r-- | src/shaders/gradients/SkGradientShader.cpp | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/shaders/SkImageShader.cpp b/src/shaders/SkImageShader.cpp index bd1b17f029..e0dd512f07 100644 --- a/src/shaders/SkImageShader.cpp +++ b/src/shaders/SkImageShader.cpp @@ -117,8 +117,7 @@ SkShaderBase::Context* SkImageShader::onMakeContext(const ContextRec& rec, } return SkBitmapProcLegacyShader::MakeContext(*this, fTileModeX, fTileModeY, - SkBitmapProvider(fImage.get(), rec.fDstColorSpace), - rec, alloc); + SkBitmapProvider(fImage.get()), rec, alloc); } SkImage* SkImageShader::onIsAImage(SkMatrix* texM, TileMode xy[]) const { @@ -285,7 +284,7 @@ bool SkImageShader::onAppendStages(const StageRec& rec) const { } auto quality = rec.fPaint.getFilterQuality(); - SkBitmapProvider provider(fImage.get(), rec.fDstCS); + SkBitmapProvider provider(fImage.get()); SkDefaultBitmapController controller; std::unique_ptr<SkBitmapController::State> state { controller.requestBitmap(provider, matrix, quality) diff --git a/src/shaders/gradients/SkGradientShader.cpp b/src/shaders/gradients/SkGradientShader.cpp index a574b7d46d..4c6a42571a 100644 --- a/src/shaders/gradients/SkGradientShader.cpp +++ b/src/shaders/gradients/SkGradientShader.cpp @@ -1288,7 +1288,7 @@ GrGradientEffect::GrGradientEffect(ClassID classID, const CreateArgs& args, bool desc.fWidth = bitmap.width(); desc.fHeight = 32; desc.fRowHeight = bitmap.height(); // always 1 here - desc.fConfig = SkImageInfo2GrPixelConfig(bitmap.info(), *caps); + desc.fConfig = SkColorType2GrPixelConfig(bitmap.colorType()); fAtlas = atlasManager->refAtlas(desc); SkASSERT(fAtlas); |