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

Side by Side Diff: src/images/SkImageEncoder_Factory.cpp

Issue 12958002: Remove SK_ENABLE_LIBPNG define as it is no longer needed by Android. (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 years, 9 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « src/images/SkImageDecoder_libpng.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 1
2 /* 2 /*
3 * Copyright 2009 The Android Open Source Project 3 * Copyright 2009 The Android Open Source Project
4 * 4 *
5 * Use of this source code is governed by a BSD-style license that can be 5 * Use of this source code is governed by a BSD-style license that can be
6 * found in the LICENSE file. 6 * found in the LICENSE file.
7 */ 7 */
8 8
9 9
10 #include "SkImageEncoder.h" 10 #include "SkImageEncoder.h"
11 #include "SkTRegistry.h" 11 #include "SkTRegistry.h"
12 12
13 typedef SkTRegistry<SkImageEncoder*, SkImageEncoder::Type> EncodeReg; 13 typedef SkTRegistry<SkImageEncoder*, SkImageEncoder::Type> EncodeReg;
14 14
15 // Can't use the typedef here because of complex C++ corner cases 15 // Can't use the typedef here because of complex C++ corner cases
16 template EncodeReg* SkTRegistry<SkImageEncoder*, SkImageEncoder::Type>::gHead; 16 template EncodeReg* SkTRegistry<SkImageEncoder*, SkImageEncoder::Type>::gHead;
17 17
18 #ifdef SK_ENABLE_LIBPNG
19 extern SkImageEncoder* sk_libpng_efactory(SkImageEncoder::Type);
20 #endif
21
22 SkImageEncoder* SkImageEncoder::Create(Type t) { 18 SkImageEncoder* SkImageEncoder::Create(Type t) {
23 SkImageEncoder* codec = NULL; 19 SkImageEncoder* codec = NULL;
24 const EncodeReg* curr = EncodeReg::Head(); 20 const EncodeReg* curr = EncodeReg::Head();
25 while (curr) { 21 while (curr) {
26 if ((codec = curr->factory()(t)) != NULL) { 22 if ((codec = curr->factory()(t)) != NULL) {
27 return codec; 23 return codec;
28 } 24 }
29 curr = curr->next(); 25 curr = curr->next();
30 } 26 }
31 #ifdef SK_ENABLE_LIBPNG
32 if ((codec = sk_libpng_efactory(t)) != NULL) {
33 return codec;
34 }
35 #endif
36 return NULL; 27 return NULL;
37 } 28 }
OLDNEW
« no previous file with comments | « src/images/SkImageDecoder_libpng.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698