diff options
| author |  robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-07-11 18:25:24 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-07-11 18:25:24 +0000 |
| commit | bca1c5de48f45a8c73dff00e60c4fa1821e2f79d (patch) | |
| tree | 7c3cbc7cbdef4cdb01ac99e171d58bdefa51915a | |
| parent | 3e11c0bd92fbd12f59080c3f9450201d6105db83 (diff) | |
Fixed merge error in r4545
git-svn-id: http://skia.googlecode.com/svn/trunk@4546 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | src/gpu/SkGpuDevice.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp index ba8be8c0e4..4e009ee731 100644 --- a/src/gpu/SkGpuDevice.cpp +++ b/src/gpu/SkGpuDevice.cpp @@ -1438,7 +1438,9 @@ void apply_custom_stage(GrContext* context, GrAutoMatrix avm(context, GrMatrix::I()); GrContext::AutoRenderTarget art(context, dstTexture->asRenderTarget()); GrClip oldClip = context->getClip(); - context->setClip(rect); + + GrClip newClip(rect); + context->setClip(newClip); GrMatrix sampleM; sampleM.setIDiv(srcTexture->width(), srcTexture->height()); |