fixed signedness compile warnings in camlibs/aox and camlibs/sq905

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

4 files changed, 20 insertions, 15 deletions

diff --git a/camlibs/sq905/ChangeLog b/camlibs/sq905/ChangeLog
index 7ba3e9f9f..fb801700d 100644
--- a/camlibs/sq905/ChangeLog
+++ b/camlibs/sq905/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-24   Theodore Kilgore <kilgota@auburn.edu>
+	* library.c:
+	* sq905.c:
+	* sq905.h: fixed compile warnings about signedness. 
+
 2007-05-10   Marcus Meissner <marcus@jet.franken.de>
 
 	* postprocess.c: Fixed some free() calls and some memory leaks.
diff --git a/camlibs/sq905/library.c b/camlibs/sq905/library.c
index 5b3e26900..0289d4a5d 100644
--- a/camlibs/sq905/library.c
+++ b/camlibs/sq905/library.c
@@ -357,12 +357,12 @@ get_file_func (CameraFilesystem *fs, const char *folder, const char *filename,
 		 */
 		ppm = malloc (w * h * 3 + 256); /* room for data + header */
 		if (!ppm) { return GP_ERROR_NO_MEMORY; }
-    		sprintf (ppm,
+    		sprintf ((char *)ppm,
 			"P6\n"
 			"# CREATOR: gphoto2, SQ905 library\n"
 			"%d %d\n"
 			"255\n", w, h);
-		size = strlen (ppm);
+		size = strlen ((char *)ppm);
 		ptr = ppm + size;
 
 			switch (camera->pl->model) {
@@ -391,7 +391,7 @@ get_file_func (CameraFilesystem *fs, const char *folder, const char *filename,
 
 		gp_file_set_mime_type (file, GP_MIME_PPM);
     		gp_file_set_name (file, filename); 
-		gp_file_set_data_and_size (file, ppm, size);
+		gp_file_set_data_and_size (file, (char *)ppm, size);
 
 	} else {	/* type is GP_FILE_TYPE_RAW */
 		size = w*h/comp_ratio;
@@ -400,7 +400,7 @@ get_file_func (CameraFilesystem *fs, const char *folder, const char *filename,
 		memcpy (rawdata, frame_data, size);
 		gp_file_set_mime_type (file, GP_MIME_RAW);
 		gp_file_set_name (file, filename);
-	        gp_file_set_data_and_size (file, rawdata, size);  
+	        gp_file_set_data_and_size (file, (char *)rawdata, size);  
 	}
 	/* Reset camera when done, for more graceful exit. */
 	if ((!(is_in_clip)&&(entry +1 == camera->pl->nb_entries)) 
@@ -450,13 +450,13 @@ camera_capture_preview (Camera *camera, CameraFile *file, GPContext *context)
 	/* Now put the data into a PPM image file. */
 	ppm = malloc (w * h * 3 + 256); 
 	if (!ppm) { return GP_ERROR_NO_MEMORY; }
-    	sprintf (ppm,
+    	sprintf ((char *)ppm,
 		"P6\n"
 		"# CREATOR: gphoto2, SQ905 library\n"
 		"%d %d\n"
 		"255\n", w, h);
-	ptr = ppm + strlen (ppm);	
-	size = strlen (ppm) + (w * h * 3);
+	ptr = ppm + strlen ((char*)ppm);	
+	size = strlen ((char*)ppm) + (w * h * 3);
 	GP_DEBUG ("size = %i\n", size);
 	switch (camera->pl->model) {
 	case SQ_MODEL_POCK_CAM:
@@ -477,7 +477,7 @@ camera_capture_preview (Camera *camera, CameraFile *file, GPContext *context)
 	gp_gamma_correct_single (gtable, ptr, w * h); 
 	gp_file_set_mime_type (file, GP_MIME_PPM);
 	gp_file_set_name (file, filename); 
-	gp_file_set_data_and_size (file, ppm, size);
+	gp_file_set_data_and_size (file, (char *)ppm, size);
 
 	sq_reset(camera->port);
         sq_access_reg(camera->port, CAPTURE);
diff --git a/camlibs/sq905/sq905.c b/camlibs/sq905/sq905.c
index 4c2698cd9..53f7c013c 100644
--- a/camlibs/sq905/sq905.c
+++ b/camlibs/sq905/sq905.c
@@ -37,11 +37,11 @@
 
 #define zero 	"\x0"
 
-static unsigned char *
+static int
 sq_read_data (GPPort *port, unsigned char *data, int size)
 {
 	SQWRITE (port, 0x0c, 0x03, size, zero, 1); 
-	gp_port_read (port, data, size); 
+	gp_port_read (port, (char *)data, size); 
 	return GP_OK;
 }
 
@@ -120,7 +120,7 @@ sq_get_num_frames (CameraPrivateLibrary *priv, int entry)
 }
 
 
-unsigned char
+int
 sq_get_comp_ratio (CameraPrivateLibrary *priv, int entry)
 {
 	switch (priv->catalog[16*entry]) {
@@ -206,7 +206,7 @@ sq_reset (GPPort *port)
     	return GP_OK;
 }
 
-unsigned char *
+int
 sq_read_picture_data (GPPort *port, unsigned char *data, int size )
 {
 	int remainder = size % 0x8000;
diff --git a/camlibs/sq905/sq905.h b/camlibs/sq905/sq905.h
index d70c91a48..63c4a8f6d 100644
--- a/camlibs/sq905/sq905.h
+++ b/camlibs/sq905/sq905.h
@@ -41,13 +41,13 @@ int sq_access_reg 		     (GPPort *, int reg);
 int sq_reset             		(GPPort *);
 int sq_rewind                        (GPPort *, CameraPrivateLibrary *);
 int sq_init                          (GPPort *, CameraPrivateLibrary *);
-unsigned char *sq_read_picture_data  (GPPort *, unsigned char *data, int size);
+int sq_read_picture_data  (GPPort *, unsigned char *data, int size);
 int sq_delete_all                    (GPPort *, CameraPrivateLibrary *);
 
 /* Those functions don't need data transfer with the camera */
 int sq_get_num_frames                (CameraPrivateLibrary *, int entry);
-unsigned 
-char sq_get_comp_ratio      	     (CameraPrivateLibrary *, int entry);
+ 
+int sq_get_comp_ratio      	     (CameraPrivateLibrary *, int entry);
 int sq_get_picture_width             (CameraPrivateLibrary *, int entry);
 int sq_is_clip                       (CameraPrivateLibrary *, int entry);