summaryrefslogtreecommitdiff
path: root/camlibs/kodak/dc210
diff options
context:
space:
mode:
authorMarcus Meissner <marcus@jet.franken.de>2020-08-28 16:32:15 +0200
committerMarcus Meissner <marcus@jet.franken.de>2020-08-28 16:32:15 +0200
commita17bc478a87bf98ebd6562dba221f03f3910c94b (patch)
treee066b46da4ce3f02d22b2eb382973ddc6a9479d8 /camlibs/kodak/dc210
parent796f1255e73094b400df3945dec6a90b935e41af (diff)
downloadlibgphoto2-a17bc478a87bf98ebd6562dba221f03f3910c94b.tar.gz
follow up fix to avoid some casts, moved 1 cast somewhere else
Diffstat (limited to 'camlibs/kodak/dc210')
-rw-r--r--camlibs/kodak/dc210/dc210.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/camlibs/kodak/dc210/dc210.c b/camlibs/kodak/dc210/dc210.c
index 43f0908f3..c1a8dec0c 100644
--- a/camlibs/kodak/dc210/dc210.c
+++ b/camlibs/kodak/dc210/dc210.c
@@ -173,7 +173,7 @@ camera_get_config (Camera *camera, CameraWidget **window, GPContext *context)
CameraWidget *section, *widget;
CameraAbilities abilities;
GPPortSettings settings;
- int i;
+ unsigned int i;
char * wvalue;
char stringbuffer[12];
@@ -260,9 +260,9 @@ camera_get_config (Camera *camera, CameraWidget **window, GPContext *context)
gp_widget_new (GP_WIDGET_MENU, _("Exposure compensation"), &widget);
gp_widget_append (section, widget);
- for (i = 0; (unsigned int)i < sizeof(exp_comp)/sizeof(*exp_comp); i++){
+ for (i = 0; i < sizeof(exp_comp)/sizeof(*exp_comp); i++){
gp_widget_add_choice (widget, exp_comp[i]);
- if (status.exp_compensation + 4 == i)
+ if ((unsigned int)(status.exp_compensation + 4) == i)
gp_widget_set_value (widget, exp_comp[i]);
};
@@ -305,7 +305,7 @@ camera_get_config (Camera *camera, CameraWidget **window, GPContext *context)
gp_port_get_settings (camera->port, &settings);
gp_widget_new (GP_WIDGET_MENU, _("Port speed"), &widget);
gp_widget_append (section, widget);
- for (i = 0; (unsigned int)i < sizeof(abilities.speed); i++){
+ for (i = 0; i < sizeof(abilities.speed); i++){
if (abilities.speed[i] == 0) break;
snprintf(stringbuffer, 12, "%d", abilities.speed[i]);
gp_widget_add_choice (widget, stringbuffer);
@@ -353,7 +353,7 @@ camera_set_config (Camera *camera, CameraWidget *window, GPContext *context)
{
CameraWidget *w, *w2;
char *wvalue, *w2value;
- int i;
+ unsigned int i;
gp_widget_get_child_by_label (window, _("File type"), &w);
if (gp_widget_changed (w)) {
@@ -425,7 +425,7 @@ camera_set_config (Camera *camera, CameraWidget *window, GPContext *context)
if (gp_widget_changed (w)) {
gp_widget_set_changed (w, 0);
gp_widget_get_value (w, &wvalue);
- for (i = 0; (unsigned int)i < sizeof(exp_comp)/sizeof(*exp_comp); i++){
+ for (i = 0; i < sizeof(exp_comp)/sizeof(*exp_comp); i++){
if (strncmp(wvalue, exp_comp[i], 4) == 0){
dc210_set_exp_compensation(camera, i - 4);
break;