aboutsummaryrefslogtreecommitdiffhomepage
path: root/gyp
diff options
context:
space:
mode:
authorGravatar senorblanco@chromium.org <senorblanco@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-01-04 22:00:34 +0000
committerGravatar senorblanco@chromium.org <senorblanco@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-01-04 22:00:34 +0000
commita0b0c122b5b91287942b1294a30f8f57337212ed (patch)
treed6cea493936c3239f3af5528dddd73c65ab52e6c /gyp
parent6630d8d8ea7a897a18e3d950bab9fa40f065804a (diff)
Fix incorrect use of the SK_RESTRICT macro in SkColorMatrixFilter, and re-enable
the colormatrix GM test. Review URL: http://codereview.appspot.com/5509048/ git-svn-id: http://skia.googlecode.com/svn/trunk@2963 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp')
-rw-r--r--gyp/gmslides.gypi4
1 files changed, 1 insertions, 3 deletions
diff --git a/gyp/gmslides.gypi b/gyp/gmslides.gypi
index 88046b06a2..2fd92cdcc7 100644
--- a/gyp/gmslides.gypi
+++ b/gyp/gmslides.gypi
@@ -8,9 +8,7 @@
'../gm/bitmapfilters.cpp',
'../gm/bitmapscroll.cpp',
'../gm/blurs.cpp',
- #Still giving problems on Win32_Float_NoDebug, so disabling until
- #that is sorted out.
- #'../gm/colormatrix.cpp',
+ '../gm/colormatrix.cpp',
'../gm/complexclip.cpp',
'../gm/complexclip2.cpp',
'../gm/cubicpaths.cpp',