OLD | NEW |
1 /* | 1 /* |
2 * Copyright 2012 The Android Open Source Project | 2 * Copyright 2012 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 #include "SkMergeImageFilter.h" | 8 #include "SkMergeImageFilter.h" |
9 #include "SkCanvas.h" | 9 #include "SkCanvas.h" |
10 #include "SkDevice.h" | 10 #include "SkDevice.h" |
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
158 } | 158 } |
159 | 159 |
160 SkMergeImageFilter::SkMergeImageFilter(SkFlattenableReadBuffer& buffer) | 160 SkMergeImageFilter::SkMergeImageFilter(SkFlattenableReadBuffer& buffer) |
161 : INHERITED(-1, buffer) { | 161 : INHERITED(-1, buffer) { |
162 bool hasModes = buffer.readBool(); | 162 bool hasModes = buffer.readBool(); |
163 if (hasModes) { | 163 if (hasModes) { |
164 this->initAllocModes(); | 164 this->initAllocModes(); |
165 int nbInputs = countInputs(); | 165 int nbInputs = countInputs(); |
166 size_t size = nbInputs * sizeof(fModes[0]); | 166 size_t size = nbInputs * sizeof(fModes[0]); |
167 SkASSERT(buffer.getArrayCount() == size); | 167 SkASSERT(buffer.getArrayCount() == size); |
168 if (buffer.readByteArray(fModes, size)) { | 168 if (buffer.validate(buffer.getArrayCount() == size) && |
| 169 buffer.readByteArray(fModes, size)) { |
169 for (int i = 0; i < nbInputs; ++i) { | 170 for (int i = 0; i < nbInputs; ++i) { |
170 buffer.validate(SkIsValidMode((SkXfermode::Mode)fModes[i])); | 171 buffer.validate(SkIsValidMode((SkXfermode::Mode)fModes[i])); |
171 } | 172 } |
172 } | 173 } |
173 } else { | 174 } else { |
174 fModes = 0; | 175 fModes = 0; |
175 } | 176 } |
176 } | 177 } |
OLD | NEW |