aboutsummaryrefslogtreecommitdiffstats
path: root/src/images/SkImageEncoder_Factory.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/images/SkImageEncoder_Factory.cpp')
-rw-r--r--src/images/SkImageEncoder_Factory.cpp21
1 files changed, 7 insertions, 14 deletions
diff --git a/src/images/SkImageEncoder_Factory.cpp b/src/images/SkImageEncoder_Factory.cpp
index 0bb4d1a..2bd1113 100644
--- a/src/images/SkImageEncoder_Factory.cpp
+++ b/src/images/SkImageEncoder_Factory.cpp
@@ -1,25 +1,19 @@
+
/*
- * Copyright 2009, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * Copyright 2009 The Android Open Source Project
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
*/
+
#include "SkImageEncoder.h"
#include "SkTRegistry.h"
typedef SkTRegistry<SkImageEncoder*, SkImageEncoder::Type> EncodeReg;
-template EncodeReg* EncodeReg::gHead;
+// 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);
@@ -41,4 +35,3 @@ SkImageEncoder* SkImageEncoder::Create(Type t) {
#endif
return NULL;
}
-