diff options
| author | Paul Kocialkowski <contact@paulk.fr> | 2014-07-01 19:10:39 +0200 |
|---|---|---|
| committer | Paul Kocialkowski <contact@paulk.fr> | 2014-07-01 19:10:39 +0200 |
| commit | 27bca80f9f0e6e32f50b0acc3c1fe9bdd328790c (patch) | |
| tree | 701fbf8ff3526a1b446eb819d5d06b0daf3f0605 | |
| parent | 9efc18a773634e56af930afaae99cccbe497c5f3 (diff) | |
| download | device_samsung_galaxys2-common-27bca80f9f0e6e32f50b0acc3c1fe9bdd328790c.zip device_samsung_galaxys2-common-27bca80f9f0e6e32f50b0acc3c1fe9bdd328790c.tar.gz device_samsung_galaxys2-common-27bca80f9f0e6e32f50b0acc3c1fe9bdd328790c.tar.bz2 | |
camera: Exif build warnings cleanup
Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
| -rw-r--r-- | camera/smdk4210_exif.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/camera/smdk4210_exif.c b/camera/smdk4210_exif.c index 8ac8b8c..4edc158 100644 --- a/camera/smdk4210_exif.c +++ b/camera/smdk4210_exif.c @@ -359,7 +359,7 @@ bv_ioctl: } int smdk4210_exif_write_data(void *exif_data, unsigned short tag, - unsigned short type, unsigned int count, int *offset, void *start, + unsigned short type, unsigned int count, unsigned int *offset, void *start, void *data, int length) { unsigned char *pointer; @@ -408,12 +408,12 @@ int smdk4210_exif_create(struct smdk4210_camera *smdk4210_camera, unsigned char user_comment_code[] = { 0x41, 0x53, 0x43, 0x49, 0x49, 0x0, 0x0, 0x0 }; unsigned char exif_ascii_prefix[] = { 0x41, 0x53, 0x43, 0x49, 0x49, 0x0, 0x0, 0x0 }; - camera_memory_t *exif_data_memory; + camera_memory_t *exif_data_memory = NULL; void *exif_data; int exif_data_size; int exif_size; - void *exif_ifd_data_start, *exif_ifd_start, *exif_ifd_gps, *exif_ifd_thumb; + void *exif_ifd_data_start, *exif_ifd_start, *exif_ifd_thumb, *exif_ifd_gps = NULL; void *exif_thumb_data; unsigned int exif_thumb_size; @@ -631,7 +631,7 @@ int smdk4210_exif_create(struct smdk4210_camera *smdk4210_camera, count = smdk4210_exif_write_data(pointer, EXIF_TAG_GPS_IFD_POINTER, EXIF_TYPE_LONG, 1, NULL, NULL, &offset, sizeof(offset)); - pointer = exif_ifd_start + offset; + pointer = (unsigned char *) exif_ifd_start + offset; if (exif_attributes->gps_processing_method[0] == 0) value = NUM_0TH_IFD_GPS - 1; |