diff options
| author | Marcus Meissner <marcus@jet.franken.de> | 2014-04-11 20:19:32 +0000 |
|---|---|---|
| committer | Marcus Meissner <marcus@jet.franken.de> | 2014-04-11 20:19:32 +0000 |
| commit | 669d3bfc2fc7b1b8f8fbe4e97e1b51a37068b3ed (patch) | |
| tree | 0a10419c81ce373256950ed05ad1298e6211289b /camlibs/polaroid | |
| parent | 292d2f69aa9846a2d24dafb0263828e8806f34c7 (diff) | |
| download | libgphoto2-669d3bfc2fc7b1b8f8fbe4e97e1b51a37068b3ed.tar.gz | |
From: "Daniel P. Berrange" <dan@berrange.com>
Many callers of strcpy/scanf/strcmp 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@14901 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'camlibs/polaroid')
| -rw-r--r-- | camlibs/polaroid/pdc640.c | 2 | ||||
| -rw-r--r-- | camlibs/polaroid/pdc700.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/camlibs/polaroid/pdc640.c b/camlibs/polaroid/pdc640.c index 49b06a60e..0b3ece79c 100644 --- a/camlibs/polaroid/pdc640.c +++ b/camlibs/polaroid/pdc640.c @@ -725,7 +725,7 @@ pdc640_getpic (Camera *camera, int n, int thumbnail, int justraw, return (GP_ERROR_NO_MEMORY); /* Set header */ - strcpy(outdata, ppmheader); + strcpy((char *)outdata, ppmheader); /* Decode and interpolate the Bayer Mask */ result = gp_bayer_decode(*data, width, height, diff --git a/camlibs/polaroid/pdc700.c b/camlibs/polaroid/pdc700.c index 84d6ee412..3c9bc5ded 100644 --- a/camlibs/polaroid/pdc700.c +++ b/camlibs/polaroid/pdc700.c @@ -477,7 +477,7 @@ pdc700_picinfo (Camera *camera, unsigned int n, PDCPicInfo *info, /* The meaning of buf[22] is unknown */ /* Version info */ - strncpy (info->version, &buf[23], 6); + strncpy (info->version, (char *)&buf[23], 6); /* * Now follows some picture data we have yet to reverse @@ -548,7 +548,7 @@ pdc700_info (Camera *camera, PDCInfo *info, GPContext *context) } /* Protocol version */ - strncpy (info->version, &buf[8], 6); + strncpy (info->version, (char *)&buf[8], 6); /* buf[14-15]: We don't know. Seems to be always 00 00 */ |