From: "Daniel P. Berrange" <dan@berrange.com>

Fixes to misc functions to address char * vs unsigned char *
sign mis-matches, by adding casts to silence the compiler.



git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14902 67ed7778-7388-44ab-90cf-0a291f65f57c

2 files changed, 7 insertions, 5 deletions

diff --git a/camlibs/minolta/dimagev/download.c b/camlibs/minolta/dimagev/download.c
index bd1e33520..575e9f0b7 100644
--- a/camlibs/minolta/dimagev/download.c
+++ b/camlibs/minolta/dimagev/download.c
@@ -191,8 +191,8 @@ int dimagev_get_picture(dimagev_t *dimagev, int file_number, CameraFile *file) {
 	}
 
 #ifdef _gphoto_exif_
-	exifdat.header = data;
-	exifdat.data = data + 12 ;
+	exifdat.header = (unsigned char *)data;
+	exifdat.data = (unsigned char *)data + 12 ;
 
 	if ( gpi_exif_stat(&exifdat) != 0 ) {
 		GP_DEBUG( "dimagev_get_picture::unable to stat EXIF tags");
@@ -352,7 +352,7 @@ int dimagev_get_thumbnail(dimagev_t *dimagev, int file_number, CameraFile *file)
 			return GP_ERROR_IO;
 	}
 
-	data = dimagev_ycbcr_to_ppm(ycrcb_data);
+	data = (char *)dimagev_ycbcr_to_ppm(ycrcb_data);
 	size = 14413;
 
 	gp_file_set_data_and_size (file, data, size);
diff --git a/camlibs/minolta/dimagev/upload.c b/camlibs/minolta/dimagev/upload.c
index 6719533fd..c7f7c600b 100644
--- a/camlibs/minolta/dimagev/upload.c
+++ b/camlibs/minolta/dimagev/upload.c
@@ -139,14 +139,16 @@ int dimagev_put_file(dimagev_t* dimagev, CameraFile *file) {
 
 	for ( sent_packets = (unsigned char) 1 ; sent_packets < total_packets ; sent_packets++ ) {
 		if ( left_to_send > 993 ) {
-			if ( ( p = dimagev_make_packet(&(data[(sent_packets * 993) - 1]), 993, sent_packets) ) == NULL ) {
+			if ( ( p = dimagev_make_packet((unsigned char *)&(data[(sent_packets * 993) - 1]),
+						       993, sent_packets) ) == NULL ) {
 				GP_DEBUG( "dimagev_put_file::unable to allocate data packet");
 				free(p);
 				return GP_ERROR_NO_MEMORY;
 			}
 			left_to_send-=993;
 		} else {
-			if ( ( p = dimagev_make_packet(&(data[((sent_packets * 993) - 1)]), left_to_send, sent_packets) ) == NULL ) {
+			if ( ( p = dimagev_make_packet((unsigned char *)&(data[((sent_packets * 993) - 1)]),
+						       left_to_send, sent_packets) ) == NULL ) {
 				GP_DEBUG( "dimagev_put_file::unable to allocate data packet");
 				return GP_ERROR_NO_MEMORY;
 			}