head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.54
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.52
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.50
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.48
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2009Q4:1.2.0.46
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2008Q4:1.2.0.44
	pkgsrc-2008Q4-base:1.2
	pkgsrc-2008Q3:1.2.0.42
	pkgsrc-2008Q3-base:1.2
	cube-native-xorg:1.2.0.40
	cube-native-xorg-base:1.2
	pkgsrc-2008Q2:1.2.0.38
	pkgsrc-2008Q2-base:1.2
	pkgsrc-2008Q1:1.2.0.36
	pkgsrc-2008Q1-base:1.2
	pkgsrc-2007Q4:1.2.0.34
	pkgsrc-2007Q4-base:1.2
	pkgsrc-2007Q3:1.2.0.32
	pkgsrc-2007Q3-base:1.2
	pkgsrc-2007Q2:1.2.0.30
	pkgsrc-2007Q2-base:1.2
	pkgsrc-2007Q1:1.2.0.28
	pkgsrc-2007Q1-base:1.2
	pkgsrc-2006Q4:1.2.0.26
	pkgsrc-2006Q4-base:1.2
	pkgsrc-2006Q3:1.2.0.24
	pkgsrc-2006Q3-base:1.2
	pkgsrc-2006Q2:1.2.0.22
	pkgsrc-2006Q2-base:1.2
	pkgsrc-2006Q1:1.2.0.20
	pkgsrc-2006Q1-base:1.2
	pkgsrc-2005Q4:1.2.0.18
	pkgsrc-2005Q4-base:1.2
	pkgsrc-2005Q3:1.2.0.16
	pkgsrc-2005Q3-base:1.2
	pkgsrc-2005Q2:1.2.0.14
	pkgsrc-2005Q2-base:1.2
	pkgsrc-2005Q1:1.2.0.12
	pkgsrc-2005Q1-base:1.2
	pkgsrc-2004Q4:1.2.0.10
	pkgsrc-2004Q4-base:1.2
	pkgsrc-2004Q3:1.2.0.8
	pkgsrc-2004Q3-base:1.2
	pkgsrc-2004Q2:1.2.0.6
	pkgsrc-2004Q2-base:1.2
	pkgsrc-2004Q1:1.2.0.4
	pkgsrc-2004Q1-base:1.2
	pkgsrc-2003Q4:1.2.0.2
	pkgsrc-2003Q4-base:1.2
	buildlink2-base:1.2;
locks; strict;
comment	@# @;


1.2
date	2002.02.26.13.14.57;	author martti;	state dead;
branches;
next	1.1;

1.1
date	2001.07.08.21.44.27;	author veego;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Updated gphoto to 2.0 (provided by Amitai Schlair in pkg/15727)

The changelog since the last version of gphoto2 in pkgsrc
(a beta from July) is 150K+. Please note that this is no longer
a beta version!
@
text
@$NetBSD: patch-ae,v 1.1 2001/07/08 21:44:27 veego Exp $

--- camlibs/kodak/dc240/library.c	2001/01/22 21:25:24	1.3
+++ camlibs/kodak/dc240/library.c	2001/07/04 08:54:14	1.4
@@@@ -378,7 +378,10 @@@@
     free(p1);
     free(p2);
     x=2;
-    while (x < file->size) {
+    /* since directory entries are 20 bytes, it is possible that */
+    /* we find some garbage. Ignore it. TODO: check that there is */
+    /* not another bug involving reading this info */
+    while ((x < file->size) && (file->size - x >= 20)) {
         if ((file->data[x] != '.') &&
             (attrib == (unsigned char)file->data[x+11]))  {
             /* Files have attrib 0x00, Folders have attrib 0x10 */
@@@@ -448,6 +451,9 @@@@
 
     free(cmd_packet);
     free(path_packet);
+
+    strcpy(file->name, filename);
+    strcpy(file->type, "image/jpeg");
 
     return (retval);
 }
@


1.1
log
@Patch from bugtracking system of gphoto:

http://sourceforge.net/tracker/index.php?func=detail&aid=438155&group_id=8874&atid=108874

Summary:
gphoto2 leave DC240 in an unstable state
Fetching a list of all the files on the DC240 camera
leave the camera in an unstable state, making it hard
to shutdown.

Was applied in revision 1.4 to the ghoto2 source tree, plus an additional
patch, so use this version and not the patch from above.
@
text
@d1 1
a1 1
$NetBSD$
@