diff options
| author | Dan Fandrich <dan@coneharvesters.com> | 2010-07-14 20:50:22 +0000 |
|---|---|---|
| committer | Dan Fandrich <dan@coneharvesters.com> | 2010-07-14 20:50:22 +0000 |
| commit | 1df292a5e4a6718b5e639c24055866bb84ada05a (patch) | |
| tree | 2da3d850be3f9f2d2268e5424676a6b0d93fa7cf /camlibs/jl2005c | |
| parent | 5186b553a5a5183eea7b54afd0ad538ae8538c64 (diff) | |
| download | libgphoto2-1df292a5e4a6718b5e639c24055866bb84ada05a.tar.gz | |
Fixed some compiler warnings and portability issues
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@13148 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'camlibs/jl2005c')
| -rw-r--r-- | camlibs/jl2005c/jl2005bcd_decompress.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/camlibs/jl2005c/jl2005bcd_decompress.c b/camlibs/jl2005c/jl2005bcd_decompress.c index d208ab7cf..da9f4fd33 100644 --- a/camlibs/jl2005c/jl2005bcd_decompress.c +++ b/camlibs/jl2005c/jl2005bcd_decompress.c @@ -80,6 +80,14 @@ jl2005bcd_decompress (unsigned char *output, unsigned char *input, int outputsize = 0; unsigned long jpeg_header_size = 0; int i, x, y, x1, y1, jpeg_data_size, jpeg_data_idx, eoi, size, ret; + JSAMPLE green[8 * 16]; + JSAMPLE red[8 * 8]; + JSAMPLE blue[8 * 8]; + JSAMPROW green_row_pointer[16]; + JSAMPROW red_row_pointer[8]; + JSAMPROW blue_row_pointer[8]; + JSAMPARRAY samp_image[3]; + GP_DEBUG("Running jl2005bcd_decompress() function.\n"); @@ -180,13 +188,6 @@ jl2005bcd_decompress (unsigned char *output, unsigned char *input, jpeg_finish_compress (&cinfo); jpeg_destroy_compress (&cinfo); - JSAMPLE green[8 * 16]; - JSAMPLE red[8 * 8]; - JSAMPLE blue[8 * 8]; - JSAMPROW green_row_pointer[16]; - JSAMPROW red_row_pointer[8]; - JSAMPROW blue_row_pointer[8]; - for (i = 0; i < 16; i++) green_row_pointer[i] = green + i * 8; @@ -195,9 +196,9 @@ jl2005bcd_decompress (unsigned char *output, unsigned char *input, blue_row_pointer[i] = blue + i * 8; } - JSAMPARRAY samp_image[3] = { green_row_pointer, - red_row_pointer, - blue_row_pointer }; + samp_image[0] = green_row_pointer; + samp_image[1] = red_row_pointer; + samp_image[2] = blue_row_pointer; memcpy(jpeg_stripe, jpeg_header, JPEG_HEADER_SIZE); jpeg_stripe[JPEG_HEIGHT_OFFSET ] = height >> 8; |