diff options
| author |  sugoi <sugoi@chromium.org> | 2014-07-03 10:44:26 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-07-03 10:44:26 -0700 |
| commit | c197c8a47eb9cf09b389f4dd5d235510feec18cb (patch) | |
| tree | 4fe97a698b9b9aab382d1615910e5df4808dd7af /src/effects | |
| parent | 2fe7b466c15fab6593da3bf32d3c3dbdf3917c01 (diff) | |
Adding 64 bit checks
Added a few more checks to avoid overflowing 32 bit sizes while computing convolutions.
I also changed a dangerously misleading INHERITED typedef.
BUG=389570
R=senorblanco@google.com, senorblanco@chromium.org
Author: sugoi@chromium.org
Review URL: https://codereview.chromium.org/361403006
Diffstat (limited to 'src/effects')
| -rw-r--r-- | src/effects/SkColorMatrixFilter.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/effects/SkColorMatrixFilter.cpp b/src/effects/SkColorMatrixFilter.cpp index b60fa84b68..bd1df79d14 100644 --- a/src/effects/SkColorMatrixFilter.cpp +++ b/src/effects/SkColorMatrixFilter.cpp @@ -450,6 +450,8 @@ public: private: GrGLUniformManager::UniformHandle fMatrixHandle; GrGLUniformManager::UniformHandle fVectorHandle; + + typedef GrGLEffect INHERITED; }; private: @@ -462,7 +464,7 @@ private: SkColorMatrix fMatrix; - typedef GrGLEffect INHERITED; + typedef GrEffect INHERITED; }; GR_DEFINE_EFFECT_TEST(ColorMatrixEffect); |