Commit Graph

10318 Commits

Author SHA1 Message Date
Marcus Meissner
3687f0da45 emit capture complete event for EOS Cameras (using CameraStatus 0)
partial fix for https://github.com/gphoto/gphoto2/issues/32
2017-07-30 12:34:39 +02:00
Marcus Meissner
d76d6f575b check for the correct size before reading the functional mode part of the device info (AFL) 2017-07-30 00:57:03 +02:00
Marcus Meissner
5412dc2262 array entries might vanish during ptp_object_want, handle that case in find_child (AFL) 2017-07-29 14:03:55 +02:00
Marcus Meissner
5f97b8286f if we are adjusting the data pointer, also adjust len to avoid incorrect size checks (AFL) 2017-07-29 13:03:29 +02:00
Marcus Meissner
d5598b0e92 added A6500
fixes https://github.com/gphoto/libgphoto2/issues/190
2017-07-29 10:36:35 +02:00
Marcus Meissner
9c7add6585 handle some buffer overreads in the OPD unpacker (AFL) 2017-07-28 08:27:29 +02:00
Marcus Meissner
17a78e2038 On device property unpacking, return 0 from unpack_string is a FAILURE (AFL)
on unpacking strings, if we do not have enough data to read, length is 0 (AFL)
2017-07-27 16:39:20 +02:00
Marcus Meissner
f728d75af7 fixed two read overflows in the DPD decoder (AFL) 2017-07-27 14:14:57 +02:00
Marcus Meissner
2b120eba69 make sure we have 4 byte to read in the array elements in the array unpacker. (AFL) 2017-07-27 13:51:23 +02:00
Marcus Meissner
f1c69dfe89 0 terminate string field that is later strduped (AFL) 2017-07-27 13:35:39 +02:00
Marcus Meissner
4fdfdc5b56 Merge branch 'master' of github.com:gphoto/libgphoto2 2017-07-27 13:25:04 +02:00
Marcus Meissner
bd13f36f35 more debug 2017-07-27 13:24:54 +02:00
Marcus Meissner
32ee226491 check also entrysize field 2017-07-27 13:24:14 +02:00
Marcus Meissner
b27fd417aa check sizes in EOS Folderentry handling (AFL) 2017-07-27 12:50:45 +02:00
Marcus Meissner
07be3c1721 Merge pull request #189 from fviard/add_ptp_nodevice_error
Improve error reporting when using the ptp2 lib
2017-07-25 21:31:07 +02:00
Florent Viard
a987f6db65 Rework of the ptp event irq manager to raise errors and rearm when needed
This commit rework the ptp2 event (irq) manager for multiple purposes:
- If the callback of an event is called because the async event
encountered an error, report this error upstream.
This allows a call to check_event to detect that a device was removed.
Without it, a call to check event will silentely hide that the
check_event call failed because a device being removed or dead (by
returning a TIMEOUT error) as if everything was ok but there was no
event.

- Re-arm async event requests if less are running than the expected
number of active interrupts transfers

