darktable/libgphoto2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed CANON_EXPERIMENTAL_SECONDARY_IMAGE and CANON_EXPERIMENTAL_SET_RELEASE_PARAMS

Browse Source 
ifdefs, now also default included.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@10346 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
Marcus Meissner
2007-06-02 21:13:29 +00:00
parent 8f74811b87
commit 064094bdcd
6 changed files with 4 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
camlibs/canon/ChangeLog
View File

@@ -2,6 +2,8 @@
* library.c, canon.c, canon.h,Makefile-files:
Removed CANON_EXPERIMENTAL_20D define, now default included.
Removed CANON_EXPERIMENTAL_SECONDARY_IMAGE and CANON_EXPERIMENTAL_SET_RELEASE_PARAMS
ifdefs, now also default included.
2007-05-25 Paul Walmsley <paul@booyaka.com>

2
camlibs/canon/Makefile-files
View File

@@ -20,7 +20,7 @@ canon_la_SOURCES = \
canon/usb.c canon/usb.h \
canon/crc.c canon/crc.h \
canon/util.c canon/util.h
canon_la_CPPFLAGS = -DCANON_EXPERIMENTAL_SET_RELEASE_PARAMS $(AM_CPPFLAGS) $(CPPFLAGS) $(LIBEXIF_CFLAGS)
canon_la_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS) $(LIBEXIF_CFLAGS)
canon_la_LDFLAGS = $(camlib_ldflags)
canon_la_DEPENDENCIES = $(camlib_dependencies)
canon_la_LIBADD = $(camlib_libadd) $(LIBEXIF_LIBS)

12
camlibs/canon/canon.c
View File

