diff options
| author | Marcus Meissner <marcus@jet.franken.de> | 2014-04-11 20:25:20 +0000 |
|---|---|---|
| committer | Marcus Meissner <marcus@jet.franken.de> | 2014-04-11 20:25:20 +0000 |
| commit | 18c4ba9cc44f21f71334787d3d09a60cb49d2c66 (patch) | |
| tree | 435a848a4f7b971de2d86c4dcf130c28d08508cb /camlibs/casio | |
| parent | 669d3bfc2fc7b1b8f8fbe4e97e1b51a37068b3ed (diff) | |
| download | libgphoto2-18c4ba9cc44f21f71334787d3d09a60cb49d2c66.tar.gz | |
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
Diffstat (limited to 'camlibs/casio')
| -rw-r--r-- | camlibs/casio/casio-qv-commands.c | 2 | ||||
| -rw-r--r-- | camlibs/casio/casio-qv.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/camlibs/casio/casio-qv-commands.c b/camlibs/casio/casio-qv-commands.c index 5a33cbc54..d1080e6ef 100644 --- a/camlibs/casio/casio-qv-commands.c +++ b/camlibs/casio/casio-qv-commands.c @@ -391,7 +391,7 @@ QVstatus (Camera *camera, char *status) cmd[0] = 'D'; cmd[1] = 'S'; cmd[2] = STX; - CR (QVsend (camera, cmd, 3, status, 2)); + CR (QVsend (camera, cmd, 3, (unsigned char *)status, 2)); return (GP_OK); } diff --git a/camlibs/casio/casio-qv.c b/camlibs/casio/casio-qv.c index 02d68c209..0d625f2d7 100644 --- a/camlibs/casio/casio-qv.c +++ b/camlibs/casio/casio-qv.c @@ -132,17 +132,17 @@ get_file_func (CameraFilesystem *fs, const char *folder, const char *filename, switch (type) { case GP_FILE_TYPE_RAW: - CHECK_RESULT (QVgetCAMpic (camera, &data, &size, attr&2)); + CHECK_RESULT (QVgetCAMpic (camera, &data, (long unsigned *)&size, attr&2)); CHECK_RESULT (gp_file_set_mime_type(file, GP_MIME_RAW)); break; case GP_FILE_TYPE_PREVIEW: - CHECK_RESULT (QVgetYCCpic (camera, &cam, &camSize)); + CHECK_RESULT (QVgetYCCpic (camera, &cam, (long unsigned *)&camSize)); CHECK_RESULT (QVycctoppm(cam, camSize, THUMBNAIL_WIDTH, THUMBNAIL_HEIGHT, 2, &data, &size)); free(cam); CHECK_RESULT (gp_file_set_mime_type (file, GP_MIME_PPM)); break; case GP_FILE_TYPE_NORMAL: - CHECK_RESULT (QVgetCAMpic (camera, &cam, &camSize, attr&2)); + CHECK_RESULT (QVgetCAMpic (camera, &cam, (long unsigned *)&camSize, attr&2)); CHECK_RESULT ((attr&2 ? QVfinecamtojpeg : QVcamtojpeg)(cam, camSize, &data, &size)); free(cam); CHECK_RESULT (gp_file_set_mime_type (file, GP_MIME_JPEG)); |