| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2011 Google Inc. | 2 * Copyright 2011 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 "SkMallocPixelRef.h" | 8 #include "SkMallocPixelRef.h" |
| 9 #include "SkBitmap.h" | 9 #include "SkBitmap.h" |
| 10 #include "SkReadBuffer.h" | 10 #include "SkReadBuffer.h" |
| (...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 233 fCTable = SkNEW_ARGS(SkColorTable, (buffer)); | 233 fCTable = SkNEW_ARGS(SkColorTable, (buffer)); |
| 234 } else { | 234 } else { |
| 235 fCTable = NULL; | 235 fCTable = NULL; |
| 236 } | 236 } |
| 237 | 237 |
| 238 this->setPreLocked(fStorage, fRB, fCTable); | 238 this->setPreLocked(fStorage, fRB, fCTable); |
| 239 } | 239 } |
| 240 | 240 |
| 241 /////////////////////////////////////////////////////////////////////////////// | 241 /////////////////////////////////////////////////////////////////////////////// |
| 242 | 242 |
| 243 SkPixelRef* SkMallocPixelRef::PRFactory::create(const SkImageInfo& info, | 243 SkPixelRef* SkMallocPixelRef::PRFactory::create(const SkImageInfo& info, size_t
rowBytes, |
| 244 SkColorTable* ctable) { | 244 SkColorTable* ctable) { |
| 245 return SkMallocPixelRef::NewAllocate(info, info.minRowBytes(), ctable); | 245 return SkMallocPixelRef::NewAllocate(info, rowBytes, ctable); |
| 246 } | 246 } |
| OLD | NEW |