Updates to images project.
Use the SkImageEncoder_Factory on all platforms. On Windows and Mac,
register the platform's image encoder as an option for
SkImageEncoder::Create. Also add more types that can be decoded.
Update comments for SkImageDecoder to be more accurate.
Add more types to SkImageEncoder::Type, and return the correct type of
encoder, if it exists.
Use a custom version of SkImageDecoder::Factory on Windows and Mac to
check the stream for registered decoders before defaulting to the platform's
version. Share code with the existing SkImageDecoder::Factory method.
Preparation for testing decoders and encoders:
BUG=https://code.google.com/p/skia/issues/detail?id=1241
Review URL: https://codereview.chromium.org/14298010
git-svn-id: http://skia.googlecode.com/svn/trunk@8730 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/images/SkImageDecoder_FactoryDefault.cpp b/src/images/SkImageDecoder_FactoryDefault.cpp
new file mode 100644
index 0000000..565519a
--- /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;
+}
diff --git a/src/images/SkImageDecoder_Factory.cpp b/src/images/SkImageDecoder_FactoryRegistrar.cpp
similarity index 61%
rename from src/images/SkImageDecoder_Factory.cpp
rename to src/images/SkImageDecoder_FactoryRegistrar.cpp
index c276a3d..6cc417a 100644
--- a/src/images/SkImageDecoder_Factory.cpp
+++ b/src/images/SkImageDecoder_FactoryRegistrar.cpp
@@ -1,24 +1,27 @@
-
/*
- * Copyright 2006 The Android Open Source Project
+ * Copyright 2013 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"
+// This file is used for registration of SkImageDecoders. It also holds a function
+// for checking all the the registered SkImageDecoders for one that matches an
+// input SkStream.
+
typedef SkTRegistry<SkImageDecoder*, SkStream*> DecodeReg;
// N.B. You can't use "DecodeReg::gHead here" due to complex C++
// corner cases.
template DecodeReg* SkTRegistry<SkImageDecoder*, SkStream*>::gHead;
-SkImageDecoder* SkImageDecoder::Factory(SkStream* stream) {
+SkImageDecoder* image_decoder_from_stream(SkStream*);
+
+SkImageDecoder* image_decoder_from_stream(SkStream* stream) {
SkImageDecoder* codec = NULL;
const DecodeReg* curr = DecodeReg::Head();
while (curr) {
@@ -42,22 +45,3 @@
}
return NULL;
}
-
-/////////////////////////////////////////////////////////////////////////
-
-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;
-}
diff --git a/src/ports/SkImageDecoder_CG.cpp b/src/ports/SkImageDecoder_CG.cpp
index f8ec108..9fc49a4 100644
--- a/src/ports/SkImageDecoder_CG.cpp
+++ b/src/ports/SkImageDecoder_CG.cpp
@@ -110,8 +110,16 @@
///////////////////////////////////////////////////////////////////////////////
+extern SkImageDecoder* image_decoder_from_stream(SkStream*);
+
SkImageDecoder* SkImageDecoder::Factory(SkStream* stream) {
- return SkNEW(SkImageDecoder_CG);
+ SkImageDecoder* decoder = image_decoder_from_stream(stream);
+ if (NULL == decoder) {
+ // If no image decoder specific to the stream exists, use SkImageDecoder_CG.
+ return SkNEW(SkImageDecoder_CG);
+ } else {
+ return decoder;
+ }
}
/////////////////////////////////////////////////////////////////////////
@@ -174,6 +182,15 @@
CFStringRef type;
switch (fType) {
+ case kICO_Type:
+ type = kUTTypeICO;
+ break;
+ case kBMP_Type:
+ type = kUTTypeBMP;
+ break;
+ case kGIF_Type:
+ type = kUTTypeGIF;
+ break;
case kJPEG_Type:
type = kUTTypeJPEG;
break;
@@ -209,13 +226,22 @@
return CGImageDestinationFinalize(dst);
}
-SkImageEncoder* SkImageEncoder::Create(Type t) {
+///////////////////////////////////////////////////////////////////////////////
+
+#include "SkTRegistry.h"
+
+static SkImageEncoder* sk_imageencoder_cg_factory(SkImageEncoder::Type t) {
switch (t) {
- case kJPEG_Type:
- case kPNG_Type:
+ case SkImageEncoder::kICO_Type:
+ case SkImageEncoder::kBMP_Type:
+ case SkImageEncoder::kGIF_Type:
+ case SkImageEncoder::kJPEG_Type:
+ case SkImageEncoder::kPNG_Type:
break;
default:
return NULL;
}
return SkNEW_ARGS(SkImageEncoder_CG, (t));
}
+
+static SkTRegistry<SkImageEncoder*, SkImageEncoder::Type> gEReg(sk_imageencoder_cg_factory);
diff --git a/src/ports/SkImageDecoder_WIC.cpp b/src/ports/SkImageDecoder_WIC.cpp
index 4b869dd..17d75cc 100644
--- a/src/ports/SkImageDecoder_WIC.cpp
+++ b/src/ports/SkImageDecoder_WIC.cpp
@@ -154,8 +154,16 @@
/////////////////////////////////////////////////////////////////////////
+extern SkImageDecoder* image_decoder_from_stream(SkStream*);
+
SkImageDecoder* SkImageDecoder::Factory(SkStream* stream) {
- return SkNEW(SkImageDecoder_WIC);
+ SkImageDecoder* decoder = image_decoder_from_stream(stream);
+ if (NULL == decoder) {
+ // If no image decoder specific to the stream exists, use SkImageDecoder_WIC.
+ return SkNEW(SkImageDecoder_WIC);
+ } else {
+ return decoder;
+ }
}
/////////////////////////////////////////////////////////////////////////
@@ -183,6 +191,15 @@
{
GUID type;
switch (fType) {
+ case kBMP_Type:
+ type = GUID_ContainerFormatBmp;
+ break;
+ case kGIF_Type:
+ type = GUID_ContainerFormatGif;
+ break;
+ case kICO_Type:
+ type = GUID_ContainerFormatIco;
+ break;
case kJPEG_Type:
type = GUID_ContainerFormatJpeg;
break;
@@ -324,13 +341,22 @@
return SUCCEEDED(hr);
}
-SkImageEncoder* SkImageEncoder::Create(Type t) {
+///////////////////////////////////////////////////////////////////////////////
+
+#include "SkTRegistry.h"
+
+static SkImageEncoder* sk_imageencoder_wic_factory(SkImageEncoder::Type t) {
switch (t) {
- case kJPEG_Type:
- case kPNG_Type:
+ case SkImageEncoder::kBMP_Type:
+ case SkImageEncoder::kGIF_Type:
+ case SkImageEncoder::kICO_Type:
+ case SkImageEncoder::kJPEG_Type:
+ case SkImageEncoder::kPNG_Type:
break;
default:
return NULL;
}
return SkNEW_ARGS(SkImageEncoder_WIC, (t));
}
+
+static SkTRegistry<SkImageEncoder*, SkImageEncoder::Type> gEReg(sk_imageencoder_wic_factory);