aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2011-10-25 19:07:23 +0000
committerGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2011-10-25 19:07:23 +0000
commitc909a1ecadd422d91ff97d10ce08865290223b14 (patch)
tree6ac2b7272f53cf87669c5a9912bd035d7b4e888e /src
parent2a6f8abf35ff8c2640c24478d9d2eaedff5e78ea (diff)
don't blend with zero in colorproc (forgot to return after memcpy check).
git-svn-id: http://skia.googlecode.com/svn/trunk@2527 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src')
-rw-r--r--src/core/SkBlitRow_D32.cpp1
-rw-r--r--src/opts/SkBlitRow_opts_SSE2.cpp1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/core/SkBlitRow_D32.cpp b/src/core/SkBlitRow_D32.cpp
index 35fb60fb34..97aa665cb9 100644
--- a/src/core/SkBlitRow_D32.cpp
+++ b/src/core/SkBlitRow_D32.cpp
@@ -162,6 +162,7 @@ void SkBlitRow::Color32(SkPMColor* SK_RESTRICT dst,
if (src != dst) {
memcpy(dst, src, count * sizeof(SkPMColor));
}
+ return;
}
unsigned colorA = SkGetPackedA32(color);
if (255 == colorA) {
diff --git a/src/opts/SkBlitRow_opts_SSE2.cpp b/src/opts/SkBlitRow_opts_SSE2.cpp
index 103e7ed381..f03468f830 100644
--- a/src/opts/SkBlitRow_opts_SSE2.cpp
+++ b/src/opts/SkBlitRow_opts_SSE2.cpp
@@ -318,6 +318,7 @@ void Color32_SSE2(SkPMColor dst[], const SkPMColor src[], int count,
if (src != dst) {
memcpy(dst, src, count * sizeof(SkPMColor));
}
+ return;
}
unsigned colorA = SkGetPackedA32(color);