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

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

Issue 2206633004: Move off SK_SUPPORT_LEGACY_DATA_FACTORIES. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Gotta catch 'em all. Created 4 years, 4 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
OLDNEW
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 "SkImageEncoder.h" 9 #include "SkImageEncoder.h"
10 #include "SkImageGenerator.h" 10 #include "SkImageGenerator.h"
(...skipping 28 matching lines...) Expand all
39 39
40 private: 40 private:
41 virtual bool encodePKM(SkWStream* stream, const SkData *data); 41 virtual bool encodePKM(SkWStream* stream, const SkData *data);
42 typedef SkImageEncoder INHERITED; 42 typedef SkImageEncoder INHERITED;
43 }; 43 };
44 44
45 bool SkKTXImageEncoder::onEncode(SkWStream* stream, const SkBitmap& bitmap, int) { 45 bool SkKTXImageEncoder::onEncode(SkWStream* stream, const SkBitmap& bitmap, int) {
46 if (!bitmap.pixelRef()) { 46 if (!bitmap.pixelRef()) {
47 return false; 47 return false;
48 } 48 }
49 SkAutoDataUnref data(bitmap.pixelRef()->refEncodedData()); 49 sk_sp<SkData> data(bitmap.pixelRef()->refEncodedData());
50 50
51 // Is this even encoded data? 51 // Is this even encoded data?
52 if (data) { 52 if (data) {
53 const uint8_t *bytes = data->bytes(); 53 const uint8_t *bytes = data->bytes();
54 if (etc1_pkm_is_valid(bytes)) { 54 if (etc1_pkm_is_valid(bytes)) {
55 return this->encodePKM(stream, data); 55 return this->encodePKM(stream, data.get());
56 } 56 }
57 57
58 // Is it a KTX file?? 58 // Is it a KTX file??
59 if (SkKTXFile::is_ktx(bytes, data->size())) { 59 if (SkKTXFile::is_ktx(bytes, data->size())) {
60 return stream->write(bytes, data->size()); 60 return stream->write(bytes, data->size());
61 } 61 }
62 62
63 // If it's neither a KTX nor a PKM, then we need to 63 // If it's neither a KTX nor a PKM, then we need to
64 // get at the actual pixels, so fall through and decompress... 64 // get at the actual pixels, so fall through and decompress...
65 } 65 }
(...skipping 22 matching lines...) Expand all
88 88
89 //////////////////////////////////////////////////////////////////////////////// ///////// 89 //////////////////////////////////////////////////////////////////////////////// /////////
90 DEFINE_ENCODER_CREATOR(KTXImageEncoder); 90 DEFINE_ENCODER_CREATOR(KTXImageEncoder);
91 //////////////////////////////////////////////////////////////////////////////// ///////// 91 //////////////////////////////////////////////////////////////////////////////// /////////
92 92
93 SkImageEncoder* sk_libktx_efactory(SkImageEncoder::Type t) { 93 SkImageEncoder* sk_libktx_efactory(SkImageEncoder::Type t) {
94 return (SkImageEncoder::kKTX_Type == t) ? new SkKTXImageEncoder : nullptr; 94 return (SkImageEncoder::kKTX_Type == t) ? new SkKTXImageEncoder : nullptr;
95 } 95 }
96 96
97 static SkImageEncoder_EncodeReg gEReg(sk_libktx_efactory); 97 static SkImageEncoder_EncodeReg gEReg(sk_libktx_efactory);
OLDNEW
« include/core/SkData.h ('K') | « src/image/SkImage_Raster.cpp ('k') | src/pdf/SkPDFFont.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698