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

2001-08-27 Lutz M�ller <urc8@rz.uni-karlsruhe.de>

Browse Source 
* camlibs/sierra/sierra.c: Now that libgphoto2_port is patched, we
        can revert the quick fix from two hours ago.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2100 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
Lutz Mueller
2001-08-27 19:32:29 +00:00
parent 9ec7ae880d
commit ad2a13ee8a
2 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -1,3 +1,8 @@
2001-08-27 Lutz Müller <urc8@rz.uni-karlsruhe.de>
* camlibs/sierra/sierra.c: Now that libgphoto2_port is patched, we
can revert the quick fix from two hours ago.
2001-08-27 Lutz Müller <urc8@rz.uni-karlsruhe.de>
* libgphoto2/camera.c

12
camlibs/sierra/sierra.c
View File

@@ -226,7 +226,7 @@ int camera_init (Camera *camera)
/* Lookup the USB information */
for (x = 0; strlen (sierra_cameras[x].model) > 0; x++) {
if (strcmp(sierra_cameras[x].model, camera->model)==0) {
if (!strcmp (sierra_cameras[x].model, camera->model)) {
vendor = sierra_cameras[x].usb_vendor;
product = sierra_cameras[x].usb_product;
inep = sierra_cameras[x].usb_inep;
@@ -252,8 +252,6 @@ int camera_init (Camera *camera)
CHECK_FREE (camera, gp_port_usb_find_device (fd->dev,
vendor, product));
CHECK_FREE (camera, gp_port_timeout_set (fd->dev, 5000));
settings.usb.inep = inep;
settings.usb.outep = outep;
settings.usb.config = 1;
@@ -273,10 +271,6 @@ int camera_init (Camera *camera)
fd->speed = camera->port->speed;
fd->type = camera->port->type;
//Remove this once libgphoto2_port is fixed
if (fd->type == GP_PORT_USB)
CHECK_FREE (camera, gp_port_open (fd->dev));
/* Establish a connection */
CHECK_FREE (camera, camera_start (camera));
@@ -335,8 +329,6 @@ int camera_start (Camera *camera)
* that other programs have the chance to access the
* camera, too.
*/
//Remove this once libgphoto2_port is fixed
if (fd->type != GP_PORT_USB)
CHECK (gp_port_open (fd->dev));
switch (fd->type) {
@@ -369,8 +361,6 @@ int camera_stop (Camera *camera)
* We close the port here to give other programs the possiblity
* to access the camera, too.
*/
//Remove this once libgphoto2_port is fixed
if (fd->type != GP_PORT_USB)
CHECK (gp_port_close (fd->dev));
return (GP_OK);