fixed some signed/unsigned warnings
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@8617 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
@@ -206,7 +206,7 @@ static int file_list_func(CameraFilesystem *fs, const char *folder,
|
||||
}
|
||||
|
||||
#define GFD_BUFSIZE 19432
|
||||
static char *digita_file_get(Camera *camera, const char *folder,
|
||||
static unsigned char *digita_file_get(Camera *camera, const char *folder,
|
||||
const char *filename, int thumbnail, int *size,
|
||||
GPContext *context)
|
||||
{
|
||||
@@ -341,7 +341,7 @@ static int get_file_func(CameraFilesystem *fs, const char *folder,
|
||||
|
||||
switch (type) {
|
||||
case GP_FILE_TYPE_NORMAL:
|
||||
gp_file_set_data_and_size(file, data, buflen);
|
||||
gp_file_set_data_and_size(file, (char*)data, buflen);
|
||||
gp_file_set_mime_type(file, GP_MIME_JPEG);
|
||||
break;
|
||||
case GP_FILE_TYPE_PREVIEW:
|
||||
@@ -367,7 +367,7 @@ static int get_file_func(CameraFilesystem *fs, const char *folder,
|
||||
|
||||
strcpy(ppm, ppmhead);
|
||||
|
||||
decode_ycc422(data + 16, width, height, ppm + strlen(ppmhead));
|
||||
decode_ycc422(data + 16, width, height, (unsigned char*)(ppm + strlen(ppmhead)));
|
||||
free(data);
|
||||
|
||||
gp_file_set_mime_type(file, GP_MIME_PPM);
|
||||
|
||||
@@ -73,8 +73,8 @@ struct partial_tag {
|
||||
|
||||
struct filename {
|
||||
unsigned int driveno;
|
||||
unsigned char path[32];
|
||||
unsigned char dosname[16];
|
||||
char path[32];
|
||||
char dosname[16];
|
||||
};
|
||||
|
||||
struct file_item {
|
||||
|
||||
@@ -122,7 +122,7 @@ static int poll_and_wait(gp_port *dev, int length, int bob, int eob)
|
||||
|
||||
static int digita_serial_send(CameraPrivateLibrary *dev, void *_buffer, int len)
|
||||
{
|
||||
unsigned char *buffer = _buffer;
|
||||
char *buffer = _buffer;
|
||||
unsigned short s;
|
||||
int sent = 0, size;
|
||||
|
||||
@@ -170,7 +170,7 @@ static int poll_and_reply(gp_port *dev, int *length, int *eob, int nak)
|
||||
|
||||
static int digita_serial_read(CameraPrivateLibrary *dev, void *_buffer, int len)
|
||||
{
|
||||
unsigned char *buffer = _buffer;
|
||||
char *buffer = _buffer;
|
||||
unsigned short s;
|
||||
int received = 0, size, eob;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user