| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2014 Google Inc. | 2 * Copyright 2014 Google Inc. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license that can be | 4 * Use of this source code is governed by a BSD-style license that can be |
| 5 * found in the LICENSE file. | 5 * found in the LICENSE file. |
| 6 */ | 6 */ |
| 7 | 7 |
| 8 #include "SkColorPriv.h" | 8 #include "SkColorPriv.h" |
| 9 #include "SkImageDecoder.h" | 9 #include "SkImageDecoder.h" |
| 10 #include "SkPixelRef.h" | 10 #include "SkPixelRef.h" |
| (...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 302 return SkKTXFile::WriteETC1ToKTX(stream, bytes, width, height); | 302 return SkKTXFile::WriteETC1ToKTX(stream, bytes, width, height); |
| 303 } | 303 } |
| 304 | 304 |
| 305 ////////////////////////////////////////////////////////////////////////////////
///////// | 305 ////////////////////////////////////////////////////////////////////////////////
///////// |
| 306 DEFINE_DECODER_CREATOR(KTXImageDecoder); | 306 DEFINE_DECODER_CREATOR(KTXImageDecoder); |
| 307 DEFINE_ENCODER_CREATOR(KTXImageEncoder); | 307 DEFINE_ENCODER_CREATOR(KTXImageEncoder); |
| 308 ////////////////////////////////////////////////////////////////////////////////
///////// | 308 ////////////////////////////////////////////////////////////////////////////////
///////// |
| 309 | 309 |
| 310 static SkImageDecoder* sk_libktx_dfactory(SkStreamRewindable* stream) { | 310 static SkImageDecoder* sk_libktx_dfactory(SkStreamRewindable* stream) { |
| 311 if (SkKTXFile::is_ktx(stream)) { | 311 if (SkKTXFile::is_ktx(stream)) { |
| 312 return SkNEW(SkKTXImageDecoder); | 312 return new SkKTXImageDecoder; |
| 313 } | 313 } |
| 314 return NULL; | 314 return NULL; |
| 315 } | 315 } |
| 316 | 316 |
| 317 static SkImageDecoder::Format get_format_ktx(SkStreamRewindable* stream) { | 317 static SkImageDecoder::Format get_format_ktx(SkStreamRewindable* stream) { |
| 318 if (SkKTXFile::is_ktx(stream)) { | 318 if (SkKTXFile::is_ktx(stream)) { |
| 319 return SkImageDecoder::kKTX_Format; | 319 return SkImageDecoder::kKTX_Format; |
| 320 } | 320 } |
| 321 return SkImageDecoder::kUnknown_Format; | 321 return SkImageDecoder::kUnknown_Format; |
| 322 } | 322 } |
| 323 | 323 |
| 324 SkImageEncoder* sk_libktx_efactory(SkImageEncoder::Type t) { | 324 SkImageEncoder* sk_libktx_efactory(SkImageEncoder::Type t) { |
| 325 return (SkImageEncoder::kKTX_Type == t) ? SkNEW(SkKTXImageEncoder) : NULL; | 325 return (SkImageEncoder::kKTX_Type == t) ? new SkKTXImageEncoder : NULL; |
| 326 } | 326 } |
| 327 | 327 |
| 328 static SkImageDecoder_DecodeReg gReg(sk_libktx_dfactory); | 328 static SkImageDecoder_DecodeReg gReg(sk_libktx_dfactory); |
| 329 static SkImageDecoder_FormatReg gFormatReg(get_format_ktx); | 329 static SkImageDecoder_FormatReg gFormatReg(get_format_ktx); |
| 330 static SkImageEncoder_EncodeReg gEReg(sk_libktx_efactory); | 330 static SkImageEncoder_EncodeReg gEReg(sk_libktx_efactory); |
| OLD | NEW |