Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(666)

Unified Diff: src/images/SkImageDecoder_FactoryDefault.cpp

Issue 14298010: Updates to images project. (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Name changes Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/images/SkImageDecoder_Factory.cpp ('k') | src/images/SkImageDecoder_FactoryRegistrar.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/images/SkImageDecoder_FactoryDefault.cpp
diff --git a/src/images/SkImageDecoder_FactoryDefault.cpp b/src/images/SkImageDecoder_FactoryDefault.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..565519acc8daab83112f947472cff340a6cff06d
--- /dev/null
+++ b/src/images/SkImageDecoder_FactoryDefault.cpp
@@ -0,0 +1,37 @@
+
+/*
+ * 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"
+#include "SkTRegistry.h"
+
+extern SkImageDecoder* image_decoder_from_stream(SkStream*);
+
+SkImageDecoder* SkImageDecoder::Factory(SkStream* stream) {
+ return image_decoder_from_stream(stream);
+}
+
+/////////////////////////////////////////////////////////////////////////
+
+typedef SkTRegistry<SkMovie*, SkStream*> MovieReg;
+
+SkMovie* SkMovie::DecodeStream(SkStream* 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;
+}
« no previous file with comments | « src/images/SkImageDecoder_Factory.cpp ('k') | src/images/SkImageDecoder_FactoryRegistrar.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698