diff options
| author | Siim Meerits <sh0@yutani.ee> | 2020-08-02 07:50:20 +0300 |
|---|---|---|
| committer | Marcus Meissner <marcus@jet.franken.de> | 2020-08-03 08:42:50 +0200 |
| commit | 86a80434baeb54b68d3be210a22fc5a4f4681670 (patch) | |
| tree | 2b0e4b11887e6223d6ca45fbbe7b3f4736c33d3a | |
| parent | aeca6633002c81e224d277a80895ad8e685e1ed4 (diff) | |
| download | libgphoto2-86a80434baeb54b68d3be210a22fc5a4f4681670.tar.gz | |
Fix st2205 camlib compilation warnings.
Add missing field initialization values and resolve signed-unsigned compare issue.
| -rw-r--r-- | camlibs/st2205/library.c | 2 | ||||
| -rw-r--r-- | camlibs/st2205/st2205.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/camlibs/st2205/library.c b/camlibs/st2205/library.c index 2b140c3f0..ea00b1125 100644 --- a/camlibs/st2205/library.c +++ b/camlibs/st2205/library.c @@ -284,7 +284,7 @@ put_file_func (CameraFilesystem *fs, const char *folder, const char *name, #if defined(HAVE_ICONV) && defined(HAVE_LANGINFO_H) in = in_name; out = out_name; - if (iconv (camera->pl->cd, &in, &inc, &out, &outc) == -1) { + if (iconv (camera->pl->cd, &in, &inc, &out, &outc) == (size_t)(-1)) { free (in_name); free (out_name); gp_log (GP_LOG_ERROR, "iconv", diff --git a/camlibs/st2205/st2205.c b/camlibs/st2205/st2205.c index e59586e3b..86ebc866c 100644 --- a/camlibs/st2205/st2205.c +++ b/camlibs/st2205/st2205.c @@ -825,7 +825,8 @@ st2205_init(Camera *camera) { 0xff, 0xff, 0x04, 0x04, 0x04, 0x04, 0x04 }, }, { 96, 64, 7, 7, { 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00 }, }, - { 0, 0, 0 } + { 0, 0, 0, 0, + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, } }; const int uncompressed_firmware_checksums[] = { 0x00ab02fc, /* Frame 96x64 from blokker (Netherlands) */ |