diff options
-rw-r--r-- | include/core/SkBlitRow.h | 6 | ||||
-rw-r--r-- | src/opts/SkBlitRow_opts_SSE2.cpp | 6 | ||||
-rw-r--r-- | src/opts/SkBlitRow_opts_arm.cpp | 6 | ||||
-rw-r--r-- | src/opts/SkBlitRow_opts_none.cpp | 6 |
4 files changed, 12 insertions, 12 deletions
diff --git a/include/core/SkBlitRow.h b/include/core/SkBlitRow.h index 6560d488d0..7d48b0cadc 100644 --- a/include/core/SkBlitRow.h +++ b/include/core/SkBlitRow.h @@ -71,9 +71,9 @@ public: system default. */ - static const Proc32 PlatformProcs32(unsigned flags); - static const Proc PlatformProcs565(unsigned flags); - static const Proc PlatformProcs4444(unsigned flags); + static Proc32 PlatformProcs32(unsigned flags); + static Proc PlatformProcs565(unsigned flags); + static Proc PlatformProcs4444(unsigned flags); private: enum { diff --git a/src/opts/SkBlitRow_opts_SSE2.cpp b/src/opts/SkBlitRow_opts_SSE2.cpp index 772c8ebb27..7428584a89 100644 --- a/src/opts/SkBlitRow_opts_SSE2.cpp +++ b/src/opts/SkBlitRow_opts_SSE2.cpp @@ -317,15 +317,15 @@ static const SkBlitRow::Proc32 platform_32_procs[] = { S32A_Blend_BlitRow32_SSE2, // S32A_Blend, }; -const SkBlitRow::Proc SkBlitRow::PlatformProcs4444(unsigned flags) { +SkBlitRow::Proc SkBlitRow::PlatformProcs4444(unsigned flags) { return NULL; } -const SkBlitRow::Proc SkBlitRow::PlatformProcs565(unsigned flags) { +SkBlitRow::Proc SkBlitRow::PlatformProcs565(unsigned flags) { return NULL; } -const SkBlitRow::Proc32 SkBlitRow::PlatformProcs32(unsigned flags) { +SkBlitRow::Proc32 SkBlitRow::PlatformProcs32(unsigned flags) { static bool once; static bool hasSSE2; if (!once) { diff --git a/src/opts/SkBlitRow_opts_arm.cpp b/src/opts/SkBlitRow_opts_arm.cpp index 44550daf9e..ae77bca56e 100644 --- a/src/opts/SkBlitRow_opts_arm.cpp +++ b/src/opts/SkBlitRow_opts_arm.cpp @@ -1011,14 +1011,14 @@ static const SkBlitRow::Proc32 platform_32_procs[] = { NULL, // S32A_Blend, }; -const SkBlitRow::Proc SkBlitRow::PlatformProcs4444(unsigned flags) { +SkBlitRow::Proc SkBlitRow::PlatformProcs4444(unsigned flags) { return platform_4444_procs[flags]; } -const SkBlitRow::Proc SkBlitRow::PlatformProcs565(unsigned flags) { +SkBlitRow::Proc SkBlitRow::PlatformProcs565(unsigned flags) { return platform_565_procs[flags]; } -const SkBlitRow::Proc32 SkBlitRow::PlatformProcs32(unsigned flags) { +SkBlitRow::Proc32 SkBlitRow::PlatformProcs32(unsigned flags) { return platform_32_procs[flags]; } diff --git a/src/opts/SkBlitRow_opts_none.cpp b/src/opts/SkBlitRow_opts_none.cpp index 15b999bfe0..8e0cddcda0 100644 --- a/src/opts/SkBlitRow_opts_none.cpp +++ b/src/opts/SkBlitRow_opts_none.cpp @@ -2,14 +2,14 @@ // Platform impl of Platform_procs with no overrides -const SkBlitRow::Proc SkBlitRow::PlatformProcs4444(unsigned flags) { +SkBlitRow::Proc SkBlitRow::PlatformProcs4444(unsigned flags) { return NULL; } -const SkBlitRow::Proc SkBlitRow::PlatformProcs565(unsigned flags) { +SkBlitRow::Proc SkBlitRow::PlatformProcs565(unsigned flags) { return NULL; } -const SkBlitRow::Proc32 SkBlitRow::PlatformProcs32(unsigned flags) { +SkBlitRow::Proc32 SkBlitRow::PlatformProcs32(unsigned flags) { return NULL; } |