881c881
<  * @data: gets thumbnail image data.
---
>  * @data: gets image data.
886c886
<  * camera. (remote shutter release via USB). The thumbnail will be
---
>  * camera. (remote shutter release via USB). The image will be
897c897
<         canonTransferMode transfermode = REMOTE_CAPTURE_THUMB_TO_PC;
---
>         canonTransferMode transfermode = REMOTE_CAPTURE_FULL_TO_PC;
938a939,968
> 
>                 {
>                         unsigned char *result_block;
>                         int result_len, payload_len;
>                         unsigned char payload[0x59];
>                         unsigned char *params;
>                         unsigned char desc[1024];
>                         payload_len = canon_int_pack_control_subcmd ( payload,
>                                                                       CANON_USB_CONTROL_GET_PARAMS,
>                                                                       0x00, 0,
>                                                                       desc );
>                         result_block = canon_usb_dialogue ( camera, CANON_USB_FUNCTION_CONTROL_CAMERA,
>                                                             &result_len, payload, payload_len );
>                         if ( result_block == NULL )
>                                 return GP_ERROR;
> 
>                         memset ( payload, 0, sizeof(payload) );
>                         params = payload+0x08;
>                         memcpy ( params, result_block+0x0c, 0x30 );
> 
>                         payload[0] = 0x07;
>                         payload[4] = 0x30;
>                         params[6] = 0;             /* Flash off */
>                         params[7] = 0;             /* Beep off */
>                         result_block = canon_usb_dialogue ( camera, CANON_USB_FUNCTION_CONTROL_CAMERA,
>                                                             &result_len, payload, 0x38 );
>                         if ( result_block == NULL )
>                                 return GP_ERROR;
>                 }
> 
975,977c1005,1007
<                 /* Download the thumbnail image. */
<                 if ( camera->pl->thumb_length > 0 ) {
<                         status = canon_usb_get_captured_thumbnail ( camera, camera->pl->image_key, data, length, context );
---
>                 /* Download the image. */
>                 if ( camera->pl->image_length > 0 ) {
>                         status = canon_usb_get_captured_image ( camera, camera->pl->image_key, data, length, context );
980c1010
<                                          " thumbnail download failed, status= %i", status );
---
>                                          " image download failed, status= %i", status );
1246c1276
< #ifdef DEBUG_TINY_IMAGES
---
> /* #ifdef DEBUG_TINY_IMAGES */
1268,1271c1298,1301
<                         params[1] = 2;       /* "Normal" compression */
<                         params[2] = 1;       /* JPEG */
<                         params[3] = 2;       /* small */
<                         params[4] = params[5] = 0; /* Self timer off */
---
> /*                         params[1] = 2;       /\* "Normal" compression *\/ */
> /*                         params[2] = 1;       /\* JPEG *\/ */
> /*                         params[3] = 2;       /\* small *\/ */
> /*                         params[4] = params[5] = 0; /\* Self timer off *\/ */
1279c1309
< #endif /* DEBUG_TINY_IMAGES */
---
> /* #endif /\* DEBUG_TINY_IMAGES *\/ */