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

Side by Side Diff: src/codec/SkWebpCodec.cpp

Issue 1516833003: Switch SkAutoMalloc to SkAutoTMalloc to avoid cast (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Go back to patch set 3 Created 5 years 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/codec/SkSampledCodec.cpp ('k') | src/core/SkBitmap.cpp » ('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 2015 Google Inc. 2 * Copyright 2015 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 "SkCodecPriv.h" 8 #include "SkCodecPriv.h"
9 #include "SkWebpCodec.h" 9 #include "SkWebpCodec.h"
10 #include "SkTemplates.h" 10 #include "SkTemplates.h"
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 config.output.u.RGBA.rgba = (uint8_t*) dst; 223 config.output.u.RGBA.rgba = (uint8_t*) dst;
224 config.output.u.RGBA.stride = (int) rowBytes; 224 config.output.u.RGBA.stride = (int) rowBytes;
225 config.output.u.RGBA.size = dstInfo.getSafeSize(rowBytes); 225 config.output.u.RGBA.size = dstInfo.getSafeSize(rowBytes);
226 config.output.is_external_memory = 1; 226 config.output.is_external_memory = 1;
227 227
228 SkAutoTCallVProc<WebPIDecoder, WebPIDelete> idec(WebPIDecode(nullptr, 0, &co nfig)); 228 SkAutoTCallVProc<WebPIDecoder, WebPIDelete> idec(WebPIDecode(nullptr, 0, &co nfig));
229 if (!idec) { 229 if (!idec) {
230 return kInvalidInput; 230 return kInvalidInput;
231 } 231 }
232 232
233 SkAutoMalloc storage(BUFFER_SIZE); 233 SkAutoTMalloc<uint8_t> storage(BUFFER_SIZE);
234 uint8_t* buffer = static_cast<uint8_t*>(storage.get()); 234 uint8_t* buffer = storage.get();
235 while (true) { 235 while (true) {
236 const size_t bytesRead = stream()->read(buffer, BUFFER_SIZE); 236 const size_t bytesRead = stream()->read(buffer, BUFFER_SIZE);
237 if (0 == bytesRead) { 237 if (0 == bytesRead) {
238 WebPIDecGetRGB(idec, rowsDecoded, NULL, NULL, NULL); 238 WebPIDecGetRGB(idec, rowsDecoded, NULL, NULL, NULL);
239 return kIncompleteInput; 239 return kIncompleteInput;
240 } 240 }
241 241
242 switch (WebPIAppend(idec, buffer, bytesRead)) { 242 switch (WebPIAppend(idec, buffer, bytesRead)) {
243 case VP8_STATUS_OK: 243 case VP8_STATUS_OK:
244 return kSuccess; 244 return kSuccess;
245 case VP8_STATUS_SUSPENDED: 245 case VP8_STATUS_SUSPENDED:
246 // Break out of the switch statement. Continue the loop. 246 // Break out of the switch statement. Continue the loop.
247 break; 247 break;
248 default: 248 default:
249 return kInvalidInput; 249 return kInvalidInput;
250 } 250 }
251 } 251 }
252 } 252 }
253 253
254 SkWebpCodec::SkWebpCodec(const SkImageInfo& info, SkStream* stream) 254 SkWebpCodec::SkWebpCodec(const SkImageInfo& info, SkStream* stream)
255 : INHERITED(info, stream) {} 255 : INHERITED(info, stream) {}
OLDNEW
« no previous file with comments | « src/codec/SkSampledCodec.cpp ('k') | src/core/SkBitmap.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698