- Use a linked list for the queue of events instead of a memory array
and steal buffers to avoid useless memory copies.
So the code should be faster and more memory efficient.
2017-07-25 17:31:48 +02:00
Florent Viard
02077d21c5 Raise errors in ptp2 and add a new PTP_ERROR_NODEVICE error
Currently, in ptp2 (usb), origin of errors are masked because only the
PTP_ERROR_IO error is raised in case of any error.
This fix add translation of gp_errors comming from the port to
meaningful "PTP errors".
An additional "PTP_ERROR_NODEVICE" virtual error is added to allow to
report upstream that a device disappeared and so that the request failed
because of that.
2017-07-25 17:19:53 +02:00
Marcus Meissner
02789c0001 SVN is not used at all anymore. 2017-07-22 12:06:40 +02:00
Marcus Meissner
26cf4a929f make vusb not-default ... some users are confused why there is a virtual PTP camera 2017-07-22 12:05:36 +02:00
Marcus Meissner
c91aef1c5e Merge pull request #188 from lacyrhoades/master
Added USB IDs: Canon SL2, Ricoh Theta S/SC
2017-07-22 12:06:09 +02:00
Lacy Rhoades
d769213c04 Added USB ID for Canon EOS SL2 / Kiss X8 / 200D
Added USB ID for Ricoh Theta S and SC models
Added Git to install/build instructions
2017-07-21 12:59:23 -04:00
Hans Ulrich Niedermann
f8abdcbe09 synchronize gphoto-m4 files 2017-07-20 22:45:45 +02:00
Hans Ulrich Niedermann
a3c9563d9e Consistently define driverdir in all *.pc files
Define driverdir both for libgphoto2 and libgphoto2_port,
and both for the -uninstalled and the installed *.pc files.
2017-07-18 07:09:43 +02:00
Hans Ulrich Niedermann
b99eb95676 Document proper make var to restrict camlib builds 2017-07-18 06:53:11 +02:00
Hans Ulrich Niedermann
db034830fa Fix a number of typos: should be iolibs, not camlibs 2017-07-18 06:52:30 +02:00
Marcus Meissner
02fd16c7d6 olympuys vr360 2017-07-13 08:00:09 +02:00
Marcus Meissner
1fe85288c9 olympus vr360 2017-07-13 07:59:07 +02:00
Marcus Meissner
2cad20531d added canon powershot elph 350 hs 2017-07-02 18:15:27 +02:00
Marcus Meissner
695281be12 reindent one questionable status read sonix.c
fixes https://github.com/gphoto/libgphoto2/issues/177
2017-07-02 18:11:58 +02:00
Marcus Meissner
695b558871 added fuji 2017-06-20 09:50:41 +02:00
Marcus Meissner
472a9461b4 ignore missing 0xd207 property on Fuji XT-2 without firmware update 2017-06-19 20:13:14 +02:00
Marcus Meissner
85b0b23ed7 added d500 2017-06-13 23:15:08 +02:00
Marcus Meissner
5cbc4e92c7 added sony DSC-HX400V
https://sourceforge.net/p/libmtp/support-requests/246/
2017-06-13 09:47:19 +02:00
Marcus Meissner
2724700ea2 added nikon d500 debug 2017-06-13 09:45:52 +02:00
Marcus Meissner
a906049235 switch to 2.5.14.1 devel 2017-06-05 20:56:42 +02:00
Marcus Meissner
b54276cca7 2.5.14 release libgphoto2-2_5_14-release 2017-06-05 20:27:03 +02:00
Marcus Meissner
9c4aef574b various fixes to free parameters and coverity issues 2017-06-05 19:13:32 +02:00
Marcus Meissner
b478473950 free allocated memory (Coverity)
1404903 Resource leak
2017-06-05 18:12:55 +02:00
Marcus Meissner
73bf500aea call va_end in error paths (Coverity)
1404926 Missing varargs init or cleanup
2017-06-05 18:11:13 +02:00
Marcus Meissner
1190d79a4b removed duplicate stepsize 0 check (Coverity)
1404896 Logically dead code
2017-06-05 18:09:47 +02:00
Marcus Meissner
3aa702c700 updated 2017-06-05 17:56:23 +02:00
Andras Salamon
8cdb35511e K-1 battery fields fix 2017-06-05 17:47:24 +02:00
Marcus Meissner
29b16546b6 add log_remove func too 2017-06-03 17:50:04 +02:00
Marcus Meissner
81b4a87770 renamed a duplicate 2017-06-03 17:49:18 +02:00
Marcus Meissner
fed8b62568 imported from libmtp 2017-06-03 17:40:03 +02:00
Marcus Meissner
033b9cf60e also use gp_log_remove_func, to test
https://github.com/gphoto/libgphoto2/pull/171
2017-06-03 11:35:21 +02:00
Marcus Meissner
03e85f9b8b Merge pull request #171 from axxel/log_remove_func-fix
fix memory corruption in gp_log_remove_func
2017-06-03 11:34:18 +02:00
Axel Waggershauser
db56a3b4fd fix memory corruption in gp_log_remove_func
The gp_log_remove_func implementation had 2 severe issues:
* it moved way to few bytes
* it moved the wrong bytes to the wrong place, destroying libc memory
management structures (resulting in different types of crashes).

When the first item has to be removed, it moved a couple bytes from the
start of the array to the left (before the start of the array), instead
of moving the second and following items over the first one.
2017-06-02 17:02:25 +02:00
Marcus Meissner
8b14ec11ca added fuji xt-20 data
https://github.com/gphoto/libgphoto2/issues/170
2017-06-02 09:28:51 +02:00
Marcus Meissner
108e9c165e DEFAULT_SOURCE define 2017-06-02 07:33:12 +02:00