diff options
| author | Marcus Meissner <marcus@jet.franken.de> | 2014-04-11 20:18:36 +0000 |
|---|---|---|
| committer | Marcus Meissner <marcus@jet.franken.de> | 2014-04-11 20:18:36 +0000 |
| commit | 292d2f69aa9846a2d24dafb0263828e8806f34c7 (patch) | |
| tree | 16d2b6363518b107fb1c0f30f2fd1376aaa24ea1 /camlibs/polaroid | |
| parent | 7318557c352d818da699bc5328756c233c9c1060 (diff) | |
| download | libgphoto2-292d2f69aa9846a2d24dafb0263828e8806f34c7.tar.gz | |
From: "Daniel P. Berrange" <dan@berrange.com>
Many calls of gp_file_* functions are passing a 'unsigned char *'
rather than the 'char *' they expect. Add explicit casts to
silence the compiler.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14900 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'camlibs/polaroid')
| -rw-r--r-- | camlibs/polaroid/pdc320.c | 2 | ||||
| -rw-r--r-- | camlibs/polaroid/pdc700.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/camlibs/polaroid/pdc320.c b/camlibs/polaroid/pdc320.c index 88fff44cc..698876c5e 100644 --- a/camlibs/polaroid/pdc320.c +++ b/camlibs/polaroid/pdc320.c @@ -416,7 +416,7 @@ get_file_func (CameraFilesystem *fs, const char *folder, const char *filename, /* Post-processing */ switch (type) { case GP_FILE_TYPE_RAW: - CR (gp_file_set_data_and_size (file, data, size)); + CR (gp_file_set_data_and_size (file, (char *)data, size)); CR (gp_file_set_mime_type (file, GP_MIME_RAW)); break; case GP_FILE_TYPE_NORMAL: diff --git a/camlibs/polaroid/pdc700.c b/camlibs/polaroid/pdc700.c index 41670048a..84d6ee412 100644 --- a/camlibs/polaroid/pdc700.c +++ b/camlibs/polaroid/pdc700.c @@ -866,7 +866,7 @@ get_file_func (CameraFilesystem *fs, const char *folder, const char *filename, case GP_FILE_TYPE_NORMAL: /* Files are always JPEG */ - CRF (gp_file_set_data_and_size (file, data, size), data); + CRF (gp_file_set_data_and_size (file, (char *)data, size), data); CR (gp_file_set_mime_type (file, GP_MIME_JPEG)); break; @@ -880,7 +880,7 @@ get_file_func (CameraFilesystem *fs, const char *folder, const char *filename, (data[size - 2] == 0xff) && (data[size - 1] == 0xd9)) { /* Image is JPEG */ - CRF (gp_file_set_data_and_size (file, data, size), + CRF (gp_file_set_data_and_size (file, (char *)data, size), data); CR (gp_file_set_mime_type (file, GP_MIME_JPEG)); @@ -907,7 +907,7 @@ get_file_func (CameraFilesystem *fs, const char *folder, const char *filename, free (data); CRF (gp_file_append (file, header, strlen (header)), ppm); - CRF (gp_file_append (file, ppm, ppm_size), ppm); + CRF (gp_file_append (file, (char *)ppm, ppm_size), ppm); free (ppm); CR (gp_file_set_mime_type (file, GP_MIME_PPM)); @@ -923,7 +923,7 @@ get_file_func (CameraFilesystem *fs, const char *folder, const char *filename, case GP_FILE_TYPE_RAW: #if 1 - CRF (gp_file_set_data_and_size (file, data, size), data); + CRF (gp_file_set_data_and_size (file, (char *)data, size), data); CR (gp_file_set_mime_type (file, GP_MIME_RAW)); break; #endif |