AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove SK_ENABLE_LIBPNG define as it is no longer needed by Android.

Browse Source 
Review URL: https://codereview.chromium.org/12958002

git-svn-id: http://skia.googlecode.com/svn/trunk@8262 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
djsollen@google.com 2013-03-20 16:07:37 +00:00
parent 8e3fb2d6f4
commit 6e32c4627b
4 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gyp/images.gyp
View File

@ -124,9 +124,6 @@
'android_deps.gyp:gif',
'android_deps.gyp:png',
],
'defines': [
'SK_ENABLE_LIBPNG',
],
},{ #else if skia_os != android
'sources!': [
'../src/images/SkImageRef_ashmem.h',

11
src/images/SkImageDecoder_Factory.cpp
View File

@ -18,10 +18,6 @@ typedef SkTRegistry<SkImageDecoder*, SkStream*> DecodeReg;
// corner cases.
template DecodeReg* SkTRegistry<SkImageDecoder*, SkStream*>::gHead;
#ifdef SK_ENABLE_LIBPNG
extern SkImageDecoder* sk_libpng_dfactory(SkStream*);
#endif
SkImageDecoder* SkImageDecoder::Factory(SkStream* stream) {
SkImageDecoder* codec = NULL;
const DecodeReg* curr = DecodeReg::Head();
@ -35,13 +31,6 @@ SkImageDecoder* SkImageDecoder::Factory(SkStream* stream) {
}
curr = curr->next();
}
#ifdef SK_ENABLE_LIBPNG
codec = sk_libpng_dfactory(stream);
stream->rewind();
if (codec) {
return codec;
}
#endif
return NULL;
}

5
src/images/SkImageDecoder_libpng.cpp
View File

@ -1086,11 +1086,6 @@ DEFINE_ENCODER_CREATOR(PNGImageEncoder);
#include "SkTRegistry.h"
#ifdef SK_ENABLE_LIBPNG
SkImageDecoder* sk_libpng_dfactory(SkStream*);
SkImageEncoder* sk_libpng_efactory(SkImageEncoder::Type);
#endif
SkImageDecoder* sk_libpng_dfactory(SkStream* stream) {
char buf[PNG_BYTES_TO_CHECK];
if (stream->read(buf, PNG_BYTES_TO_CHECK) == PNG_BYTES_TO_CHECK &&

9
src/images/SkImageEncoder_Factory.cpp
View File

@ -15,10 +15,6 @@ typedef SkTRegistry<SkImageEncoder*, SkImageEncoder::Type> EncodeReg;
// Can't use the typedef here because of complex C++ corner cases
template EncodeReg* SkTRegistry<SkImageEncoder*, SkImageEncoder::Type>::gHead;
#ifdef SK_ENABLE_LIBPNG
extern SkImageEncoder* sk_libpng_efactory(SkImageEncoder::Type);
#endif
SkImageEncoder* SkImageEncoder::Create(Type t) {
SkImageEncoder* codec = NULL;
const EncodeReg* curr = EncodeReg::Head();
@ -28,10 +24,5 @@ SkImageEncoder* SkImageEncoder::Create(Type t) {
}
curr = curr->next();
}
#ifdef SK_ENABLE_LIBPNG
if ((codec = sk_libpng_efactory(t)) != NULL) {
return codec;
}
#endif
return NULL;
}