OLD | NEW |
1 | 1 |
2 /* | 2 /* |
3 * Copyright 2006 The Android Open Source Project | 3 * Copyright 2006 The Android Open Source Project |
4 * | 4 * |
5 * Use of this source code is governed by a BSD-style license that can be | 5 * Use of this source code is governed by a BSD-style license that can be |
6 * found in the LICENSE file. | 6 * found in the LICENSE file. |
7 */ | 7 */ |
8 | 8 |
9 | 9 |
10 #include "SkBuffer.h" | 10 #include "SkBuffer.h" |
(...skipping 16 matching lines...) Expand all Loading... |
27 } | 27 } |
28 | 28 |
29 size_t SkRBuffer::skipToAlign4() | 29 size_t SkRBuffer::skipToAlign4() |
30 { | 30 { |
31 size_t pos = this->pos(); | 31 size_t pos = this->pos(); |
32 size_t n = SkAlign4(pos) - pos; | 32 size_t n = SkAlign4(pos) - pos; |
33 fPos += n; | 33 fPos += n; |
34 return n; | 34 return n; |
35 } | 35 } |
36 | 36 |
37 void SkRBufferWithSizeCheck::read(void* buffer, size_t size) { | 37 bool SkRBufferWithSizeCheck::read(void* buffer, size_t size) { |
38 fError = fError || (fPos + size > fStop); | 38 fError = fError || (fPos + size > fStop); |
39 if (!fError && (size > 0)) { | 39 if (!fError && (size > 0)) { |
40 readNoSizeCheck(buffer, size); | 40 readNoSizeCheck(buffer, size); |
41 } | 41 } |
| 42 return !fError; |
42 } | 43 } |
43 | 44 |
44 void* SkWBuffer::skip(size_t size) | 45 void* SkWBuffer::skip(size_t size) |
45 { | 46 { |
46 void* result = fPos; | 47 void* result = fPos; |
47 writeNoSizeCheck(NULL, size); | 48 writeNoSizeCheck(NULL, size); |
48 return fData == NULL ? NULL : result; | 49 return fData == NULL ? NULL : result; |
49 } | 50 } |
50 | 51 |
51 void SkWBuffer::writeNoSizeCheck(const void* buffer, size_t size) | 52 void SkWBuffer::writeNoSizeCheck(const void* buffer, size_t size) |
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
127 | 128 |
128 const void* sk_buffer_read_ptr(const void* buffer, void** ptr) | 129 const void* sk_buffer_read_ptr(const void* buffer, void** ptr) |
129 { | 130 { |
130 AssertBuffer32(buffer); | 131 AssertBuffer32(buffer); |
131 if (ptr) | 132 if (ptr) |
132 *ptr = *(void**)buffer; | 133 *ptr = *(void**)buffer; |
133 return (const char*)buffer + sizeof(void*); | 134 return (const char*)buffer + sizeof(void*); |
134 } | 135 } |
135 | 136 |
136 #endif | 137 #endif |
OLD | NEW |