"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "camlibs/canon/library.c" between
libgphoto2-2.5.26.tar.bz2 and libgphoto2-2.5.27.tar.bz2

About: libgphoto2 is a library that can be used by applications to access various digital cameras.

library.c  (libgphoto2-2.5.26.tar.bz2):library.c  (libgphoto2-2.5.27.tar.bz2)
skipping to change at line 233 skipping to change at line 233
}; };
static const struct canonFlashModeStateStruct flashModeStateArray[] = { static const struct canonFlashModeStateStruct flashModeStateArray[] = {
{FLASH_MODE_OFF, N_("Flash off")}, {FLASH_MODE_OFF, N_("Flash off")},
{FLASH_MODE_ON, N_("Flash on")}, {FLASH_MODE_ON, N_("Flash on")},
{FLASH_MODE_AUTO, N_("Flash auto")}, {FLASH_MODE_AUTO, N_("Flash auto")},
{0, NULL}, {0, NULL},
}; };
static const struct canonExposureBiasStateStruct exposureBiasStateArray[] = { static const struct canonExposureBiasStateStruct exposureBiasStateArray[] = {
{0x10,"+2"}, {0x10,0x08,"+2"},
{0x0d,"+1 2/3"}, {0x0d,0x0b,"+1 2/3"},
{0x0c,"+1 1/2"}, {0x0c,0x0c,"+1 1/2"},
{0x0b,"+1 1/3"}, {0x0b,0x0d,"+1 1/3"},
{0x08,"+1"}, {0x08,0x10,"+1"},
{0x05,"+2/3"}, {0x05,0x13,"+2/3"},
{0x04,"+1/2"}, {0x04,0x14,"+1/2"},
{0x03,"+1/3"}, {0x03,0x15,"+1/3"},
{0x00,"0"}, {0x00,0x18,"0"},
{0xfd,"-1/3"}, {0xfd,0x1b,"-1/3"},
{0xfc,"-1/2"}, {0xfc,0x1c,"-1/2"},
{0xfb,"-2/3"}, {0xfb,0x1d,"-2/3"},
{0xf8,"-1"}, {0xf8,0x20,"-1"},
{0xf5,"-1 1/3"}, {0xf5,0x23,"-1 1/3"},
{0xf4,"-1 1/2"}, {0xf4,0x24,"-1 1/2"},
{0xf3,"-1 2/3"}, {0xf3,0x25,"-1 2/3"},
{0xf0,"-2"}, {0xf0,0x28,"-2"},
{0, NULL}, {0,0,NULL},
}; };
static const struct canonShootingModeStateStruct shootingModeStateArray[] = { static const struct canonShootingModeStateStruct shootingModeStateArray[] = {
{0x00,N_("AUTO")}, {0x00,N_("AUTO")},
{0x01,N_("P")}, {0x01,N_("P")},
{0x02,N_("Tv")}, {0x02,N_("Tv")},
{0x03,N_("Av")}, {0x03,N_("Av")},
{0x04,N_("M")}, {0x04,N_("M")},
{0x05,N_("A-DEP")}, {0x05,N_("A-DEP")},
{0x06,N_("M-DEP")}, {0x06,N_("M-DEP")},
skipping to change at line 1740 skipping to change at line 1740
/* Exposure Compensation */ /* Exposure Compensation */
gp_widget_new (GP_WIDGET_MENU, _("Exposure Compensation"), &t); gp_widget_new (GP_WIDGET_MENU, _("Exposure Compensation"), &t);
gp_widget_set_name (t, "exposurecompensation"); gp_widget_set_name (t, "exposurecompensation");
/* Map exposure compensation to the list of choices */ /* Map exposure compensation to the list of choices */
i = 0; i = 0;
menuval = -1; menuval = -1;
while (exposureBiasStateArray[i].label) { while (exposureBiasStateArray[i].label) {
gp_widget_add_choice (t, _(exposureBiasStateArray[i].label)); gp_widget_add_choice (t, _(exposureBiasStateArray[i].label));
if (camera->pl->release_params[EXPOSUREBIAS_INDEX] == if (camera->pl->release_params[EXPOSUREBIAS_INDEX] ==
exposureBiasStateArray[i].value) { ((camera->pl->md->id_str && !strstr(camera->pl->md->id_str,"E OS") && !strstr(camera->pl->md->id_str,"Rebel")) ? exposureBiasStateArray[i].val uePS : exposureBiasStateArray[i].valueEOS)) {
gp_widget_set_value (t, _(exposureBiasStateArray[i].label )); gp_widget_set_value (t, _(exposureBiasStateArray[i].label ));
menuval = i; menuval = i;
} }
i++; i++;
} }
/* Set an unknown exp bias value if the /* Set an unknown exp bias value if the
* camera is set to something weird */ * camera is set to something weird */
if (menuval == -1) { if (menuval == -1) {
gp_widget_add_choice (t, _("Unknown")); gp_widget_add_choice (t, _("Unknown"));
skipping to change at line 2127 skipping to change at line 2127
gp_widget_set_changed (w, 0); gp_widget_set_changed (w, 0);
gp_widget_get_value (w, &wvalue); gp_widget_get_value (w, &wvalue);
if (!check_readiness (camera, context)) { if (!check_readiness (camera, context)) {
gp_context_status (context, _("Camera unavailable")); gp_context_status (context, _("Camera unavailable"));
} else { } else {
/* Map the menu option setting to the camera binary value */ /* Map the menu option setting to the camera binary value */
i = 0; i = 0;
while (exposureBiasStateArray[i].label) { while (exposureBiasStateArray[i].label) {
if (strcmp (_(exposureBiasStateArray[i].label), w value) == 0) { if (strcmp (_(exposureBiasStateArray[i].label), w value) == 0) {
expbias = exposureBiasStateArray[i].value ; expbias = ((camera->pl->md->id_str && !st rstr(camera->pl->md->id_str,"EOS") && !strstr(camera->pl->md->id_str,"Rebel")) ? exposureBiasStateArray[i].valuePS : exposureBiasStateArray[i].valueEOS);
break; break;
} }
i++; i++;
} }
if (!exposureBiasStateArray[i].label) { if (!exposureBiasStateArray[i].label) {
gp_context_status (context, _("Invalid exposure c ompensation setting")); gp_context_status (context, _("Invalid exposure c ompensation setting"));
} else { } else {
if (canon_int_set_exposurebias (camera, expbias, context) == GP_OK) if (canon_int_set_exposurebias (camera, expbias, context) == GP_OK)
gp_context_status (context, _("Exposure c ompensation changed")); gp_context_status (context, _("Exposure c ompensation changed"));
 End of changes. 3 change blocks. 
20 lines changed or deleted 20 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)