Commit Graph

3596 Commits

Author SHA1 Message Date
Dan Fandrich
239ebc0066 Combined gp_file_raw_to_pnm with gp_file_raw_to_ppm
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2148 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-08-31 01:34:59 +00:00
Dan Fandrich
7e547c86f7 Replaced references to PNM with the appropriate PPM or PGM
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2147 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-08-31 01:33:34 +00:00
Lutz Mueller
553f193a8f Forgot to commit that, too.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2146 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-08-30 22:58:50 +00:00
Lutz Mueller
ac4a9aeaca Close the port.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2145 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-08-30 22:58:13 +00:00
Lutz Mueller
2534e20510 2001-08-30 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
* include/gphoto2-port.h: GP_ERROR_IO_LOCK
        * libgphoto2_port/gp_port.c: Better error reporting.
        * serial/unix.c: Implement locking of serial ports


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2144 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-08-30 22:57:31 +00:00
Dan Fandrich
0e69a6327e Fixed problem with saving raw images. Stopped file name suffixes from
needlessly changing.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2143 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-08-30 21:59:08 +00:00
Lutz Mueller
07b98c4f4d Small addition.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2142 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-08-30 20:11:47 +00:00
Lutz Mueller
257a15f010 2001-08-30 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
* camlibs/dimera/dimera3500.c (camera_file_get): Use
        gp_file_adjust_name_for_mime_type
        * libgphoto2/file.c (gp_file_adjust_name_for_mime_type):
        GP_MIME_RAW -> *.raw


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2141 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-08-30 20:10:40 +00:00
Lutz Mueller
9f0311ea68 2001-08-30 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
* camlibs/agfa.c:
        * camlibs/commands.c:
        * camlibs/commands.h: Use a macro CHECK for most of the simple
        error checks. That makes the code much cleaner.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2140 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-08-30 20:04:31 +00:00
Lutz Mueller
510bca1694 2001-08-30 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
* camlibs/agfa-cl18/agfa.h: Renamed to
        * camlibs/agfa-cl18/commands.h
        * camlibs/Makefile.am: Reflect this change.
        * camlibs/commands.c:
        * camlibs/agfa.c: Improve error reporting.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2139 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-08-30 19:34:26 +00:00
