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 "SkMetaData.h" | 10 #include "SkMetaData.h" |
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
84 SkScalar* SkMetaData::setScalars(const char name[], int count, const SkScalar va
lues[]) | 84 SkScalar* SkMetaData::setScalars(const char name[], int count, const SkScalar va
lues[]) |
85 { | 85 { |
86 SkASSERT(count > 0); | 86 SkASSERT(count > 0); |
87 if (count > 0) | 87 if (count > 0) |
88 return (SkScalar*)this->set(name, values, sizeof(SkScalar), kScalar_Type
, count); | 88 return (SkScalar*)this->set(name, values, sizeof(SkScalar), kScalar_Type
, count); |
89 return NULL; | 89 return NULL; |
90 } | 90 } |
91 | 91 |
92 void SkMetaData::setString(const char name[], const char value[]) | 92 void SkMetaData::setString(const char name[], const char value[]) |
93 { | 93 { |
94 (void)this->set(name, value, sizeof(char), kString_Type, strlen(value) + 1); | 94 (void)this->set(name, value, sizeof(char), kString_Type, SkToInt(strlen(valu
e) + 1)); |
95 } | 95 } |
96 | 96 |
97 void SkMetaData::setPtr(const char name[], void* ptr, PtrProc proc) { | 97 void SkMetaData::setPtr(const char name[], void* ptr, PtrProc proc) { |
98 PtrPair pair = { ptr, proc }; | 98 PtrPair pair = { ptr, proc }; |
99 (void)this->set(name, &pair, sizeof(PtrPair), kPtr_Type, 1); | 99 (void)this->set(name, &pair, sizeof(PtrPair), kPtr_Type, 1); |
100 } | 100 } |
101 | 101 |
102 void SkMetaData::setBool(const char name[], bool value) | 102 void SkMetaData::setBool(const char name[], bool value) |
103 { | 103 { |
104 (void)this->set(name, &value, sizeof(bool), kBool_Type, 1); | 104 (void)this->set(name, &value, sizeof(bool), kBool_Type, 1); |
105 } | 105 } |
106 | 106 |
107 void SkMetaData::setData(const char name[], const void* data, size_t byteCount)
{ | 107 void SkMetaData::setData(const char name[], const void* data, size_t byteCount)
{ |
108 (void)this->set(name, data, sizeof(char), kData_Type, byteCount); | 108 (void)this->set(name, data, sizeof(char), kData_Type, SkToInt(byteCount)); |
109 } | 109 } |
110 | 110 |
111 void* SkMetaData::set(const char name[], const void* data, size_t dataSize, Type
type, int count) | 111 void* SkMetaData::set(const char name[], const void* data, size_t dataSize, Type
type, int count) |
112 { | 112 { |
113 SkASSERT(name); | 113 SkASSERT(name); |
114 SkASSERT(dataSize); | 114 SkASSERT(dataSize); |
115 SkASSERT(count > 0); | 115 SkASSERT(count > 0); |
116 | 116 |
117 (void)this->remove(name, type); | 117 (void)this->remove(name, type); |
118 | 118 |
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
327 | 327 |
328 /////////////////////////////////////////////////////////////////////////////// | 328 /////////////////////////////////////////////////////////////////////////////// |
329 | 329 |
330 SkMetaData::Rec* SkMetaData::Rec::Alloc(size_t size) { | 330 SkMetaData::Rec* SkMetaData::Rec::Alloc(size_t size) { |
331 return (Rec*)sk_malloc_throw(size); | 331 return (Rec*)sk_malloc_throw(size); |
332 } | 332 } |
333 | 333 |
334 void SkMetaData::Rec::Free(Rec* rec) { | 334 void SkMetaData::Rec::Free(Rec* rec) { |
335 sk_free(rec); | 335 sk_free(rec); |
336 } | 336 } |
OLD | NEW |