summaryrefslogtreecommitdiff
path: root/camlibs/jamcam
diff options
context:
space:
mode:
authorHubert Figuiere <hub@figuiere.net>2002-03-20 23:52:29 +0000
committerHubert Figuiere <hub@figuiere.net>2002-03-20 23:52:29 +0000
commit2c8407ff663c44b706e8e4a480eb2fd6e98f86cc (patch)
tree9c9a637771a3ac96e660db7789f0090f26339ea8 /camlibs/jamcam
parentaf70d8b11e139152897183dda39f7958024d67d2 (diff)
downloadlibgphoto2-2c8407ff663c44b706e8e4a480eb2fd6e98f86cc.tar.gz
* library.c (jamcam_file_count): Patch by Thor Ablestar <thor@irk.ru>
Fix the file count if the camera storage is full. git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@4299 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'camlibs/jamcam')
-rw-r--r--camlibs/jamcam/ChangeLog5
-rw-r--r--camlibs/jamcam/library.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/camlibs/jamcam/ChangeLog b/camlibs/jamcam/ChangeLog
index bc1b847c8..1ffdee163 100644
--- a/camlibs/jamcam/ChangeLog
+++ b/camlibs/jamcam/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-21 Hubert Figuiere <hfiguiere@teaser.fr>
+
+ * library.c (jamcam_file_count): Patch by Thor Ablestar <thor@irk.ru>
+ Fix the file count if the camera storage is full.
+
2002-01-04 Chris Pinkham <cpinkham@infi.net>
* jamcam.c, library.c, library.h: updated code to use new
diff --git a/camlibs/jamcam/library.c b/camlibs/jamcam/library.c
index 6e7b659da..e36248e41 100644
--- a/camlibs/jamcam/library.c
+++ b/camlibs/jamcam/library.c
@@ -239,7 +239,7 @@ int jamcam_file_count (Camera *camera) {
jamcam_read_packet( camera, reply, 16 );
- while( reply[0] != 0xff ) {
+ while( reply[0] = 'K' ) {
width = (reply[5] * 256) + reply[4];
height = (reply[7] * 256) + reply[6];