@@ -366,9 +366,7 @@ extern long int timezone;
# define __unused__
#endif
#ifdef CANON_EXPERIMENTAL_SET_RELEASE_PARAMS
static int canon_int_set_release_params (Camera *camera, GPContext *context);
#endif
static const char * canon2gphotopath (Camera __unused__ *camera, const char *path);
@@ -1250,7 +1248,6 @@ canon_int_capture_preview (Camera *camera, unsigned char **data, unsigned int *l
}
}
#ifdef CANON_EXPERIMENTAL_SECONDARY_IMAGE
/* Download the secondary image, if one exists */
if ( camera->pl->image_b_length > 0 ) {
status = canon_usb_get_captured_secondary_image ( camera, camera->pl->image_b_key, b_data, b_length, context );
@@ -1265,7 +1262,6 @@ canon_int_capture_preview (Camera *camera, unsigned char **data, unsigned int *l
* to do something else with it */
free(b_data_orig);
}
#endif /* CANON_EXPERIMENTAL_SECONDARY_IMAGE */
} else if (transfermode == REMOTE_CAPTURE_THUMB_TO_PC) {
@@ -1784,14 +1780,12 @@ canon_int_get_release_params (Camera *camera, GPContext *context)
camera->pl->release_params[FOCUS_MODE_INDEX]);
camera->pl->secondary_image = 0;
#ifdef CANON_EXPERIMENTAL_SECONDARY_IMAGE
/* Based on the resolution settings in the release params,
determine whether we expect one or two images to be returned
by the camera.
I am not sure if this will work correctly for non-EOS 5D
cameras - I would appreciate testing feedback from other
Canon camera users. To test, define
CANON_EXPERIMENTAL_SECONDARY_IMAGE, then try capturing an image
Canon camera users. To test try capturing an image
to the host computer in a single format (e.g., RAW or Large Fine
JPEG). Also try capturing an image when the camera is set to
a dual format, e.g., RAW + Large Fine JPEG. Note that currently, we
@@ -1800,12 +1794,10 @@ canon_int_get_release_params (Camera *camera, GPContext *context)
*/
if (camera->pl->release_params[RESOLUTION_2_INDEX] & 0xf0)
camera->pl->secondary_image = 1;
#endif
return GP_OK;
}
#ifdef CANON_EXPERIMENTAL_SET_RELEASE_PARAMS
/**
* canon_int_set_shutter_speed
@@ -2215,8 +2207,6 @@ canon_int_set_release_params (Camera *camera, GPContext *context)
}
#endif /* CANON_EXPERIMENTAL_SET_RELEASE_PARAMS */
/**
* canon_int_set_owner_name:
* @camera: the camera to set the owner name of

2
camlibs/canon/canon.h
View File

@@ -622,13 +622,11 @@ int canon_int_get_thumbnail(Camera *camera, const char *name, unsigned char **re
int canon_int_put_file(Camera *camera, CameraFile *file, char *destname, char *destpath, GPContext *context);
int canon_int_set_file_attributes(Camera *camera, const char *file, const char *dir, canonDirentAttributeBits attrs, GPContext *context);
int canon_int_delete_file(Camera *camera, const char *name, const char *dir, GPContext *context);
#ifdef CANON_EXPERIMENTAL_SET_RELEASE_PARAMS
int canon_int_set_shutter_speed(Camera *camera, canonShutterSpeedState shutter_speed, GPContext *context);
int canon_int_set_iso(Camera *camera, canonIsoState iso, GPContext *context);
int canon_int_set_aperture(Camera *camera, canonApertureState aperture, GPContext *context);
int canon_int_set_focus_mode (Camera *camera, canonFocusModeState focus_mode, GPContext *context);
int canon_int_set_resolution (Camera *camera, unsigned char res_byte1, unsigned char res_byte2, unsigned char res_byte3, GPContext *context);
#endif
int canon_serial_off(Camera *camera);
int canon_int_get_time(Camera *camera, time_t *camera_time, GPContext *context);
int canon_int_set_time(Camera *camera, time_t date, GPContext *context);

25
camlibs/canon/library.c
View File

@@ -1774,10 +1774,8 @@ camera_set_config (Camera *camera, CameraWidget *window, GPContext *context)
CameraWidget *w;
char *wvalue;
int i, val;
#ifdef CANON_EXPERIMENTAL_SET_RELEASE_PARAMS
int res;
unsigned char iso, shutter_speed, aperture, focus_mode;
#endif
char str[16];
GP_DEBUG ("camera_set_config()");
@@ -1814,28 +1812,6 @@ camera_set_config (Camera *camera, CameraWidget *window, GPContext *context)
}
# ifndef CANON_EXPERIMENTAL_SET_RELEASE_PARAMS
/* Return errors if the user attempts to change any of the release
parameters. */
gp_widget_get_child_by_label (window, _("Shutter speed"), &w);
if (gp_widget_changed (w))
return GP_ERROR;
gp_widget_get_child_by_label (window, _("ISO speed"), &w);
if (gp_widget_changed (w))
return GP_ERROR;
gp_widget_get_child_by_label (window, _("Aperture"), &w);
if (gp_widget_changed (w))
return GP_ERROR;
gp_widget_get_child_by_label (window, _("Resolution"), &w);
if (gp_widget_changed (w))
return GP_ERROR;
gp_widget_get_child_by_label (window, _("Focus mode"), &w);
if (gp_widget_changed (w))
return GP_ERROR;
# else
gp_widget_get_child_by_label (window, _("ISO speed"), &w);
if (gp_widget_changed (w)) {
gp_widget_get_value (w, &wvalue);
@@ -2036,7 +2012,6 @@ camera_set_config (Camera *camera, CameraWidget *window, GPContext *context)
}
}
# endif /* CANON_EXPERIMENTAL_SET_RELEASE_PARAMS */
gp_widget_get_child_by_label (window, _("Set camera date to PC date"), &w);
if (gp_widget_changed (w)) {
gp_widget_get_value (w, &wvalue);

2
camlibs/canon/usb.h
View File

@@ -266,9 +266,7 @@ int canon_usb_long_dialogue (Camera *camera, canonCommandIndex canon_funct, unsi
int canon_usb_get_file (Camera *camera, const char *name, unsigned char **data, unsigned int *length, GPContext *context);
int canon_usb_get_thumbnail (Camera *camera, const char *name, unsigned char **data, unsigned int *length, GPContext *context);
int canon_usb_get_captured_image (Camera *camera, const int key, unsigned char **data, unsigned int *length, GPContext *context);
#ifdef CANON_EXPERIMENTAL_SECONDARY_IMAGE
int canon_usb_get_captured_secondary_image (Camera *camera, const int key, unsigned char **data, unsigned int *length, GPContext *context);
#endif
int canon_usb_get_captured_thumbnail (Camera *camera, const int key, unsigned char **data, unsigned int *length, GPContext *context);
int canon_usb_lock_keys(Camera *camera, GPContext *context);
int canon_usb_unlock_keys(Camera *camera, GPContext *context);