Lutz Mueller
4fdf510202 2001-08-30 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
* camlibs/agfa-cl18/*: Bring it up to date (camera->port and camera->fs)


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2138 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-08-30 18:05:54 +00:00
Lutz Mueller
a6b26bfbda Small fix.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2137 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-08-30 10:51:59 +00:00
Lutz Mueller
2e2f938991 2001-08-29 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
* camlibs/barbie/*: Use camera->port and camera->fs.
        * camlibs/dimera/dimera3500.c
        (populate_filesystem): Removed.
        (camera_folder_list_folders): Removed. We don't support folders anyways
        (camera_folder_list_files): Renamed to
        (file_list_func): Don't access the CameraFilesystem here. Just
        populate the list. The CameraFilesystem will get updated by libgphoto2.
        (camera_file_get_info): Renamed to
        (get_info_func): New
        (camera_file_set_info): Removed. Not supported.
        (camera_init): Correctly gp_filesystem_set_list_funcs and
        gp_filesystem_set_info_funcs so that the CameraFilesystem has full
        control over the information
        * include/gphoto2-list.h:
        * libgphoto2/list.c: (gp_list_populate): New. Please use this
        function to populate the list passed to you on file_list_func.
        * libgphoto2/filesys.c: Don't remove the dirty flag on folders
        on gp_filesystem_append (thanks, Dan!)


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2136 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-08-30 10:47:51 +00:00
Lutz Mueller
2b3ff3a07c Cosmetic change.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2135 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-08-30 09:39:17 +00:00
Lutz Mueller
c6577b14dc 2001-08-29 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
* camlibs/template/*: Updated
        * include/gphoto2-camera.h: Add a note about c_folder_list_folders and
        c_folder_list_files not to be used. Same with [get,set]_info.
        * include/gphoto2-filesys.h: Remove an uneeded typedef.
        * libgphoto2/filesys.c: Here, too.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2134 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-08-30 09:32:58 +00:00
Lutz Mueller
999cac37ed 2001-08-29 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
Dan Fandrich <dan@coneharvesters.com> found this bug:

        * libgphoto2/camera.c (list_files, list_folders): If
        gp_filesystem_list_files returns 0 files, try the old method. Same with
        folders.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2133 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-08-30 08:51:33 +00:00
Lutz Mueller
b2e930e4d3 Small improvements.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2132 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-08-30 08:39:30 +00:00
Lutz Mueller
d501dfff13 2001-08-29 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
Fabrice did it again:

        * camlibs/sierra/*: Actually use camera->fs.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2131 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-08-30 08:30:53 +00:00
Dan Fandrich
891f972065 Now using predefined camera->port and camera->fs structures. Removed
unneeded include files. Now using predefined MIME types. Made all local
functions static. Updated camera_manual text.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2130 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-08-29 22:04:54 +00:00
Dan Fandrich
3655814ddc Don't call gp_port_new or gp_port_close any more. Fixed mesa_set_speed to
treat "unspecified" speed of 0 as 115200.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2129 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-08-29 22:01:08 +00:00
Dan Fandrich
2cc01ea545 Changed port parameter to mesa_port_open
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2128 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-08-29 21:57:28 +00:00
Dan Fandrich
04e6526789 Updated
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2127 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-08-29 19:39:09 +00:00
Lutz Mueller
c06b27b536 2001-08-29 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
* include/gphotoos2.h:
        * include/gphoto2-portability-os2.h: Removed. Contents are now ...
        * include/gphoto2.h: ... here.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2126 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-08-29 18:12:33 +00:00
Lutz Mueller
97b7ab3706 char * -> const char *
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2125 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-08-29 18:00:51 +00:00
Lutz Mueller
90d8c3325c 2001-08-29 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
* gphoto2-library.h: Clean up this file.
        * gphoto2-camera.h: We don't need camera_init, camera_abilities, and
        camera_id here. That belongs into gphoto2-library.h.
        * libgphoto2/camera.c:
        * libgphoto2/core.c: Adapt
        * camlibs/*: Move camera_init to the bottom of the file. Camera
        driver authors, could you please declare the functions above static?
        Except camera_id and camera_abilities.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2124 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-08-29 17:53:03 +00:00
Lutz Mueller
3451744b2f 2001-08-29 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
All work from Fabrice Bellet <Fabrice.Bellet@creatis.insa-lyon.fr>:

        * libgphoto2/filesys.c (gp_filesystem_number): Check if the folder
        is dirty (like in gp_filesystem_folder_number).


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2122 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-08-29 15:09:21 +00:00
Lutz Mueller
aed601baa5 2001-08-29 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
All work from Fabrice Bellet <Fabrice.Bellet@creatis.insa-lyon.fr>:

        * libgphoto2_port/library.c (gp_port_library_list): Don't try to
        open .*
        * usb/libusb.c (gp_port_usb_close): Release the interface here.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2121 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-08-29 15:07:26 +00:00
Lutz Mueller
890cd45b93 Small correction...
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2120 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-08-29 14:50:45 +00:00
Lutz Mueller
4a549f1555 *** empty log message ***
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2119 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-08-29 14:47:05 +00:00
Lutz Mueller
59daa31f20 Open the port on camera_init.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2118 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-08-29 10:22:47 +00:00
Lutz Mueller
205d6f1081 2001-08-29 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
* camlibs/sierra/*:
        * camlibs/directory/directory.c (camera_folder_list_folders),
        (camera_folder_list_files), (camera_file_[get,set]_info): Removed.
        Use the camera->fs. Use camera->port.
        * camlibs/*: camera->port->* -> camera->port_info->*
        * include/gphoto2-camera.h:
        * libgphoto2/camera.c: Open the port before accessing a camera,
        close it after.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2115 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-08-29 10:09:57 +00:00
Lutz Mueller
3649573855 2001-08-29 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
* libgphoto2_port/gp_port.c: if (!dev) return (GP_OK) instead of
        accessing dev->whatever... Plus, set the timeout on gp_port_open.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2114 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-08-29 10:09:30 +00:00
Lutz Mueller
1dd3cfc991 Updated
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2113 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-08-29 06:54:13 +00:00
Hubert Figuiere
f0096aa835 * include/gphoto2-file.h (GP_MIME_BMP): added this mime type.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2112 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-08-28 18:06:38 +00:00
Lutz Mueller
71d1b6d0a6 *** empty log message ***
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2111 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-08-28 11:00:22 +00:00
Lutz Mueller
d26885f0a3 Clean up.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2110 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-08-28 10:55:08 +00:00
Lutz Mueller
80c9833005 New file.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2109 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-08-28 10:52:21 +00:00
Lutz Mueller
4cd8f3ba7f Updated.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2108 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-08-28 10:51:38 +00:00
Lutz Mueller
910bd5293b 2001-08-29 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
* include/gphoto2-file.h: Add a note about the crappy API
        * include/gphoto2-abilities-list.h:
        * libgphoto2/abilities-list.c:
        * libgphoto2/core.c: Don't access the CameraAbilitiesList directly
        any more.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2107 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-08-28 07:22:43 +00:00
Lutz Mueller
5bbd164d9b 2001-08-29 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
Another patch from Ilya Konstantinov <future@shiny.co.il>:

        * libgphoto2/camera.c (gp_camera_new): Correctly initialize the speed
        to 0


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2106 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-08-28 05:41:27 +00:00
Lutz Mueller
c118e3b640 Tiny fix.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2105 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-08-27 23:04:24 +00:00
Lutz Mueller
458f934200 2001-08-28 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
* camlibs/canon/psa50.c:
        * camlibs/kodak/dc120/library.c:
        * camlibs/minolta/dimagev/dimagev.c:
        * camlibs/panasonic/dc1000.c:
        * camlibs/panasonic/dc1580.c:
        * camlibs/sonydscf1/sonydscf1.c: Remove direct accesses to the
        CameraFile struct.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2104 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-08-27 22:19:01 +00:00
Lutz Mueller
320f12b8ce Again, line numbers have changed...
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2103 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-08-27 21:42:51 +00:00
Lutz Mueller
8388607ec8 2001-08-27 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
Patch from Fabrice Bellet <Fabrice.Bellet@creatis.insa-lyon.fr>:

        * camlibs/sierra/library.[c,h]:
        * camlibs/sierra/sierra.c: Use the new filesystem to cache file
        information and for listing files/folders.
        * include/gphoto2-file.h:
        * libgphoto2/file.c (gp_file_detect_mime_type),
        (gp_file_adjust_name_for_mime_type): New
        * libgphoto2/camera.c: list->count = 0;
        * libpghoto2/filesys.c (gp_filesystem_number): If this function is
        called, scan the whole filesystem.
        * tests/test-filesys.c: Test gp_filesystem_get_folder, too.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2102 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-08-27 21:42:13 +00:00
Lutz Mueller
ad2a13ee8a 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.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2100 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-08-27 19:32:29 +00:00
Lutz Mueller
9ec7ae880d 2001-08-27 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
Suggestion from Fabrice Bellet <Fabrice.Bellet@creatis.insa-lyon.fr>:

        * include/gphoto2-port.h:
        * usb/libusb.c (gp_port_usb_close): Don't report an error if the
        device has already been closed. Correctly reuse the devices on
        gp_port_open after gp_port_close.

        * parallel/Makefile.am: Remove some references to libgpio.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2099 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-08-27 19:28:22 +00:00
Lutz Mueller
09a1928ad7 2001-08-27 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
* libgphoto2/camera.c
        * libgphoto2/file.c: strcpy -> strncpy


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2098 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-08-27 19:16:00 +00:00
Lutz Mueller
320ea33bb2 Forgot to commit that, too.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2097 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-08-27 17:21:50 +00:00
Lutz Mueller
6685339a14 Line numbers changed. And I don't like to have this file show up in every cvs diff.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2096 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-08-27 17:15:07 +00:00
Lutz Mueller
db161947e9 2001-08-27 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
* include/gphoto2-filesys.h:
        * libgphoto2/filesys.c: Cache folders and files, too (that is, only
        query them from the camera when needed.
        * frontends/command-line/main.c: Don't require a port with
        "Directory Browse".
        * camlibs/konica/library.c: Use the new functions
        * camlibs/directory/directory.[c,h]: Use the filesystem
        * tests/test-filesys.c: Demonstrate the use of the new functions.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2095 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-08-27 17:13:55 +00:00