Commit Graph

3596 Commits

Author SHA1 Message Date
Fabrice Bellet
9f6cc06c6b 2001-10-05 Fabrice Bellet <fabrice@gnu.org>
* frontends/command-line/actions.c:
	* frontends/command-line/foreach.c:
	* frontends/command-line/main.c: Print directory names at
	each step of the recursion when using '--list-folders --recurse'.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2392 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-10-05 14:04:34 +00:00
Lutz Mueller
eb8223dd10 2001-10-05 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
Suggestion from Fredrik <fredrik@krixor.xy.org>:

        * configure.in: Check for vsnprintf
        * libgphoto2_port/debug.c: Use vsnprintf if available


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2391 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-10-05 11:43:11 +00:00
Fabrice Bellet
46160ac5f6 2001-10-05 Fabrice Bellet <fabrice@gnu.org>
* command-line/actions.c:
	* command-line/actions.h:
	* command-line/foreach.c:
	* command-line/main.c: The --recurse option should now work
	with --get-all-thumbnails, --get-all-images, --get-all-raw-data,
	--list-files and --list-folders.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2390 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-10-05 10:47:13 +00:00
Lutz Mueller
a5e3d73832 2001-10-05 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
Patch based on suggestions from Fredrik <fredrik@krixor.xy.org>:

        * libgphoto2_port/debug.c: Make sure we memset the same number of
        bytes we malloc.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2389 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-10-05 09:34:03 +00:00
Philippe Marzouk
a66b553df8 patch fromHans Ulrich Niedermann to better ignore some bogus data with USB cameras until we get better understanding of the protocol
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2387 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-10-05 06:30:37 +00:00
Lutz Mueller
0c9e178e54 2001-10-04 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
* libgphoto2/filesys.c: Only spew debugging messages in case of error -
        there don't seem to be serious bugs in there any more.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2386 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-10-04 23:07:42 +00:00
Hubert Figuiere
9457b9044d * camlibs/kodak/dc240/library.c: patch by Peter Fales <peter@fales.com>
compute the packet checksum and ask to resend it.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2384 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-10-04 22:21:04 +00:00
Lutz Mueller
f25d424fc4 *** empty log message ***
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2383 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-10-04 21:27:31 +00:00
Lutz Mueller
a3681f7aff *** empty log message ***
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2382 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-10-04 21:22:01 +00:00
Lutz Mueller
14e5a1216b 2001-10-04 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
* serial/unix.c:
        * usb/libusb.c: Fix includes


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2381 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-10-04 21:21:51 +00:00
Lutz Mueller
2ba2a66a9e 2001-10-04 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
* include/gphoto2-debug.h: #include <gphoto2-port-debug.h>
        * include/gphoto2-result.h: #include <gphoto2-port-result.h>
        * libgphoto2/debug.c: #include <gphoto2-port.h>


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2380 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-10-04 21:20:53 +00:00
Lutz Mueller
f89c7f8021 2001-10-04 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
* include/Makefile.am
        * include/gphoto2-port-result.h
        * libgphoto2_port/Makefile.am
        * libgphoto2_port/result.c: New
        * include/gphoto2-port-debug.h: Define debug levels here
        * include/gphoto2-port.h: Clean up
        * libgphoto2_port/debug.c: Check if history is big enough for message


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2379 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-10-04 21:18:43 +00:00
Lutz Mueller
bc8a41103b 2001-10-04 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
* libgphoto2/debug.c: Move debugging stuff to libgphoto2_port so
        that those messages get saved, too.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2378 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-10-04 16:52:59 +00:00
Lutz Mueller
d239e506a0 2001-10-04 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
* include/Makefile.am
        * include/gphoto2-port-debug.h
        * libgphoto2_port/Makefile.am
        * libgphoto2_port/debug.c: New files
        * libgphoto2_port/gp_port.c: Move debugging stuff out of here.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2377 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-10-04 16:51:01 +00:00
Lutz Mueller
d04c926018 Forgot const
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2376 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-10-04 16:12:16 +00:00
Lutz Mueller
4afcf0d3f1 2001-10-04 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
* camlibs/konica/library.c: const
        * frontents/command-line/main.c: Print out last debugging messages
        on error
        * include/gphoto2-debug.h:
        * libgphoto2/debug.c: Remember history
        * include/gphoto2-result.h:
        * libgphoto2/result.c: Revert the result_as_description thing


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2375 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-10-04 16:11:43 +00:00
Lutz Mueller
55870cf6df 2001-10-04 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
* include/gphoto2-port.h:
        * libgphoto2_port/gp_port.c: Revert the result_as_description thing


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2374 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-10-04 16:09:46 +00:00
Lutz Mueller
2647c8a7cf 2001-10-04 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
* acconfig.h:
        * configure.in:
        * serial/unix.c: Use baudboy.h if available (Red Hat)


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2373 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-10-04 13:22:00 +00:00
Lutz Mueller
e6c1c0aea9 2001-10-04 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
* libgphoto2/result.c:
        * libgphoto2/camera.c:
        * include/gphoto2-camera.h:
        * include/gphoto2-result.h: Put in some consts.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2372 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-10-04 10:13:37 +00:00
