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

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

Issue 1882593002: Make is_ktx safer (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 8 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
« no previous file with comments | « src/gpu/SkGr.cpp ('k') | third_party/ktx/ktx.h » ('j') | 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 * 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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 SkAutoDataUnref data(bitmap.pixelRef()->refEncodedData()); 49 SkAutoDataUnref 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);
56 } 56 }
57 57
58 // Is it a KTX file?? 58 // Is it a KTX file??
59 if (SkKTXFile::is_ktx(bytes)) { 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 }
66 66
67 return SkKTXFile::WriteBitmapToKTX(stream, bitmap); 67 return SkKTXFile::WriteBitmapToKTX(stream, bitmap);
68 } 68 }
69 69
(...skipping 18 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
« no previous file with comments | « src/gpu/SkGr.cpp ('k') | third_party/ktx/ktx.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698