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

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

Issue 1316123003: Style Change: SkNEW->new; SkDELETE->delete (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 2015-08-26 (Wednesday) 15:59:00 EDT Created 5 years, 3 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/codec/SkBmpCodec.cpp ('k') | src/codec/SkBmpRLECodec.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 "SkBmpMaskCodec.h" 8 #include "SkBmpMaskCodec.h"
9 #include "SkCodecPriv.h" 9 #include "SkCodecPriv.h"
10 #include "SkColorPriv.h" 10 #include "SkColorPriv.h"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 SkCodecPrintf("Error: cannot initialize swizzler.\n"); 51 SkCodecPrintf("Error: cannot initialize swizzler.\n");
52 return kInvalidConversion; 52 return kInvalidConversion;
53 } 53 }
54 54
55 return this->decode(dstInfo, dst, dstRowBytes, opts); 55 return this->decode(dstInfo, dst, dstRowBytes, opts);
56 } 56 }
57 57
58 bool SkBmpMaskCodec::initializeSwizzler(const SkImageInfo& dstInfo) { 58 bool SkBmpMaskCodec::initializeSwizzler(const SkImageInfo& dstInfo) {
59 // Allocate space for a row buffer 59 // Allocate space for a row buffer
60 const size_t rowBytes = SkAlign4(compute_row_bytes(dstInfo.width(), this->bi tsPerPixel())); 60 const size_t rowBytes = SkAlign4(compute_row_bytes(dstInfo.width(), this->bi tsPerPixel()));
61 fSrcBuffer.reset(SkNEW_ARRAY(uint8_t, rowBytes)); 61 fSrcBuffer.reset(new uint8_t[rowBytes]);
62 62
63 // Create the swizzler 63 // Create the swizzler
64 fMaskSwizzler.reset(SkMaskSwizzler::CreateMaskSwizzler( 64 fMaskSwizzler.reset(SkMaskSwizzler::CreateMaskSwizzler(
65 dstInfo, fMasks, this->bitsPerPixel())); 65 dstInfo, fMasks, this->bitsPerPixel()));
66 66
67 if (NULL == fMaskSwizzler.get()) { 67 if (NULL == fMaskSwizzler.get()) {
68 return false; 68 return false;
69 } 69 }
70 70
71 return true; 71 return true;
(...skipping 29 matching lines...) Expand all
101 101
102 // Decode the row in destination format 102 // Decode the row in destination format
103 int row = SkBmpCodec::kBottomUp_RowOrder == this->rowOrder() ? height - 1 - y : y; 103 int row = SkBmpCodec::kBottomUp_RowOrder == this->rowOrder() ? height - 1 - y : y;
104 void* dstRow = SkTAddOffset<void>(dst, row * dstRowBytes); 104 void* dstRow = SkTAddOffset<void>(dst, row * dstRowBytes);
105 fMaskSwizzler->swizzle(dstRow, srcRow); 105 fMaskSwizzler->swizzle(dstRow, srcRow);
106 } 106 }
107 107
108 // Finished decoding the entire image 108 // Finished decoding the entire image
109 return kSuccess; 109 return kSuccess;
110 } 110 }
OLDNEW
« no previous file with comments | « src/codec/SkBmpCodec.cpp ('k') | src/codec/SkBmpRLECodec.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698