| Index: src/images/SkImageDecoder_FactoryDefault.cpp
|
| diff --git a/src/images/SkImageDecoder_FactoryDefault.cpp b/src/images/SkImageDecoder_FactoryDefault.cpp
|
| deleted file mode 100644
|
| index e959c8b69b8144ca0b501e77fd8d5a0e965e9a8a..0000000000000000000000000000000000000000
|
| --- a/src/images/SkImageDecoder_FactoryDefault.cpp
|
| +++ /dev/null
|
| @@ -1,36 +0,0 @@
|
| -
|
| -/*
|
| - * Copyright 2006 The Android Open Source Project
|
| - *
|
| - * Use of this source code is governed by a BSD-style license that can be
|
| - * found in the LICENSE file.
|
| - */
|
| -
|
| -#include "SkImageDecoder.h"
|
| -#include "SkMovie.h"
|
| -#include "SkStream.h"
|
| -
|
| -extern SkImageDecoder* image_decoder_from_stream(SkStreamRewindable*);
|
| -
|
| -SkImageDecoder* SkImageDecoder::Factory(SkStreamRewindable* stream) {
|
| - return image_decoder_from_stream(stream);
|
| -}
|
| -
|
| -/////////////////////////////////////////////////////////////////////////
|
| -
|
| -typedef SkTRegistry<SkMovie*(*)(SkStreamRewindable*)> MovieReg;
|
| -
|
| -SkMovie* SkMovie::DecodeStream(SkStreamRewindable* stream) {
|
| - const MovieReg* curr = MovieReg::Head();
|
| - while (curr) {
|
| - SkMovie* movie = curr->factory()(stream);
|
| - if (movie) {
|
| - return movie;
|
| - }
|
| - // we must rewind only if we got NULL, since we gave the stream to the
|
| - // movie, who may have already started reading from it
|
| - stream->rewind();
|
| - curr = curr->next();
|
| - }
|
| - return NULL;
|
| -}
|
|
|