diff options
| author |  msarett <msarett@google.com> | 2016-03-25 11:08:14 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-25 11:08:14 -0700 |
| commit | d442d32335a12964af1691b64977621d18048d20 (patch) | |
| tree | 00bd250a3df3e4a10193b184242dff0e4ae862bd | |
| parent | 384b5e9cd36e443437de8df3b0f78ef4150efbac (diff) | |
Remove extra definitions of SkMovie
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1830343004
Review URL: https://codereview.chromium.org/1830343004
| -rw-r--r-- | src/ports/SkImageEncoder_CG.cpp | 10 | ||||
| -rw-r--r-- | src/ports/SkImageEncoder_WIC.cpp | 10 |
2 files changed, 2 insertions, 18 deletions
diff --git a/src/ports/SkImageEncoder_CG.cpp b/src/ports/SkImageEncoder_CG.cpp index ead0ed6506..5b217e62ec 100644 --- a/src/ports/SkImageEncoder_CG.cpp +++ b/src/ports/SkImageEncoder_CG.cpp @@ -8,11 +8,11 @@ #include "SkTypes.h" #if defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS) +#include "SkBitmap.h" #include "SkCGUtils.h" #include "SkColorPriv.h" #include "SkData.h" #include "SkImageEncoder.h" -#include "SkMovie.h" #include "SkStream.h" #include "SkStreamPriv.h" #include "SkTemplates.h" @@ -28,14 +28,6 @@ #include <MobileCoreServices/MobileCoreServices.h> #endif -///////////////////////////////////////////////////////////////////////// - -SkMovie* SkMovie::DecodeStream(SkStreamRewindable* stream) { - return nullptr; -} - -///////////////////////////////////////////////////////////////////////// - static size_t consumer_put(void* info, const void* buffer, size_t count) { SkWStream* stream = reinterpret_cast<SkWStream*>(info); return stream->write(buffer, count) ? count : 0; diff --git a/src/ports/SkImageEncoder_WIC.cpp b/src/ports/SkImageEncoder_WIC.cpp index 43068fc8f6..7911a403b6 100644 --- a/src/ports/SkImageEncoder_WIC.cpp +++ b/src/ports/SkImageEncoder_WIC.cpp @@ -31,9 +31,9 @@ #include <wincodec.h> #include "SkAutoCoInitialize.h" +#include "SkBitmap.h" #include "SkImageEncoder.h" #include "SkIStream.h" -#include "SkMovie.h" #include "SkStream.h" #include "SkTScopedComPtr.h" #include "SkUnPreMultiply.h" @@ -47,14 +47,6 @@ #undef CLSID_WICImagingFactory #endif -///////////////////////////////////////////////////////////////////////// - -SkMovie* SkMovie::DecodeStream(SkStreamRewindable* stream) { - return nullptr; -} - -///////////////////////////////////////////////////////////////////////// - class SkImageEncoder_WIC : public SkImageEncoder { public: SkImageEncoder_WIC(Type t) : fType(t) {} |