system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-15 06:41:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

qcap: Use malloc() instead of heap_alloc().

Browse source 
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2020-11-26 22:34:30 -06:00 committed by Alexandre Julliard
parent 8fa03e494a
commit 8bcb4466c9
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
dlls/qcap/v4l.c
View file

@ -116,9 +116,9 @@ static void v4l_device_destroy(struct video_capture_device *device)
if (device->fd != -1) if (device->fd != -1)
video_close(device->fd); video_close(device->fd);
if (device->caps_count) if (device->caps_count)
heap_free(device->caps); free(device->caps);
heap_free(device->image_data); free(device->image_data);
heap_free(device); free(device);
} }
static const struct caps *find_caps(struct video_capture_device *device, const AM_MEDIA_TYPE *mt) static const struct caps *find_caps(struct video_capture_device *device, const AM_MEDIA_TYPE *mt)
@ -167,7 +167,7 @@ static HRESULT set_caps(struct video_capture_device *device, const struct caps *
height = caps->video_info.bmiHeader.biHeight; height = caps->video_info.bmiHeader.biHeight;
image_size = width * height * caps->video_info.bmiHeader.biBitCount / 8; image_size = width * height * caps->video_info.bmiHeader.biBitCount / 8;
if (!(image_data = heap_alloc(image_size))) if (!(image_data = malloc(image_size)))
{ {
ERR("Failed to allocate memory.\n"); ERR("Failed to allocate memory.\n");
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
@ -183,14 +183,14 @@ static HRESULT set_caps(struct video_capture_device *device, const struct caps *
|| format.fmt.pix.height != height) || format.fmt.pix.height != height)
{ {
ERR("Failed to set pixel format: %s.\n", strerror(errno)); ERR("Failed to set pixel format: %s.\n", strerror(errno));
heap_free(image_data); free(image_data);
return VFW_E_TYPE_NOT_ACCEPTED; return VFW_E_TYPE_NOT_ACCEPTED;
} }
device->current_caps = caps; device->current_caps = caps;
device->image_size = image_size; device->image_size = image_size;
device->image_pitch = width * caps->video_info.bmiHeader.biBitCount / 8; device->image_pitch = width * caps->video_info.bmiHeader.biBitCount / 8;
heap_free(device->image_data); free(device->image_data);
device->image_data = image_data; device->image_data = image_data;
return S_OK; return S_OK;
} }
@ -407,7 +407,7 @@ struct video_capture_device *v4l_device_create(USHORT index)
have_libv4l2 = video_init(); have_libv4l2 = video_init();
if (!(device = heap_alloc_zero(sizeof(*device)))) if (!(device = calloc(1, sizeof(*device))))
return NULL; return NULL;
sprintf(path, "/dev/video%i", index); sprintf(path, "/dev/video%i", index);
@ -509,7 +509,7 @@ struct video_capture_device *v4l_device_create(USHORT index)
else else
ERR("Failed to get fps: %s.\n", strerror(errno)); ERR("Failed to get fps: %s.\n", strerror(errno));
new_caps = heap_realloc(device->caps, (device->caps_count + 1) * sizeof(*device->caps)); new_caps = realloc(device->caps, (device->caps_count + 1) * sizeof(*device->caps));
if (!new_caps) if (!new_caps)
goto error; goto error;
device->caps = new_caps; device->caps = new_caps;