commit ae1221683364d05faf8c3c15137dada6ea8926c7
author humper@google.com <humper@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Jul 09 18:02:06 2013 +0000
committer humper@google.com <humper@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Jul 09 18:02:06 2013 +0000
tree 9e11cf5d41dcb75c5d789f76b76b4525e7db95fc
parent 1c10e475f4e43bbfacb72861290074bb7e46a5c3

Revert "More general image filter interface; tested implementation of standalone"

This reverts commit 4df3e8b079e019af5f60c13e7e6ec6589663962a.

git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@9937 2bbb7eff-a529-9590-31e7-b0007b416f81

bench.gypi

diff --git a/bench.gypi b/bench.gypi
index 956fec9..37e6552 100644
--- a/bench.gypi
+++ b/bench.gypi
@@ -5,6 +5,7 @@
     '../bench/benchmain.cpp',
     '../bench/SkBenchmark.h',
     '../bench/SkBenchmark.cpp',
+
     '../bench/AAClipBench.cpp',
     '../bench/BicubicBench.cpp',
     '../bench/BitmapBench.cpp',

core.gypi

diff --git a/core.gypi b/core.gypi
index e87c0f4..2703231 100644
--- a/core.gypi
+++ b/core.gypi
@@ -21,14 +21,13 @@
         '<(skia_src_path)/core/SkBBoxHierarchyRecord.cpp',
         '<(skia_src_path)/core/SkBBoxHierarchyRecord.h',
         '<(skia_src_path)/core/SkBitmap.cpp',
-        '<(skia_src_path)/core/SkBitmapFilter.h',
-        '<(skia_src_path)/core/SkBitmapFilter.cpp',
         '<(skia_src_path)/core/SkBitmapHeap.cpp',
         '<(skia_src_path)/core/SkBitmapHeap.h',
         '<(skia_src_path)/core/SkBitmapProcShader.cpp',
         '<(skia_src_path)/core/SkBitmapProcShader.h',
         '<(skia_src_path)/core/SkBitmapProcState.cpp',
         '<(skia_src_path)/core/SkBitmapProcState.h',
+        '<(skia_src_path)/core/SkBitmapProcBicubic.cpp',
         '<(skia_src_path)/core/SkBitmapProcState_matrix.h',
         '<(skia_src_path)/core/SkBitmapProcState_matrixProcs.cpp',
         '<(skia_src_path)/core/SkBitmapProcState_sample.h',

gmslides.gypi

diff --git a/gmslides.gypi b/gmslides.gypi
index 0b640a2..66f869f 100644
--- a/gmslides.gypi
+++ b/gmslides.gypi
@@ -89,7 +89,6 @@
     '../gm/rrects.cpp',
     '../gm/roundrects.cpp',
     '../gm/samplerstress.cpp',
-    # '../gm/scalebitmap.cpp',
     '../gm/shaderbounds.cpp',
     '../gm/selftest.cpp',
     '../gm/shadertext.cpp',

opts.gyp

diff --git a/opts.gyp b/opts.gyp
index bcc85a9..2c87b81 100644
--- a/opts.gyp
+++ b/opts.gyp
@@ -43,13 +43,9 @@
               ],
             }],
           ],
-          'include_dirs': [
-            '../include/utils',
-          ],
           'sources': [
             '../src/opts/opts_check_SSE2.cpp',
             '../src/opts/SkBitmapProcState_opts_SSE2.cpp',
-            '../src/opts/SkBitmapFilter_opts_SSE2.cpp',
             '../src/opts/SkBlitRow_opts_SSE2.cpp',
             '../src/opts/SkBlitRect_opts_SSE2.cpp',
             '../src/opts/SkUtils_opts_SSE2.cpp',