diff options
| author | dcommander <dcommander@632fc199-4ca6-4c93-a231-07263d6284db> | 2013-01-01 10:17:03 +0000 |
|---|---|---|
| committer | dcommander <dcommander@632fc199-4ca6-4c93-a231-07263d6284db> | 2013-01-01 10:17:03 +0000 |
| commit | 5fdd6ca97e919aaf6f76da1905672f4c3c8bd33f (patch) | |
| tree | 66aebf107f1f048a44ad7cd07076d8038b36dce8 /jdatadst-tj.c | |
| parent | 1fc3e95031361f18eb68840c3a79f8ae448c40fa (diff) | |
Minor modifications from jpeg-8d
git-svn-id: svn://svn.code.sf.net/p/libjpeg-turbo/code/trunk@879 632fc199-4ca6-4c93-a231-07263d6284db
Diffstat (limited to 'jdatadst-tj.c')
| -rw-r--r-- | jdatadst-tj.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/jdatadst-tj.c b/jdatadst-tj.c index 1939f23..8551495 100644 --- a/jdatadst-tj.c +++ b/jdatadst-tj.c @@ -3,7 +3,7 @@ * * This file was part of the Independent JPEG Group's software: * Copyright (C) 1994-1996, Thomas G. Lane. - * Modified 2009 by Guido Vollbeding. + * Modified 2009-2012 by Guido Vollbeding. * Modifications: * Copyright (C) 2011, D. R. Commander. * For conditions of distribution and use, see the accompanying README file. @@ -93,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); @@ -177,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; |