Lutz Mueller
0b25f25a22 2001-10-04 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
Thanks to Bill Richardson <bill@riverstonenet.com>:

        * test/Makefile.am: Oops, don't use -lgphoto_port


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2371 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-10-04 06:16:01 +00:00
Lutz Mueller
caaeae6746 I don't know where LOCKLIB is - remove references to that.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2370 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-10-03 19:50:19 +00:00
Lutz Mueller
0aa2521357 2001-10-03 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
* acconfig.h: #undef HAVE_TTYLOCK
        * configure.in: Improved checks for locking headers/libs
        * serial/unix.c: Yet another locking lib: ttylock.h


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2369 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-10-03 19:31:49 +00:00
Hubert Figuiere
8230b94291 added latest Kodak DX models.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2368 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-10-03 17:59:52 +00:00
Lutz Mueller
f39f97047c 2001-10-03 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
* include/gphoto2-port.h:
        * libgphoto2_port/gp_port.c: Explain to the users why claiming an
        interface could fail.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2367 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-10-03 14:55:51 +00:00
Lutz Mueller
75a62a299f 2001-10-03 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
* frontends/command-line/main.c: Print out additional information
        on error.
        * include/gphoto2-result.h:
        * libgphoto2/result.c (gp_result_as_description): New.

CVS


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2366 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-10-03 14:48:08 +00:00
Lutz Mueller
930443f221 2001-10-03 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
* include/gphoto2-port.h:
        * libgphoto2_port/gp_port.c (gp_port_result_as_description): New


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2365 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-10-03 14:47:20 +00:00
Lutz Mueller
8923485d74 2001-10-03 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
* serial/unix.c: Correctly interpret the return value of dev_[un]lock


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2364 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-10-03 13:42:58 +00:00
Lutz Mueller
40002bfd2c 2001-10-03 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
* libgphoto2/camera.c: Check the result of gp_port_open.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2363 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-10-03 13:41:51 +00:00
Lutz Mueller
fe2ea50ad4 *** empty log message ***
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2362 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-10-03 12:13:06 +00:00
Lutz Mueller
6b726a8dee 2001-10-03 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
* test/gphoto2-port-test.c: Renamed into
        * test/test-gp-port.c
        * test/Makefile.am: New
        * Makefile.am: Add test to SUBDIRS
        * acconfig.h: #undef HAVE_LOCKDEV
        * configure.in: Check for lockdev and use it if available
        * serial/Makefile.am: -llockdev if that is available
        * serial/unix.c: Use lockdev if available


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2361 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-10-03 12:12:45 +00:00
Lutz Mueller
fc7f53d445 *** empty log message ***
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2359 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-10-02 19:35:47 +00:00
Lutz Mueller
44f67bc9ba 2001-10-01 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
* camlibs/konica/localization/Makefile.am: EXTRA_DIST the localization
        data to get the stuff included in the dist tarball.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2349 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-10-01 21:31:19 +00:00
Lutz Mueller
6de0760d28 2001-10-01 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
* camlibs/konica: Rejoice, we no longer have a glib dependency!


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2348 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-10-01 18:00:19 +00:00
Scott Fritzinger
73441bd952 added redcurve.h to dist
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2347 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-10-01 17:45:28 +00:00
Scott Fritzinger
b59d9481f1 fixing build
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2346 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-10-01 17:31:49 +00:00
Scott Fritzinger
f9f84e8ce9 bad fix. would overwrite implemented files. removed references in Makefile.am
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2345 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-10-01 17:05:38 +00:00
Scott Fritzinger
3890a1e149 fixing jamcam build. adding empty missing files
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2344 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-10-01 17:04:12 +00:00
Lutz Mueller
1d2956d026 Another one...
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2343 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-10-01 16:48:48 +00:00
Lutz Mueller
dc363869dc Another glib patch...
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2342 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-10-01 16:44:50 +00:00
Lutz Mueller
193b3f3de7 2001-10-01 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
* camlibs/konica/konica.[c,h]:
        * camlibs/konica/library.c: Moving towards glib-free code...


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2341 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-10-01 16:17:05 +00:00
Lutz Mueller
8d38d124dd 2001-10-01 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
* camlibs/konica/konica.[c,h]:
        * camlibs/konica/library.c: Moving towards glib-free code...


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2340 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-10-01 15:35:07 +00:00
Dan Fandrich
02cf4a6c35 Updated
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2339 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-09-30 01:00:43 +00:00
Philippe Marzouk
eabc93a7a1 patch by fredrik@krixor.xy.org to correct a lot of things :
serial.c :
  * made new function called canon_usb_camera_init() that takes care of
    the init-dialogue with canon USB cameras with error-checking (not
    complete, I need to get USB sniffing working in order to figure out
    what to do in different situations).
  * made canon_serial_init() return GP_ERROR or GP_OK (same return values,
    just use defines instead of hard coded values).
  * added other error checks to canon_serial_init().
  * improved USB settings code in canon_serial_init().

  maybe the USB parts of serial.c should be moved to a new file called
  usb.c and the init routine could be called canon_usb_init()?
  canon.c:camera_init() already distinguishes USB from serial and could
  easily call canon_usb_init() instead if it is a USB camera.

