| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * Copyright 2015 The Android Open Source Project | 2  * Copyright 2015 The Android Open Source Project | 
| 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 #ifndef SubsetBenchPriv_DEFINED | 8 #ifndef SubsetBenchPriv_DEFINED | 
| 9 #define SubsetBenchPriv_DEFINED | 9 #define SubsetBenchPriv_DEFINED | 
| 10 | 10 | 
| (...skipping 23 matching lines...) Expand all  Loading... | 
| 34 | 34 | 
| 35 /* | 35 /* | 
| 36  * If we plan to decode to kIndex8, we must create a color table and pass it to 
    the | 36  * If we plan to decode to kIndex8, we must create a color table and pass it to 
    the | 
| 37  * bitmap when we allocate pixels.  Otherwise, we simply allocate pixels using t
    he | 37  * bitmap when we allocate pixels.  Otherwise, we simply allocate pixels using t
    he | 
| 38  * decode info. | 38  * decode info. | 
| 39  */ | 39  */ | 
| 40 static inline void alloc_pixels(SkBitmap* bitmap, const SkImageInfo& info, SkPMC
    olor* colors, | 40 static inline void alloc_pixels(SkBitmap* bitmap, const SkImageInfo& info, SkPMC
    olor* colors, | 
| 41         int colorCount) { | 41         int colorCount) { | 
| 42     if (kIndex_8_SkColorType == info.colorType()) { | 42     if (kIndex_8_SkColorType == info.colorType()) { | 
| 43         SkAutoTUnref<SkColorTable> colorTable(new SkColorTable(colors, colorCoun
    t)); | 43         SkAutoTUnref<SkColorTable> colorTable(new SkColorTable(colors, colorCoun
    t)); | 
| 44         bitmap->allocPixels(info, NULL, colorTable); | 44         bitmap->allocPixels(info, nullptr, colorTable); | 
| 45     } else { | 45     } else { | 
| 46         bitmap->allocPixels(info); | 46         bitmap->allocPixels(info); | 
| 47     } | 47     } | 
| 48 } | 48 } | 
| 49 | 49 | 
| 50 #endif // SubsetBenchPriv_DEFINED | 50 #endif // SubsetBenchPriv_DEFINED | 
| OLD | NEW | 
|---|