dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2024-11-19 20:08:28 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

make ImgIoUtilReadFile use WebPMalloc instead of malloc

Browse Source 
This is a minor technical change in API in case a special allocator
was used in WebPMalloc.

Change-Id: Idb78a9150d006f158c1a9538525097749e42e7f7
This commit is contained in:
Pascal Massimino 2020-10-16 15:37:26 +02:00 committed by Skal
parent 8cb7e536d2
commit 906c1fcd61
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/cwebp.c
View File

@ -94,7 +94,7 @@ static int ReadPicture(const char* const filename, WebPPicture* const pic,
WFPRINTF(stderr, "Error! Could not process file %s\n",
(const W_CHAR*)filename);
}
free((void*)data);
WebPFree((void*)data);
return ok;
}
@ -121,7 +121,7 @@ static int ReadPicture(const char* const filename, WebPPicture* const pic,
WFPRINTF(stderr, "Error! Could not process file %s\n",
(const W_CHAR*)filename);
}
free((void*)data);
WebPFree((void*)data);
return ok;
}

2
examples/img2webp.c
View File

@ -84,7 +84,7 @@ static int ReadImage(const char filename[], WebPPicture* const pic) {
if (!ImgIoUtilReadFile(filename, &data, &data_size)) return 0;
reader = WebPGuessImageReader(data, data_size);
ok = reader(data, data_size, pic, 1, NULL);
free((void*)data);
WebPFree((void*)data);
return ok;
}

2
examples/webpmux.c
View File

@ -1011,7 +1011,7 @@ static int Process(const Config* config) {
ok = ExUtilReadFileToWebPData(config->args_[0].filename_, &chunk);
if (!ok) goto Err2;
err = WebPMuxSetChunk(mux, kFourccList[config->type_], &chunk, 1);
free((void*)chunk.bytes);
WebPDataClear(&chunk);
if (err != WEBP_MUX_OK) {
ERROR_GOTO3("ERROR (%s): Could not set the %s.\n",
ErrorString(err), kDescriptions[config->type_], Err2);

4
imageio/imageio_util.c
View File

@ -91,7 +91,7 @@ int ImgIoUtilReadFile(const char* const file_name,
file_size = ftell(in);
fseek(in, 0, SEEK_SET);
// we allocate one extra byte for the \0 terminator
file_data = (uint8_t*)malloc(file_size + 1);
file_data = (uint8_t*)WebPMalloc(file_size + 1);
if (file_data == NULL) {
fclose(in);
WFPRINTF(stderr, "memory allocation failure when reading file %s\n",
@ -104,7 +104,7 @@ int ImgIoUtilReadFile(const char* const file_name,
if (!ok) {
WFPRINTF(stderr, "Could not read %d bytes of data from file %s\n",
(int)file_size, (const W_CHAR*)file_name);
free(file_data);
WebPFree(file_data);
return 0;
}
file_data[file_size] = '\0'; // convenient 0-terminator

2
imageio/imageio_util.h
View File

@ -29,7 +29,7 @@ FILE* ImgIoUtilSetBinaryMode(FILE* file);
// Allocates storage for entire file 'file_name' and returns contents and size
// in 'data' and 'data_size'. Returns 1 on success, 0 otherwise. '*data' should
// be deleted using free().
// be deleted using WebPFree().
// Note: for convenience, the data will be null-terminated with an extra byte
// (not accounted for in *data_size), in case the file is text and intended
// to be used as a C-string.

2
imageio/webpdec.c
View File

@ -65,7 +65,7 @@ int LoadWebP(const char* const in_file,
status = WebPGetFeatures(*data, *data_size, bitstream);
if (status != VP8_STATUS_OK) {
free((void*)*data);
WebPFree((void*)*data);
*data = NULL;
*data_size = 0;
PrintWebPError(in_file, status);