aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-02-25 18:17:12 +0000
committerGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-02-25 18:17:12 +0000
commit1a6880597e88ecb81e19df26fed8fb63f42cb627 (patch)
treec8cf3fd69f6e60c2f143dfb8164c5a84d42ccf49
parent12d588a7f28e18f87f5f9a6eb57fc1f5137a8d28 (diff)
move SkFDStream out of images into core
git-svn-id: http://skia.googlecode.com/svn/trunk@7846 2bbb7eff-a529-9590-31e7-b0007b416f81
-rw-r--r--gyp/core.gypi1
-rw-r--r--gyp/images.gyp1
-rw-r--r--src/core/SkFDStream.cpp (renamed from src/images/SkFDStream.cpp)0
3 files changed, 1 insertions, 1 deletions
diff --git a/gyp/core.gypi b/gyp/core.gypi
index 9831bbb168..590cac205e 100644
--- a/gyp/core.gypi
+++ b/gyp/core.gypi
@@ -76,6 +76,7 @@
'<(skia_src_path)/core/SkEdgeClipper.cpp',
'<(skia_src_path)/core/SkEdge.cpp',
'<(skia_src_path)/core/SkEdge.h',
+ '<(skia_src_path)/core/SkFDStream.cpp',
'<(skia_src_path)/core/SkFP.h',
'<(skia_src_path)/core/SkFilterProc.cpp',
'<(skia_src_path)/core/SkFilterProc.h',
diff --git a/gyp/images.gyp b/gyp/images.gyp
index 2f007ff68a..4560980a1a 100644
--- a/gyp/images.gyp
+++ b/gyp/images.gyp
@@ -31,7 +31,6 @@
'../src/images/bmpdecoderhelper.cpp',
'../src/images/bmpdecoderhelper.h',
- '../src/images/SkFDStream.cpp',
'../src/images/SkImageDecoder.cpp',
'../src/images/SkImageDecoder_Factory.cpp',
'../src/images/SkImageDecoder_libjpeg.cpp',
diff --git a/src/images/SkFDStream.cpp b/src/core/SkFDStream.cpp
index d38813c54d..d38813c54d 100644
--- a/src/images/SkFDStream.cpp
+++ b/src/core/SkFDStream.cpp