Revision 7267c094 pflib.c
b/pflib.c | ||
---|---|---|
145 | 145 |
{ |
146 | 146 |
if (conv->conv_cnt < cnt) { |
147 | 147 |
conv->conv_cnt = cnt; |
148 |
conv->conv_buf = qemu_realloc(conv->conv_buf, sizeof(QemuPixel) * conv->conv_cnt);
|
|
148 |
conv->conv_buf = g_realloc(conv->conv_buf, sizeof(QemuPixel) * conv->conv_cnt);
|
|
149 | 149 |
} |
150 | 150 |
conv->conv_from(&conv->src, conv->conv_buf, src, cnt); |
151 | 151 |
conv->conv_to(&conv->dst, dst, conv->conv_buf, cnt); |
... | ... | |
156 | 156 |
|
157 | 157 |
QemuPfConv *qemu_pf_conv_get(PixelFormat *dst, PixelFormat *src) |
158 | 158 |
{ |
159 |
QemuPfConv *conv = qemu_mallocz(sizeof(QemuPfConv));
|
|
159 |
QemuPfConv *conv = g_malloc0(sizeof(QemuPfConv));
|
|
160 | 160 |
|
161 | 161 |
conv->src = *src; |
162 | 162 |
conv->dst = *dst; |
... | ... | |
195 | 195 |
return conv; |
196 | 196 |
|
197 | 197 |
err: |
198 |
qemu_free(conv);
|
|
198 |
g_free(conv);
|
|
199 | 199 |
return NULL; |
200 | 200 |
} |
201 | 201 |
|
... | ... | |
207 | 207 |
void qemu_pf_conv_put(QemuPfConv *conv) |
208 | 208 |
{ |
209 | 209 |
if (conv) { |
210 |
qemu_free(conv->conv_buf);
|
|
211 |
qemu_free(conv);
|
|
210 |
g_free(conv->conv_buf);
|
|
211 |
g_free(conv);
|
|
212 | 212 |
} |
213 | 213 |
} |
Also available in: Unified diff