summaryrefslogtreecommitdiff
path: root/camlibs/canon
Commit message (Collapse)AuthorAgeFilesLines
* camlibs: Move camlib specific SUBDIRS addtions to subdir Makefile-filesHans Ulrich Niedermann2020-01-221-0/+2
| | | | | Move camlib specific SUBDIRS additions to subdir Makefile-files where they logically belong.
* BSD_SOURCE -> DEFAULT_SPURCEMarcus Meissner2018-06-201-1/+1
|
* import typo fixes (in debug messages) from DebianMarcus Meissner2017-08-291-2/+2
|
* small warning fixes. use calloc instead of mnalloc/memsetMarcus Meissner2017-04-232-5/+4
|
* camlibs: canon_int_get_zoom - work with shorter response from S45Eliot Blennerhassett2017-01-041-2/+3
| | | | | | Relax datalen check so it accepts the minimum reqired for referenced data (15th element). Canon S45 returns 16 bytes for this query, and failed the previous requirement for 28 bytes returned.
* Adjust the semantics of gp_widget_changed to not clear the changed state.Marcus Meissner2016-11-201-0/+18
| | | | | | | Adjust the camlibs that use it (As this is mostly a internal function it should be ok to change.) Fixes https://github.com/gphoto/libgphoto2/issues/73
* Help editors treat as Makefiles all our Makefile-files filesHans Ulrich Niedermann2016-10-281-0/+2
|
* the driver is non-experimental also for USBMarcus Meissner2016-04-131-8/+1
|
* compare translated strings in set_config (we translate them during get_config)Marcus Meissner2016-04-101-5/+5
| | | | fixes https://github.com/gphoto/libgphoto2/issues/49
* keep the final post-capture directory state for later wait-eventsMarcus Meissner2016-02-111-1/+6
|
* fixed some memory leaks on error (Coverity)Marcus Meissner2016-02-061-3/+15
| | | | 1033336 Resource leak
* remove probably unistd.h include , or protected by ifdef forMarcus Meissner2016-01-035-5/+0
| | | | | | building better with Visual C https://github.com/gphoto/libgphoto2/issues/33
* let the canon driver support the IXUS 30Marcus Meissner2015-11-011-0/+3
|
* chanve type of crc to allow -1 (Coverity)Marcus Meissner2015-06-071-1/+1
| | | | git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@15452 67ed7778-7388-44ab-90cf-0a291f65f57c
* remove some dead code from error handling (Coverity)Marcus Meissner2015-06-071-4/+3
| | | | git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@15451 67ed7778-7388-44ab-90cf-0a291f65f57c
* initialize the wait_for_event state during capture,Marcus Meissner2015-03-221-0/+7
| | | | | | | so we get the secondary image even on the first capture git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@15394 67ed7778-7388-44ab-90cf-0a291f65f57c
* replaced some exit(1) by error returnsMarcus Meissner2015-02-053-8/+8
| | | | | | | https://sourceforge.net/p/gphoto/bugs/1007/ git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@15350 67ed7778-7388-44ab-90cf-0a291f65f57c
* removed useless NULL check (Coccinelle)Marcus Meissner2014-09-211-3/+1
| | | | git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@15189 67ed7778-7388-44ab-90cf-0a291f65f57c
* From: Axel Waggershauser <awagger@web.de> ↵Marcus Meissner2014-09-093-33/+18
| | | | | | | | | | | | condense gp_log_data debug output. - changed gp_log_data to take a printf style debug string -> new major version of libgphoto2_port - adjusted all callers git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@15175 67ed7778-7388-44ab-90cf-0a291f65f57c
* do not query/set Zoom on EOS / Rebel DSLRsMarcus Meissner2014-08-231-25/+28
| | | | git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@15156 67ed7778-7388-44ab-90cf-0a291f65f57c
* From: Axel Waggershauser <awagger@web.de> ↵Marcus Meissner2014-07-221-2/+2
| | | | | | | | | | | | I had something 'prepared' for this situation, here you go.. ;) The patch does not, however, actually remove the GP_LOG_VERBOSE enum, since that would change the interface for all clients, which might not be worth it. If you don't think that is a problem, please remove it... git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@15107 67ed7778-7388-44ab-90cf-0a291f65f57c
* removed copyright umlauts and replaced other umlautsMarcus Meissner2014-06-274-5/+5
| | | | | | | by international spelling git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@15027 67ed7778-7388-44ab-90cf-0a291f65f57c
* From: "Daniel P. Berrange" <berrange@redhat.com>Marcus Meissner2014-04-113-81/+1
| | | | | | | | | | A great many functions have variables which are set to some value, but never read thereafter. All these variables can be removed with no functional impact. git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14896 67ed7778-7388-44ab-90cf-0a291f65f57c
* ioctl.h also not neededMarcus Meissner2014-02-221-1/+0
| | | | git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14771 67ed7778-7388-44ab-90cf-0a291f65f57c
* termios does not seem to be requriedMarcus Meissner2014-02-221-1/+0
| | | | git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14770 67ed7778-7388-44ab-90cf-0a291f65f57c
* termios.h is only used in serial driverMarcus Meissner2014-02-222-2/+0
| | | | git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14769 67ed7778-7388-44ab-90cf-0a291f65f57c
* undef NOERROR, is defined in winerror.h Marcus Meissner2014-02-221-0/+1
| | | | git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14768 67ed7778-7388-44ab-90cf-0a291f65f57c
* fixed indentationMarcus Meissner2014-01-101-2/+2
| | | | git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14690 67ed7778-7388-44ab-90cf-0a291f65f57c
* removed an unused string translationMarcus Meissner2014-01-061-1/+0
| | | | git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14673 67ed7778-7388-44ab-90cf-0a291f65f57c
* updated fsf addressMarcus Meissner2014-01-011-2/+3
| | | | git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14608 67ed7778-7388-44ab-90cf-0a291f65f57c
* removed optura 10 duplicate idMarcus Meissner2013-12-011-5/+2
| | | | git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14588 67ed7778-7388-44ab-90cf-0a291f65f57c
* removed a duplicate MVX100i idMarcus Meissner2013-12-011-1/+0
| | | | git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14587 67ed7778-7388-44ab-90cf-0a291f65f57c
* From: Mark EichinMarcus Meissner2013-10-281-1/+1
| | | | | | | | | | S100 is also duplicated into the ptp2 driver, adjust name http://sourceforge.net/p/gphoto/bugs/965/ git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14578 67ed7778-7388-44ab-90cf-0a291f65f57c
* replace && by ||, Marcus Meissner2013-10-071-1/+1
| | | | | | | found by Jaromír Končický via Coverity git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14557 67ed7778-7388-44ab-90cf-0a291f65f57c
* do not deref a NULL camera_time (Coverity)Marcus Meissner2013-09-031-4/+4
| | | | git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14543 67ed7778-7388-44ab-90cf-0a291f65f57c
* also remove the clear halt calls here, to avoid hangsMarcus Meissner2013-09-011-3/+5
| | | | | | | on raspberry and usb 3 git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14538 67ed7778-7388-44ab-90cf-0a291f65f57c
* do not deref a NULL ptrMarcus Meissner2013-09-011-3/+2
| | | | git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14526 67ed7778-7388-44ab-90cf-0a291f65f57c
* int -> unsigned int for loop countersMarcus Meissner2013-08-271-2/+4
| | | | git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14515 67ed7778-7388-44ab-90cf-0a291f65f57c
* correct "mark as downloaded" logicMarcus Meissner2013-08-243-12/+9
| | | | | | | Patch by Wolfram Sang <wolfram@the-dreams.de> git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14509 67ed7778-7388-44ab-90cf-0a291f65f57c
* From: Wolfram Sang <wolfram@the-dreams.de>Marcus Meissner2013-08-181-1/+4
| | | | | | | fixed wait_for_event by fixing the errorcode git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14503 67ed7778-7388-44ab-90cf-0a291f65f57c
* mark the S110 as from 2001Marcus Meissner2013-06-151-1/+1
| | | | git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14452 67ed7778-7388-44ab-90cf-0a291f65f57c
* note potential issueMarcus Meissner2013-05-051-0/+2
| | | | git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14400 67ed7778-7388-44ab-90cf-0a291f65f57c
* set the "mtime" of the CameraFile during retrieval from theMarcus Meissner2013-05-053-2/+311
| | | | | | | | | | CameraFileInfo to avoid "0" as mtime in filenames more complete get_info_func, although it should not be called actually git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14399 67ed7778-7388-44ab-90cf-0a291f65f57c
* free packet on error pathMarcus Meissner2013-05-011-1/+5
| | | | git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14374 67ed7778-7388-44ab-90cf-0a291f65f57c
* return an error if we enounter errors, otherwise we will not exit the Marcus Meissner2013-04-221-2/+2
| | | | | | | poll loop. git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14349 67ed7778-7388-44ab-90cf-0a291f65f57c
* add some _BSD_SOURCE or _POSIX_C_SOURCE where neededMarcus Meissner2013-02-202-0/+4
| | | | | | | for strict -ansi or MacOS X build git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14245 67ed7778-7388-44ab-90cf-0a291f65f57c
* replace n_tries in usb polling by timeoutMarcus Meissner2013-01-062-53/+58
| | | | git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14166 67ed7778-7388-44ab-90cf-0a291f65f57c
* The canon_int_get_release_param method loads all release params,Marcus Meissner2012-12-111-76/+39
| | | | | | | | | | | so there is no need to call it once for each param being read. Switch camera_get_config to only invoke it once at the start Signed-off-by: Daniel P. Berrange <berrange@redhat.com> git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14154 67ed7778-7388-44ab-90cf-0a291f65f57c
* The start of camera_get_config returns immediately ifMarcus Meissner2012-12-111-72/+45
| | | | | | | | | | | check_readiness() returns 0, so checking the cached_ready flag again is not required Signed-off-by: Daniel P. Berrange <berrange@redhat.com> git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14151 67ed7778-7388-44ab-90cf-0a291f65f57c
* The 14th byte returned from CANON_USB_CONTROL_GET_ZOOM_POSMarcus Meissner2012-12-113-5/+10
| | | | | | | | | | | | contains the upper limit for the zoom level. This can be used to populate the 'zoom' widget range, instead of hardcoding 255. Tested with PowerShot G1 and PowerShot S200 Signed-off-by: Daniel P. Berrange <berrange@redhat.com> git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14150 67ed7778-7388-44ab-90cf-0a291f65f57c