canon.c :
  * improved debug output produced by :
        check_readiness()
        is_thumbnail()
        is_image()
        is_movie()
  * check return value of psa50_get_file() before acting further on
    images (instead of trying to set attributes even if retreival of the
    file failed).
  * some other cleanups and error checkings.

psa50.c :
  * added a define called BULK_READ_SIZE, needed since some USB things
    need to be done with the same buffer size and buffer size is not
    always passed between functions. even if the size was passed all over
    a define still seems like the right thing to use since it should be
    the same for multiple operations (get file, get thumbnail ...). maybe
    the define should be in a .h file instead of psa50.c though.
  * major cleanups to psa50_usb_dialogue(). added lots of error checking,
    debug output (tell me if you think it is overkill to map commands to
    strings, but i think it really eases debugging).
  * changed the following routines to return GP_OK or GP_ERROR instead of
    hard coded values. also changed what was expected as return where
    these functions were called.
        psa50_get_owner_name()
        psa50_set_owner_name()
        psa50_get_time()
  * rewrote big parts of psa50_get_file_usb(). made much simpler and
    probably less buggy (had hacks to avoid segfaults when reading
    thumbnails etc.). i am a bit worried that i might have broken fetching
    of files that are an exact multiple of BULK_READ_SIZE in size. i think
    the code is correct but have not been able to try since i do not have
    a flash reader and therefore cannot place a file matching these
    criterias on the flash. this is the code i am talking about :

        changed :
                size=0x2000;
                ...
                    if ((total-expect) <= 0x2000)
                        size=total-expect;
                    else
                        size=0x2000;
        to :
                size = BULK_READ_SIZE;
                ...
                if ((total-expect) < size)
                        size=total-expect;

    as i said, the code seems correct to me but all code has bugs...

  * rewrote the 'dump data to file if exif-parsing fails' in
    psa50_get_thumbnail() to include the name of the thumbnail in the dump
    file name and also open it with O_EXCL and mode 0600 to prevent
    security issues (if root for example downloads files from the camera
    in /tmp where a malicious user has placed a symlink
    'canon-death-dump.dat -> /etc/passwd').


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2338 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-09-29 17:19:36 +00:00
Philippe Marzouk
27c8b178d7 added support for PowerShot G2 thanks to Hans Ulrich Niedermann
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2337 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-09-29 09:50:01 +00:00
Lutz Mueller
80a742dde8 2001-09-27 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
* camlibs/sierra/protocol.c:
        * camlibs/sierra/sierra.c: Gilles Grandou <gilles@grandou.net>
        figured out how to retrieve date and software revision.
        * configure.in:
        * camlibs/jd350e: New driver from Michael Trawny <trawny99@yahoo.com>


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2336 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-09-27 08:41:35 +00:00
Nathan Stenzel
b8728da03f Added in the code to put the standard JFIF marker in.
Thanks, Michael Golden for the reminder.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2335 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-09-26 00:53:59 +00:00
Nathan Stenzel
854636c33c Replaced the sloppy code that chose the width and height by the camera model
with code that chose the width and height using the data sent by the camera
in the image data header (first six bytes which starts with ffc2)


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2334 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-09-26 00:49:34 +00:00
Lutz Mueller
5cf2d90818 2001-09-25 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
* libgphoto2/jpeg.h: Fix a warning
        * libgphoto2/camera.c: Fix locking problem in
        gp_camera_folder_delete_all.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2333 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-09-25 06:20:41 +00:00
Lutz Mueller
85264c9821 Yet another USB Mass Storage camera.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2332 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-09-25 06:10:49 +00:00
Lutz Mueller
a9f3845612 Enumerate some front-ends.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2331 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-09-25 06:03:17 +00:00