diff options
Diffstat (limited to 'chromium/third_party/libjpeg_turbo/jdatadst-tj.c')
| -rw-r--r-- | chromium/third_party/libjpeg_turbo/jdatadst-tj.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/chromium/third_party/libjpeg_turbo/jdatadst-tj.c b/chromium/third_party/libjpeg_turbo/jdatadst-tj.c index cb674dca9f4..a8bf2401abe 100644 --- a/chromium/third_party/libjpeg_turbo/jdatadst-tj.c +++ b/chromium/third_party/libjpeg_turbo/jdatadst-tj.c @@ -1,9 +1,11 @@ /* - * jdatadst.c + * jdatadst-tj.c * + * This file was part of the Independent JPEG Group's software: * Copyright (C) 1994-1996, Thomas G. Lane. - * Modified 2009 by Guido Vollbeding. - * This file is part of the Independent JPEG Group's software. + * Modified 2009-2012 by Guido Vollbeding. + * libjpeg-turbo Modifications: + * Copyright (C) 2011, D. R. Commander. * For conditions of distribution and use, see the accompanying README file. * * This file contains compression data destination routines for the case of @@ -91,7 +93,7 @@ empty_mem_output_buffer (j_compress_ptr cinfo) /* Try to allocate new buffer with double size */ nextsize = dest->bufsize * 2; - nextbuffer = malloc(nextsize); + nextbuffer = (JOCTET *) malloc(nextsize); if (nextbuffer == NULL) ERREXIT1(cinfo, JERR_OUT_OF_MEMORY, 10); @@ -175,7 +177,7 @@ jpeg_mem_dest_tj (j_compress_ptr cinfo, if (*outbuffer == NULL || *outsize == 0) { if (alloc) { /* Allocate initial buffer */ - dest->newbuffer = *outbuffer = malloc(OUTPUT_BUF_SIZE); + dest->newbuffer = *outbuffer = (unsigned char *) malloc(OUTPUT_BUF_SIZE); if (dest->newbuffer == NULL) ERREXIT1(cinfo, JERR_OUT_OF_MEMORY, 10); *outsize = OUTPUT_BUF_SIZE; |