Home / Browse / gPhoto / Mail / Archive

gPhoto

Email Archive: gphoto-cvs (read-only)

2002:	_Jan	_Feb	_Mar	_Apr	_May	_Jun	_Jul	_Aug (224)	_Sep (194)	_Oct (222)	_Nov (567)	_Dec (190)
2003:	_Jan (304)	_Feb (159)	_Mar (31)	_Apr (45)	_May (112)	_Jun (103)	_Jul (114)	_Aug (84)	_Sep (134)	_Oct (135)	_Nov (37)	_Dec (28)
2004:	_Jan (182)	_Feb (44)	_Mar (28)	_Apr (45)	_May (27)	_Jun (18)	_Jul (51)	_Aug (59)	_Sep (40)	_Oct (33)	_Nov (44)	_Dec (56)
2005:	_Jan (117)	_Feb (49)	_Mar (111)	_Apr (337)	_May (103)	_Jun (121)	_Jul (52)	_Aug (48)	_Sep (31)	_Oct (12)	_Nov (26)	_Dec (80)
2006:	_Jan (217)	_Feb (43)	_Mar (125)	_Apr (80)	_May (53)	_Jun (171)	_Jul (40)	_Aug (79)	_Sep (109)	_Oct (133)	_Nov (105)	_Dec (332)
2007:	_Jan (112)	_Feb (55)	_Mar (43)	_Apr (31)	_May (247)	_Jun (76)	_Jul (89)	_Aug (109)	_Sep (137)	_Oct (84)	_Nov (33)	_Dec (36)
2008:	_Jan (23)	_Feb (29)	_Mar (97)	_Apr (53)	_May (33)	_Jun (43)	_Jul (59)	_Aug (42)	_Sep (57)	_Oct (154)	_Nov (73)	_Dec (64)
2009:	_Jan (138)	_Feb (53)	_Mar (77)	_Apr (108)	_May (104)	_Jun (48)	_Jul (170)	_Aug (79)	_Sep (47)	_Oct (44)	_Nov (18)	_Dec (33)
2010:	_Jan (105)	_Feb (48)	_Mar (161)	_Apr (160)	_May (30)	_Jun (42)	_Jul (82)	_Aug (99)	_Sep (48)	_Oct (29)	_Nov (43)	_Dec (54)
2011:	_Jan (34)	_Feb (48)	_Mar (24)	_Apr (47)	_May (20)	_Jun (15)	_Jul (15)	_Aug (19)	_Sep (57)	_Oct (10)	_Nov (23)	_Dec (41)
2012:	_Jan (27)	_Feb (44)	_Mar (60)	_Apr (59)	_May (15)	_Jun (14)	_Jul (32)	_Aug (20)	_Sep (25)	_Oct (14)	_Nov (12)	_Dec (25)
2013:	_Jan (56)	_Feb (46)	_Mar (36)	_Apr (66)	_May (58)	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec


S	M	T	W	T	F	S
					1	2

3	4	5	6	7	8	9
			(1)	(1)
10	11	12	13	14	15	16
	(3)		(2)	(1)
17	18	19	20	21	22	23
(1)		(5)		(1)	(1)
24	25	26	27	28	29
(6)	(1)	(2)		(3)	(1)

[gphoto-cvs] SF.net SVN: gphoto: [10954] trunk/libgphoto2/camlibs/ptp2

From: <marcusmeissner@us...> - 2008-02-19 19:52

Revision: 10954
          http://gphoto.svn.sourceforge.net/gphoto/?rev=10954&view=rev
Author:   marcusmeissner
Date:     2008-02-19 11:52:09 -0800 (Tue, 19 Feb 2008)

Log Message:
-----------
save the changed flag for non matching configentries

Modified Paths:
--------------
    trunk/libgphoto2/camlibs/ptp2/ChangeLog
    trunk/libgphoto2/camlibs/ptp2/config.c

Modified: trunk/libgphoto2/camlibs/ptp2/ChangeLog
===================================================================
--- trunk/libgphoto2/camlibs/ptp2/ChangeLog	2008-02-19 04:29:26 UTC (rev 10953)
+++ trunk/libgphoto2/camlibs/ptp2/ChangeLog	2008-02-19 19:52:09 UTC (rev 10954)
@@ -1,3 +1,8 @@
+2008-02-19  Marcus Meissner  <marcus@...>
+
+	* config.c: Do not clear the "changed" flag when its not the
+	  widget we want.
+
 2008-02-07  Marcus Meissner  <marcus@...>
 
 	* library.c: Added Canon IXUS 860 IS as reported.

Modified: trunk/libgphoto2/camlibs/ptp2/config.c
===================================================================
--- trunk/libgphoto2/camlibs/ptp2/config.c	2008-02-19 04:29:26 UTC (rev 10953)
+++ trunk/libgphoto2/camlibs/ptp2/config.c	2008-02-19 19:52:09 UTC (rev 10954)
@@ -2816,8 +2816,12 @@
 			if (!gp_widget_changed (widget))
 				continue;
 
+			/* restore the "changed flag" */
+			gp_widget_set_changed (widget, TRUE);
+
 			gp_log (GP_LOG_DEBUG, "camera_set_config", "Found and setting Property %04x (%s)", cursub->propid, cursub->label);
 			if (have_prop(camera,cursub->vendorid,cursub->propid)) {
+				gp_widget_changed (widget); /* clear flag */
 				if (cursub->propid) {
 					PTPDevicePropDesc dpd;
 
@@ -2835,6 +2839,7 @@
 			if (have_eos_prop(camera,cursub->vendorid,cursub->propid)) {
 				PTPDevicePropDesc	dpd;
 
+				gp_widget_changed (widget); /* clear flag */
 				gp_log (GP_LOG_DEBUG, "camera_set_config", "Found and setting EOS Property %04x (%s)", cursub->propid, cursub->label);
 				memset(&dpd,0,sizeof(dpd));
 				ptp_canon_eos_getdevicepropdesc (&camera->pl->params,cursub->propid, &dpd);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[gphoto-cvs] SF.net SVN: gphoto: [10959] trunk/libgphoto2/camlibs/ptp2

From: <marcusmeissner@us...> - 2008-02-22 22:19

Revision: 10959
          http://gphoto.svn.sourceforge.net/gphoto/?rev=10959&view=rev
Author:   marcusmeissner
Date:     2008-02-22 14:18:57 -0800 (Fri, 22 Feb 2008)

Log Message:
-----------
implement that canon capture mode can store to the card too.

Modified Paths:
--------------
    trunk/libgphoto2/camlibs/ptp2/ChangeLog
    trunk/libgphoto2/camlibs/ptp2/library.c
    trunk/libgphoto2/camlibs/ptp2/ptp.h

Modified: trunk/libgphoto2/camlibs/ptp2/ChangeLog
===================================================================
--- trunk/libgphoto2/camlibs/ptp2/ChangeLog	2008-02-21 07:46:13 UTC (rev 10958)
+++ trunk/libgphoto2/camlibs/ptp2/ChangeLog	2008-02-22 22:18:57 UTC (rev 10959)
@@ -1,3 +1,11 @@
+2008-02-22  Marcus Meissner  <marcus@...>
+
+	* library.c, ptp.h:
+	  Always use Canon capture mode if available.
+
+	  Allow the Canon capture mode to store its stuff on the card
+	  by using the 0xd029 property (CaptureTransferMode).
+
 2008-02-19  Marcus Meissner  <marcus@...>
 
 	* config.c: Do not clear the "changed" flag when its not the

Modified: trunk/libgphoto2/camlibs/ptp2/library.c
===================================================================
--- trunk/libgphoto2/camlibs/ptp2/library.c	2008-02-21 07:46:13 UTC (rev 10958)
+++ trunk/libgphoto2/camlibs/ptp2/library.c	2008-02-22 22:18:57 UTC (rev 10959)
@@ -1461,7 +1461,7 @@
 camera_canon_capture (Camera *camera, CameraCaptureType type, CameraFilePath *path,
 		GPContext *context)
 {
-	static int capcnt = 0;
+	static int 		capcnt = 0;
 	PTPObjectInfo		oi;
 	int			i, ret, isevent;
 	PTPParams		*params = &camera->pl->params;
@@ -1471,6 +1471,8 @@
 	PTPContainer		event;
 	PTPUSBEventContainer	usbevent;
 	uint32_t		handle;
+	char 			buf[1024];
+	int			xmode = CANON_TRANSFER_CARD;
 
 	if (!ptp_operation_issupported(params, PTP_OC_CANON_InitiateCaptureInMemory)) {
 		gp_context_error (context,
@@ -1491,7 +1493,10 @@
 	}
 
 	if (ptp_property_issupported(params, PTP_DPC_CANON_CaptureTransferMode)) {
-		propval.u16=3; /* 3 */
+		if ((GP_OK == gp_setting_get("ptp2","capturetarget",buf)) && !strcmp(buf,"sdram"))
+			propval.u16 = xmode = CANON_TRANSFER_MEMORY;
+		else
+			propval.u16 = xmode = CANON_TRANSFER_CARD;
 		ret = ptp_setdevicepropvalue(params, PTP_DPC_CANON_CaptureTransferMode, &propval, PTP_DTC_UINT16);
 		if (ret != PTP_RC_OK)
 			gp_log (GP_LOG_DEBUG, "ptp", "setdevicepropvalue CaptureTransferMode failed, %d\n", ret);
@@ -1563,12 +1568,26 @@
 	/* FIXME: handle multiple images (as in BurstMode) */
 	ret = ptp_getobjectinfo (params, newobject, &oi);
 	if (ret != PTP_RC_OK) return GP_ERROR_IO;
+
 	if (oi.ParentObject != 0) {
-		fprintf(stderr,"Parentobject is 0x%lx now?\n", (unsigned long)oi.ParentObject);
+		if (xmode != CANON_TRANSFER_CARD) {
+			fprintf (stderr,"parentobject is 0x%x, but not in card mode?\n", oi.ParentObject);
+		}
+		add_object (camera, newobject, context);
+		strcpy  (path->name,  oi.Filename);
+		sprintf (path->folder,"/"STORAGE_FOLDER_PREFIX"%08lx/",(unsigned long)oi.StorageID);
+		get_folder_from_handle (camera, oi.StorageID, oi.ParentObject, path->folder);
+		/* delete last / or we get confused later. */
+		path->folder[ strlen(path->folder)-1 ] = '\0';
+		return GP_OK;
+	} else {
+		if (xmode == CANON_TRANSFER_CARD) {
+			fprintf (stderr,"parentobject is 0, but not in memory mode?\n");
+		}
+		sprintf (path->folder,"/"STORAGE_FOLDER_PREFIX"%08lx",(unsigned long)oi.StorageID);
+		sprintf (path->name, "capt%04d.jpg", capcnt++);
+		return add_objectid_to_gphotofs(camera, path, context, newobject, &oi);
 	}
-	sprintf (path->folder,"/"STORAGE_FOLDER_PREFIX"%08lx",(unsigned long)oi.StorageID);
-	sprintf (path->name, "capt%04d.jpg", capcnt++);
-	return add_objectid_to_gphotofs(camera, path, context, newobject, &oi);
 }
 
 static int
@@ -1595,9 +1614,7 @@
 	if (	(params->deviceinfo.VendorExtensionID == PTP_VENDOR_CANON) &&
 		ptp_operation_issupported(params, PTP_OC_CANON_InitiateCaptureInMemory)
 	) {
-		char buf[1024];
-		if ((GP_OK != gp_setting_get("ptp2","capturetarget",buf)) || !strcmp(buf,"sdram"))
-			return camera_canon_capture (camera, type, path, context);
+		return camera_canon_capture (camera, type, path, context);
 	}
 
 	if (	(params->deviceinfo.VendorExtensionID == PTP_VENDOR_CANON) &&

Modified: trunk/libgphoto2/camlibs/ptp2/ptp.h
===================================================================
--- trunk/libgphoto2/camlibs/ptp2/ptp.h	2008-02-21 07:46:13 UTC (rev 10958)
+++ trunk/libgphoto2/camlibs/ptp2/ptp.h	2008-02-22 22:18:57 UTC (rev 10959)
@@ -1065,6 +1065,8 @@
 #define PTP_DPC_CANON_FocalLengthWide	0xD027
 #define PTP_DPC_CANON_FocalLengthDenominator	0xD028
 #define PTP_DPC_CANON_CaptureTransferMode		0xD029
+#define CANON_TRANSFER_MEMORY	3
+#define CANON_TRANSFER_CARD	9
 #define PTP_DPC_CANON_Zoom		0xD02A
 #define PTP_DPC_CANON_NamePrefix	0xD02B
 #define PTP_DPC_CANON_SizeQualityMode	0xD02C


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[gphoto-cvs] SF.net SVN: gphoto: [10973] trunk/libgphoto2/camlibs/ptp2

From: <marcusmeissner@us...> - 2008-03-01 21:37

Revision: 10973
          http://gphoto.svn.sourceforge.net/gphoto/?rev=10973&view=rev
Author:   marcusmeissner
Date:     2008-03-01 13:37:31 -0800 (Sat, 01 Mar 2008)

Log Message:
-----------
in ptp_mtpgetobjectreferences handle the case where no DATA is
returned at all.

Modified Paths:
--------------
    trunk/libgphoto2/camlibs/ptp2/ChangeLog
    trunk/libgphoto2/camlibs/ptp2/ptp.c

Modified: trunk/libgphoto2/camlibs/ptp2/ChangeLog
===================================================================
--- trunk/libgphoto2/camlibs/ptp2/ChangeLog	2008-02-29 07:51:36 UTC (rev 10972)
+++ trunk/libgphoto2/camlibs/ptp2/ChangeLog	2008-03-01 21:37:31 UTC (rev 10973)
@@ -1,3 +1,10 @@
+2008-03-01  Marcus Meissner  <marcus@...>
+
+	* ptp.c: MTP GetObjectReferences on Sansa MTP device
+	  can skip the dataphase, but return OK as response.
+
+	  Handle this strange case here.
+
 2008-02-22  Marcus Meissner  <marcus@...>
 
 	* library.c, ptp.h:

Modified: trunk/libgphoto2/camlibs/ptp2/ptp.c
===================================================================
--- trunk/libgphoto2/camlibs/ptp2/ptp.c	2008-02-29 07:51:36 UTC (rev 10972)
+++ trunk/libgphoto2/camlibs/ptp2/ptp.c	2008-03-01 21:37:31 UTC (rev 10973)
@@ -2797,13 +2797,23 @@
 	PTPContainer ptp;
 	uint16_t ret;
 	unsigned char* dpv=NULL;
+	unsigned int dpvlen = 0;
 
 	PTP_CNT_INIT(ptp);
 	ptp.Code=PTP_OC_MTP_GetObjectReferences;
 	ptp.Param1=handle;
 	ptp.Nparam=1;
-	ret=ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, &dpv, NULL);
-	if (ret == PTP_RC_OK) *arraylen = ptp_unpack_uint32_t_array(params, dpv, 0, ohArray);
+	ret=ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, &dpv, &dpvlen);
+	if (ret == PTP_RC_OK) {
+		/* Sandisk Sansa skips the DATA phase, but returns OK as response.
+		 * this will gives us a NULL here. Handle it. -Marcus */
+		if ((dpv == NULL) || (dpvlen == 0)) {
+			*arraylen = 0;
+			*ohArray = NULL;
+		} else {
+			*arraylen = ptp_unpack_uint32_t_array(params, dpv, 0, ohArray);
+		}
+	}
 	free(dpv);
 	return ret;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[gphoto-cvs] SF.net SVN: gphoto: [10964] trunk/website/doc/remote/index.php

From: <marcusmeissner@us...> - 2008-02-24 18:43

Revision: 10964
          http://gphoto.svn.sourceforge.net/gphoto/?rev=10964&view=rev
Author:   marcusmeissner
Date:     2008-02-24 10:43:47 -0800 (Sun, 24 Feb 2008)

Log Message:
-----------
added d40 as reported

Modified Paths:
--------------
    trunk/website/doc/remote/index.php

Modified: trunk/website/doc/remote/index.php
===================================================================
--- trunk/website/doc/remote/index.php	2008-02-24 18:40:53 UTC (rev 10963)
+++ trunk/website/doc/remote/index.php	2008-02-24 18:43:47 UTC (rev 10964)
@@ -427,6 +427,14 @@
 </tr>
 
 <tr>
+	<td>Nikon D40</td>
+	<td>Yes</td>
+	<td>All</td>
+	<td>6</td>
+	<td>&nbsp;</td>
+</tr>
+
+<tr>
 	<td>Nikon D50</td>
 	<td>Yes</td>
 	<td>All</td>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[gphoto-cvs] SF.net SVN: gphoto: [10972] trunk/website/doc/remote/index.php

From: <marcusmeissner@us...> - 2008-02-29 07:51

Revision: 10972
          http://gphoto.svn.sourceforge.net/gphoto/?rev=10972&view=rev
Author:   marcusmeissner
Date:     2008-02-28 23:51:36 -0800 (Thu, 28 Feb 2008)

Log Message:
-----------
added eos 400d, 40d, adjusted a80

Modified Paths:
--------------
    trunk/website/doc/remote/index.php

Modified: trunk/website/doc/remote/index.php
===================================================================
--- trunk/website/doc/remote/index.php	2008-02-28 22:19:52 UTC (rev 10971)
+++ trunk/website/doc/remote/index.php	2008-02-29 07:51:36 UTC (rev 10972)
@@ -114,6 +114,22 @@
 </tr>
 
 <tr>
+	<td>Canon EOS 40D</td>
+	<td>Yes</td>
+	<td>limited level of configurability</td>
+	<td>?</td>
+	<td>support is very fresh and might be unstable</td>
+</tr>
+
+<tr>
+	<td>Canon EOS 400D</td>
+	<td>Yes</td>
+	<td>limited level of configurability</td>
+	<td>?</td>
+	<td>support is very fresh and might be unstable</td>
+</tr>
+
+<tr>
 	<td>Canon PowerShot A40</td>
 	<td>Yes</td>
 	<td>All</td>
@@ -164,9 +180,9 @@
 <tr>
 	<td>Canon PowerShot A80</td>
 	<td>Yes</td>
-	<td>Unknown</td>
+	<td>All</td>
 	<td>4</td>
-	<td>from capture.sf.net notes</td>
+	<td>capture.sf.net and user reported</td>
 </tr>
 
 <tr>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[gphoto-cvs] SF.net SVN: gphoto: [10971] trunk/libgphoto2/camlibs/ptp2/cameras/ canon-eos40d.txt

From: <marcusmeissner@us...> - 2008-02-28 22:19

Revision: 10971
          http://gphoto.svn.sourceforge.net/gphoto/?rev=10971&view=rev
Author:   marcusmeissner
Date:     2008-02-28 14:19:52 -0800 (Thu, 28 Feb 2008)

Log Message:
-----------
added eos 40d

Added Paths:
-----------
    trunk/libgphoto2/camlibs/ptp2/cameras/canon-eos40d.txt

Added: trunk/libgphoto2/camlibs/ptp2/cameras/canon-eos40d.txt
===================================================================
--- trunk/libgphoto2/camlibs/ptp2/cameras/canon-eos40d.txt	                        (rev 0)
+++ trunk/libgphoto2/camlibs/ptp2/cameras/canon-eos40d.txt	2008-02-28 22:19:52 UTC (rev 10971)
@@ -0,0 +1,156 @@
+Device info:
+Manufacturer: Canon Inc.
+  model: Canon EOS 40D
+  device version: 3-1.0.5
+  serial number: 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
+Vendor extension ID: 0x0000000b
+Vendor extension description: (null)
+Supported operations:
+  0x1014
+  0x1015
+  0x1016
+  0x1001
+  0x1002
+  0x1003
+  0x1006
+  0x1004
+  0x9101
+  0x1005
+  0x9102
+  0x1007
+  0x1008
+  0x9103
+  0x1009
+  0x9104
+  0x100a
+  0x101b
+  0x9107
+  0x100c
+  0x100d
+  0x100b
+  0x9105
+  0x100f
+  0x9106
+  0x9110
+  0x9127
+  0x910b
+  0x9108
+  0x9109
+  0x910c
+  0x910e
+  0x910f
+  0x9125
+  0x9126
+  0x9115
+  0x9114
+  0x9113
+  0x9116
+  0x9117
+  0x9120
+  0x91f0
+  0x9118
+  0x9121
+  0x9120
+  0x91f0
+  0x9118
+  0x9121
+  0x91f1
+  0x911d
+  0x910a
+  0x911b
+  0x911c
+  0x911e
+  0x911a
+  0x9153
+  0x9154
+  0x9155
+  0x9157
+  0x9158
+  0x9159
+  0x911f
+  0x91fe
+  0x91ff
+  0x9801
+  0x9802
+  0x9803
+  0x9804
+  0x9805
+  0x91c0
+  0x91c1
+  0x91c2
+  0x91c3
+  0x91c4
+  0x91c5
+  0x91c6
+  0x91c7
+  0x91c8
+  0x91c9
+  0x91ca
+  0x91cb
+  0x91cc
+  0x91ce
+  0x91cf
+  0x91e1
+  0x91e2
+  0x91e3
+  0x91e4
+  0x91e5
+  0x91e6
+  0x91e7
+  0x91e8
+  0x91e9
+  0x91ea
+  0x91eb
+  0x91f2
+  0x91f3
+  0x91f4
+  0x91f7
+  0x9122
+  0x9123
+  0x9124
+  0x91f5
+  0x91f6
+Events Supported:
+  0x4009
+  0x4004
+  0x4005
+  0x4003
+  0x4002
+  0x4007
+  0xc101
+Device Properties Supported:
+  0xd402
+  0xd407
+  0xd406
+
+
+Camera summary:
+Model: Canon EOS 40D
+  device version: 3-1.0.5
+  serial number:  xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+Vendor extension ID: 0x0000000b
+Vendor extension description: (null)
+
+Capture Formats: JPEG
+Display Formats: Association/Directory, Script, DPOF, MS AVI, MS Wave, JPEG,
+CRW, Unknown(b103), Unknown(bf02), Defined Type
+
+Device Capabilities:
+        File Download, File Deletion, File Upload
+        No Image Capture, No Open Capture, No vendor specific capture
+
+Storage Devices Summary:
+store_00010001:
+        StorageDescription: CF
+        VolumeLabel: None
+        Storage Type: Removable RAM (memory card)
+        Filesystemtype: Digital Camera Layout (DCIM)
+        Access Capability: Read-Write
+        Maximum Capability: 2048065536 (1953 MB)
+        Free Space (Bytes): 2047967232 (1953 MB)
+        Free Space (Images): -1
+
+Device Property Summary:
+Property 0xd402:(read only) (type=0xffff) 'Canon EOS 40D'
+Property 0xd407:(read only) (type=0x6) 1
+Property 0xd406:(readwrite) (type=0xffff) 'Unknown Initiator'


Property changes on: trunk/libgphoto2/camlibs/ptp2/cameras/canon-eos40d.txt
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[gphoto-cvs] SF.net SVN: gphoto: [10960] trunk/libgphoto2/camlibs/ptp2/library.c

From: <marcusmeissner@us...> - 2008-02-24 10:18

Revision: 10960
          http://gphoto.svn.sourceforge.net/gphoto/?rev=10960&view=rev
Author:   marcusmeissner
Date:     2008-02-24 02:18:15 -0800 (Sun, 24 Feb 2008)

Log Message:
-----------
%d -> %x in some debugoutputs

Modified Paths:
--------------
    trunk/libgphoto2/camlibs/ptp2/library.c

Modified: trunk/libgphoto2/camlibs/ptp2/library.c
===================================================================
--- trunk/libgphoto2/camlibs/ptp2/library.c	2008-02-22 22:18:57 UTC (rev 10959)
+++ trunk/libgphoto2/camlibs/ptp2/library.c	2008-02-24 10:18:15 UTC (rev 10960)
@@ -1386,7 +1386,7 @@
 
 	ret = ptp_canon_eos_capture (params);
 	if (ret != PTP_RC_OK) {
-		gp_context_error (context, _("Canon EOS Capture failed: %d"), ret);
+		gp_context_error (context, _("Canon EOS Capture failed: %x"), ret);
 		return GP_ERROR;
 	}
 	newobject = 0;
@@ -1394,7 +1394,7 @@
 		int i;
 		ret = ptp_canon_eos_getevent (params, &entries, &nrofentries);
 		if (ret != PTP_RC_OK) {
-			gp_context_error (context, _("Canon EOS Get Changes failed: %d"), ret);
+			gp_context_error (context, _("Canon EOS Get Changes failed: %x"), ret);
 			return GP_ERROR;
 		}
 		if (!nrofentries) {
@@ -1499,7 +1499,7 @@
 			propval.u16 = xmode = CANON_TRANSFER_CARD;
 		ret = ptp_setdevicepropvalue(params, PTP_DPC_CANON_CaptureTransferMode, &propval, PTP_DTC_UINT16);
 		if (ret != PTP_RC_OK)
-			gp_log (GP_LOG_DEBUG, "ptp", "setdevicepropvalue CaptureTransferMode failed, %d\n", ret);
+			gp_log (GP_LOG_DEBUG, "ptp", "setdevicepropvalue CaptureTransferMode failed, %x\n", ret);
 	}
 
 #if 0
@@ -1509,7 +1509,7 @@
 #endif
 	ret = ptp_canon_initiatecaptureinmemory (params);
 	if (ret != PTP_RC_OK) {
-		gp_context_error (context, _("Canon Capture failed: %d"), ret);
+		gp_context_error (context, _("Canon Capture failed: %x"), ret);
 		return GP_ERROR;
 	}
 	/* Catch event */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[gphoto-cvs] SF.net SVN: gphoto: [10961] trunk/libgphoto2/camlibs/ptp2/library.c

From: <marcusmeissner@us...> - 2008-02-24 16:50

Revision: 10961
          http://gphoto.svn.sourceforge.net/gphoto/?rev=10961&view=rev
Author:   marcusmeissner
Date:     2008-02-24 08:49:20 -0800 (Sun, 24 Feb 2008)

Log Message:
-----------
added fuji

Modified Paths:
--------------
    trunk/libgphoto2/camlibs/ptp2/library.c

Modified: trunk/libgphoto2/camlibs/ptp2/library.c
===================================================================
--- trunk/libgphoto2/camlibs/ptp2/library.c	2008-02-24 10:18:15 UTC (rev 10960)
+++ trunk/libgphoto2/camlibs/ptp2/library.c	2008-02-24 16:49:20 UTC (rev 10961)
@@ -773,6 +773,8 @@
 	{"Fuji:FinePix A820",			0x04cb, 0x01c6, 0},
 	/* g4@... */
 	{"Fuji:FinePix A800",			0x04cb, 0x01d2, 0},
+	/* Teppo Jalava <tjjalava@...> */
+	{"Fuji:FinePix F50fd",			0x04cb, 0x01d4, 0},
 
 	{"Ricoh:Caplio GX (PTP mode)",          0x05ca, 0x0325, 0},
 	{"Sea & Sea:5000G (PTP mode)",		0x05ca, 0x0327, 0},


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[gphoto-cvs] SF.net SVN: gphoto: [10966] trunk/libgphoto2/camlibs/ptp2/library.c

From: <marcusmeissner@us...> - 2008-02-25 12:45

Revision: 10966
          http://gphoto.svn.sourceforge.net/gphoto/?rev=10966&view=rev
Author:   marcusmeissner
Date:     2008-02-25 04:45:32 -0800 (Mon, 25 Feb 2008)

Log Message:
-----------
added powershot sx100 is

Modified Paths:
--------------
    trunk/libgphoto2/camlibs/ptp2/library.c

Modified: trunk/libgphoto2/camlibs/ptp2/library.c
===================================================================
--- trunk/libgphoto2/camlibs/ptp2/library.c	2008-02-24 20:16:09 UTC (rev 10965)
+++ trunk/libgphoto2/camlibs/ptp2/library.c	2008-02-25 12:45:32 UTC (rev 10966)
@@ -742,6 +742,8 @@
 	{"Canon:PowerShot G9 (PTP mode)",       0x04a9, 0x315a, PTPBUG_DELETE_SENDS_EVENT},
 	/* Roger Lynn <roger@...> */
 	{"Canon:PowerShot A720 IS (PTP mode)",	0x04a9, 0x315d, PTPBUG_DELETE_SENDS_EVENT},
+	/* Mats Petersson <mats.petersson@...> */
+	{"Canon:Powershot SX100 IS (PTP mode)",	0x04a9, 0x315e, PTPBUG_DELETE_SENDS_EVENT|PTP_CAP|PTP_CAP_PREVIEW},
 	/* Ruben Vandamme <vandamme.ruben@...> */
 	{"Canon:Digital IXUS 860 IS",		0x04a9, 0x3160, PTPBUG_DELETE_SENDS_EVENT},
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[gphoto-cvs] SF.net SVN: gphoto: [10969] trunk/libgphoto2/camlibs/ptp2/library.c

From: <marcusmeissner@us...> - 2008-02-28 19:01

Revision: 10969
          http://gphoto.svn.sourceforge.net/gphoto/?rev=10969&view=rev
Author:   marcusmeissner
Date:     2008-02-28 11:01:40 -0800 (Thu, 28 Feb 2008)

Log Message:
-----------
added Ricoh Caplio RR750

Modified Paths:
--------------
    trunk/libgphoto2/camlibs/ptp2/library.c

Modified: trunk/libgphoto2/camlibs/ptp2/library.c
===================================================================
--- trunk/libgphoto2/camlibs/ptp2/library.c	2008-02-26 16:32:37 UTC (rev 10968)
+++ trunk/libgphoto2/camlibs/ptp2/library.c	2008-02-28 19:01:40 UTC (rev 10969)
@@ -778,12 +778,14 @@
 	/* Teppo Jalava <tjjalava@...> */
 	{"Fuji:FinePix F50fd",			0x04cb, 0x01d4, 0},
 
+	{"Ricoh:Caplio R5 (PTP mode)",          0x05ca, 0x0110, 0},
 	{"Ricoh:Caplio GX (PTP mode)",          0x05ca, 0x0325, 0},
 	{"Sea & Sea:5000G (PTP mode)",		0x05ca, 0x0327, 0},
 	/* Michael Steinhauser <mistr@...> */
 	{"Ricoh Caplio:R1v (PTP mode)",		0x05ca, 0x032b, 0},
 	{"Ricoh:Caplio R3 (PTP mode)",          0x05ca, 0x032f, 0},
-	{"Ricoh:Caplio R5 (PTP mode)",          0x05ca, 0x0110, 0},
+	/* Arthur Butler <arthurbutler@...> */
+	{"Ricoh:Caplio RR750 (PTP mode)",	0x05ca, 0x033d, 0},
 
 	/* Rollei dr5  */
 	{"Rollei:dr5 (PTP mode)",               0x05ca, 0x220f, 0},


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[gphoto-cvs] SF.net SVN: gphoto: [10970] trunk/libgphoto2/camlibs/ptp2/library.c

From: <marcusmeissner@us...> - 2008-02-28 21:51

Revision: 10970
          http://gphoto.svn.sourceforge.net/gphoto/?rev=10970&view=rev
Author:   marcusmeissner
Date:     2008-02-28 13:50:58 -0800 (Thu, 28 Feb 2008)

Log Message:
-----------
added Kodak Z812 IS

Modified Paths:
--------------
    trunk/libgphoto2/camlibs/ptp2/library.c

Modified: trunk/libgphoto2/camlibs/ptp2/library.c
===================================================================
--- trunk/libgphoto2/camlibs/ptp2/library.c	2008-02-28 19:01:40 UTC (rev 10969)
+++ trunk/libgphoto2/camlibs/ptp2/library.c	2008-02-28 21:50:58 UTC (rev 10970)
@@ -346,6 +346,8 @@
 	{"Kodak:C653",   0x040a, 0x05af, 0},
 	/* Nicolas Brodu <nicolas.brodu@...> */
 	{"Kodak:Z712 IS",0x040a, 0x05b4, 0},
+	/* http://sourceforge.net/tracker/index.php?func=detail&aid=1904224&group_id=8874&atid=358874 */
+	{"Kodak:Z812 IS",0x040a, 0x05b5, 0},
 	/* */
 	{"Kodak:C613",   0x040a, 0x05b7, 0},
 	/* via IRC */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[gphoto-cvs] SF.net SVN: gphoto: [10968] trunk/libgphoto2/ChangeLog

From: <marcusmeissner@us...> - 2008-02-26 16:32

Revision: 10968
          http://gphoto.svn.sourceforge.net/gphoto/?rev=10968&view=rev
Author:   marcusmeissner
Date:     2008-02-26 08:32:37 -0800 (Tue, 26 Feb 2008)

Log Message:
-----------
add hal change

Modified Paths:
--------------
    trunk/libgphoto2/ChangeLog

Modified: trunk/libgphoto2/ChangeLog
===================================================================
--- trunk/libgphoto2/ChangeLog	2008-02-26 16:31:45 UTC (rev 10967)
+++ trunk/libgphoto2/ChangeLog	2008-02-26 16:32:37 UTC (rev 10968)
@@ -1,3 +1,9 @@
+2008-02-26  Marcus Meissner  <meissner@...>
+
+	* packaging/generic/print-camera-list.c:
+
+	  HAL's "info.bus" is been called "info.subsystem" now.
+
 2007-10-21  Marcus Meissner  <marcus@...>
 
 	* gphoto2/gphoto2-filesys.h: Change long


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[gphoto-cvs] SF.net SVN: gphoto: [10967] trunk/libgphoto2/packaging/generic/ print-camera-list.c

From: <marcusmeissner@us...> - 2008-02-26 16:32

Revision: 10967
          http://gphoto.svn.sourceforge.net/gphoto/?rev=10967&view=rev
Author:   marcusmeissner
Date:     2008-02-26 08:31:45 -0800 (Tue, 26 Feb 2008)

Log Message:
-----------
info.bus is now called info.subsystem. Will be obsoleted on March 1 2008.

Modified Paths:
--------------
    trunk/libgphoto2/packaging/generic/print-camera-list.c

Modified: trunk/libgphoto2/packaging/generic/print-camera-list.c
===================================================================
--- trunk/libgphoto2/packaging/generic/print-camera-list.c	2008-02-25 12:45:32 UTC (rev 10966)
+++ trunk/libgphoto2/packaging/generic/print-camera-list.c	2008-02-26 16:31:45 UTC (rev 10967)
@@ -790,7 +790,7 @@
 	print_version_comment(stdout, "    | ", "\n", "<!--+\n", "    +-->\n");
 	printf("<deviceinfo version=\"0.2\">\n");
 	printf(" <device>\n");
-	printf("  <match key=\"info.bus\" string=\"usb\">\n");
+	printf("  <match key=\"info.subsystem\" string=\"usb\">\n");
 	return 0;
 }
 
@@ -909,7 +909,7 @@
 	print_version_comment(stdout, "    | ", "\n", "<!--+\n", "    +-->\n");
 	printf("<deviceinfo version=\"0.2\">\n");
 	printf(" <device>\n");
-	printf("  <match key=\"info.bus\" string=\"usb\">\n");
+	printf("  <match key=\"info.subsystem\" string=\"usb\">\n");
 	return 0;
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[gphoto-cvs] SF.net SVN: gphoto: [10965] trunk/libgphoto2/po

From: <marcusmeissner@us...> - 2008-02-24 20:16

Revision: 10965
          http://gphoto.svn.sourceforge.net/gphoto/?rev=10965&view=rev
Author:   marcusmeissner
Date:     2008-02-24 12:16:09 -0800 (Sun, 24 Feb 2008)

Log Message:
-----------
make update-po

Modified Paths:
--------------
    trunk/libgphoto2/po/da.po
    trunk/libgphoto2/po/de.po
    trunk/libgphoto2/po/es.po
    trunk/libgphoto2/po/eu.po
    trunk/libgphoto2/po/fr.po
    trunk/libgphoto2/po/hu.po
    trunk/libgphoto2/po/it.po
    trunk/libgphoto2/po/ja.po
    trunk/libgphoto2/po/nb.po
    trunk/libgphoto2/po/nl.po
    trunk/libgphoto2/po/pl.po
    trunk/libgphoto2/po/ru.po
    trunk/libgphoto2/po/sl.po
    trunk/libgphoto2/po/sv.po
    trunk/libgphoto2/po/uk.po
    trunk/libgphoto2/po/zh_CN.po

Modified: trunk/libgphoto2/po/da.po
===================================================================
--- trunk/libgphoto2/po/da.po	2008-02-24 18:43:47 UTC (rev 10964)
+++ trunk/libgphoto2/po/da.po	2008-02-24 20:16:09 UTC (rev 10965)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: libgphoto2 2.4.0\n"
 "Report-Msgid-Bugs-To: gphoto-devel@..."
-"POT-Creation-Date: 2008-02-11 10:55+0100\n"
+"POT-Creation-Date: 2008-02-24 21:16+0100\n"
 "PO-Revision-Date: 2007-08-23 09:09+0200\n"
 "Last-Translator: Mogens Jaeger <mogens@..."
 "Language-Team: Danish <dansk@..."
@@ -525,7 +525,7 @@
 #: camlibs/canon/library.c:1626 camlibs/canon/library.c:1627
 #: camlibs/canon/library.c:1665 camlibs/canon/library.c:1666
 #: camlibs/canon/library.c:1699 camlibs/canon/library.c:1700
-#: camlibs/ptp2/library.c:1863 camlibs/ptp2/library.c:1865
+#: camlibs/ptp2/library.c:1882 camlibs/ptp2/library.c:1884
 #: camlibs/ptp2/ptp.c:3693
 msgid "Unknown"
 msgstr "Ukendt"
@@ -2131,7 +2131,7 @@
 
 #: camlibs/kodak/dc210/dc210.c:261 camlibs/kodak/dc210/dc210.c:269
 #: camlibs/ptp2/config.c:1646 camlibs/ptp2/config.c:2282
-#: camlibs/ptp2/library.c:2157 camlibs/ptp2/library.c:2161
+#: camlibs/ptp2/library.c:2176 camlibs/ptp2/library.c:2180
 #: camlibs/ptp2/ptp.c:3679 camlibs/ricoh/library.c:347
 msgid "None"
 msgstr "Ingen"
@@ -2565,7 +2565,7 @@
 "\n"
 "Spørgsmål og kommentarer værdsættes."
 
-#: camlibs/kodak/ez200/ez200.c:198
+#: camlibs/kodak/ez200/ez200.c:177
 #, c-format
 msgid ""
 "Your USB camera is a Kodak EZ200.\n"
@@ -2574,7 +2574,7 @@
 "Dit USB kamera er et Kodak EZ200.\n"
 "Antallet af billeder er %i\n"
 
-#: camlibs/kodak/ez200/ez200.c:206
+#: camlibs/kodak/ez200/ez200.c:185
 msgid ""
 "Kodak EZ200 driver\n"
 "Bucas Jean-Francois <jfbucas@..."
@@ -3546,7 +3546,7 @@
 "Filstørrelse er %ld byte. Størst mulige fil der kan oplægges er: %i byte."
 
 #: camlibs/panasonic/dc1000.c:471 camlibs/panasonic/dc1580.c:591
-#: camlibs/ricoh/ricoh.c:837
+#: camlibs/ricoh/ricoh.c:843
 msgid "Uploading..."
 msgstr "Oplægger..."
 
@@ -4472,8 +4472,8 @@
 msgid "Long distance"
 msgstr "Lang afstand"
 
-#: camlibs/ptp2/config.c:1671 camlibs/ptp2/library.c:2166
-#: camlibs/ptp2/library.c:2180 camlibs/ptp2/ptp.c:3898
+#: camlibs/ptp2/config.c:1671 camlibs/ptp2/library.c:2185
+#: camlibs/ptp2/library.c:2199 camlibs/ptp2/ptp.c:3898
 msgid "Undefined"
 msgstr "Ikke defineret"
 
@@ -5159,7 +5159,7 @@
 msgid "PTP Protocol error, response expected"
 msgstr "PTP protokol fejl, svar forventet"
 
-#: camlibs/ptp2/library.c:1081
+#: camlibs/ptp2/library.c:1083
 #, fuzzy
 msgid ""
 "PTP2 driver\n"
@@ -5185,76 +5185,76 @@
 "\n"
 "God fornøjelse!"
 
-#: camlibs/ptp2/library.c:1158
+#: camlibs/ptp2/library.c:1160
 msgid "Sorry, your Canon camera does not support Canon Viewfinder mode"
 msgstr "Beklager, dit Canon kamera understøtter ikke Canon søger tilstand"
 
-#: camlibs/ptp2/library.c:1164
+#: camlibs/ptp2/library.c:1166
 #, c-format
 msgid "Canon enable viewfinder failed: %d"
 msgstr "Canon tillad-søger fejlede: %d"
 
-#: camlibs/ptp2/library.c:1170
+#: camlibs/ptp2/library.c:1172
 #, c-format
 msgid "Canon get viewfinder image failed: %d"
 msgstr "Canon hent-søgerbillede fejlede: %d"
 
-#: camlibs/ptp2/library.c:1181
+#: camlibs/ptp2/library.c:1183
 #, c-format
 msgid "Canon disable viewfinder failed: %d"
 msgstr "Canon slå-søger-fra fejlede: %d"
 
-#: camlibs/ptp2/library.c:1297
+#: camlibs/ptp2/library.c:1299
 msgid "Sorry, your camera does not support Nikon capture"
 msgstr "Beklager, dit kamera understøtter ikke Nikon optagning"
 
-#: camlibs/ptp2/library.c:1383
+#: camlibs/ptp2/library.c:1385
 msgid "Sorry, your Canon camera does not support Canon EOS Capture"
 msgstr "Beklager, dit Canon kamera understøtter ikke Canon EOS optagning"
 
-#: camlibs/ptp2/library.c:1389
-#, c-format
-msgid "Canon EOS Capture failed: %d"
+#: camlibs/ptp2/library.c:1391
+#, fuzzy, c-format
+msgid "Canon EOS Capture failed: %x"
 msgstr "Canon EOS optagning fejlede: %d"
 
-#: camlibs/ptp2/library.c:1397
-#, c-format
-msgid "Canon EOS Get Changes failed: %d"
+#: camlibs/ptp2/library.c:1399
+#, fuzzy, c-format
+msgid "Canon EOS Get Changes failed: %x"
 msgstr "Canon EOS hent ændringer fejlede: %d"
 
-#: camlibs/ptp2/library.c:1477
+#: camlibs/ptp2/library.c:1481
 msgid "Sorry, your Canon camera does not support Canon Capture initiation"
 msgstr ""
 "Beklager, dit Canon kamera understøtter ikke Canon optagningsinitiering"
 
-#: camlibs/ptp2/library.c:1488
+#: camlibs/ptp2/library.c:1492
 msgid "Sorry, initializing your camera did not work. Please report this."
 msgstr ""
 "Beklager, initiering af dit kamera virkede ikke. Send en fejlmelding, tak."
 
-#: camlibs/ptp2/library.c:1507
-#, c-format
-msgid "Canon Capture failed: %d"
+#: camlibs/ptp2/library.c:1514
+#, fuzzy, c-format
+msgid "Canon Capture failed: %x"
 msgstr "Canon optagning fejlede: %d"
 
-#: camlibs/ptp2/library.c:1611
+#: camlibs/ptp2/library.c:1630
 msgid "Sorry, your camera does not support generic capture"
 msgstr "Beklager, dit kamera understøtter ikke almen optagning"
 
-#: camlibs/ptp2/library.c:1687
+#: camlibs/ptp2/library.c:1706
 #, c-format
 msgid "No event received, error %x."
 msgstr "Ingen hændelse modtaget, fejl %x."
 
-#: camlibs/ptp2/library.c:1861
+#: camlibs/ptp2/library.c:1880
 msgid "read only"
 msgstr "skrivebeskyttet"
 
-#: camlibs/ptp2/library.c:1862
+#: camlibs/ptp2/library.c:1881
 msgid "readwrite"
 msgstr "læse/skrive"
 
-#: camlibs/ptp2/library.c:1996
+#: camlibs/ptp2/library.c:2015
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -5269,7 +5269,7 @@
 "Fremstiller udvidelses ID: 0x%08x\n"
 "Fremstiller udvidelsesbeskrivelse: %s\n"
 
-#: camlibs/ptp2/library.c:2014
+#: camlibs/ptp2/library.c:2033
 #, c-format
 msgid ""
 "\n"
@@ -5278,22 +5278,22 @@
 "\n"
 "Optageformater: "
 
-#: camlibs/ptp2/library.c:2028
+#: camlibs/ptp2/library.c:2047
 #, c-format
 msgid "Display Formats: "
 msgstr "Visningsformater: "
 
-#: camlibs/ptp2/library.c:2044
+#: camlibs/ptp2/library.c:2063
 #, c-format
 msgid "Supported MTP Object Properties:\n"
 msgstr "Understøttede MTP objektegenskaber:\n"
 
-#: camlibs/ptp2/library.c:2060
+#: camlibs/ptp2/library.c:2079
 #, c-format
 msgid " PTP error %04x on query"
 msgstr " PTP fejl %04x ved forespørgsel"
 
-#: camlibs/ptp2/library.c:2077
+#: camlibs/ptp2/library.c:2096
 #, c-format
 msgid ""
 "\n"
@@ -5302,77 +5302,77 @@
 "\n"
 "Enhedens egenskaber:\n"
 
-#: camlibs/ptp2/library.c:2081
+#: camlibs/ptp2/library.c:2100
 #, c-format
 msgid "\tFile Download, "
 msgstr "\tFil hjemhentning, "
 
-#: camlibs/ptp2/library.c:2084
+#: camlibs/ptp2/library.c:2103
 #, c-format
 msgid "File Deletion, "
 msgstr "Filsletning, "
 
-#: camlibs/ptp2/library.c:2086
+#: camlibs/ptp2/library.c:2105
 #, c-format
 msgid "No File Deletion, "
 msgstr "Ingen filsletning, "
 
-#: camlibs/ptp2/library.c:2090
+#: camlibs/ptp2/library.c:2109
 #, c-format
 msgid "File Upload\n"
 msgstr "Filoplægning\n"
 
-#: camlibs/ptp2/library.c:2092
+#: camlibs/ptp2/library.c:2111
 #, c-format
 msgid "No File Upload\n"
 msgstr "Ingen filoplægning\n"
 
-#: camlibs/ptp2/library.c:2097
+#: camlibs/ptp2/library.c:2116
 #, c-format
 msgid "\tGeneric Image Capture, "
 msgstr "\tAlmen billedoptagning, "
 
-#: camlibs/ptp2/library.c:2099
+#: camlibs/ptp2/library.c:2118
 #, c-format
 msgid "\tNo Image Capture, "
 msgstr "\tIngen billedoptagning, "
 
-#: camlibs/ptp2/library.c:2102
+#: camlibs/ptp2/library.c:2121
 #, c-format
 msgid "Open Capture, "
 msgstr "Åben optagning, "
 
-#: camlibs/ptp2/library.c:2104
+#: camlibs/ptp2/library.c:2123
 #, c-format
 msgid "No Open Capture, "
 msgstr "Ingen åben optagning, "
 
-#: camlibs/ptp2/library.c:2110
+#: camlibs/ptp2/library.c:2129
 #, c-format
 msgid "Canon Capture\n"
 msgstr "Canon optagning\n"
 
-#: camlibs/ptp2/library.c:2114
+#: camlibs/ptp2/library.c:2133
 #, c-format
 msgid "Nikon Capture\n"
 msgstr "Nikon optagning\n"
 
-#: camlibs/ptp2/library.c:2116
+#: camlibs/ptp2/library.c:2135
 #, c-format
 msgid "No vendor specific capture\n"
 msgstr "Ingen fremstillerspecifik optagning\n"
 
-#: camlibs/ptp2/library.c:2124
+#: camlibs/ptp2/library.c:2143
 #, c-format
 msgid "\tNikon Wifi support\n"
 msgstr "\tNikon Wifi understøttelse\n"
 
-#: camlibs/ptp2/library.c:2130
+#: camlibs/ptp2/library.c:2149
 #, c-format
 msgid "\tCanon Wifi support\n"
 msgstr "\tCanon Wifi understøttelse\n"
 
-#: camlibs/ptp2/library.c:2141
+#: camlibs/ptp2/library.c:2160
 #, c-format
 msgid ""
 "\n"
@@ -5381,93 +5381,93 @@
 "\n"
 "Sammendrag for lagerenheder:\n"
 
-#: camlibs/ptp2/library.c:2156
+#: camlibs/ptp2/library.c:2175
 #, c-format
 msgid "\tStorageDescription: %s\n"
 msgstr "\tBeskrivelse af lagerenheder: %s\n"
 
-#: camlibs/ptp2/library.c:2160
+#: camlibs/ptp2/library.c:2179
 #, c-format
 msgid "\tVolumeLabel: %s\n"
 msgstr "\tVolumen mærkat: %s\n"
 
-#: camlibs/ptp2/library.c:2167
+#: camlibs/ptp2/library.c:2186
 msgid "Builtin ROM"
 msgstr "Indbygget rom"
 
-#: camlibs/ptp2/library.c:2168
+#: camlibs/ptp2/library.c:2187
 msgid "Removable ROM"
 msgstr "Udtagelig rom"
 
-#: camlibs/ptp2/library.c:2169
+#: camlibs/ptp2/library.c:2188
 msgid "Builtin RAM"
 msgstr "Indbygget ram"
 
-#: camlibs/ptp2/library.c:2170
+#: camlibs/ptp2/library.c:2189
 msgid "Removable RAM (memory card)"
 msgstr "Udtagelig ram (hukommelseskort)"
 
-#: camlibs/ptp2/library.c:2172 camlibs/ptp2/library.c:2185
-#: camlibs/ptp2/library.c:2197
+#: camlibs/ptp2/library.c:2191 camlibs/ptp2/library.c:2204
+#: camlibs/ptp2/library.c:2216
 #, c-format
 msgid "Unknown: 0x%04x\n"
 msgstr "Ukendt: 0x%04x\n"
 
-#: camlibs/ptp2/library.c:2176
+#: camlibs/ptp2/library.c:2195
 #, c-format
 msgid "\tStorage Type: %s\n"
 msgstr "\tLagringstype: %s\n"
 
-#: camlibs/ptp2/library.c:2181
+#: camlibs/ptp2/library.c:2200
 msgid "Generic Flat"
 msgstr "Almen flad"
 
-#: camlibs/ptp2/library.c:2182
+#: camlibs/ptp2/library.c:2201
 msgid "Generic Hierarchical"
 msgstr "Almen hierarkisk"
 
-#: camlibs/ptp2/library.c:2183
+#: camlibs/ptp2/library.c:2202
 msgid "Digital Camera Layout (DCIM)"
 msgstr "Digitalkamera layout (DCIM)"
 
-#: camlibs/ptp2/library.c:2189
+#: camlibs/ptp2/library.c:2208
 #, c-format
 msgid "\tFilesystemtype: %s\n"
 msgstr "\tFilsystemtype: %s\n"
 
-#: camlibs/ptp2/library.c:2193
+#: camlibs/ptp2/library.c:2212
 msgid "Read-Write"
 msgstr "Læse-skrive"
 
-#: camlibs/ptp2/library.c:2194
+#: camlibs/ptp2/library.c:2213
 msgid "Read-Only"
 msgstr "Kun læsning"
 
-#: camlibs/ptp2/library.c:2195
+#: camlibs/ptp2/library.c:2214
 msgid "Read Only with Object deletion"
 msgstr "Kun-læse med objekt-sletning"
 
-#: camlibs/ptp2/library.c:2201
+#: camlibs/ptp2/library.c:2220
 #, c-format
 msgid "\tAccess Capability: %s\n"
 msgstr "\tTilgangskapacitet: %s\n"
 
-#: camlibs/ptp2/library.c:2203
+#: camlibs/ptp2/library.c:2222
 #, c-format
 msgid "\tMaximum Capability: %llu (%lu MB)\n"
 msgstr "\tMaksimal kapacitet: %llu (%lu MB)\n"
 
-#: camlibs/ptp2/library.c:2208
+#: camlibs/ptp2/library.c:2227
 #, c-format
 msgid "\tFree Space (Bytes): %llu (%lu MB)\n"
 msgstr "\tLedig plads (byte): %llu (%lu MB)\n"
 
-#: camlibs/ptp2/library.c:2213
+#: camlibs/ptp2/library.c:2232
 #, c-format
 msgid "\tFree Space (Images): %d\n"
 msgstr "\tLedig plads (billeder): %d\n"
 
-#: camlibs/ptp2/library.c:2221
+#: camlibs/ptp2/library.c:2240
 #, c-format
 msgid ""
 "\n"
@@ -5476,25 +5476,25 @@
 "\n"
 "Enhedsengenskabs-sammendrag:\n"
 
-#: camlibs/ptp2/library.c:2247
+#: camlibs/ptp2/library.c:2266
 #, c-format
 msgid " not read out.\n"
 msgstr " ikke læsning ud.\n"
 
-#: camlibs/ptp2/library.c:3214 camlibs/ptp2/library.c:3218
+#: camlibs/ptp2/library.c:3233 camlibs/ptp2/library.c:3237
 #, c-format
 msgid "File '%s/%s' does not exist."
 msgstr "Filen '%s/%s' findes ikke."
 
-#: camlibs/ptp2/library.c:3224
+#: camlibs/ptp2/library.c:3243
 msgid "Metadata only supported for MTP devices."
 msgstr "Metadata understøttes kun for MTP enheder"
 
-#: camlibs/ptp2/library.c:3913
+#: camlibs/ptp2/library.c:3932
 msgid "Initializing Camera"
 msgstr "Initialisation af kamera"
 
-#: camlibs/ptp2/library.c:4081
+#: camlibs/ptp2/library.c:4100
 #, fuzzy, c-format
 msgid ""
 "Currently, PTP is only implemented for USB and PTP/IP cameras currently, "
@@ -7035,7 +7035,7 @@
 msgid "Bad characters (0x%x, 0x%x). Please contact %s."
 msgstr "Forkerte tegn (0x%x, 0x%x). Kontakt %s."
 
-#: camlibs/ricoh/ricoh.c:256 camlibs/ricoh/ricoh.c:325
+#: camlibs/ricoh/ricoh.c:256 camlibs/ricoh/ricoh.c:331
 #, c-format
 msgid "Camera busy. If the problem persists, please contact %s."
 msgstr "Kameraet optaget. Hvis problemet fortsætter, kontakt %s."
@@ -7050,22 +7050,22 @@
 msgid "Communication error even after 2 retries. Please contact %s."
 msgstr "Kommunikationsfejl endda efter 2 ekstra forsøg. Kontakt %s."
 
-#: camlibs/ricoh/ricoh.c:339
+#: camlibs/ricoh/ricoh.c:345
 #, c-format
 msgid "Camera is in wrong mode. Please contact %s."
 msgstr "Kameraet er i en forkert tilstand. Kontakt %s."
 
-#: camlibs/ricoh/ricoh.c:348
+#: camlibs/ricoh/ricoh.c:354
 #, c-format
 msgid "Camera did not accept the parameters. Please contact %s."
 msgstr "Kameraet accepterede ikke parametrene. Kontakt %s."
 
-#: camlibs/ricoh/ricoh.c:354
+#: camlibs/ricoh/ricoh.c:360
 #, c-format
 msgid "An unknown error occurred. Please contact %s."
 msgstr "En ukendt fejl opstod. Kontakt %s."
 
-#: camlibs/ricoh/ricoh.c:816
+#: camlibs/ricoh/ricoh.c:822
 #, c-format
 msgid ""
 "The filename's length must not exceed 12 characters ('%s' has %i characters)."

Modified: trunk/libgphoto2/po/de.po
===================================================================
--- trunk/libgphoto2/po/de.po	2008-02-24 18:43:47 UTC (rev 10964)
+++ trunk/libgphoto2/po/de.po	2008-02-24 20:16:09 UTC (rev 10965)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: gphoto-devel@..."
-"POT-Creation-Date: 2008-02-11 10:55+0100\n"
+"POT-Creation-Date: 2008-02-24 21:16+0100\n"
 "PO-Revision-Date: 2007-05-11 21:59+0200\n"
 "Last-Translator: Marcus Meissner <marcus@..."
 "Language-Team:  <de@..."
@@ -521,7 +521,7 @@
 #: camlibs/canon/library.c:1626 camlibs/canon/library.c:1627
 #: camlibs/canon/library.c:1665 camlibs/canon/library.c:1666
 #: camlibs/canon/library.c:1699 camlibs/canon/library.c:1700
-#: camlibs/ptp2/library.c:1863 camlibs/ptp2/library.c:1865
+#: camlibs/ptp2/library.c:1882 camlibs/ptp2/library.c:1884
 #: camlibs/ptp2/ptp.c:3693
 msgid "Unknown"
 msgstr "Unbekannt"
@@ -2124,7 +2124,7 @@
 
 #: camlibs/kodak/dc210/dc210.c:261 camlibs/kodak/dc210/dc210.c:269
 #: camlibs/ptp2/config.c:1646 camlibs/ptp2/config.c:2282
-#: camlibs/ptp2/library.c:2157 camlibs/ptp2/library.c:2161
+#: camlibs/ptp2/library.c:2176 camlibs/ptp2/library.c:2180
 #: camlibs/ptp2/ptp.c:3679 camlibs/ricoh/library.c:347
 msgid "None"
 msgstr "Keine"
@@ -2559,7 +2559,7 @@
 "\n"
 "Fragen und Kommentare werden gesch\xE4tzt."
 
-#: camlibs/kodak/ez200/ez200.c:198
+#: camlibs/kodak/ez200/ez200.c:177
 #, c-format
 msgid ""
 "Your USB camera is a Kodak EZ200.\n"
@@ -2568,7 +2568,7 @@
 "Ihre USB Kamera ist eine Kodaz EZ200.\n"
 "Anzahl Bilder= %i\n"
 
-#: camlibs/kodak/ez200/ez200.c:206
+#: camlibs/kodak/ez200/ez200.c:185
 msgid ""
 "Kodak EZ200 driver\n"
 "Bucas Jean-Francois <jfbucas@..."
@@ -3546,7 +3546,7 @@
 "Dateigr\xF6\xDFe ist %ld bytes. Gr\xF6\xDFtm\xF6gliche Datei f\xFCr das Hochladen ist %i bytes."
 
 #: camlibs/panasonic/dc1000.c:471 camlibs/panasonic/dc1580.c:591
-#: camlibs/ricoh/ricoh.c:837
+#: camlibs/ricoh/ricoh.c:843
 msgid "Uploading..."
 msgstr "Lade Bild hoch..."
 
@@ -4481,8 +4481,8 @@
 msgid "Long distance"
 msgstr "Weite Entfernung"
 
-#: camlibs/ptp2/config.c:1671 camlibs/ptp2/library.c:2166
-#: camlibs/ptp2/library.c:2180 camlibs/ptp2/ptp.c:3898
+#: camlibs/ptp2/config.c:1671 camlibs/ptp2/library.c:2185
+#: camlibs/ptp2/library.c:2199 camlibs/ptp2/ptp.c:3898
 msgid "Undefined"
 msgstr "Undefiniert"
 
@@ -5179,7 +5179,7 @@
 msgid "PTP Protocol error, response expected"
 msgstr "PTP-Protokollfehler: Antwort erwartet"
 
-#: camlibs/ptp2/library.c:1081
+#: camlibs/ptp2/library.c:1083
 #, fuzzy
 msgid ""
 "PTP2 driver\n"
@@ -5205,79 +5205,79 @@
 "\n"
 "Viel Spa\xDF!"
 
-#: camlibs/ptp2/library.c:1158
+#: camlibs/ptp2/library.c:1160
 msgid "Sorry, your Canon camera does not support Canon Viewfinder mode"
 msgstr "Diese Kamera unterst\xFCtzt nicht den Canon Viewfinder Modus"
 
-#: camlibs/ptp2/library.c:1164
+#: camlibs/ptp2/library.c:1166
 #, c-format
 msgid "Canon enable viewfinder failed: %d"
 msgstr "Anschalten des Viewfinder fehlgeschlagen: %d"
 
-#: camlibs/ptp2/library.c:1170
+#: camlibs/ptp2/library.c:1172
 #, c-format
 msgid "Canon get viewfinder image failed: %d"
 msgstr "Holen des Viewfinder Bildes fehlgeschlagen: %d"
 
-#: camlibs/ptp2/library.c:1181
+#: camlibs/ptp2/library.c:1183
 #, c-format
 msgid "Canon disable viewfinder failed: %d"
 msgstr "Abschalten des Viewfinders fehlgeschlagen: %d"
 
-#: camlibs/ptp2/library.c:1297
+#: camlibs/ptp2/library.c:1299
 msgid "Sorry, your camera does not support Nikon capture"
 msgstr "Diese Kamera unterst\xFCtzt keine Nikon spezifische Aufnahme von Bildern"
 
-#: camlibs/ptp2/library.c:1383
+#: camlibs/ptp2/library.c:1385
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon EOS Capture"
 msgstr "Diese Canon Kamera unterst\xFCtzt nicht den Canon Aufnahme Modus"
 
-#: camlibs/ptp2/library.c:1389
+#: camlibs/ptp2/library.c:1391
 #, fuzzy, c-format
-msgid "Canon EOS Capture failed: %d"
-msgstr "Canon Aufnahme fehlgeschlagen: %d"
+msgid "Canon EOS Capture failed: %x"
+msgstr "Canon Aufnahme fehlgeschlagen: %x"
 
-#: camlibs/ptp2/library.c:1397
+#: camlibs/ptp2/library.c:1399
 #, fuzzy, c-format
-msgid "Canon EOS Get Changes failed: %d"
-msgstr "Canon Aufnahme fehlgeschlagen: %d"
+msgid "Canon EOS Get Changes failed: %x"
+msgstr "Canon Aufnahme fehlgeschlagen: %x"
 
-#: camlibs/ptp2/library.c:1477
+#: camlibs/ptp2/library.c:1481
 msgid "Sorry, your Canon camera does not support Canon Capture initiation"
 msgstr ""
 "Diese Kamera versteht leider den Canon-Befehl zum Beginn von Aufnahmen per "
 "Fernausl\xF6ser nicht"
 
-#: camlibs/ptp2/library.c:1488
+#: camlibs/ptp2/library.c:1492
 msgid "Sorry, initializing your camera did not work. Please report this."
 msgstr ""
 "Das Initialisieren Ihrer Kamera hat nicht funktioniert. Bitte reporten Sie "
 "dies."
 
-#: camlibs/ptp2/library.c:1507
-#, c-format
-msgid "Canon Capture failed: %d"
-msgstr "Canon Aufnahme fehlgeschlagen: %d"
+#: camlibs/ptp2/library.c:1514
+#, fuzzy, c-format
+msgid "Canon Capture failed: %x"
+msgstr "Canon Aufnahme fehlgeschlagen: %x"
 
-#: camlibs/ptp2/library.c:1611
+#: camlibs/ptp2/library.c:1630
 msgid "Sorry, your camera does not support generic capture"
 msgstr "Diese Kamera unterst\xFCtzt keine Aufnahme von Bildern"
 
-#: camlibs/ptp2/library.c:1687
+#: camlibs/ptp2/library.c:1706
 #, c-format
 msgid "No event received, error %x."
 msgstr ""
 
-#: camlibs/ptp2/library.c:1861
+#: camlibs/ptp2/library.c:1880
 msgid "read only"
 msgstr "schreibgesch\xFCtzt"
 
-#: camlibs/ptp2/library.c:1862
+#: camlibs/ptp2/library.c:1881
 msgid "readwrite"
 msgstr "schreibbar"
 
-#: camlibs/ptp2/library.c:1996
+#: camlibs/ptp2/library.c:2015
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -5292,7 +5292,7 @@
 "H\xE4ndler Kennung: 0x%08x\n"
 "H\xE4ndler Beschreibung: %s\n"
 
-#: camlibs/ptp2/library.c:2014
+#: camlibs/ptp2/library.c:2033
 #, c-format
 msgid ""
 "\n"
@@ -5301,22 +5301,22 @@
 "\n"
 "Aufnahmeformate: "
 
-#: camlibs/ptp2/library.c:2028
+#: camlibs/ptp2/library.c:2047
 #, c-format
 msgid "Display Formats: "
 msgstr "Anzeigeformate: "
 
-#: camlibs/ptp2/library.c:2044
+#: camlibs/ptp2/library.c:2063
 #, c-format
 msgid "Supported MTP Object Properties:\n"
 msgstr "Unterst\xFCtzte MTP Object Properties:\n"
 
-#: camlibs/ptp2/library.c:2060
+#: camlibs/ptp2/library.c:2079
 #, c-format
 msgid " PTP error %04x on query"
 msgstr "PTP Fehler %04x beim Abfragen"
 
-#: camlibs/ptp2/library.c:2077
+#: camlibs/ptp2/library.c:2096
 #, c-format
 msgid ""
 "\n"
@@ -5325,77 +5325,77 @@
 "\n"
 "F\xE4higkeiten des Ger\xE4ts:\n"
 
-#: camlibs/ptp2/library.c:2081
+#: camlibs/ptp2/library.c:2100
 #, c-format
 msgid "\tFile Download, "
 msgstr "\tDateien Download, "
 
-#: camlibs/ptp2/library.c:2084
+#: camlibs/ptp2/library.c:2103
 #, c-format
 msgid "File Deletion, "
 msgstr "L\xF6schen von Dateien, "
 
-#: camlibs/ptp2/library.c:2086
+#: camlibs/ptp2/library.c:2105
 #, c-format
 msgid "No File Deletion, "
 msgstr "kein L\xF6schen von Dateien, "
 
-#: camlibs/ptp2/library.c:2090
+#: camlibs/ptp2/library.c:2109
 #, c-format
 msgid "File Upload\n"
 msgstr "Hochladen von Dateien\n"
 
-#: camlibs/ptp2/library.c:2092
+#: camlibs/ptp2/library.c:2111
 #, c-format
 msgid "No File Upload\n"
 msgstr "kein Hochladen von Dateien\n"
 
-#: camlibs/ptp2/library.c:2097
+#: camlibs/ptp2/library.c:2116
 #, c-format
 msgid "\tGeneric Image Capture, "
 msgstr "\tGenerische Bild Aufnahme, "
 
-#: camlibs/ptp2/library.c:2099
+#: camlibs/ptp2/library.c:2118
 #, c-format
 msgid "\tNo Image Capture, "
 msgstr "\tKeine Aufnahme von Bildern, "
 
-#: camlibs/ptp2/library.c:2102
+#: camlibs/ptp2/library.c:2121
 #, c-format
 msgid "Open Capture, "
 msgstr "Offene Aufnahme, "
 
-#: camlibs/ptp2/library.c:2104
+#: camlibs/ptp2/library.c:2123
 #, c-format
 msgid "No Open Capture, "
 msgstr "keine Offene Aufnahme, "
 
-#: camlibs/ptp2/library.c:2110
+#: camlibs/ptp2/library.c:2129
 #, c-format
 msgid "Canon Capture\n"
 msgstr "Canon Aufnahme\n"
 
-#: camlibs/ptp2/library.c:2114
+#: camlibs/ptp2/library.c:2133
 #, c-format
 msgid "Nikon Capture\n"
 msgstr "Nikon Aufnahme\n"
 
-#: camlibs/ptp2/library.c:2116
+#: camlibs/ptp2/library.c:2135
 #, c-format
 msgid "No vendor specific capture\n"
 msgstr "Kein Vendor spezifischer Aufnahmemodus\n"
 
-#: camlibs/ptp2/library.c:2124
+#: camlibs/ptp2/library.c:2143
 #, c-format
 msgid "\tNikon Wifi support\n"
 msgstr "\tNikon WiFi Unterst\xFCtzung\n"
 
-#: camlibs/ptp2/library.c:2130
+#: camlibs/ptp2/library.c:2149
 #, c-format
 msgid "\tCanon Wifi support\n"
 msgstr "\tCanon WiFI Unterst\xFCtzung\n"
 
-#: camlibs/ptp2/library.c:2141
+#: camlibs/ptp2/library.c:2160
 #, c-format
 msgid ""
 "\n"
@@ -5404,93 +5404,93 @@
 "\n"
 "Informationen \xFCber Speichermedium:\n"
 
-#: camlibs/ptp2/library.c:2156
+#: camlibs/ptp2/library.c:2175
 #, c-format
 msgid "\tStorageDescription: %s\n"
 msgstr "\tBeschreibung des Speicherger\xE4ts: %s\n"
 
-#: camlibs/ptp2/library.c:2160
+#: camlibs/ptp2/library.c:2179
 #, c-format
 msgid "\tVolumeLabel: %s\n"
 msgstr "\tLabel des Speicherger\xE4tes: %s\n"
 
-#: camlibs/ptp2/library.c:2167
+#: camlibs/ptp2/library.c:2186
 msgid "Builtin ROM"
 msgstr "Eingebautes ROM"
 
-#: camlibs/ptp2/library.c:2168
+#: camlibs/ptp2/library.c:2187
 msgid "Removable ROM"
 msgstr "Entfernbares ROM"
 
-#: camlibs/ptp2/library.c:2169
+#: camlibs/ptp2/library.c:2188
 msgid "Builtin RAM"
 msgstr "Eingebauter Speicher"
 
-#: camlibs/ptp2/library.c:2170
+#: camlibs/ptp2/library.c:2189
 msgid "Removable RAM (memory card)"
 msgstr "Entfernbarer Speicher (Karte)"
 
-#: camlibs/ptp2/library.c:2172 camlibs/ptp2/library.c:2185
-#: camlibs/ptp2/library.c:2197
+#: camlibs/ptp2/library.c:2191 camlibs/ptp2/library.c:2204
+#: camlibs/ptp2/library.c:2216
 #, c-format
 msgid "Unknown: 0x%04x\n"
 msgstr "Unbekannt: 0x%04x\n"
 
-#: camlibs/ptp2/library.c:2176
+#: camlibs/ptp2/library.c:2195
 #, c-format
 msgid "\tStorage Type: %s\n"
 msgstr "\tSpeichertyp: %s\n"
 
-#: camlibs/ptp2/library.c:2181
+#: camlibs/ptp2/library.c:2200
 msgid "Generic Flat"
 msgstr "Generisch flacher Modus"
 
-#: camlibs/ptp2/library.c:2182
+#: camlibs/ptp2/library.c:2201
 msgid "Generic Hierarchical"
 msgstr "Generisch hierarchischer Modus"
 
-#: camlibs/ptp2/library.c:2183
+#: camlibs/ptp2/library.c:2202
 msgid "Digital Camera Layout (DCIM)"
 msgstr "Standard Digital Kamera Layout (DCIM)"
 
-#: camlibs/ptp2/library.c:2189
+#: camlibs/ptp2/library.c:2208
 #, c-format
 msgid "\tFilesystemtype: %s\n"
 msgstr "\tTyp des Dateisystems: %s\n"
 
-#: camlibs/ptp2/library.c:2193
+#: camlibs/ptp2/library.c:2212
 msgid "Read-Write"
 msgstr "Lesen und Schreiben"
 
-#: camlibs/ptp2/library.c:2194
+#: camlibs/ptp2/library.c:2213
 msgid "Read-Only"
 msgstr "nur Lesen"
 
-#: camlibs/ptp2/library.c:2195
+#: camlibs/ptp2/library.c:2214
 msgid "Read Only with Object deletion"
 msgstr "Nur Lesen und L\xF6schen"
 
-#: camlibs/ptp2/library.c:2201
+#: camlibs/ptp2/library.c:2220
 #, c-format
 msgid "\tAccess Capability: %s\n"
 msgstr "\tZugriffsm\xF6glichkeiten: %s\n"
 
-#: camlibs/ptp2/library.c:2203
+#: camlibs/ptp2/library.c:2222
 #, c-format
 msgid "\tMaximum Capability: %llu (%lu MB)\n"
 msgstr "\tMaximale Kapazit\xE4t: %llu (%lu MB)\n"
 
-#: camlibs/ptp2/library.c:2208
+#: camlibs/ptp2/library.c:2227
 #, c-format
 msgid "\tFree Space (Bytes): %llu (%lu MB)\n"
 msgstr "\tFreier Platz (Bytes): %llu (%lu MB)\n"
 
-#: camlibs/ptp2/library.c:2213
+#: camlibs/ptp2/library.c:2232
 #, c-format
 msgid "\tFree Space (Images): %d\n"
 msgstr "\tFreier Speicher (Bilder): %d\n"
 
-#: camlibs/ptp2/library.c:2221
+#: camlibs/ptp2/library.c:2240
 #, c-format
 msgid ""
 "\n"
@@ -5499,25 +5499,25 @@
 "\n"
 "Properties des Ger\xE4ts:\n"
 
-#: camlibs/ptp2/library.c:2247
+#: camlibs/ptp2/library.c:2266
 #, c-format
 msgid " not read out.\n"
 msgstr " nicht ausgelesen.\n"
 
-#: camlibs/ptp2/library.c:3214 camlibs/ptp2/library.c:3218
+#: camlibs/ptp2/library.c:3233 camlibs/ptp2/library.c:3237
 #, c-format
 msgid "File '%s/%s' does not exist."
 msgstr "Datei \xBB%s/%s\xAB existiert nicht"
 
-#: camlibs/ptp2/library.c:3224
+#: camlibs/ptp2/library.c:3243
 msgid "Metadata only supported for MTP devices."
 msgstr "Der Metadaten Dateityp ist nur f\xFCr MTP Ger\xE4te unterst\xFCtzt."
 
-#: camlibs/ptp2/library.c:3913
+#: camlibs/ptp2/library.c:3932
 msgid "Initializing Camera"
 msgstr "Initialisiere Kamera"
 
-#: camlibs/ptp2/library.c:4081
+#: camlibs/ptp2/library.c:4100
 #, fuzzy, c-format
 msgid ""
 "Currently, PTP is only implemented for USB and PTP/IP cameras currently, "
@@ -7085,7 +7085,7 @@
 msgstr ""
 "Fehlerhafte Zeichen (0x%x, 0x%x). Bitte kontaktieren Sie %s (auf Englisch)."
 
-#: camlibs/ricoh/ricoh.c:256 camlibs/ricoh/ricoh.c:325
+#: camlibs/ricoh/ricoh.c:256 camlibs/ricoh/ricoh.c:331
 #, c-format
 msgid "Camera busy. If the problem persists, please contact %s."
 msgstr ""
@@ -7106,28 +7106,28 @@
 "Kommunikationsproblem selbst nach 2 Versuchen.\n"
 "Bitte kontaktieren Sie %s (auf Englisch)."
 
-#: camlibs/ricoh/ricoh.c:339
+#: camlibs/ricoh/ricoh.c:345
 #, c-format
 msgid "Camera is in wrong mode. Please contact %s."
 msgstr ""
 "Kamera ist im falschen Modus.\n"
 "Bitte kontaktieren Sie %s (auf Englisch)."
 
-#: camlibs/ricoh/ricoh.c:348
+#: camlibs/ricoh/ricoh.c:354
 #, c-format
 msgid "Camera did not accept the parameters. Please contact %s."
 msgstr ""
 "Kamera akzeptierte die Parameter nicht.\n"
 "Bitte kontaktieren Sie %s (auf Englisch)."
 
-#: camlibs/ricoh/ricoh.c:354
+#: camlibs/ricoh/ricoh.c:360
 #, c-format
 msgid "An unknown error occurred. Please contact %s."
 msgstr ""
 "Ein unbekannter Fehler trat auf.\n"
 "Bitte kontaktieren Sie %s (auf Englisch)."
 
-#: camlibs/ricoh/ricoh.c:816
+#: camlibs/ricoh/ricoh.c:822
 #, c-format
 msgid ""
 "The filename's length must not exceed 12 characters ('%s' has %i characters)."

Modified: trunk/libgphoto2/po/es.po
===================================================================
--- trunk/libgphoto2/po/es.po	2008-02-24 18:43:47 UTC (rev 10964)
+++ trunk/libgphoto2/po/es.po	2008-02-24 20:16:09 UTC (rev 10965)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: libgphoto2 2.1.4\n"
 "Report-Msgid-Bugs-To: gphoto-devel@..."
-"POT-Creation-Date: 2008-02-11 10:55+0100\n"
+"POT-Creation-Date: 2008-02-24 21:16+0100\n"
 "PO-Revision-Date: 2004-05-11 13:12+0200\n"
 "Last-Translator: Quique <quique@..."
 "Language-Team: Spanish <es@..."
@@ -508,7 +508,7 @@
 #: camlibs/canon/library.c:1626 camlibs/canon/library.c:1627
 #: camlibs/canon/library.c:1665 camlibs/canon/library.c:1666
 #: camlibs/canon/library.c:1699 camlibs/canon/library.c:1700
-#: camlibs/ptp2/library.c:1863 camlibs/ptp2/library.c:1865
+#: camlibs/ptp2/library.c:1882 camlibs/ptp2/library.c:1884
 #: camlibs/ptp2/ptp.c:3693
 #, fuzzy
 msgid "Unknown"
@@ -2081,7 +2081,7 @@
 
 #: camlibs/kodak/dc210/dc210.c:261 camlibs/kodak/dc210/dc210.c:269
 #: camlibs/ptp2/config.c:1646 camlibs/ptp2/config.c:2282
-#: camlibs/ptp2/library.c:2157 camlibs/ptp2/library.c:2161
+#: camlibs/ptp2/library.c:2176 camlibs/ptp2/library.c:2180
 #: camlibs/ptp2/ptp.c:3679 camlibs/ricoh/library.c:347
 msgid "None"
 msgstr "Ninguno"
@@ -2510,14 +2510,14 @@
 "\n"
 "Sus preguntas y comentarios ser\xE1n bienvenidos."
 
-#: camlibs/kodak/ez200/ez200.c:198
+#: camlibs/kodak/ez200/ez200.c:177
 #, c-format
 msgid ""
 "Your USB camera is a Kodak EZ200.\n"
 "Number of PICs = %i\n"
 msgstr ""
 
-#: camlibs/kodak/ez200/ez200.c:206
+#: camlibs/kodak/ez200/ez200.c:185
 msgid ""
 "Kodak EZ200 driver\n"
 "Bucas Jean-Francois <jfbucas@..."
@@ -3473,7 +3473,7 @@
 "de: %i bytes."
 
 #: camlibs/panasonic/dc1000.c:471 camlibs/panasonic/dc1580.c:591
-#: camlibs/ricoh/ricoh.c:837
+#: camlibs/ricoh/ricoh.c:843
 msgid "Uploading..."
 msgstr "Enviando..."
 
@@ -4470,8 +4470,8 @@
 msgid "Long distance"
 msgstr "Posici\xF3n del foco"
 
-#: camlibs/ptp2/config.c:1671 camlibs/ptp2/library.c:2166
-#: camlibs/ptp2/library.c:2180 camlibs/ptp2/ptp.c:3898
+#: camlibs/ptp2/config.c:1671 camlibs/ptp2/library.c:2185
+#: camlibs/ptp2/library.c:2199 camlibs/ptp2/ptp.c:3898
 #, fuzzy
 msgid "Undefined"
 msgstr "Error no definido de PTP"
@@ -5242,7 +5242,7 @@
 msgid "PTP Protocol error, response expected"
 msgstr "PTP. Error de protocolo, se esperaba respuesta"
 
-#: camlibs/ptp2/library.c:1081
+#: camlibs/ptp2/library.c:1083
 msgid ""
 "PTP2 driver\n"
 "(c) 2001-2005 by Mariusz Woloszyn <emsi@..."
@@ -5256,80 +5256,80 @@
 "Enjoy!"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1158
+#: camlibs/ptp2/library.c:1160
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon Viewfinder mode"
 msgstr "Su c\xE1mara no soporta cambiar los nombres de fichero."
 
-#: camlibs/ptp2/library.c:1164
+#: camlibs/ptp2/library.c:1166
 #, c-format
 msgid "Canon enable viewfinder failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1170
+#: camlibs/ptp2/library.c:1172
 #, c-format
 msgid "Canon get viewfinder image failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1181
+#: camlibs/ptp2/library.c:1183
 #, c-format
 msgid "Canon disable viewfinder failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1297
+#: camlibs/ptp2/library.c:1299
 #, fuzzy
 msgid "Sorry, your camera does not support Nikon capture"
 msgstr "Su c\xE1mara no soporta cambiar los nombres de fichero."
 
-#: camlibs/ptp2/library.c:1383
+#: camlibs/ptp2/library.c:1385
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon EOS Capture"
 msgstr "Su c\xE1mara no soporta cambiar los nombres de fichero."
 
-#: camlibs/ptp2/library.c:1389
+#: camlibs/ptp2/library.c:1391
 #, fuzzy, c-format
-msgid "Canon EOS Capture failed: %d"
+msgid "Canon EOS Capture failed: %x"
 msgstr "Captura"
 
-#: camlibs/ptp2/library.c:1397
-#, c-format
-msgid "Canon EOS Get Changes failed: %d"
-msgstr ""
+#: camlibs/ptp2/library.c:1399
+#, fuzzy, c-format
+msgid "Canon EOS Get Changes failed: %x"
+msgstr "Captura"
 
-#: camlibs/ptp2/library.c:1477
+#: camlibs/ptp2/library.c:1481
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon Capture initiation"
 msgstr "Su c\xE1mara no soporta cambiar los nombres de fichero."
 
-#: camlibs/ptp2/library.c:1488
+#: camlibs/ptp2/library.c:1492
 msgid "Sorry, initializing your camera did not work. Please report this."
 msgstr ""
 
-#: camlibs/ptp2/library.c:1507
-#, c-format
-msgid "Canon Capture failed: %d"
-msgstr ""
+#: camlibs/ptp2/library.c:1514
+#, fuzzy, c-format
+msgid "Canon Capture failed: %x"
+msgstr "Captura"
 
-#: camlibs/ptp2/library.c:1611
+#: camlibs/ptp2/library.c:1630
 #, fuzzy
 msgid "Sorry, your camera does not support generic capture"
 msgstr "Su c\xE1mara no soporta cambiar los nombres de fichero."
 
-#: camlibs/ptp2/library.c:1687
+#: camlibs/ptp2/library.c:1706
 #, c-format
 msgid "No event received, error %x."
 msgstr ""
 
-#: camlibs/ptp2/library.c:1861
+#: camlibs/ptp2/library.c:1880
 #, fuzzy
 msgid "read only"
 msgstr "preparada"
 
-#: camlibs/ptp2/library.c:1862
+#: camlibs/ptp2/library.c:1881
 msgid "readwrite"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1996
+#: camlibs/ptp2/library.c:2015
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -5344,226 +5344,226 @@
 "ID extensi\xF3n del fabricante: 0x%08x\n"
 "Descripci\xF3n extensi\xF3n del fabricante: %s\n"
 
-#: camlibs/ptp2/library.c:2014
+#: camlibs/ptp2/library.c:2033
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Capture Formats: "
 msgstr "Formato de la fecha"
 
-#: camlibs/ptp2/library.c:2028
+#: camlibs/ptp2/library.c:2047
 #, fuzzy, c-format
 msgid "Display Formats: "
 msgstr "Formato de la fecha"
 
-#: camlibs/ptp2/library.c:2044
+#: camlibs/ptp2/library.c:2063
 #, c-format
 msgid "Supported MTP Object Properties:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2060
+#: camlibs/ptp2/library.c:2079
 #, c-format
 msgid " PTP error %04x on query"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2077
+#: camlibs/ptp2/library.c:2096
 #, c-format
 msgid ""
 "\n"
 "Device Capabilities:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2081
+#: camlibs/ptp2/library.c:2100
 #, c-format
 msgid "\tFile Download, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:2084
+#: camlibs/ptp2/library.c:2103
 #, fuzzy, c-format
 msgid "File Deletion, "
 msgstr "Resoluci\xF3n del fichero"
 
-#: camlibs/ptp2/library.c:2086
+#: camlibs/ptp2/library.c:2105
 #, fuzzy, c-format
 msgid "No File Deletion, "
 msgstr "Resoluci\xF3n del fichero"
 
-#: camlibs/ptp2/library.c:2090
+#: camlibs/ptp2/library.c:2109
 #, fuzzy, c-format
 msgid "File Upload\n"
 msgstr "El env\xEDo de fichero ha fallado."
 
-#: camlibs/ptp2/library.c:2092
+#: camlibs/ptp2/library.c:2111
 #, c-format
 msgid "No File Upload\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2097
+#: camlibs/ptp2/library.c:2116
 #, c-format
 msgid "\tGeneric Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:2099
+#: camlibs/ptp2/library.c:2118
 #, c-format
 msgid "\tNo Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:2102
+#: camlibs/ptp2/library.c:2121
 #, fuzzy, c-format
 msgid "Open Capture, "
 msgstr "Captura"
 
-#: camlibs/ptp2/library.c:2104
+#: camlibs/ptp2/library.c:2123
 #, c-format
 msgid "No Open Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:2110
+#: camlibs/ptp2/library.c:2129
 #, fuzzy, c-format
 msgid "Canon Capture\n"
 msgstr "Captura"
 
-#: camlibs/ptp2/library.c:2114
+#: camlibs/ptp2/library.c:2133
 #, fuzzy, c-format
 msgid "Nikon Capture\n"
 msgstr "Captura"
 
-#: camlibs/ptp2/library.c:2116
+#: camlibs/ptp2/library.c:2135
 #, c-format
 msgid "No vendor specific capture\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2124
+#: camlibs/ptp2/library.c:2143
 #, c-format
 msgid "\tNikon Wifi support\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2130
+#: camlibs/ptp2/library.c:2149
 #, fuzzy, c-format
 msgid "\tCanon Wifi support\n"
 msgstr "No se soporta la tarjeta."
 
-#: camlibs/ptp2/library.c:2141
+#: camlibs/ptp2/library.c:2160
 #, c-format
 msgid ""
 "\n"
 "Storage Devices Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2156
+#: camlibs/ptp2/library.c:2175
 #, c-format
 msgid "\tStorageDescription: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2160
+#: camlibs/ptp2/library.c:2179
 #, c-format
 msgid "\tVolumeLabel: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2167
+#: camlibs/ptp2/library.c:2186
 msgid "Builtin ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2168
+#: camlibs/ptp2/library.c:2187
 msgid "Removable ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2169
+#: camlibs/ptp2/library.c:2188
 msgid "Builtin RAM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2170
+#: camlibs/ptp2/library.c:2189
 msgid "Removable RAM (memory card)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2172 camlibs/ptp2/library.c:2185
-#: camlibs/ptp2/library.c:2197
+#: camlibs/ptp2/library.c:2191 camlibs/ptp2/library.c:2204
+#: camlibs/ptp2/library.c:2216
 #, fuzzy, c-format
 msgid "Unknown: 0x%04x\n"
 msgstr "desconocido (0x%02x)"
 
-#: camlibs/ptp2/library.c:2176
+#: camlibs/ptp2/library.c:2195
 #, c-format
 msgid "\tStorage Type: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2181
+#: camlibs/ptp2/library.c:2200
 #, fuzzy
 msgid "Generic Flat"
 msgstr "General"
 
-#: camlibs/ptp2/library.c:2182
+#: camlibs/ptp2/library.c:2201
 msgid "Generic Hierarchical"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2183
+#: camlibs/ptp2/library.c:2202
 msgid "Digital Camera Layout (DCIM)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2189
+#: camlibs/ptp2/library.c:2208
 #, c-format
 msgid "\tFilesystemtype: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2193
+#: camlibs/ptp2/library.c:2212
 msgid "Read-Write"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2194
+#: camlibs/ptp2/library.c:2213
 #, fuzzy
 msgid "Read-Only"
 msgstr "Preparada"
 
-#: camlibs/ptp2/library.c:2195
+#: camlibs/ptp2/library.c:2214
 msgid "Read Only with Object deletion"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2201
+#: camlibs/ptp2/library.c:2220
 #, c-format
 msgid "\tAccess Capability: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2203
+#: camlibs/ptp2/library.c:2222
 #, c-format
 msgid "\tMaximum Capability: %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2208
+#: camlibs/ptp2/library.c:2227
 #, c-format
 msgid "\tFree Space (Bytes): %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2213
+#: camlibs/ptp2/library.c:2232
 #, fuzzy, c-format
 msgid "\tFree Space (Images): %d\n"
 msgstr "Cantidad de im\xE1genes: %d\n"
 
-#: camlibs/ptp2/library.c:2221
+#: camlibs/ptp2/library.c:2240
 #, c-format
 msgid ""
 "\n"
 "Device Property Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2247
+#: camlibs/ptp2/library.c:2266
 #, c-format
 msgid " not read out.\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3214 camlibs/ptp2/library.c:3218
+#: camlibs/ptp2/library.c:3233 camlibs/ptp2/library.c:3237
 #, c-format
 msgid "File '%s/%s' does not exist."
 msgstr ""
 
-#: camlibs/ptp2/library.c:3224
+#: camlibs/ptp2/library.c:3243
 msgid "Metadata only supported for MTP devices."
 msgstr ""
 
-#: camlibs/ptp2/library.c:3913
+#: camlibs/ptp2/library.c:3932
 msgid "Initializing Camera"
 msgstr "Inicializando la c\xE1mara"
 
-#: camlibs/ptp2/library.c:4081
+#: camlibs/ptp2/library.c:4100
 #, fuzzy, c-format
 msgid ""
 "Currently, PTP is only implemented for USB and PTP/IP cameras currently, "
@@ -7180,7 +7180,7 @@
 msgid "Bad characters (0x%x, 0x%x). Please contact %s."
 msgstr "Caracteres no v\xE1lidos (0x%x, 0x%x). Por favor, contace con %s."
 
-#: camlibs/ricoh/ricoh.c:256 camlibs/ricoh/ricoh.c:325
+#: camlibs/ricoh/ricoh.c:256 camlibs/ricoh/ricoh.c:331
 #, c-format
 msgid "Camera busy. If the problem persists, please contact %s."
 msgstr ""
@@ -7200,22 +7200,22 @@
 "Tiempo de espera superado incluso despu\xE9s de 2 reintentos. Por favor, "
 "contacte con %s."
 
-#: camlibs/ricoh/ricoh.c:339
+#: camlibs/ricoh/ricoh.c:345
 #, c-format
 msgid "Camera is in wrong mode. Please contact %s."
 msgstr "La c\xE1mara est\xE1 en un modo incorrecto. Por favor, contacte con %s."
 
-#: camlibs/ricoh/ricoh.c:348
+#: camlibs/ricoh/ricoh.c:354
 #, c-format
 msgid "Camera did not accept the parameters. Please contact %s."
 msgstr "La c\xE1mara no ha aceptado los par\xE1metros. Por favor, contacte con %s."
 
-#: camlibs/ricoh/ricoh.c:354
+#: camlibs/ricoh/ricoh.c:360
 #, c-format
 msgid "An unknown error occurred. Please contact %s."
 msgstr "Se ha producido un error desconocido. Por favor, contacte con %s."
 
-#: camlibs/ricoh/ricoh.c:816
+#: camlibs/ricoh/ricoh.c:822
 #, c-format
 msgid ""
 "The filename's length must not exceed 12 characters ('%s' has %i characters)."

Modified: trunk/libgphoto2/po/eu.po
===================================================================
--- trunk/libgphoto2/po/eu.po	2008-02-24 18:43:47 UTC (rev 10964)
+++ trunk/libgphoto2/po/eu.po	2008-02-24 20:16:09 UTC (rev 10965)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: eu\n"
 "Report-Msgid-Bugs-To: gphoto-devel@..."
-"POT-Creation-Date: 2008-02-11 10:55+0100\n"
+"POT-Creation-Date: 2008-02-24 21:16+0100\n"
 "PO-Revision-Date: 2005-05-12 16:52+0200\n"
 "Last-Translator: Hizkuntza Politikarako Sailburuordetza <hizkpol@..."
 "Language-Team:  <itzulpena@..."
@@ -514,7 +514,7 @@
 #: camlibs/canon/library.c:1626 camlibs/canon/library.c:1627
 #: camlibs/canon/library.c:1665 camlibs/canon/library.c:1666
 #: camlibs/canon/library.c:1699 camlibs/canon/library.c:1700
-#: camlibs/ptp2/library.c:1863 camlibs/ptp2/library.c:1865
+#: camlibs/ptp2/library.c:1882 camlibs/ptp2/library.c:1884
 #: camlibs/ptp2/ptp.c:3693
 msgid "Unknown"
 msgstr "Ezezaguna"
@@ -2111,7 +2111,7 @@
 
 #: camlibs/kodak/dc210/dc210.c:261 camlibs/kodak/dc210/dc210.c:269
 #: camlibs/ptp2/config.c:1646 camlibs/ptp2/config.c:2282
-#: camlibs/ptp2/library.c:2157 camlibs/ptp2/library.c:2161
+#: camlibs/ptp2/library.c:2176 camlibs/ptp2/library.c:2180
 #: camlibs/ptp2/ptp.c:3679 camlibs/ricoh/library.c:347
 msgid "None"
 msgstr "Bat ere ez"
@@ -2538,7 +2538,7 @@
 "\n"
 "Galderak eta oharrak ongi etorriak izango dira."
 
-#: camlibs/kodak/ez200/ez200.c:198
+#: camlibs/kodak/ez200/ez200.c:177
 #, c-format
 msgid ""
 "Your USB camera is a Kodak EZ200.\n"
@@ -2547,7 +2547,7 @@
 "Zure USB kamera Kodak EZ200 da.\n"
 "IRUD kopurua = %i\n"
 
-#: camlibs/kodak/ez200/ez200.c:206
+#: camlibs/kodak/ez200/ez200.c:185
 msgid ""
 "Kodak EZ200 driver\n"
 "Bucas Jean-Francois <jfbucas@..."
@@ -3524,7 +3524,7 @@
 "tamaina hau da: %i byte."
 
 #: camlibs/panasonic/dc1000.c:471 camlibs/panasonic/dc1580.c:591
-#: camlibs/ricoh/ricoh.c:837
+#: camlibs/ricoh/ricoh.c:843
 msgid "Uploading..."
 msgstr "Kargatzen..."
 
@@ -4521,8 +4521,8 @@
 msgid "Long distance"
 msgstr "Foku-distantzia"
 
-#: camlibs/ptp2/config.c:1671 camlibs/ptp2/library.c:2166
-#: camlibs/ptp2/library.c:2180 camlibs/ptp2/ptp.c:3898
+#: camlibs/ptp2/config.c:1671 camlibs/ptp2/library.c:2185
+#: camlibs/ptp2/library.c:2199 camlibs/ptp2/ptp.c:3898
 #, fuzzy
 msgid "Undefined"
 msgstr "PTP Definitu gabeko errorea"
@@ -5277,7 +5277,7 @@
 msgid "PTP Protocol error, response expected"
 msgstr "PTP Protokolo-errorea, erantzuna espero zen"
 
-#: camlibs/ptp2/library.c:1081
+#: camlibs/ptp2/library.c:1083
 msgid ""
 "PTP2 driver\n"
 "(c) 2001-2005 by Mariusz Woloszyn <emsi@..."
@@ -5291,78 +5291,78 @@
 "Enjoy!"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1158
+#: camlibs/ptp2/library.c:1160
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon Viewfinder mode"
 msgstr "Zure kamerak ez du onartzen kaptura generikoa"
 
-#: camlibs/ptp2/library.c:1164
+#: camlibs/ptp2/library.c:1166
 #, c-format
 msgid "Canon enable viewfinder failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1170
+#: camlibs/ptp2/library.c:1172
 #, c-format
 msgid "Canon get viewfinder image failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1181
+#: camlibs/ptp2/library.c:1183
 #, c-format
 msgid "Canon disable viewfinder failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1297
+#: camlibs/ptp2/library.c:1299
 #, fuzzy
 msgid "Sorry, your camera does not support Nikon capture"
 msgstr "Zure kamerak ez du onartzen kaptura generikoa"
 
-#: camlibs/ptp2/library.c:1383
+#: camlibs/ptp2/library.c:1385
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon EOS Capture"
 msgstr "Zure kamerak ez du onartzen kaptura generikoa"
 
-#: camlibs/ptp2/library.c:1389
+#: camlibs/ptp2/library.c:1391
 #, fuzzy, c-format
-msgid "Canon EOS Capture failed: %d"
+msgid "Canon EOS Capture failed: %x"
 msgstr "Kapturatu"
 
-#: camlibs/ptp2/library.c:1397
-#, c-format
-msgid "Canon EOS Get Changes failed: %d"
-msgstr ""
+#: camlibs/ptp2/library.c:1399
+#, fuzzy, c-format
+msgid "Canon EOS Get Changes failed: %x"
+msgstr "Kapturatu"
 
-#: camlibs/ptp2/library.c:1477
+#: camlibs/ptp2/library.c:1481
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon Capture initiation"
 msgstr "Zure kamerak ez du onartzen kaptura generikoa"
 
-#: camlibs/ptp2/library.c:1488
+#: camlibs/ptp2/library.c:1492
 msgid "Sorry, initializing your camera did not work. Please report this."
 msgstr ""
 
-#: camlibs/ptp2/library.c:1507
-#, c-format
-msgid "Canon Capture failed: %d"
-msgstr ""
+#: camlibs/ptp2/library.c:1514
+#, fuzzy, c-format
+msgid "Canon Capture failed: %x"
+msgstr "Kapturatu"
 
-#: camlibs/ptp2/library.c:1611
+#: camlibs/ptp2/library.c:1630
 msgid "Sorry, your camera does not support generic capture"
 msgstr "Zure kamerak ez du onartzen kaptura generikoa"
 
-#: camlibs/ptp2/library.c:1687
+#: camlibs/ptp2/library.c:1706
 #, c-format
 msgid "No event received, error %x."
 msgstr ""
 
-#: camlibs/ptp2/library.c:1861
+#: camlibs/ptp2/library.c:1880
 msgid "read only"
 msgstr "irakurtzeko soilik"
 
-#: camlibs/ptp2/library.c:1862
+#: camlibs/ptp2/library.c:1881
 msgid "readwrite"
 msgstr "irakurri-idatzi"
 
-#: camlibs/ptp2/library.c:1996
+#: camlibs/ptp2/library.c:2015
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -5377,227 +5377,227 @@
 "Fabrikatzailearen luzapenaren IDa: 0x%08x\n"
 "Fabrikatzailearen luzapenaren deskribapena: %s\n"
 
-#: camlibs/ptp2/library.c:2014
+#: camlibs/ptp2/library.c:2033
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Capture Formats: "
 msgstr "Data-formatua"
 
-#: camlibs/ptp2/library.c:2028
+#: camlibs/ptp2/library.c:2047
 #, fuzzy, c-format
 msgid "Display Formats: "
 msgstr "Data-formatua"
 
-#: camlibs/ptp2/library.c:2044
+#: camlibs/ptp2/library.c:2063
 #, c-format
 msgid "Supported MTP Object Properties:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2060
+#: camlibs/ptp2/library.c:2079
 #, c-format
 msgid " PTP error %04x on query"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2077
+#: camlibs/ptp2/library.c:2096
 #, c-format
 msgid ""
 "\n"
 "Device Capabilities:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2081
+#: camlibs/ptp2/library.c:2100
 #, c-format
 msgid "\tFile Download, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:2084
+#: camlibs/ptp2/library.c:2103
 #, fuzzy, c-format
 msgid "File Deletion, "
 msgstr "Fitxategiaren bereizmena"
 
-#: camlibs/ptp2/library.c:2086
+#: camlibs/ptp2/library.c:2105
 #, fuzzy, c-format
 msgid "No File Deletion, "
 msgstr "Fitxategiaren bereizmena"
 
-#: camlibs/ptp2/library.c:2090
+#: camlibs/ptp2/library.c:2109
 #, fuzzy, c-format
 msgid "File Upload\n"
 msgstr "Fitxategia kargatzeak huts egin du."
 
-#: camlibs/ptp2/library.c:2092
+#: camlibs/ptp2/library.c:2111
 #, c-format
 msgid "No File Upload\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2097
+#: camlibs/ptp2/library.c:2116
 #, c-format
 msgid "\tGeneric Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:2099
+#: camlibs/ptp2/library.c:2118
 #, c-format
 msgid "\tNo Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:2102
+#: camlibs/ptp2/library.c:2121
 #, fuzzy, c-format
 msgid "Open Capture, "
 msgstr "Kapturatu"
 
-#: camlibs/ptp2/library.c:2104
+#: camlibs/ptp2/library.c:2123
 #, c-format
 msgid "No Open Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:2110
+#: camlibs/ptp2/library.c:2129
 #, fuzzy, c-format
 msgid "Canon Capture\n"
 msgstr "Kapturatu"
 
-#: camlibs/ptp2/library.c:2114
+#: camlibs/ptp2/library.c:2133
 #, fuzzy, c-format
 msgid "Nikon Capture\n"
 msgstr "Kapturatu"
 
-#: camlibs/ptp2/library.c:2116
+#: camlibs/ptp2/library.c:2135
 #, c-format
 msgid "No vendor specific capture\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2124
+#: camlibs/ptp2/library.c:2143
 #, c-format
 msgid "\tNikon Wifi support\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2130
+#: camlibs/ptp2/library.c:2149
 #, fuzzy, c-format
 msgid "\tCanon Wifi support\n"
 msgstr "Txartela ez da onartzen."
 
-#: camlibs/ptp2/library.c:2141
+#: camlibs/ptp2/library.c:2160
 #, c-format
 msgid ""
 "\n"
 "Storage Devices Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2156
+#: camlibs/ptp2/library.c:2175
 #, c-format
 msgid "\tStorageDescription: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2160
+#: camlibs/ptp2/library.c:2179
 #, c-format
 msgid "\tVolumeLabel: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2167
+#: camlibs/ptp2/library.c:2186
 msgid "Builtin ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2168
+#: camlibs/ptp2/library.c:2187
 msgid "Removable ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2169
+#: camlibs/ptp2/library.c:2188
 msgid "Builtin RAM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2170
+#: camlibs/ptp2/library.c:2189
 msgid "Removable RAM (memory card)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2172 camlibs/ptp2/library.c:2185
-#: camlibs/ptp2/library.c:2197
+#: camlibs/ptp2/library.c:2191 camlibs/ptp2/library.c:2204
+#: camlibs/ptp2/library.c:2216
 #, fuzzy, c-format
 msgid "Unknown: 0x%04x\n"
 msgstr "ezezaguna (0x%02x)"
 
-#: camlibs/ptp2/library.c:2176
+#: camlibs/ptp2/library.c:2195
 #, c-format
 msgid "\tStorage Type: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2181
+#: camlibs/ptp2/library.c:2200
 #, fuzzy
 msgid "Generic Flat"
 msgstr "Orokorra"
 
-#: camlibs/ptp2/library.c:2182
+#: camlibs/ptp2/library.c:2201
 msgid "Generic Hierarchical"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2183
+#: camlibs/ptp2/library.c:2202
 msgid "Digital Camera Layout (DCIM)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2189
+#: camlibs/ptp2/library.c:2208
 #, c-format
 msgid "\tFilesystemtype: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2193
+#: camlibs/ptp2/library.c:2212
 #, fuzzy
 msgid "Read-Write"
 msgstr "irakurri-idatzi"
 
-#: camlibs/ptp2/library.c:2194
+#: camlibs/ptp2/library.c:2213
 #, fuzzy
 msgid "Read-Only"
 msgstr "Prest"
 
-#: camlibs/ptp2/library.c:2195
+#: camlibs/ptp2/library.c:2214
 msgid "Read Only with Object deletion"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2201
+#: camlibs/ptp2/library.c:2220
 #, c-format
 msgid "\tAccess Capability: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2203
+#: camlibs/ptp2/library.c:2222
 #, c-format
 msgid "\tMaximum Capability: %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2208
+#: camlibs/ptp2/library.c:2227
 #, c-format
 msgid "\tFree Space (Bytes): %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2213
+#: camlibs/ptp2/library.c:2232
 #, fuzzy, c-format
 msgid "\tFree Space (Images): %d\n"
 msgstr "Irudi-kopurua: %d\n"
 
-#: camlibs/ptp2/library.c:2221
+#: camlibs/ptp2/library.c:2240
 #, c-format
 msgid ""
 "\n"
 "Device Property Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2247
+#: camlibs/ptp2/library.c:2266
 #, c-format
 msgid " not read out.\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3214 camlibs/ptp2/library.c:3218
+#: camlibs/ptp2/library.c:3233 camlibs/ptp2/library.c:3237
 #, c-format
 msgid "File '%s/%s' does not exist."
 msgstr ""
 
-#: camlibs/ptp2/library.c:3224
+#: camlibs/ptp2/library.c:3243
 msgid "Metadata only supported for MTP devices."
 msgstr ""
 
-#: camlibs/ptp2/library.c:3913
+#: camlibs/ptp2/library.c:3932
 msgid "Initializing Camera"
 msgstr "Kamera hasieratzen"
 
-#: camlibs/ptp2/library.c:4081
+#: camlibs/ptp2/library.c:4100
 #, fuzzy, c-format
 msgid ""
 "Currently, PTP is only implemented for USB and PTP/IP cameras currently, "
@@ -7208,7 +7208,7 @@
 msgid "Bad characters (0x%x, 0x%x). Please contact %s."
 msgstr "Karaktere okerrak (0x%x, 0x%x). Jo %s(r)engana."
 
-#: camlibs/ricoh/ricoh.c:256 camlibs/ricoh/ricoh.c:325
+#: camlibs/ricoh/ricoh.c:256 camlibs/ricoh/ricoh.c:331
 #, c-format
 msgid "Camera busy. If the problem persists, please contact %s."
 msgstr "Kamera okupatuta dago. Arazoak jarraitzen badu, jo %s(r)engana."
@@ -7223,22 +7223,22 @@
 msgid "Communication error even after 2 retries. Please contact %s."
 msgstr "Komunikazio-errorea 2 saiakeren ondoren ere. Jo %s(r)engana."
 
-#: camlibs/ricoh/ricoh.c:339
+#: camlibs/ricoh/ricoh.c:345
 #, c-format
 msgid "Camera is in wrong mode. Please contact %s."
 msgstr "Kamera modu okerrean dago. Jo %s(r)engana."
 
-#: camlibs/ricoh/ricoh.c:348
+#: camlibs/ricoh/ricoh.c:354
 #, c-format
 msgid "Camera did not accept the parameters. Please contact %s."
 msgstr "Kamerak ez ditu parametroak onartu. Jo %s(r)engana."
 
-#: camlibs/ricoh/ricoh.c:354
+#: camlibs/ricoh/ricoh.c:360
 #, c-format
 msgid "An unknown error occurred. Please contact %s."
 msgstr "Errore ezezagun bat gertatu da. Jo %s(r)engana."
 
-#: camlibs/ricoh/ricoh.c:816
+#: camlibs/ricoh/ricoh.c:822
 #, c-format
 msgid ""
 "The filename's length must not exceed 12 characters ('%s' has %i characters)."

Modified: trunk/libgphoto2/po/fr.po
===================================================================
--- trunk/libgphoto2/po/fr.po	2008-02-24 18:43:47 UTC (rev 10964)
+++ trunk/libgphoto2/po/fr.po	2008-02-24 20:16:09 UTC (rev 10965)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: gphoto-devel@..."
-"POT-Creation-Date: 2008-02-11 10:55+0100\n"
+"POT-Creation-Date: 2008-02-24 21:16+0100\n"
 "PO-Revision-Date: 2003-06-22 23:47+0200\n"
 "Last-Translator: Aur\xE9lien Croc <aurelien@..."
 "Language-Team: Fran\xE7ais\n"
@@ -507,7 +507,7 @@
 #: camlibs/canon/library.c:1626 camlibs/canon/library.c:1627
 #: camlibs/canon/library.c:1665 camlibs/canon/library.c:1666
 #: camlibs/canon/library.c:1699 camlibs/canon/library.c:1700
-#: camlibs/ptp2/library.c:1863 camlibs/ptp2/library.c:1865
+#: camlibs/ptp2/library.c:1882 camlibs/ptp2/library.c:1884
 #: camlibs/ptp2/ptp.c:3693
 #, fuzzy
 msgid "Unknown"
@@ -2071,7 +2071,7 @@
 
 #: camlibs/kodak/dc210/dc210.c:261 camlibs/kodak/dc210/dc210.c:269
 #: camlibs/ptp2/config.c:1646 camlibs/ptp2/config.c:2282
-#: camlibs/ptp2/library.c:2157 camlibs/ptp2/library.c:2161
+#: camlibs/ptp2/library.c:2176 camlibs/ptp2/library.c:2180
 #: camlibs/ptp2/ptp.c:3679 camlibs/ricoh/library.c:347
 msgid "None"
 msgstr "Aucune"
@@ -2500,14 +2500,14 @@
 "\n"
 "Questions et commentaires bienvenus."
 
-#: camlibs/kodak/ez200/ez200.c:198
+#: camlibs/kodak/ez200/ez200.c:177
 #, c-format
 msgid ""
 "Your USB camera is a Kodak EZ200.\n"
 "Number of PICs = %i\n"
 msgstr ""
 
-#: camlibs/kodak/ez200/ez200.c:206
+#: camlibs/kodak/ez200/ez200.c:185
 msgid ""
 "Kodak EZ200 driver\n"
 "Bucas Jean-Francois <jfbucas@..."
@@ -3466,7 +3466,7 @@
 "de : %i octets."
 
 #: camlibs/panasonic/dc1000.c:471 camlibs/panasonic/dc1580.c:591
-#: camlibs/ricoh/ricoh.c:837
+#: camlibs/ricoh/ricoh.c:843
 msgid "Uploading..."
 msgstr "T\xE9l\xE9chargement du fichier..."
 
@@ -4464,8 +4464,8 @@
 msgid "Long distance"
 msgstr "Position du focus"
 
-#: camlibs/ptp2/config.c:1671 camlibs/ptp2/library.c:2166
-#: camlibs/ptp2/library.c:2180 camlibs/ptp2/ptp.c:3898
+#: camlibs/ptp2/config.c:1671 camlibs/ptp2/library.c:2185
+#: camlibs/ptp2/library.c:2199 camlibs/ptp2/ptp.c:3898
 #, fuzzy
 msgid "Undefined"
 msgstr "PTP Erreur non d\xE9finie"
@@ -5236,7 +5236,7 @@
 msgid "PTP Protocol error, response expected"
 msgstr "PTP Erreur de protocole, r\xE9ponse attendue"
 
-#: camlibs/ptp2/library.c:1081
+#: camlibs/ptp2/library.c:1083
 msgid ""
 "PTP2 driver\n"
 "(c) 2001-2005 by Mariusz Woloszyn <emsi@..."
@@ -5250,80 +5250,80 @@
 "Enjoy!"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1158
+#: camlibs/ptp2/library.c:1160
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon Viewfinder mode"
 msgstr "Cet appareil ne permet pas de changer les noms de fichiers."
 
-#: camlibs/ptp2/library.c:1164
+#: camlibs/ptp2/library.c:1166
 #, c-format
 msgid "Canon enable viewfinder failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1170
+#: camlibs/ptp2/library.c:1172
 #, c-format
 msgid "Canon get viewfinder image failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1181
+#: camlibs/ptp2/library.c:1183
 #, c-format
 msgid "Canon disable viewfinder failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1297
+#: camlibs/ptp2/library.c:1299
 #, fuzzy
 msgid "Sorry, your camera does not support Nikon capture"
 msgstr "Cet appareil ne permet pas de changer les noms de fichiers."
 
-#: camlibs/ptp2/library.c:1383
+#: camlibs/ptp2/library.c:1385
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon EOS Capture"
 msgstr "Cet appareil ne permet pas de changer les noms de fichiers."
 
-#: camlibs/ptp2/library.c:1389
+#: camlibs/ptp2/library.c:1391
 #, fuzzy, c-format
-msgid "Canon EOS Capture failed: %d"
+msgid "Canon EOS Capture failed: %x"
 msgstr "Capture"
 
-#: camlibs/ptp2/library.c:1397
-#, c-format
-msgid "Canon EOS Get Changes failed: %d"
-msgstr ""
+#: camlibs/ptp2/library.c:1399
+#, fuzzy, c-format
+msgid "Canon EOS Get Changes failed: %x"
+msgstr "Capture"
 
-#: camlibs/ptp2/library.c:1477
+#: camlibs/ptp2/library.c:1481
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon Capture initiation"
 msgstr "Cet appareil ne permet pas de changer les noms de fichiers."
 
-#: camlibs/ptp2/library.c:1488
+#: camlibs/ptp2/library.c:1492
 msgid "Sorry, initializing your camera did not work. Please report this."
 msgstr ""
 
-#: camlibs/ptp2/library.c:1507
-#, c-format
-msgid "Canon Capture failed: %d"
-msgstr ""
+#: camlibs/ptp2/library.c:1514
+#, fuzzy, c-format
+msgid "Canon Capture failed: %x"
+msgstr "Capture"
 
-#: camlibs/ptp2/library.c:1611
+#: camlibs/ptp2/library.c:1630
 #, fuzzy
 msgid "Sorry, your camera does not support generic capture"
 msgstr "Cet appareil ne permet pas de changer les noms de fichiers."
 
-#: camlibs/ptp2/library.c:1687
+#: camlibs/ptp2/library.c:1706
 #, c-format
 msgid "No event received, error %x."
 msgstr ""
 
-#: camlibs/ptp2/library.c:1861
+#: camlibs/ptp2/library.c:1880
 #, fuzzy
 msgid "read only"
 msgstr "pr\xEAt"
 
-#: camlibs/ptp2/library.c:1862
+#: camlibs/ptp2/library.c:1881
 msgid "readwrite"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1996
+#: camlibs/ptp2/library.c:2015
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -5338,226 +5338,226 @@
 "ID \xE9tendue du vendeur : 0x%08x\n"
 "Description \xE9tendue du vendeur : %s\n"
 
-#: camlibs/ptp2/library.c:2014
+#: camlibs/ptp2/library.c:2033
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Capture Formats: "
 msgstr "Format de date"
 
-#: camlibs/ptp2/library.c:2028
+#: camlibs/ptp2/library.c:2047
 #, fuzzy, c-format
 msgid "Display Formats: "
 msgstr "Format de date"
 
-#: camlibs/ptp2/library.c:2044
+#: camlibs/ptp2/library.c:2063
 #, c-format
 msgid "Supported MTP Object Properties:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2060
+#: camlibs/ptp2/library.c:2079
 #, c-format
 msgid " PTP error %04x on query"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2077
+#: camlibs/ptp2/library.c:2096
 #, c-format
 msgid ""
 "\n"
 "Device Capabilities:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2081
+#: camlibs/ptp2/library.c:2100
 #, c-format
 msgid "\tFile Download, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:2084
+#: camlibs/ptp2/library.c:2103
 #, fuzzy, c-format
 msgid "File Deletion, "
 msgstr "R\xE9solution du fichier"
 
-#: camlibs/ptp2/library.c:2086
+#: camlibs/ptp2/library.c:2105
 #, fuzzy, c-format
 msgid "No File Deletion, "
 msgstr "R\xE9solution du fichier"
 
-#: camlibs/ptp2/library.c:2090
+#: camlibs/ptp2/library.c:2109
 #, fuzzy, c-format
 msgid "File Upload\n"
 msgstr "Envoi du fichier rat\xE9."
 
-#: camlibs/ptp2/library.c:2092
+#: camlibs/ptp2/library.c:2111
 #, c-format
 msgid "No File Upload\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2097
+#: camlibs/ptp2/library.c:2116
 #, c-format
 msgid "\tGeneric Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:2099
+#: camlibs/ptp2/library.c:2118
 #, c-format
 msgid "\tNo Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:2102
+#: camlibs/ptp2/library.c:2121
 #, fuzzy, c-format
 msgid "Open Capture, "
 msgstr "Capture"
 
-#: camlibs/ptp2/library.c:2104
+#: camlibs/ptp2/library.c:2123
 #, c-format
 msgid "No Open Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:2110
+#: camlibs/ptp2/library.c:2129
 #, fuzzy, c-format
 msgid "Canon Capture\n"
 msgstr "Capture"
 
-#: camlibs/ptp2/library.c:2114
+#: camlibs/ptp2/library.c:2133
 #, fuzzy, c-format
 msgid "Nikon Capture\n"
 msgstr "Capture"
 
-#: camlibs/ptp2/library.c:2116
+#: camlibs/ptp2/library.c:2135
 #, c-format
 msgid "No vendor specific capture\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2124
+#: camlibs/ptp2/library.c:2143
 #, c-format
 msgid "\tNikon Wifi support\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2130
+#: camlibs/ptp2/library.c:2149
 #, fuzzy, c-format
 msgid "\tCanon Wifi support\n"
 msgstr "Type de capture non g\xE9r\xE9."
 
-#: camlibs/ptp2/library.c:2141
+#: camlibs/ptp2/library.c:2160
 #, c-format
 msgid ""
 "\n"
 "Storage Devices Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2156
+#: camlibs/ptp2/library.c:2175
 #, c-format
 msgid "\tStorageDescription: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2160
+#: camlibs/ptp2/library.c:2179
 #, c-format
 msgid "\tVolumeLabel: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2167
+#: camlibs/ptp2/library.c:2186
 msgid "Builtin ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2168
+#: camlibs/ptp2/library.c:2187
 msgid "Removable ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2169
+#: camlibs/ptp2/library.c:2188
 msgid "Builtin RAM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2170
+#: camlibs/ptp2/library.c:2189
 msgid "Removable RAM (memory card)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2172 camlibs/ptp2/library.c:2185
-#: camlibs/ptp2/library.c:2197
+#: camlibs/ptp2/library.c:2191 camlibs/ptp2/library.c:2204
+#: camlibs/ptp2/library.c:2216
 #, fuzzy, c-format
 msgid "Unknown: 0x%04x\n"
 msgstr "inconnu (0x%02x)"
 
-#: camlibs/ptp2/library.c:2176
+#: camlibs/ptp2/library.c:2195
 #, c-format
 msgid "\tStorage Type: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2181
+#: camlibs/ptp2/library.c:2200
 #, fuzzy
 msgid "Generic Flat"
 msgstr "G\xE9n\xE9ral"
 
-#: camlibs/ptp2/library.c:2182
+#: camlibs/ptp2/library.c:2201
 msgid "Generic Hierarchical"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2183
+#: camlibs/ptp2/library.c:2202
 msgid "Digital Camera Layout (DCIM)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2189
+#: camlibs/ptp2/library.c:2208
 #, c-format
 msgid "\tFilesystemtype: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2193
+#: camlibs/ptp2/library.c:2212
 msgid "Read-Write"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2194
+#: camlibs/ptp2/library.c:2213
 #, fuzzy
 msgid "Read-Only"
 msgstr "Pr\xEAt"
 
-#: camlibs/ptp2/library.c:2195
+#: camlibs/ptp2/library.c:2214
 msgid "Read Only with Object deletion"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2201
+#: camlibs/ptp2/library.c:2220
 #, c-format
 msgid "\tAccess Capability: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2203
+#: camlibs/ptp2/library.c:2222
 #, c-format
 msgid "\tMaximum Capability: %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2208
+#: camlibs/ptp2/library.c:2227
 #, c-format
 msgid "\tFree Space (Bytes): %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2213
+#: camlibs/ptp2/library.c:2232
 #, fuzzy, c-format
 msgid "\tFree Space (Images): %d\n"
 msgstr "Nombre de fichiers : %d\n"
 
-#: camlibs/ptp2/library.c:2221
+#: camlibs/ptp2/library.c:2240
 #, c-format
 msgid ""
 "\n"
 "Device Property Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2247
+#: camlibs/ptp2/library.c:2266
 #, c-format
 msgid " not read out.\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3214 camlibs/ptp2/library.c:3218
+#: camlibs/ptp2/library.c:3233 camlibs/ptp2/library.c:3237
 #, c-format
 msgid "File '%s/%s' does not exist."
 msgstr ""
 
-#: camlibs/ptp2/library.c:3224
+#: camlibs/ptp2/library.c:3243
 msgid "Metadata only supported for MTP devices."
 msgstr ""
 
-#: camlibs/ptp2/library.c:3913
+#: camlibs/ptp2/library.c:3932
 msgid "Initializing Camera"
 msgstr "Initialisation de l'appareil photo"
 
-#: camlibs/ptp2/library.c:4081
+#: camlibs/ptp2/library.c:4100
 #, fuzzy, c-format
 msgid ""
 "Currently, PTP is only implemented for USB and PTP/IP cameras currently, "
@@ -7170,7 +7170,7 @@
 msgid "Bad characters (0x%x, 0x%x). Please contact %s."
 msgstr "Mauvais caract\xE8res (0x%x, 0x%x). Merci de contacter %s."
 
-#: camlibs/ricoh/ricoh.c:256 camlibs/ricoh/ricoh.c:325
+#: camlibs/ricoh/ricoh.c:256 camlibs/ricoh/ricoh.c:331
 #, c-format
 msgid "Camera busy. If the problem persists, please contact %s."
 msgstr "L'appareil est occup\xE9. Si le probl\xE8me persiste, merci de contacter %s."
@@ -7185,22 +7185,22 @@
 msgid "Communication error even after 2 retries. Please contact %s."
 msgstr "D\xE9lai d'attente d\xE9pass\xE9 m\xEAme apr\xE8s 2 tentatives. Contactez %s."
 
-#: camlibs/ricoh/ricoh.c:339
+#: camlibs/ricoh/ricoh.c:345
 #, c-format
 msgid "Camera is in wrong mode. Please contact %s."
 msgstr "L'appareil n'est pas dans le bon mode. Contactez %s."
 
-#: camlibs/ricoh/ricoh.c:348
+#: camlibs/ricoh/ricoh.c:354
 #, c-format
 msgid "Camera did not accept the parameters. Please contact %s."
 msgstr "L'appareil n'a pas accept\xE9 les param\xE8tres. Contactez %s."
 
-#: camlibs/ricoh/ricoh.c:354
+#: camlibs/ricoh/ricoh.c:360
 #, c-format
 msgid "An unknown error occurred. Please contact %s."
 msgstr "Une erreur inconnue est survenue. Contactez %s."
 
-#: camlibs/ricoh/ricoh.c:816
+#: camlibs/ricoh/ricoh.c:822
 #, c-format
 msgid ""
 "The filename's length must not exceed 12 characters ('%s' has %i characters)."

Modified: trunk/libgphoto2/po/hu.po
===================================================================
--- trunk/libgphoto2/po/hu.po	2008-02-24 18:43:47 UTC (rev 10964)
+++ trunk/libgphoto2/po/hu.po	2008-02-24 20:16:09 UTC (rev 10965)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: libgphoto2\n"
 "Report-Msgid-Bugs-To: gphoto-devel@..."
-"POT-Creation-Date: 2008-02-11 10:55+0100\n"
+"POT-Creation-Date: 2008-02-24 21:16+0100\n"
 "PO-Revision-Date: 2003-02-14 11:11+0100\n"
 "Last-Translator: Tamas Szanto <tszanto@..."
 "Language-Team: Hungarian <kde-lista@..."
@@ -489,7 +489,7 @@
 #: camlibs/canon/library.c:1626 camlibs/canon/library.c:1627
 #: camlibs/canon/library.c:1665 camlibs/canon/library.c:1666
 #: camlibs/canon/library.c:1699 camlibs/canon/library.c:1700
-#: camlibs/ptp2/library.c:1863 camlibs/ptp2/library.c:1865
+#: camlibs/ptp2/library.c:1882 camlibs/ptp2/library.c:1884
 #: camlibs/ptp2/ptp.c:3693
 #, fuzzy
 msgid "Unknown"
@@ -1996,7 +1996,7 @@
 
 #: camlibs/kodak/dc210/dc210.c:261 camlibs/kodak/dc210/dc210.c:269
 #: camlibs/ptp2/config.c:1646 camlibs/ptp2/config.c:2282
-#: camlibs/ptp2/library.c:2157 camlibs/ptp2/library.c:2161
+#: camlibs/ptp2/library.c:2176 camlibs/ptp2/library.c:2180
 #: camlibs/ptp2/ptp.c:3679 camlibs/ricoh/library.c:347
 msgid "None"
 msgstr "Nincs"
@@ -2424,14 +2424,14 @@
 "\n"
 "Várom a kérdéseket, észrevételeket."
 
-#: camlibs/kodak/ez200/ez200.c:198
+#: camlibs/kodak/ez200/ez200.c:177
 #, c-format
 msgid ""
 "Your USB camera is a Kodak EZ200.\n"
 "Number of PICs = %i\n"
 msgstr ""
 
-#: camlibs/kodak/ez200/ez200.c:206
+#: camlibs/kodak/ez200/ez200.c:185
 msgid ""
 "Kodak EZ200 driver\n"
 "Bucas Jean-Francois <jfbucas@..."
@@ -3367,7 +3367,7 @@
 msgstr "A fájlméret %i bájt. A feltölthető fájlok maximális mérete: %i bájt."
 
 #: camlibs/panasonic/dc1000.c:471 camlibs/panasonic/dc1580.c:591
-#: camlibs/ricoh/ricoh.c:837
+#: camlibs/ricoh/ricoh.c:843
 msgid "Uploading..."
 msgstr "Feltöltés..."
 
@@ -4332,8 +4332,8 @@
 msgid "Long distance"
 msgstr "A fókusz helyzete"
 
-#: camlibs/ptp2/config.c:1671 camlibs/ptp2/library.c:2166
-#: camlibs/ptp2/library.c:2180 camlibs/ptp2/ptp.c:3898
+#: camlibs/ptp2/config.c:1671 camlibs/ptp2/library.c:2185
+#: camlibs/ptp2/library.c:2199 camlibs/ptp2/ptp.c:3898
 #, fuzzy
 msgid "Undefined"
 msgstr "PTP - nem definiált hiba"
@@ -5096,7 +5096,7 @@
 msgid "PTP Protocol error, response expected"
 msgstr "PTP protokollhiba, nem jött válasz"
 
-#: camlibs/ptp2/library.c:1081
+#: camlibs/ptp2/library.c:1083
 msgid ""
 "PTP2 driver\n"
 "(c) 2001-2005 by Mariusz Woloszyn <emsi@..."
@@ -5110,80 +5110,80 @@
 "Enjoy!"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1158
+#: camlibs/ptp2/library.c:1160
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon Viewfinder mode"
 msgstr "A kamera nem támogatja fájlnevek cserélését."
 
-#: camlibs/ptp2/library.c:1164
+#: camlibs/ptp2/library.c:1166
 #, c-format
 msgid "Canon enable viewfinder failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1170
+#: camlibs/ptp2/library.c:1172
 #, c-format
 msgid "Canon get viewfinder image failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1181
+#: camlibs/ptp2/library.c:1183
 #, c-format
 msgid "Canon disable viewfinder failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1297
+#: camlibs/ptp2/library.c:1299
 #, fuzzy
 msgid "Sorry, your camera does not support Nikon capture"
 msgstr "A kamera nem támogatja fájlnevek cserélését."
 
-#: camlibs/ptp2/library.c:1383
+#: camlibs/ptp2/library.c:1385
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon EOS Capture"
 msgstr "A kamera nem támogatja fájlnevek cserélését."
 
-#: camlibs/ptp2/library.c:1389
+#: camlibs/ptp2/library.c:1391
 #, fuzzy, c-format
-msgid "Canon EOS Capture failed: %d"
+msgid "Canon EOS Capture failed: %x"
 msgstr "Rögzítés"
 
-#: camlibs/ptp2/library.c:1397
-#, c-format
-msgid "Canon EOS Get Changes failed: %d"
-msgstr ""
+#: camlibs/ptp2/library.c:1399
+#, fuzzy, c-format
+msgid "Canon EOS Get Changes failed: %x"
+msgstr "Rögzítés"
 
-#: camlibs/ptp2/library.c:1477
+#: camlibs/ptp2/library.c:1481
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon Capture initiation"
 msgstr "A kamera nem támogatja fájlnevek cserélését."
 
-#: camlibs/ptp2/library.c:1488
+#: camlibs/ptp2/library.c:1492
 msgid "Sorry, initializing your camera did not work. Please report this."
 msgstr ""
 
-#: camlibs/ptp2/library.c:1507
-#, c-format
-msgid "Canon Capture failed: %d"
-msgstr ""
+#: camlibs/ptp2/library.c:1514
+#, fuzzy, c-format
+msgid "Canon Capture failed: %x"
+msgstr "Rögzítés"
 
-#: camlibs/ptp2/library.c:1611
+#: camlibs/ptp2/library.c:1630
 #, fuzzy
 msgid "Sorry, your camera does not support generic capture"
 msgstr "A kamera nem támogatja fájlnevek cserélését."
 
-#: camlibs/ptp2/library.c:1687
+#: camlibs/ptp2/library.c:1706
 #, c-format
 msgid "No event received, error %x."
 msgstr ""
 
-#: camlibs/ptp2/library.c:1861
+#: camlibs/ptp2/library.c:1880
 #, fuzzy
 msgid "read only"
 msgstr "kész"
 
-#: camlibs/ptp2/library.c:1862
+#: camlibs/ptp2/library.c:1881
 msgid "readwrite"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1996
+#: camlibs/ptp2/library.c:2015
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -5193,227 +5193,227 @@
 "Vendor extension description: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2014
+#: camlibs/ptp2/library.c:2033
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Capture Formats: "
 msgstr "Dátumformátum"
 
-#: camlibs/ptp2/library.c:2028
+#: camlibs/ptp2/library.c:2047
 #, fuzzy, c-format
 msgid "Display Formats: "
 msgstr "Dátumformátum"
 
-#: camlibs/ptp2/library.c:2044
+#: camlibs/ptp2/library.c:2063
 #, c-format
 msgid "Supported MTP Object Properties:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2060
+#: camlibs/ptp2/library.c:2079
 #, c-format
 msgid " PTP error %04x on query"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2077
+#: camlibs/ptp2/library.c:2096
 #, c-format
 msgid ""
 "\n"
 "Device Capabilities:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2081
+#: camlibs/ptp2/library.c:2100
 #, c-format
 msgid "\tFile Download, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:2084
+#: camlibs/ptp2/library.c:2103
 #, fuzzy, c-format
 msgid "File Deletion, "
 msgstr "Fájlfelbontás"
 
-#: camlibs/ptp2/library.c:2086
+#: camlibs/ptp2/library.c:2105
 #, fuzzy, c-format
 msgid "No File Deletion, "
 msgstr "Fájlfelbontás"
 
-#: camlibs/ptp2/library.c:2090
+#: camlibs/ptp2/library.c:2109
 #, fuzzy, c-format
 msgid "File Upload\n"
 msgstr "Fájl feltöltése..."
 
-#: camlibs/ptp2/library.c:2092
+#: camlibs/ptp2/library.c:2111
 #, c-format
 msgid "No File Upload\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2097
+#: camlibs/ptp2/library.c:2116
 #, c-format
 msgid "\tGeneric Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:2099
+#: camlibs/ptp2/library.c:2118
 #, c-format
 msgid "\tNo Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:2102
+#: camlibs/ptp2/library.c:2121
 #, fuzzy, c-format
 msgid "Open Capture, "
 msgstr "Rögzítés"
 
-#: camlibs/ptp2/library.c:2104
+#: camlibs/ptp2/library.c:2123
 #, c-format
 msgid "No Open Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:2110
+#: camlibs/ptp2/library.c:2129
 #, fuzzy, c-format
 msgid "Canon Capture\n"
 msgstr "Rögzítés"
 
-#: camlibs/ptp2/library.c:2114
+#: camlibs/ptp2/library.c:2133
 #, fuzzy, c-format
 msgid "Nikon Capture\n"
 msgstr "Rögzítés"
 
-#: camlibs/ptp2/library.c:2116
+#: camlibs/ptp2/library.c:2135
 #, c-format
 msgid "No vendor specific capture\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2124
+#: camlibs/ptp2/library.c:2143
 #, c-format
 msgid "\tNikon Wifi support\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2130
+#: camlibs/ptp2/library.c:2149
 #, fuzzy, c-format
 msgid "\tCanon Wifi support\n"
 msgstr "A kártya nem támogatott."
 
-#: camlibs/ptp2/library.c:2141
+#: camlibs/ptp2/library.c:2160
 #, c-format
 msgid ""
 "\n"
 "Storage Devices Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2156
+#: camlibs/ptp2/library.c:2175
 #, c-format
 msgid "\tStorageDescription: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2160
+#: camlibs/ptp2/library.c:2179
 #, c-format
 msgid "\tVolumeLabel: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2167
+#: camlibs/ptp2/library.c:2186
 msgid "Builtin ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2168
+#: camlibs/ptp2/library.c:2187
 msgid "Removable ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2169
+#: camlibs/ptp2/library.c:2188
 msgid "Builtin RAM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2170
+#: camlibs/ptp2/library.c:2189
 msgid "Removable RAM (memory card)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2172 camlibs/ptp2/library.c:2185
-#: camlibs/ptp2/library.c:2197
+#: camlibs/ptp2/library.c:2191 camlibs/ptp2/library.c:2204
+#: camlibs/ptp2/library.c:2216
 #, fuzzy, c-format
 msgid "Unknown: 0x%04x\n"
 msgstr "ismeretlen (0x%02x)"
 
-#: camlibs/ptp2/library.c:2176
+#: camlibs/ptp2/library.c:2195
 #, c-format
 msgid "\tStorage Type: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2181
+#: camlibs/ptp2/library.c:2200
 #, fuzzy
 msgid "Generic Flat"
 msgstr "Általános"
 
-#: camlibs/ptp2/library.c:2182
+#: camlibs/ptp2/library.c:2201
 msgid "Generic Hierarchical"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2183
+#: camlibs/ptp2/library.c:2202
 msgid "Digital Camera Layout (DCIM)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2189
+#: camlibs/ptp2/library.c:2208
 #, c-format
 msgid "\tFilesystemtype: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2193
+#: camlibs/ptp2/library.c:2212
 msgid "Read-Write"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2194
+#: camlibs/ptp2/library.c:2213
 #, fuzzy
 msgid "Read-Only"
 msgstr "Kész"
 
-#: camlibs/ptp2/library.c:2195
+#: camlibs/ptp2/library.c:2214
 msgid "Read Only with Object deletion"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2201
+#: camlibs/ptp2/library.c:2220
 #, c-format
 msgid "\tAccess Capability: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2203
+#: camlibs/ptp2/library.c:2222
 #, c-format
 msgid "\tMaximum Capability: %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2208
+#: camlibs/ptp2/library.c:2227
 #, c-format
 msgid "\tFree Space (Bytes): %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2213
+#: camlibs/ptp2/library.c:2232
 #, fuzzy, c-format
 msgid "\tFree Space (Images): %d\n"
 msgstr "A képek száma: %d\n"
 
-#: camlibs/ptp2/library.c:2221
+#: camlibs/ptp2/library.c:2240
 #, c-format
 msgid ""
 "\n"
 "Device Property Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2247
+#: camlibs/ptp2/library.c:2266
 #, c-format
 msgid " not read out.\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3214 camlibs/ptp2/library.c:3218
+#: camlibs/ptp2/library.c:3233 camlibs/ptp2/library.c:3237
 #, c-format
 msgid "File '%s/%s' does not exist."
 msgstr ""
 
-#: camlibs/ptp2/library.c:3224
+#: camlibs/ptp2/library.c:3243
 msgid "Metadata only supported for MTP devices."
 msgstr ""
 
-#: camlibs/ptp2/library.c:3913
+#: camlibs/ptp2/library.c:3932
 #, fuzzy
 msgid "Initializing Camera"
 msgstr "A kamera kikapcsolása"
 
-#: camlibs/ptp2/library.c:4081
+#: camlibs/ptp2/library.c:4100
 #, fuzzy, c-format
 msgid ""
 "Currently, PTP is only implemented for USB and PTP/IP cameras currently, "
@@ -7072,7 +7072,7 @@
 "Hibás karakterek (0x%x, 0x%x). Kérjük jelezze a hibát ezen a címen: <gphoto-"
 "devel@...>."
 
-#: camlibs/ricoh/ricoh.c:256 camlibs/ricoh/ricoh.c:325
+#: camlibs/ricoh/ricoh.c:256 camlibs/ricoh/ricoh.c:331
 #, fuzzy, c-format
 msgid "Camera busy. If the problem persists, please contact %s."
 msgstr ""
@@ -7094,28 +7094,28 @@
 "Adatátviteli hiba történt 2 sikertelen próbálkozás után. Kérjük jelezze a "
 "hibát itt: <gphoto-devel@...>."
 
-#: camlibs/ricoh/ricoh.c:339
+#: camlibs/ricoh/ricoh.c:345
 #, fuzzy, c-format
 msgid "Camera is in wrong mode. Please contact %s."
 msgstr ""
 "A kamera nem megfelelő módba van kacsolva. További információ: <gphoto-"
 "devel@...>."
 
-#: camlibs/ricoh/ricoh.c:348
+#: camlibs/ricoh/ricoh.c:354
 #, fuzzy, c-format
 msgid "Camera did not accept the parameters. Please contact %s."
 msgstr ""
 "A kamera nem fogadta el a paramétereket. Kérjük jelezze a hibát ezen a "
 "címen: <gphoto-devel@...>."
 
-#: camlibs/ricoh/ricoh.c:354
+#: camlibs/ricoh/ricoh.c:360
 #, fuzzy, c-format
 msgid "An unknown error occurred. Please contact %s."
 msgstr ""
 "Ismeretlen hiba történt. Kérjük jelezze a hibát ezen a címen: <gphoto-"
 "devel@...>."
 
-#: camlibs/ricoh/ricoh.c:816
+#: camlibs/ricoh/ricoh.c:822
 #, c-format
 msgid ""
 "The filename's length must not exceed 12 characters ('%s' has %i characters)."

Modified: trunk/libgphoto2/po/it.po
===================================================================
--- trunk/libgphoto2/po/it.po	2008-02-24 18:43:47 UTC (rev 10964)
+++ trunk/libgphoto2/po/it.po	2008-02-24 20:16:09 UTC (rev 10965)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: libgphoto2 2.4.0\n"
 "Report-Msgid-Bugs-To: gphoto-devel@..."
-"POT-Creation-Date: 2008-02-11 10:55+0100\n"
+"POT-Creation-Date: 2008-02-24 21:16+0100\n"
 "PO-Revision-Date: 2007-10-30 18:19+0000\n"
 "Last-Translator: Marco Colombo <m.colombo@..."
 "Language-Team: Italian <tp@..."
@@ -496,7 +496,7 @@
 #: camlibs/canon/library.c:1626 camlibs/canon/library.c:1627
 #: camlibs/canon/library.c:1665 camlibs/canon/library.c:1666
 #: camlibs/canon/library.c:1699 camlibs/canon/library.c:1700
-#: camlibs/ptp2/library.c:1863 camlibs/ptp2/library.c:1865
+#: camlibs/ptp2/library.c:1882 camlibs/ptp2/library.c:1884
 #: camlibs/ptp2/ptp.c:3693
 msgid "Unknown"
 msgstr "Sconosciuto"
@@ -1994,7 +1994,7 @@
 
 #: camlibs/kodak/dc210/dc210.c:261 camlibs/kodak/dc210/dc210.c:269
 #: camlibs/ptp2/config.c:1646 camlibs/ptp2/config.c:2282
-#: camlibs/ptp2/library.c:2157 camlibs/ptp2/library.c:2161
+#: camlibs/ptp2/library.c:2176 camlibs/ptp2/library.c:2180
 #: camlibs/ptp2/ptp.c:3679 camlibs/ricoh/library.c:347
 msgid "None"
 msgstr "Nessuno"
@@ -2416,7 +2416,7 @@
 "\n"
 "Domande e commenti sono apprezzati."
 
-#: camlibs/kodak/ez200/ez200.c:198
+#: camlibs/kodak/ez200/ez200.c:177
 #, c-format
 msgid ""
 "Your USB camera is a Kodak EZ200.\n"
@@ -2425,7 +2425,7 @@
 "La fotocamera USB è una Kodak EZ200.\n"
 "Numero di immagini: %i\n"
 
-#: camlibs/kodak/ez200/ez200.c:206
+#: camlibs/kodak/ez200/ez200.c:185
 msgid ""
 "Kodak EZ200 driver\n"
 "Bucas Jean-Francois <jfbucas@..."
@@ -3356,7 +3356,7 @@
 "possibile da caricare è %i byte."
 
 #: camlibs/panasonic/dc1000.c:471 camlibs/panasonic/dc1580.c:591
-#: camlibs/ricoh/ricoh.c:837
+#: camlibs/ricoh/ricoh.c:843
 msgid "Uploading..."
 msgstr "Caricamento in corso..."
 
@@ -4239,8 +4239,8 @@
 msgid "Long distance"
 msgstr "Lunga distanza"
 
-#: camlibs/ptp2/config.c:1671 camlibs/ptp2/library.c:2166
-#: camlibs/ptp2/library.c:2180 camlibs/ptp2/ptp.c:3898
+#: camlibs/ptp2/config.c:1671 camlibs/ptp2/library.c:2185
+#: camlibs/ptp2/library.c:2199 camlibs/ptp2/ptp.c:3898
 msgid "Undefined"
 msgstr "Non definito"
 
@@ -4942,7 +4942,7 @@
 msgid "PTP Protocol error, response expected"
 msgstr "PTP Errore di protocollo, risposta attesa"
 
-#: camlibs/ptp2/library.c:1081
+#: camlibs/ptp2/library.c:1083
 msgid ""
 "PTP2 driver\n"
 "(c) 2001-2005 by Mariusz Woloszyn <emsi@..."
@@ -4956,76 +4956,76 @@
 "Enjoy!"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1158
+#: camlibs/ptp2/library.c:1160
 msgid "Sorry, your Canon camera does not support Canon Viewfinder mode"
 msgstr "Questa fotocamera Canon non gestisce la modalità Canon Viewfinder"
 
-#: camlibs/ptp2/library.c:1164
+#: camlibs/ptp2/library.c:1166
 #, c-format
 msgid "Canon enable viewfinder failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1170
+#: camlibs/ptp2/library.c:1172
 #, c-format
 msgid "Canon get viewfinder image failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1181
+#: camlibs/ptp2/library.c:1183
 #, c-format
 msgid "Canon disable viewfinder failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1297
+#: camlibs/ptp2/library.c:1299
 msgid "Sorry, your camera does not support Nikon capture"
 msgstr "Questa fotocamera non gestisce la cattura Nikon"
 
-#: camlibs/ptp2/library.c:1383
+#: camlibs/ptp2/library.c:1385
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon EOS Capture"
 msgstr "Questa fotocamera Canon non gestisce la cattura Canon"
 
-#: camlibs/ptp2/library.c:1389
+#: camlibs/ptp2/library.c:1391
 #, fuzzy, c-format
-msgid "Canon EOS Capture failed: %d"
+msgid "Canon EOS Capture failed: %x"
 msgstr "Canon Capture non riuscito: %d"
 
-#: camlibs/ptp2/library.c:1397
+#: camlibs/ptp2/library.c:1399
 #, fuzzy, c-format
-msgid "Canon EOS Get Changes failed: %d"
+msgid "Canon EOS Get Changes failed: %x"
 msgstr "Canon Capture non riuscito: %d"
 
 # FIXME
-#: camlibs/ptp2/library.c:1477
+#: camlibs/ptp2/library.c:1481
 msgid "Sorry, your Canon camera does not support Canon Capture initiation"
 msgstr "Questa fotocamera Canon non gestisce Canon Capture initiation"
 
-#: camlibs/ptp2/library.c:1488
+#: camlibs/ptp2/library.c:1492
 msgid "Sorry, initializing your camera did not work. Please report this."
 msgstr ""
 
-#: camlibs/ptp2/library.c:1507
-#, c-format
-msgid "Canon Capture failed: %d"
+#: camlibs/ptp2/library.c:1514
+#, fuzzy, c-format
+msgid "Canon Capture failed: %x"
 msgstr "Canon Capture non riuscito: %d"
 
-#: camlibs/ptp2/library.c:1611
+#: camlibs/ptp2/library.c:1630
 msgid "Sorry, your camera does not support generic capture"
 msgstr "Questa fotocamera non gestisce la cattura generica"
 
-#: camlibs/ptp2/library.c:1687
+#: camlibs/ptp2/library.c:1706
 #, c-format
 msgid "No event received, error %x."
 msgstr "Nessun evento ricevuto, errore %x."
 
-#: camlibs/ptp2/library.c:1861
+#: camlibs/ptp2/library.c:1880
 msgid "read only"
 msgstr "solo lettura"
 
-#: camlibs/ptp2/library.c:1862
+#: camlibs/ptp2/library.c:1881
 msgid "readwrite"
 msgstr "lettura scrittura"
 
-#: camlibs/ptp2/library.c:1996
+#: camlibs/ptp2/library.c:2015
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -5040,7 +5040,7 @@
 "Estensione ID vendor: 0x%08x\n"
 "Descrizione estensione vendor: %s\n"
 
-#: camlibs/ptp2/library.c:2014
+#: camlibs/ptp2/library.c:2033
 #, c-format
 msgid ""
 "\n"
@@ -5049,22 +5049,22 @@
 "\n"
 "Formati di cattura: "
 
-#: camlibs/ptp2/library.c:2028
+#: camlibs/ptp2/library.c:2047
 #, c-format
 msgid "Display Formats: "
 msgstr "Formati di visualizzazione: "
 
-#: camlibs/ptp2/library.c:2044
+#: camlibs/ptp2/library.c:2063
 #, c-format
 msgid "Supported MTP Object Properties:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2060
+#: camlibs/ptp2/library.c:2079
 #, c-format
 msgid " PTP error %04x on query"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2077
+#: camlibs/ptp2/library.c:2096
 #, c-format
 msgid ""
 "\n"
@@ -5073,170 +5073,170 @@
 "\n"
 "Capacità dispositivo:\n"
 
-#: camlibs/ptp2/library.c:2081
+#: camlibs/ptp2/library.c:2100
 #, c-format
 msgid "\tFile Download, "
 msgstr "\tScaricamento file, "
 
-#: camlibs/ptp2/library.c:2084
+#: camlibs/ptp2/library.c:2103
 #, c-format
 msgid "File Deletion, "
 msgstr "Eliminazione file, "
 
-#: camlibs/ptp2/library.c:2086
+#: camlibs/ptp2/library.c:2105
 #, c-format
 msgid "No File Deletion, "
 msgstr "Nessuna eliminazione file, "
 
-#: camlibs/ptp2/library.c:2090
+#: camlibs/ptp2/library.c:2109
 #, c-format
 msgid "File Upload\n"
 msgstr "Caricamento del file\n"
 
-#: camlibs/ptp2/library.c:2092
+#: camlibs/ptp2/library.c:2111
 #, c-format
 msgid "No File Upload\n"
 msgstr "Nessun caricamento file\n"
 
-#: camlibs/ptp2/library.c:2097
+#: camlibs/ptp2/library.c:2116
 #, c-format
 msgid "\tGeneric Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:2099
+#: camlibs/ptp2/library.c:2118
 #, c-format
 msgid "\tNo Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:2102
+#: camlibs/ptp2/library.c:2121
 #, fuzzy, c-format
 msgid "Open Capture, "
 msgstr "Cattura"
 
-#: camlibs/ptp2/library.c:2104
+#: camlibs/ptp2/library.c:2123
 #, c-format
 msgid "No Open Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:2110
+#: camlibs/ptp2/library.c:2129
 #, c-format
 msgid "Canon Capture\n"
 msgstr "Cattura Canon\n"
 
-#: camlibs/ptp2/library.c:2114
+#: camlibs/ptp2/library.c:2133
 #, c-format
 msgid "Nikon Capture\n"
 msgstr "Cattura Nikon\n"
 
-#: camlibs/ptp2/library.c:2116
+#: camlibs/ptp2/library.c:2135
 #, c-format
 msgid "No vendor specific capture\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2124
+#: camlibs/ptp2/library.c:2143
 #, c-format
 msgid "\tNikon Wifi support\n"
 msgstr "\tGestione Nikon Wifi\n"
 
-#: camlibs/ptp2/library.c:2130
+#: camlibs/ptp2/library.c:2149
 #, c-format
 msgid "\tCanon Wifi support\n"
 msgstr "\tGestione Canon Wifi\n"
 
-#: camlibs/ptp2/library.c:2141
+#: camlibs/ptp2/library.c:2160
 #, c-format
 msgid ""
 "\n"
 "Storage Devices Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2156
+#: camlibs/ptp2/library.c:2175
 #, c-format
 msgid "\tStorageDescription: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2160
+#: camlibs/ptp2/library.c:2179
 #, c-format
 msgid "\tVolumeLabel: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2167
+#: camlibs/ptp2/library.c:2186
 msgid "Builtin ROM"
 msgstr "ROM interna"
 
-#: camlibs/ptp2/library.c:2168
+#: camlibs/ptp2/library.c:2187
 msgid "Removable ROM"
 msgstr "ROM rimovibile"
 
-#: camlibs/ptp2/library.c:2169
+#: camlibs/ptp2/library.c:2188
 msgid "Builtin RAM"
 msgstr "RAM interna"
 
-#: camlibs/ptp2/library.c:2170
+#: camlibs/ptp2/library.c:2189
 msgid "Removable RAM (memory card)"
 msgstr "RAM rimovibile (scheda di memoria)"
 
-#: camlibs/ptp2/library.c:2172 camlibs/ptp2/library.c:2185
-#: camlibs/ptp2/library.c:2197
+#: camlibs/ptp2/library.c:2191 camlibs/ptp2/library.c:2204
+#: camlibs/ptp2/library.c:2216
 #, c-format
 msgid "Unknown: 0x%04x\n"
 msgstr "Sconosciuto (0x%04x)\n"
 
-#: camlibs/ptp2/library.c:2176
+#: camlibs/ptp2/library.c:2195
 #, c-format
 msgid "\tStorage Type: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2181
+#: camlibs/ptp2/library.c:2200
 msgid "Generic Flat"
 msgstr "Generico piatto"
 
-#: camlibs/ptp2/library.c:2182
+#: camlibs/ptp2/library.c:2201
 msgid "Generic Hierarchical"
 msgstr "Generico gerarchico"
 
-#: camlibs/ptp2/library.c:2183
+#: camlibs/ptp2/library.c:2202
 msgid "Digital Camera Layout (DCIM)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2189
+#: camlibs/ptp2/library.c:2208
 #, c-format
 msgid "\tFilesystemtype: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2193
+#: camlibs/ptp2/library.c:2212
 msgid "Read-Write"
 msgstr "Lettura-Scrittura"
 
-#: camlibs/ptp2/library.c:2194
+#: camlibs/ptp2/library.c:2213
 msgid "Read-Only"
 msgstr "Solo Lettura"
 
-#: camlibs/ptp2/library.c:2195
+#: camlibs/ptp2/library.c:2214
 msgid "Read Only with Object deletion"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2201
+#: camlibs/ptp2/library.c:2220
 #, c-format
 msgid "\tAccess Capability: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2203
+#: camlibs/ptp2/library.c:2222
 #, c-format
 msgid "\tMaximum Capability: %llu (%lu MB)\n"
 msgstr "\tCapacità massima: %llu (%lu MB)\n"
 
-#: camlibs/ptp2/library.c:2208
+#: camlibs/ptp2/library.c:2227
 #, c-format
 msgid "\tFree Space (Bytes): %llu (%lu MB)\n"
 msgstr "\tSpazio libero (byte): %llu (%lu MB)\n"
 
-#: camlibs/ptp2/library.c:2213
+#: camlibs/ptp2/library.c:2232
 #, c-format
 msgid "\tFree Space (Images): %d\n"
 msgstr "\tSpazio libero (immagini): %d\n"
 
-#: camlibs/ptp2/library.c:2221
+#: camlibs/ptp2/library.c:2240
 #, c-format
 msgid ""
 "\n"
@@ -5245,25 +5245,25 @@
 "\n"
 "Sommario proprietà dispositivo:\n"
 
-#: camlibs/ptp2/library.c:2247
+#: camlibs/ptp2/library.c:2266
 #, c-format
 msgid " not read out.\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3214 camlibs/ptp2/library.c:3218
+#: camlibs/ptp2/library.c:3233 camlibs/ptp2/library.c:3237
 #, c-format
 msgid "File '%s/%s' does not exist."
 msgstr "Il file \"%s/%s\" non esiste."
 
-#: camlibs/ptp2/library.c:3224
+#: camlibs/ptp2/library.c:3243
 msgid "Metadata only supported for MTP devices."
 msgstr ""
 
-#: camlibs/ptp2/library.c:3913
+#: camlibs/ptp2/library.c:3932
 msgid "Initializing Camera"
 msgstr "Inizializzazione fotocamera"
 
-#: camlibs/ptp2/library.c:4081
+#: camlibs/ptp2/library.c:4100
 #, fuzzy, c-format
 msgid ""
 "Currently, PTP is only implemented for USB and PTP/IP cameras currently, "
@@ -6807,7 +6807,7 @@
 msgid "Bad characters (0x%x, 0x%x). Please contact %s."
 msgstr "Carattere non valido (0x%x, 0x%x). Contattare %s."
 
-#: camlibs/ricoh/ricoh.c:256 camlibs/ricoh/ricoh.c:325
+#: camlibs/ricoh/ricoh.c:256 camlibs/ricoh/ricoh.c:331
 #, c-format
 msgid "Camera busy. If the problem persists, please contact %s."
 msgstr "Fotocamera occupata. Se il problema persiste, contattare %s."
@@ -6822,22 +6822,22 @@
 msgid "Communication error even after 2 retries. Please contact %s."
 msgstr "Errore di comunicazione anche dopo 2 tentativi. Contattare %s."
 
-#: camlibs/ricoh/ricoh.c:339
+#: camlibs/ricoh/ricoh.c:345
 #, c-format
 msgid "Camera is in wrong mode. Please contact %s."
 msgstr "La fotocamera è in una modalità errata. Contattare %s."
 
-#: camlibs/ricoh/ricoh.c:348
+#: camlibs/ricoh/ricoh.c:354
 #, c-format
 msgid "Camera did not accept the parameters. Please contact %s."
 msgstr "La fotocamera non ha accettato i parametri. Contattare %s."
 
-#: camlibs/ricoh/ricoh.c:354
+#: camlibs/ricoh/ricoh.c:360
 #, c-format
 msgid "An unknown error occurred. Please contact %s."
 msgstr "Si è verificato un errore sconosciuto. Contattare %s."
 
-#: camlibs/ricoh/ricoh.c:816
+#: camlibs/ricoh/ricoh.c:822
 #, c-format
 msgid ""
 "The filename's length must not exceed 12 characters ('%s' has %i characters)."

Modified: trunk/libgphoto2/po/ja.po
===================================================================
--- trunk/libgphoto2/po/ja.po	2008-02-24 18:43:47 UTC (rev 10964)
+++ trunk/libgphoto2/po/ja.po	2008-02-24 20:16:09 UTC (rev 10965)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: libgphoto2 2.1.5head\n"
 "Report-Msgid-Bugs-To: gphoto-devel@..."
-"POT-Creation-Date: 2008-02-11 10:55+0100\n"
+"POT-Creation-Date: 2008-02-24 21:16+0100\n"
 "PO-Revision-Date: 2004-12-21 00:59+0900\n"
 "Last-Translator: Takeshi AIHANA <aihana@..."
 "Language-Team: Japanese <gnome-translation@..."
@@ -509,7 +509,7 @@
 #: camlibs/canon/library.c:1626 camlibs/canon/library.c:1627
 #: camlibs/canon/library.c:1665 camlibs/canon/library.c:1666
 #: camlibs/canon/library.c:1699 camlibs/canon/library.c:1700
-#: camlibs/ptp2/library.c:1863 camlibs/ptp2/library.c:1865
+#: camlibs/ptp2/library.c:1882 camlibs/ptp2/library.c:1884
 #: camlibs/ptp2/ptp.c:3693
 msgid "Unknown"
 msgstr "不明"
@@ -2097,7 +2097,7 @@
 
 #: camlibs/kodak/dc210/dc210.c:261 camlibs/kodak/dc210/dc210.c:269
 #: camlibs/ptp2/config.c:1646 camlibs/ptp2/config.c:2282
-#: camlibs/ptp2/library.c:2157 camlibs/ptp2/library.c:2161
+#: camlibs/ptp2/library.c:2176 camlibs/ptp2/library.c:2180
 #: camlibs/ptp2/ptp.c:3679 camlibs/ricoh/library.c:347
 msgid "None"
 msgstr "なし"
@@ -2524,7 +2524,7 @@
 "\n"
 "質問やコメントは大歓迎です。"
 
-#: camlibs/kodak/ez200/ez200.c:198
+#: camlibs/kodak/ez200/ez200.c:177
 #, c-format
 msgid ""
 "Your USB camera is a Kodak EZ200.\n"
@@ -2533,7 +2533,7 @@
 "お使いの USB カメラは Kodak EZ200 です。\n"
 "写真の合計 = %i\n"
 
-#: camlibs/kodak/ez200/ez200.c:206
+#: camlibs/kodak/ez200/ez200.c:185
 msgid ""
 "Kodak EZ200 driver\n"
 "Bucas Jean-Francois <jfbucas@..."
@@ -3505,7 +3505,7 @@
 "ファイルサイズは %ld バイトです。アップロード可能なサイズは %i バイトです。"
 
 #: camlibs/panasonic/dc1000.c:471 camlibs/panasonic/dc1580.c:591
-#: camlibs/ricoh/ricoh.c:837
+#: camlibs/ricoh/ricoh.c:843
 msgid "Uploading..."
 msgstr "アップロード中..."
 
@@ -4501,8 +4501,8 @@
 msgid "Long distance"
 msgstr "フォーカスの距離"
 
-#: camlibs/ptp2/config.c:1671 camlibs/ptp2/library.c:2166
-#: camlibs/ptp2/library.c:2180 camlibs/ptp2/ptp.c:3898
+#: camlibs/ptp2/config.c:1671 camlibs/ptp2/library.c:2185
+#: camlibs/ptp2/library.c:2199 camlibs/ptp2/ptp.c:3898
 #, fuzzy
 msgid "Undefined"
 msgstr "PTP の不明なエラー"
@@ -5258,7 +5258,7 @@
 msgid "PTP Protocol error, response expected"
 msgstr "PTP プロトコル・エラー (期待値: 応答)"
 
-#: camlibs/ptp2/library.c:1081
+#: camlibs/ptp2/library.c:1083
 msgid ""
 "PTP2 driver\n"
 "(c) 2001-2005 by Mariusz Woloszyn <emsi@..."
@@ -5272,83 +5272,83 @@
 "Enjoy!"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1158
+#: camlibs/ptp2/library.c:1160
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon Viewfinder mode"
 msgstr ""
 "すみません、お使いのカメラは汎用キャプチャ機能をサポートしておりません。"
 
-#: camlibs/ptp2/library.c:1164
+#: camlibs/ptp2/library.c:1166
 #, c-format
 msgid "Canon enable viewfinder failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1170
+#: camlibs/ptp2/library.c:1172
 #, c-format
 msgid "Canon get viewfinder image failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1181
+#: camlibs/ptp2/library.c:1183
 #, c-format
 msgid "Canon disable viewfinder failed: %d"
 msgstr ""
 
-#: camlibs/ptp2/library.c:1297
+#: camlibs/ptp2/library.c:1299
 #, fuzzy
 msgid "Sorry, your camera does not support Nikon capture"
 msgstr ""
 "すみません、お使いのカメラは汎用キャプチャ機能をサポートしておりません。"
 
-#: camlibs/ptp2/library.c:1383
+#: camlibs/ptp2/library.c:1385
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon EOS Capture"
 msgstr ""
 "すみません、お使いのカメラは汎用キャプチャ機能をサポートしておりません。"
 
-#: camlibs/ptp2/library.c:1389
+#: camlibs/ptp2/library.c:1391
 #, fuzzy, c-format
-msgid "Canon EOS Capture failed: %d"
+msgid "Canon EOS Capture failed: %x"
 msgstr "キャプチャ"
 
-#: camlibs/ptp2/library.c:1397
-#, c-format
-msgid "Canon EOS Get Changes failed: %d"
-msgstr ""
+#: camlibs/ptp2/library.c:1399
+#, fuzzy, c-format
+msgid "Canon EOS Get Changes failed: %x"
+msgstr "キャプチャ"
 
-#: camlibs/ptp2/library.c:1477
+#: camlibs/ptp2/library.c:1481
 #, fuzzy
 msgid "Sorry, your Canon camera does not support Canon Capture initiation"
 msgstr ""
 "すみません、お使いのカメラは汎用キャプチャ機能をサポートしておりません。"
 
-#: camlibs/ptp2/library.c:1488
+#: camlibs/ptp2/library.c:1492
 msgid "Sorry, initializing your camera did not work. Please report this."
 msgstr ""
 
-#: camlibs/ptp2/library.c:1507
-#, c-format
-msgid "Canon Capture failed: %d"
-msgstr ""
+#: camlibs/ptp2/library.c:1514
+#, fuzzy, c-format
+msgid "Canon Capture failed: %x"
+msgstr "キャプチャ"
 
-#: camlibs/ptp2/library.c:1611
+#: camlibs/ptp2/library.c:1630
 msgid "Sorry, your camera does not support generic capture"
 msgstr ""
 "すみません、お使いのカメラは汎用キャプチャ機能をサポートしておりません。"
 
-#: camlibs/ptp2/library.c:1687
+#: camlibs/ptp2/library.c:1706
 #, c-format
 msgid "No event received, error %x."
 msgstr ""
 
-#: camlibs/ptp2/library.c:1861
+#: camlibs/ptp2/library.c:1880
 msgid "read only"
 msgstr "読み込みのみ"
 
-#: camlibs/ptp2/library.c:1862
+#: camlibs/ptp2/library.c:1881
 msgid "readwrite"
 msgstr "読み書き"
 
-#: camlibs/ptp2/library.c:1996
+#: camlibs/ptp2/library.c:2015
 #, c-format
 msgid ""
 "Model: %s\n"
@@ -5363,227 +5363,227 @@
 "ベンダの拡張 ID: 0x%08x\n"
 "ベンダの拡張情報: %s\n"
 
-#: camlibs/ptp2/library.c:2014
+#: camlibs/ptp2/library.c:2033
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Capture Formats: "
 msgstr "データ形式"
 
-#: camlibs/ptp2/library.c:2028
+#: camlibs/ptp2/library.c:2047
 #, fuzzy, c-format
 msgid "Display Formats: "
 msgstr "データ形式"
 
-#: camlibs/ptp2/library.c:2044
+#: camlibs/ptp2/library.c:2063
 #, c-format
 msgid "Supported MTP Object Properties:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2060
+#: camlibs/ptp2/library.c:2079
 #, c-format
 msgid " PTP error %04x on query"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2077
+#: camlibs/ptp2/library.c:2096
 #, c-format
 msgid ""
 "\n"
 "Device Capabilities:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2081
+#: camlibs/ptp2/library.c:2100
 #, c-format
 msgid "\tFile Download, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:2084
+#: camlibs/ptp2/library.c:2103
 #, fuzzy, c-format
 msgid "File Deletion, "
 msgstr "ファイルの解像度"
 
-#: camlibs/ptp2/library.c:2086
+#: camlibs/ptp2/library.c:2105
 #, fuzzy, c-format
 msgid "No File Deletion, "
 msgstr "ファイルの解像度"
 
-#: camlibs/ptp2/library.c:2090
+#: camlibs/ptp2/library.c:2109
 #, fuzzy, c-format
 msgid "File Upload\n"
 msgstr "ファイルのアップロードに失敗しました"
 
-#: camlibs/ptp2/library.c:2092
+#: camlibs/ptp2/library.c:2111
 #, c-format
 msgid "No File Upload\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2097
+#: camlibs/ptp2/library.c:2116
 #, c-format
 msgid "\tGeneric Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:2099
+#: camlibs/ptp2/library.c:2118
 #, c-format
 msgid "\tNo Image Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:2102
+#: camlibs/ptp2/library.c:2121
 #, fuzzy, c-format
 msgid "Open Capture, "
 msgstr "キャプチャ"
 
-#: camlibs/ptp2/library.c:2104
+#: camlibs/ptp2/library.c:2123
 #, c-format
 msgid "No Open Capture, "
 msgstr ""
 
-#: camlibs/ptp2/library.c:2110
+#: camlibs/ptp2/library.c:2129
 #, fuzzy, c-format
 msgid "Canon Capture\n"
 msgstr "キャプチャ"
 
-#: camlibs/ptp2/library.c:2114
+#: camlibs/ptp2/library.c:2133
 #, fuzzy, c-format
 msgid "Nikon Capture\n"
 msgstr "キャプチャ"
 
-#: camlibs/ptp2/library.c:2116
+#: camlibs/ptp2/library.c:2135
 #, c-format
 msgid "No vendor specific capture\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2124
+#: camlibs/ptp2/library.c:2143
 #, c-format
 msgid "\tNikon Wifi support\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2130
+#: camlibs/ptp2/library.c:2149
 #, fuzzy, c-format
 msgid "\tCanon Wifi support\n"
 msgstr "カードをサポートしていません。"
 
-#: camlibs/ptp2/library.c:2141
+#: camlibs/ptp2/library.c:2160
 #, c-format
 msgid ""
 "\n"
 "Storage Devices Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2156
+#: camlibs/ptp2/library.c:2175
 #, c-format
 msgid "\tStorageDescription: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2160
+#: camlibs/ptp2/library.c:2179
 #, c-format
 msgid "\tVolumeLabel: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2167
+#: camlibs/ptp2/library.c:2186
 msgid "Builtin ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2168
+#: camlibs/ptp2/library.c:2187
 msgid "Removable ROM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2169
+#: camlibs/ptp2/library.c:2188
 msgid "Builtin RAM"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2170
+#: camlibs/ptp2/library.c:2189
 msgid "Removable RAM (memory card)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2172 camlibs/ptp2/library.c:2185
-#: camlibs/ptp2/library.c:2197
+#: camlibs/ptp2/library.c:2191 camlibs/ptp2/library.c:2204
+#: camlibs/ptp2/library.c:2216
 #, fuzzy, c-format
 msgid "Unknown: 0x%04x\n"
 msgstr "不明 (0x%02x)"
 
-#: camlibs/ptp2/library.c:2176
+#: camlibs/ptp2/library.c:2195
 #, c-format
 msgid "\tStorage Type: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2181
+#: camlibs/ptp2/library.c:2200
 #, fuzzy
 msgid "Generic Flat"
 msgstr "全般"
 
-#: camlibs/ptp2/library.c:2182
+#: camlibs/ptp2/library.c:2201
 msgid "Generic Hierarchical"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2183
+#: camlibs/ptp2/library.c:2202
 msgid "Digital Camera Layout (DCIM)"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2189
+#: camlibs/ptp2/library.c:2208
 #, c-format
 msgid "\tFilesystemtype: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2193
+#: camlibs/ptp2/library.c:2212
 #, fuzzy
 msgid "Read-Write"
 msgstr "読み書き"
 
-#: camlibs/ptp2/library.c:2194
+#: camlibs/ptp2/library.c:2213
 #, fuzzy
 msgid "Read-Only"
 msgstr "準備 OK"
 
-#: camlibs/ptp2/library.c:2195
+#: camlibs/ptp2/library.c:2214
 msgid "Read Only with Object deletion"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2201
+#: camlibs/ptp2/library.c:2220
 #, c-format
 msgid "\tAccess Capability: %s\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2203
+#: camlibs/ptp2/library.c:2222
 #, c-format
 msgid "\tMaximum Capability: %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2208
+#: camlibs/ptp2/library.c:2227
 #, c-format
 msgid "\tFree Space (Bytes): %llu (%lu MB)\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2213
+#: camlibs/ptp2/library.c:2232
 #, fuzzy, c-format
 msgid "\tFree Space (Images): %d\n"
 msgstr "写真の数: %d\n"
 
-#: camlibs/ptp2/library.c:2221
+#: camlibs/ptp2/library.c:2240
 #, c-format
 msgid ""
 "\n"
 "Device Property Summary:\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:2247
+#: camlibs/ptp2/library.c:2266
 #, c-format
 msgid " not read out.\n"
 msgstr ""
 
-#: camlibs/ptp2/library.c:3214 camlibs/ptp2/library.c:3218
+#: camlibs/ptp2/library.c:3233 camlibs/ptp2/library.c:3237
 #, c-format
 msgid "File '%s/%s' does not exist."
 msgstr ""
 
-#: camlibs/ptp2/library.c:3224
+#: camlibs/ptp2/library.c:3243
 msgid "Metadata only supported for MTP devices."
 msgstr ""
 
-#: camlibs/ptp2/library.c:3913
+#: camlibs/ptp2/library.c:3932
 msgid "Initializing Camera"
 msgstr "カメラの初期化中..."
 
-#: camlibs/ptp2/library.c:4081
+#: camlibs/ptp2/library.c:4100
 #, fuzzy, c-format
 msgid ""
 "Currently, PTP is only implemented for USB and PTP/IP cameras currently, "
@@ -7197,7 +7197,7 @@
 msgid "Bad characters (0x%x, 0x%x). Please contact %s."
 msgstr "おかしな文字 (0x%x, 0x%x) です。%s に連絡して下さい。"
 
-#: camlibs/ricoh/ricoh.c:256 camlibs/ricoh/ricoh.c:325
+#: camlibs/ricoh/ricoh.c:256 camlibs/ricoh/ricoh.c:331
 #, c-format
 msgid "Camera busy. If the problem persists, please contact %s."
 msgstr "カメラがビジーです。この状態が長く続いた場合は %s に連絡して下さい。"
@@ -7212,22 +7212,22 @@
 msgid "Communication error even after 2 retries. Please contact %s."
 msgstr "二回トライしましたが通信エラーです。%s に連絡して下さい。"
 
-#: camlibs/ricoh/ricoh.c:339
+#: camlibs/ricoh/ricoh.c:345
 #, c-format
 msgid "Camera is in wrong mode. Please contact %s."
 msgstr "カメラが間違ったモードにあります。%s に連絡して下さい。"
 
-#: camlibs/ricoh/ricoh.c:348
+#: camlibs/ricoh/ricoh.c:354
 #, c-format
 msgid "Camera did not accept the parameters. Please contact %s."
 msgstr "カメラが引数を受け取りません。%s に連絡して下さい。"
 
-#: camlibs/ricoh/ricoh.c:354
+#: camlibs/ricoh/ricoh.c:360
 #, c-format
 msgid "An unknown error occurred. Please contact %s."
 msgstr "不明なエラーが発生しました。%s に連絡して下さい。"
 
-#: camlibs/ricoh/ricoh.c:816
+#: camlibs/ricoh/ricoh.c:822
 #, c-format
 msgid ""
 "The filename's length must not exceed 12 characters ('%s' has %i characters)."

Modified: trunk/libgphoto2/po/nb.po
===================================================================
--- trunk/libgphoto2/po/nb.po	2008-02-24 18:43:47 UTC (rev 10964)
+++ trunk/libgphoto2/po/nb.po	2008-02-24 20:16:09 UTC (rev 10965)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: gphoto 0.4.3\n"
 "Report-Msgid-Bugs-To: gphoto-devel@..."
-"POT-Creation-Date: 2008-02-11 10:55+0100\n"
+"POT-Creation-Date: 2008-02-24 21:16+0100\n"
 "PO-Revision-Date: 2000-04-11 10:12+02:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@..."
 "Language-Team: Norwegian <i18n-nb@..."

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[gphoto-cvs] SF.net SVN: gphoto: [10958] trunk/libgphoto2/camlibs/ptp2/cameras/ canon-digital-ixus2-cap.txt

From: <marcusmeissner@us...> - 2008-02-21 07:46

Revision: 10958
          http://gphoto.svn.sourceforge.net/gphoto/?rev=10958&view=rev
Author:   marcusmeissner
Date:     2008-02-20 23:46:13 -0800 (Wed, 20 Feb 2008)

Log Message:
-----------
updated comments

Modified Paths:
--------------
    trunk/libgphoto2/camlibs/ptp2/cameras/canon-digital-ixus2-cap.txt

Modified: trunk/libgphoto2/camlibs/ptp2/cameras/canon-digital-ixus2-cap.txt
===================================================================
--- trunk/libgphoto2/camlibs/ptp2/cameras/canon-digital-ixus2-cap.txt	2008-02-19 22:20:36 UTC (rev 10957)
+++ trunk/libgphoto2/camlibs/ptp2/cameras/canon-digital-ixus2-cap.txt	2008-02-21 07:46:13 UTC (rev 10958)
@@ -27,34 +27,34 @@
   0x1015	GetDevicePropValue
   0x1016	SetDevicePropValue
   0x101b	GetPartialObject
-  0x9001	GetObjectSize
-  0x9002
-  0x9003
-  0x9006
-  0x9008	StartShootingMode
-  0x9009	EndShootingMode
-  0x900a
+  0x9001	GetPartialObjectInfo
+  0x9002	SetObjectArchive
+  0x9003	KeepDeviceOn
+  0x9006	GetObjectHandleByName
+  0x9008	InitiateReleaseControl
+  0x9009	TerminateReleaseControl
+  0x900a        TerminatePlaybackMode
   0x900b	ViewFinderOn
   0x900c	ViewFinderOff
-  0x900d	ReflectChanges
-  0x900e
-  0x900f
-  0x9010	ThemeDownload
-  0x9011	ThemeUpload
-  0x9012
+  0x900d	DoAeAfAwb
+  0x900e	GetCustomizeSpec
+  0x900f	GetCustomizeItemInfo
+  0x9010	GetCustomizeData
+  0x9011	SetCustomizeData
+  0x9012	GetCaptureStatus
   0x9013	CheckEvent
   0x9014	FocusLock
   0x9015	FocusUnlock
-  0x9018	
-  0x9019
+  0x9018	AskAboutPcEvf
+  0x9019	SendPartialObject
   0x901a	InitiateCaptureIntoMemory
-  0x901b	GetPartialObject
-  0x901c
+  0x901b	GetPartialObjectEx
+  0x901c	SetObjectTime
   0x901d	GetViewFinderImage
-  0x901e	
-  0x901f
+  0x901e	GetObjectAttributes
+  0x901f	ChangeUSBProtocol
   0x9020	GetChanges
-  0x9021	GetFolderEntries
+  0x9021	GetObjectInfoEx
 Events Supported:
   0x4001	CancelTransaction
   0x4002	ObjectAdded


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[gphoto-cvs] SF.net SVN: gphoto: [10963] trunk/libgphoto2/camlibs/ptp2/cameras/ canon-digital-ixus2-cap.txt

From: <marcusmeissner@us...> - 2008-02-24 18:41

Revision: 10963
          http://gphoto.svn.sourceforge.net/gphoto/?rev=10963&view=rev
Author:   marcusmeissner
Date:     2008-02-24 10:40:53 -0800 (Sun, 24 Feb 2008)

Log Message:
-----------
updated with current names

Modified Paths:
--------------
    trunk/libgphoto2/camlibs/ptp2/cameras/canon-digital-ixus2-cap.txt

Modified: trunk/libgphoto2/camlibs/ptp2/cameras/canon-digital-ixus2-cap.txt
===================================================================
--- trunk/libgphoto2/camlibs/ptp2/cameras/canon-digital-ixus2-cap.txt	2008-02-24 18:28:04 UTC (rev 10962)
+++ trunk/libgphoto2/camlibs/ptp2/cameras/canon-digital-ixus2-cap.txt	2008-02-24 18:40:53 UTC (rev 10963)
@@ -147,7 +147,7 @@
 Vendor extension description: (null)
 
 Capture Formats: JPEG
-Display Formats: Association/Directory, JPEG, MS AVI, MS Wave, Unknown(b101), Script
+Display Formats: Association/Directory, JPEG, MS AVI, MS Wave, CRW, Script
 
 Device Capabilities:
 	File Download, File Deletion, File Upload
@@ -161,8 +161,8 @@
 	Filesystemtype: Digital Camera Layout (DCIM)
 	Access Capability: Read-Write
 	Maximum Capability: 14696448 (14 MB)
-	Free Space (Bytes): 12894208 (12 MB)
-	Free Space (Images): 13
+	Free Space (Bytes): 1064960 (1 MB)
+	Free Space (Images): 0
 store_80000001:
 	StorageDescription: None
 	VolumeLabel: V
@@ -176,7 +176,7 @@
 
 Device Property Summary:
 Beep Mode(0xd001):(readwrite) (type=0x2) Enumeration [0,1] value: 1
-Battery Kind(0xd002):(read only) (type=0x4) Enumeration [0,1,2,3,4,5] value: 2
+Battery Type(0xd002):(read only) (type=0x4) Enumeration [0,1,2,3,4,5] value: 2
 Battery Mode(0xd003):(read only) (type=0x6) Enumeration [0,1,2,3] value: 1
 Camera Mode(0xd005):(read only) (type=0x2) 32
 Image Quality(0xd006):(readwrite) (type=0x2) Enumeration [2,3,5] value: 3
@@ -198,7 +198,7 @@
 Sharpness(0xd019):(readwrite) (type=0x1) Enumeration [0] value: 0
 ISO Speed(0xd01c):(readwrite) (type=0x4) Enumeration [64,72,80,88,0] value: 64
 Aperture(0xd01d):(readwrite) (type=0x4) Enumeration [] value: 32
-ShutterSpeed(0xd01e):(readwrite) (type=0x4) Enumeration [] value: 112
+Shutter Speed(0xd01e):(readwrite) (type=0x4) Enumeration [] value: 112
 Exposure Compensation(0xd01f):(readwrite) (type=0x2) Enumeration [8,11,13,16,19,21,24,27,29,32,35,37,40] value: 24
 Av Open(0xd023):(read only) (type=0x4) 32
 Av Max(0xd024):(read only) (type=0x4) 53
@@ -209,29 +209,29 @@
 Capture Transfer Mode(0xd029):(readwrite) (type=0x4) Enumeration [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15] value: 3
 Zoom(0xd02a):(readwrite) (type=0x4) Range [0 - 9, step 1] value: 0
 Size Quality Mode(0xd02c):(read only) (type=0x4006) Enumeration [
-	,
-	,
-	,
-	,
-	,
-	,
-	,
-	,
-	,
-	,
-	,
-	
-	] value: 
+	a[6] 1536,2048,1,0,0,0,
+	a[6] 1536,2048,6,0,0,0,
+	a[6] 1536,2048,11,0,0,0,
+	a[6] 1200,1600,2,0,0,0,
+	a[6] 1200,1600,7,0,0,0,
+	a[6] 1200,1600,12,0,0,0,
+	a[6] 768,1024,3,0,0,0,
+	a[6] 768,1024,8,0,0,0,
+	a[6] 768,1024,13,0,0,0,
+	a[6] 480,640,5,0,0,0,
+	a[6] 480,640,10,0,0,0,
+	a[6] 480,640,15,0,0,0
+	] value: a[6] 1536,2048,6,0,0,0
 Supported Thumb Size(0xd02d):(read only) (type=0x4006) Enumeration [
-	
-	] value: 
+	a[4] 119,0,159,0
+	] value: a[4] 119,0,159,0
 Size of Output Data from Camera(0xd02e):(read only) (type=0x6) 20480
 Size of Input Data to Camera(0xd02f):(read only) (type=0x6) 5120
 Remote API Version(0xd030):(read only) (type=0x6) 256
 Firmware Version(0xd031):(read only) (type=0x6) 33554688
 Camera Model(0xd032):(read only) (type=0xffff) 'Canon PowerShot SD100'
-Camera Owner(0xd033):(readwrite) (type=0x4002) 
-UNIX Time(0xd034):(readwrite) (type=0x6) 1181084254
+Camera Owner(0xd033):(readwrite) (type=0x4002) a[16] 77,97,114,99,117,115,32,77,101,105,115,115,110,101,114,0
+UNIX Time(0xd034):(readwrite) (type=0x6) 1203882175
 Disp Av(0xd037):(read only) (type=0x4) 0
 Av Open Apex(0xd038):(read only) (type=0x3) 32
 Digital Zoom Magnification(0xd039):(read only) (type=0x4) 2048
@@ -239,7 +239,7 @@
 Disp Av Max(0xd03b):(read only) (type=0x4) 0
 Av Max Apex(0xd03c):(read only) (type=0x4) 53
 EZoom Start Position(0xd03d):(read only) (type=0x4) 5
-Focal Length of Tele(0xd03e):(read only) (type=0x4) 346
+Focal Length Tele(0xd03e):(read only) (type=0x4) 346
 EZoom Size of Tele(0xd03f):(read only) (type=0x4) 640
 Photo Effect(0xd040):(readwrite) (type=0x4) Enumeration [0,1,2,3,4,5] value: 0
 Assist Light(0xd041):(readwrite) (type=0x4) Enumeration [0,1] value: 1
@@ -248,5 +248,5 @@
 Event Emulate Mode(0xd045):(readwrite) (type=0x4) Enumeration [1,2,3,4,5,6,7] value: 4
 DPOF Version(0xd046):(read only) (type=0x4) 257
 Type of Slideshow(0xd047):(read only) (type=0x4) 2
-Average Filesizes(0xd048):(read only) (type=0x4006) 
+Average Filesizes(0xd048):(read only) (type=0x4006) a[16] 1640448,1026048,583680,0,254976,914432,571392,327680,0,153600,455680,284672,174080,0,86016,2097152
 Model ID(0xd049):(read only) (type=0x6) 19070976


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[gphoto-cvs] SF.net SVN: gphoto: [10962] trunk/libgphoto2/camlibs/ptp2/cameras/ canon-powershot-a95.txt

From: <marcusmeissner@us...> - 2008-02-24 18:28

Revision: 10962
          http://gphoto.svn.sourceforge.net/gphoto/?rev=10962&view=rev
Author:   marcusmeissner
Date:     2008-02-24 10:28:04 -0800 (Sun, 24 Feb 2008)

Log Message:
-----------
added debugging info for a95 in capture mode

Added Paths:
-----------
    trunk/libgphoto2/camlibs/ptp2/cameras/canon-powershot-a95.txt

Added: trunk/libgphoto2/camlibs/ptp2/cameras/canon-powershot-a95.txt
===================================================================
--- trunk/libgphoto2/camlibs/ptp2/cameras/canon-powershot-a95.txt	                        (rev 0)
+++ trunk/libgphoto2/camlibs/ptp2/cameras/canon-powershot-a95.txt	2008-02-24 18:28:04 UTC (rev 10962)
@@ -0,0 +1,263 @@
+Device info:
+Manufacturer: Canon Inc.
+  model: Canon PowerShot A95
+  device version: 1-1.0.0.0
+  serial number: '(null)'
+Vendor extension ID: 0x0000000b
+Vendor extension description: (null)
+Supported operations:
+  0x1001
+  0x1002
+  0x1003
+  0x1004
+  0x1005
+  0x1006
+  0x1007
+  0x1008
+  0x1009
+  0x100a
+  0x100b
+  0x100c
+  0x100d
+  0x100e
+  0x100f
+  0x1012
+  0x1014
+  0x1015
+  0x1016
+  0x101b
+  0x9001
+  0x9002
+  0x9003
+  0x9006
+  0x9008
+  0x9009
+  0x900a
+  0x900b
+  0x900c
+  0x900d
+  0x900e
+  0x900f
+  0x9010
+  0x9011
+  0x9012
+  0x9013
+  0x9014
+  0x9015
+  0x9018
+  0x9019
+  0x901a
+  0x901b
+  0x901c
+  0x901d
+  0x901e
+  0x901f
+  0x9020
+  0x9021
+  0x9022
+  0x9023
+  0x9024
+  0x9025
+  0x9026
+  0x9027
+Events Supported:
+  0x4001
+  0x4002
+  0x4003
+  0x4004
+  0x4005
+  0x4006
+  0x4008
+  0x4009
+  0x400a
+  0x400c
+  0x400d
+  0xc001
+  0xc005
+  0xc008
+  0xc009
+  0xc00a
+  0xc00b
+  0xc00c
+  0xc00d
+  0xc00f
+Device Properties Supported:
+  0xd001
+  0xd002
+  0xd003
+  0xd005
+  0xd006
+  0xd007
+  0xd008
+  0xd009
+  0xd00a
+  0xd00b
+  0xd00c
+  0xd00e
+  0xd00f
+  0xd010
+  0xd011
+  0xd012
+  0xd013
+  0xd015
+  0xd017
+  0xd018
+  0xd019
+  0xd01c
+  0xd01d
+  0xd01e
+  0xd01f
+  0xd023
+  0xd024
+  0xd025
+  0xd026
+  0xd027
+  0xd028
+  0xd029
+  0xd02a
+  0xd02c
+  0xd02d
+  0xd02e
+  0xd02f
+  0xd030
+  0xd031
+  0xd032
+  0xd033
+  0xd034
+  0xd036
+  0xd037
+  0xd038
+  0xd039
+  0xd03a
+  0xd03b
+  0xd03c
+  0xd03d
+  0xd03e
+  0xd03f
+  0xd040
+  0xd041
+  0xd042
+  0xd043
+  0xd044
+  0xd045
+  0xd046
+  0xd047
+  0xd048
+  0xd049
+  0xd04b
+
+Camera summary:                                                                
+Model: Canon PowerShot A95
+  device version: 1-1.0.0.0
+  serial number:  (null)
+Vendor extension ID: 0x0000000b
+Vendor extension description: (null)
+
+Capture Formats: JPEG
+Display Formats: Association/Directory, JPEG, MS AVI, MS Wave, CRW, Script
+
+Device Capabilities:
+        File Download, File Deletion, File Upload
+        Generic Image Capture, No Open Capture, Canon Capture
+
+Storage Devices Summary:
+store_00010001:
+        StorageDescription: None
+        VolumeLabel: D
+        Storage Type: Removable RAM (memory card)
+        Filesystemtype: Digital Camera Layout (DCIM)
+        Access Capability: Read-Write
+        Maximum Capability: 514760704 (490 MB)
+        Free Space (Bytes): 509345792 (485 MB)
+        Free Space (Images): 352
+store_80000001:
+        StorageDescription: None
+        VolumeLabel: V
+        Storage Type: Builtin RAM
+        Filesystemtype: Unknown: 0x8001
+
+        Access Capability: Read-Write
+        Maximum Capability: 0 (0 MB)
+        Free Space (Bytes): 0 (0 MB)
+        Free Space (Images): -1
+
+Device Property Summary:
+Beep Mode(0xd001):(readwrite) (type=0x2) Enumeration [0,1] value: 1
+Battery Kind(0xd002):(read only) (type=0x4) Enumeration [0,1,2,3,4,5] value: 2
+Battery Mode(0xd003):(read only) (type=0x6) Enumeration [0,1,2,3] value: 1
+Camera Mode(0xd005):(read only) (type=0x2) 32
+Image Quality(0xd006):(readwrite) (type=0x2) Enumeration [2,3,5] value: 3
+Full View File Format(0xd007):(readwrite) (type=0x2) Enumeration [1] value: 1
+Image Size(0xd008):(readwrite) (type=0x2) Enumeration [0,1,3,2] value: 0
+Self Time(0xd009):(read only) (type=0x4) 100
+Flash Mode(0xd00a):(readwrite) (type=0x2) Enumeration [0,1,2,5,6] value: 0
+Beep(0xd00b):(readwrite) (type=0x2) Enumeration [0,1] value: 0
+Shooting Mode(0xd00c):(readwrite) (type=0x2) Enumeration [1,2,3,4] value: 1
+Drive Mode(0xd00e):(read only) (type=0x2) 0
+Zoom(0xd00f):(read only) (type=0x2) 0
+Metering Mode(0xd010):(readwrite) (type=0x2) Enumeration [0,1,3] value: 3
+AF Distance(0xd011):(readwrite) (type=0x2) Enumeration [1,3] value: 1
+Focusing Point(0xd012):(readwrite) (type=0x4) Enumeration [12291,12289] value: 12289
+White Balance(0xd013):(readwrite) (type=0x2) Enumeration [0,1,2,3,4,7,6] value: 0
+AF Mode(0xd015):(read only) (type=0x2) 0
+Contrast(0xd017):(readwrite) (type=0x1) Enumeration [0] value: 0
+Color Gain(0xd018):(readwrite) (type=0x1) Enumeration [0] value: 0
+Sharpness(0xd019):(readwrite) (type=0x1) Enumeration [0] value: 0
+ISO Speed(0xd01c):(readwrite) (type=0x4) Enumeration [64,72,80,88,0] value: 64
+Aperture(0xd01d):(readwrite) (type=0x4) Enumeration [] value: 40
+ShutterSpeed(0xd01e):(readwrite) (type=0x4) Enumeration [] value: 112
+Exposure Compensation(0xd01f):(readwrite) (type=0x2) Enumeration [8,11,13,16,19,21,24,27,29,32,35,37,40] value: 24
+Av Open(0xd023):(read only) (type=0x4) 32
+Av Max(0xd024):(read only) (type=0x4) 56
+Focal Length(0xd025):(read only) (type=0x4) 250
+Focal Length Tele(0xd026):(read only) (type=0x4) 749
+Focal Length Wide(0xd027):(read only) (type=0x4) 250
+Focal Length Denominator(0xd028):(read only) (type=0x4) 32
+Capture Transfer Mode(0xd029):(readwrite) (type=0x4) Enumeration [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15] value: 3
+Zoom(0xd02a):(readwrite) (type=0x4) Range [0 - 12, step 1] value: 0
+Size Quality Mode(0xd02c):(read only) (type=0x4006) Enumeration [
+        a[6] 1944,2592,1,0,0,0,
+        a[6] 1944,2592,6,0,0,0,
+        a[6] 1944,2592,11,0,0,0,
+        a[6] 1536,2048,2,0,0,0,
+        a[6] 1536,2048,7,0,0,0,
+        a[6] 1536,2048,12,0,0,0,
+        a[6] 1200,1600,3,0,0,0,
+        a[6] 1200,1600,8,0,0,0,
+        a[6] 1200,1600,13,0,0,0,
+        a[6] 480,640,5,0,0,0,
+        a[6] 480,640,10,0,0,0,
+        a[6] 480,640,15,0,0,0
+        ] value: a[6] 1944,2592,6,0,0,0
+Supported Thumb Size(0xd02d):(read only) (type=0x4006) Enumeration [
+        a[4] 119,0,159,0
+        ] value: a[4] 119,0,159,0
+Size of Output Data from Camera(0xd02e):(read only) (type=0x6) 20480
+Size of Input Data to Camera(0xd02f):(read only) (type=0x6) 5120
+Remote API Version(0xd030):(read only) (type=0x6) 256
+Firmware Version(0xd031):(read only) (type=0x6) 16777216
+Camera Model(0xd032):(read only) (type=0xffff) 'Canon PowerShot A95'
+Camera Owner(0xd033):(readwrite) (type=0x4002) a[0] 
+UNIX Time(0xd034):(readwrite) (type=0x6) 1203880608
+Camera Output(0xd036):(readwrite) (type=0x2) Enumeration [1,2,3] value: 3
+Disp Av(0xd037):(read only) (type=0x4) 0
+Av Open Apex(0xd038):(read only) (type=0x3) 32
+Digital Zoom Magnification(0xd039):(read only) (type=0x4) 2592
+Ml Spot Position(0xd03a):(read only) (type=0x4) 0
+Disp Av Max(0xd03b):(read only) (type=0x4) 0
+Av Max Apex(0xd03c):(read only) (type=0x4) 56
+EZoom Start Position(0xd03d):(read only) (type=0x4) 7
+Focal Length of Tele(0xd03e):(read only) (type=0x4) 749
+EZoom Size of Tele(0xd03f):(read only) (type=0x4) 640
+Photo Effect(0xd040):(readwrite) (type=0x4) Enumeration [0,1,2,3,4,5] value: 0
+Assist Light(0xd041):(readwrite) (type=0x4) Enumeration [1,0] value: 1
+Flash Quanity Count(0xd042):(readwrite) (type=0x4) Enumeration [] value: 65535
+Rotation Angle(0xd043):(read only) (type=0x4) 0
+Rotation Scene(0xd044):(readwrite) (type=0x4) Enumeration [0,1] value: 0
+Event Emulate Mode(0xd045):(readwrite) (type=0x4) Enumeration [1,2,3,4,5,6,7] value: 4
+DPOF Version(0xd046):(read only) (type=0x4) 257
+Type of Slideshow(0xd047):(read only) (type=0x4) 0
+Average Filesizes(0xd048):(read only) (type=0x4006) a[19] 2563072,1640448,1026048,0,254976,1428480,914432,571392,0,153600,711680,455680,284672,0,86016,4405248,0,0,0
+Model ID(0xd049):(read only) (type=0x6) 22216704
+Property 0xd04b:(read only) (type=0x2) 0
+


Property changes on: trunk/libgphoto2/camlibs/ptp2/cameras/canon-powershot-a95.txt
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[gphoto-cvs] SF.net SVN: gphoto: [10950] trunk/playground/raw_converters

From: <kilgota@us...> - 2008-02-13 23:39

Revision: 10950
          http://gphoto.svn.sourceforge.net/gphoto/?rev=10950&view=rev
Author:   kilgota
Date:     2008-02-13 15:39:36 -0800 (Wed, 13 Feb 2008)

Log Message:
-----------
added sonix_raw_converter in playground/raw_converters

Added Paths:
-----------
    trunk/playground/raw_converters/sonix_raw_converter/
    trunk/playground/raw_converters/sonix_raw_converter/Makefile
    trunk/playground/raw_converters/sonix_raw_converter/README
    trunk/playground/raw_converters/sonix_raw_converter/bayer.h
    trunk/playground/raw_converters/sonix_raw_converter/byr2ppm.c
    trunk/playground/raw_converters/sonix_raw_converter/convert_all_show
    trunk/playground/raw_converters/sonix_raw_converter/gamma.h
    trunk/playground/raw_converters/sonix_raw_converter/show_sonix_raw.c
    trunk/playground/raw_converters/sonix_raw_converter/sonix_process.c
    trunk/playground/raw_converters/sonix_raw_converter/sonix_process.h

Added: trunk/playground/raw_converters/sonix_raw_converter/Makefile
===================================================================
--- trunk/playground/raw_converters/sonix_raw_converter/Makefile	                        (rev 0)
+++ trunk/playground/raw_converters/sonix_raw_converter/Makefile	2008-02-13 23:39:36 UTC (rev 10950)
@@ -0,0 +1,14 @@
+CC = gcc
+CFLAGS = -g -Wall -O3 `pkg-config --cflags --libs gtk+-2.0`
+OBJS = show_sonix_raw.o sonix_process.o byr2ppm.o
+EXE = show_sonix_raw
+
+all: $(EXE)
+
+$(EXE): $(OBJS)
+	gcc  $(CFLAGS) $(OBJS) -o $(EXE)
+	
+# rule to build $(OBJS) is implicit
+
+clean:
+	rm $(EXE) *.o


Property changes on: trunk/playground/raw_converters/sonix_raw_converter/Makefile
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Added: trunk/playground/raw_converters/sonix_raw_converter/README
===================================================================
--- trunk/playground/raw_converters/sonix_raw_converter/README	                        (rev 0)
+++ trunk/playground/raw_converters/sonix_raw_converter/README	2008-02-13 23:39:36 UTC (rev 10950)
@@ -0,0 +1,101 @@
+/* README
+ *
+ * Copyright (C) 2008 Theodore Kilgore <kilgota@...>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+The program show_sonix_raw will convert a raw file from any one of the known 
+cameras supported in libgphoto2/camlibs/sonix into a viewable PPM file. The 
+file will be saved, and the image contained in the file will be displayed in 
+an X window. To close the program, close the window. The output file will be
+saved. The name of the output file will look like sonix***ppm. An image file 
+created by libgphoto2/camlibs/sonix will have a similar name, but with a "." 
+before the ppm. The reason why the filenames put out from this program are 
+slightly different is that the output of this program and of the sonix camera 
+library will be close together if in the same directory, whereas at the same 
+time there will be no name conflicts. As one of the purposes of the 
+show_sonix_raw program is to try to improve the image processing for the Sonix
+cameras, this feature will therefore allow easy comparison of the image 
+resulting from two different processing routines. 
+
+The program is written to accept raw files which were the output of 
+gphoto2 --get-all-raw-data 
+or 
+gphoto2 --get-raw-data (number or range of numbers, or file name(s)). The  
+raw files will have names which look like raw_sonix***.raw in which *** is the 
+number of the photo. A sample script file should also be present here, which 
+will successively run the program through all of the raw files in a directory, 
+provided that the numbering of those raw files is consecutive and starts with 
+001. Just put the script and the show_sonix_raw executable in the same 
+directory with the raw files and run the script. The first image will be 
+displayed and will remain displayed until you close the window in which it sits.
+At that point, the second image will be displayed, and so on until you have 
+opened all of the photos.  
+
+There are several Sonix SN9C2028 cameras, and they have different features:
+
+First, there is an option about the camera's resolution. For, embedded in 
+each raw file is the information about whether the image is low or high 
+resolution, relative to what the camera will do. But unfortunately the 
+information about what is the camera's highest resolution is not present. Thus,
+for cameras which have a maximum resolution setting of 352*288, and a lower 
+resolution setting of 176*144, please use the
+command 
+
+show_sonix_raw -qvga (name of raw file)
+
+and if the camera has its highest resolution setting as 640*280, then do not 
+use this option. The max resolution of the camera will then be presumed to be 
+a default setting of 640*480, and information embedded in the image will then 
+determine whether that particular image is 640*480 or 320*240. 
+
+As far as I know right now, the cameras which will do 352*288 resolution will 
+not need any other options but this one, so that no other options may be used
+if the -qvga option is used. If this causes any problems or is inconsistent 
+with your camera, please let me know. 
+
+Second, the 640*480 cameras are divided into two classes, those which have a
+header of length 8 bytes in the raw files, and those which do not. A camera 
+which has such headers in the raw files will need the option 
+
+show_sonix_raw -useoffset (name of raw file).
+
+It is easy to tell if the camera needs this or not. Just try 
+
+show_sonix_raw (name of raw file)
+
+and if the output comes out looking very strange, then try the option. 
+
+Third, the 640*480 cameras which require the option -useoffset are divided in
+turn into two sets. If by trying the -useoffset option you got a recognizable 
+image, but the image is upside down and color-shifted, then please try 
+
+show_sonix_raw -useoffset -invert (name of raw file)
+
+and, one hopes, you will get good results. 
+
+Please do note that each option is listed above. For example, there is no 
+option built in to do both -qvga and -invert, or -invert without -useoffset 
+given first, or any other combination which is not listed explicitly above. 
+
+
+If you encounter any SN9C2028 camera which seems to require other processing 
+options which are not incorporated here, or if there are any other problems 
+remaining with the raw conversion program which prevent it from doing its job, 
+then please let me know. 
+
+Theodore Kilgore (February 12, 2007).
\ No newline at end of file


Property changes on: trunk/playground/raw_converters/sonix_raw_converter/README
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Added: trunk/playground/raw_converters/sonix_raw_converter/bayer.h
===================================================================
--- trunk/playground/raw_converters/sonix_raw_converter/bayer.h	                        (rev 0)
+++ trunk/playground/raw_converters/sonix_raw_converter/bayer.h	2008-02-13 23:39:36 UTC (rev 10950)
@@ -0,0 +1,43 @@
+/** \file
+ *
+ * \author Copyright 2001 Lutz M\xFCller <lutz@...>
+ *
+ * \note
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * \note
+ * This library is distributed in the hope that it will be useful, 
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details. 
+ *
+ * \note
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __BAYER_H__
+#define __BAYER_H__
+
+typedef enum {
+	BAYER_TILE_RGGB = 0,
+	BAYER_TILE_GRBG = 1,
+	BAYER_TILE_BGGR = 2,
+	BAYER_TILE_GBRG = 3,
+	BAYER_TILE_RGGB_INTERLACED = 4,		/* scanline order: R1,G1,R2,G2,...,G1,B1,G2,B2,... */
+	BAYER_TILE_GRBG_INTERLACED = 5,
+	BAYER_TILE_BGGR_INTERLACED = 6,
+	BAYER_TILE_GBRG_INTERLACED = 7,
+} BayerTile;
+
+int gp_bayer_expand (unsigned char *input, int w, int h, unsigned char *output,
+                     BayerTile tile);
+int gp_bayer_decode (unsigned char *input, int w, int h, unsigned char *output,
+		     BayerTile tile);
+int gp_bayer_interpolate (unsigned char *image, int w, int h, BayerTile tile);
+#endif /* __BAYER_H__ */


Property changes on: trunk/playground/raw_converters/sonix_raw_converter/bayer.h
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Added: trunk/playground/raw_converters/sonix_raw_converter/byr2ppm.c
===================================================================
--- trunk/playground/raw_converters/sonix_raw_converter/byr2ppm.c	                        (rev 0)
+++ trunk/playground/raw_converters/sonix_raw_converter/byr2ppm.c	2008-02-13 23:39:36 UTC (rev 10950)
@@ -0,0 +1,355 @@
+/** byr2ppm.c (equivalent to libgphoto2/libgphoto2/bayer.c)
+ * Bayer array conversion routines.
+ * 
+ * Copyright 2001 Lutz Mller <lutz@...>
+ * Copyright 2007 Theodore Kilgore <kilgota@...>
+ *
+ * 
+ * gp_bayer_accrue() from Theodore Kilgore <kilgota@...>
+ * contains suggestions by B. R. Harris (e-mail address disappeared) and
+ * Werner Eugster <eugster@...>
+ *
+ * License
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * 
+ * You should have received a copy of the GNU General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+ 
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+
+/* The tiles will be used in the Bayer interpolation routine. */
+#include "bayer.h"
+#include "gamma.h"
+
+static int tile_colors[8][4] = {
+	{0, 1, 1, 2},
+	{1, 0, 2, 1},
+	{2, 1, 1, 0},
+	{1, 2, 0, 1},
+	{0, 1, 1, 2},
+	{1, 0, 2, 1},
+	{2, 1, 1, 0},
+	{1, 2, 0, 1}};
+
+#define RED 0
+#define GREEN 1
+#define BLUE 2
+
+
+/* Bayer interpolation routine. Credit to libgphoto2/bayer.c, by Lutz M\"uller.
+*/
+
+int
+gp_bayer_accrue (unsigned char *image, int w, int h, int x0, int y0,
+		int x1, int y1, int x2, int y2, int x3, int y3, int colour) ;
+
+int
+gp_bayer_expand (unsigned char *input, int w, int h, unsigned char *output,
+		 BayerTile tile)
+{
+	int x, y, i;
+	int colour, bayer;
+	unsigned char *ptr = input;
+
+	switch (tile) {
+
+		case BAYER_TILE_RGGB:
+		case BAYER_TILE_GRBG:
+		case BAYER_TILE_BGGR:
+		case BAYER_TILE_GBRG:
+			for (y = 0; y < h; ++y)
+				for (x = 0; x < w; ++x, ++ptr) {
+					bayer = (x&1?0:1) + (y&1?0:2);
+
+					colour = tile_colors[tile][bayer];
+
+					i = (y * w + x) * 3;
+
+					output[i+RED]    = 0;
+					output[i+GREEN]  = 0;
+					output[i+BLUE]   = 0;
+					output[i+colour] = *ptr;
+				}
+			break;
+
+		case BAYER_TILE_RGGB_INTERLACED:
+		case BAYER_TILE_GRBG_INTERLACED:
+		case BAYER_TILE_BGGR_INTERLACED:
+		case BAYER_TILE_GBRG_INTERLACED:
+			for (y = 0; y < h; ++y, ptr+=w)
+				for (x = 0; x < w; ++x) {
+					bayer = (x&1?0:1) + (y&1?0:2);
+
+					colour = tile_colors[tile][bayer];
+
+					i = (y * w + x) * 3;
+
+					output[i+RED]    = 0;
+					output[i+GREEN]  = 0;
+					output[i+BLUE]   = 0;
+					output[i+colour] = (x&1)? ptr[x>>1]:ptr[(w>>1)+(x>>1)];
+				}
+			break;
+	}
+
+	return 0;
+}
+
+#define AD(x, y, w) ((y)*(w)*3+3*(x))
+
+int
+gp_bayer_interpolate (unsigned char *image, int w, int h, BayerTile tile)
+{
+	int x, y, bayer;
+	int p0, p1, p2, p3;
+	int value, div ;
+
+	switch (tile) {
+	default:
+	case BAYER_TILE_RGGB:
+	case BAYER_TILE_RGGB_INTERLACED:
+		p0 = 0; p1 = 1; p2 = 2; p3 = 3;
+		break;
+	case BAYER_TILE_GRBG:
+	case BAYER_TILE_GRBG_INTERLACED:
+		p0 = 1; p1 = 0; p2 = 3; p3 = 2;
+		break;
+	case BAYER_TILE_BGGR:
+	case BAYER_TILE_BGGR_INTERLACED:
+		p0 = 3; p1 = 2; p2 = 1; p3 = 0;
+		break;
+	case BAYER_TILE_GBRG:
+	case BAYER_TILE_GBRG_INTERLACED:
+		p0 = 2; p1 = 3; p2 = 0; p3 = 1;
+		break;
+	}
+
+	for (y = 0; y < h; y++)
+		for (x = 0; x < w; x++) {
+			bayer = (x&1?0:1) + (y&1?0:2);
+
+			if ( bayer == p0 ) {
+
+				/* red. green lrtb, blue diagonals */
+				image[AD(x,y,w)+GREEN] =
+					gp_bayer_accrue(image, w, h, x-1, y, x+1, y, x, y-1, x, y+1, GREEN) ;
+
+				image[AD(x,y,w)+BLUE] =
+					gp_bayer_accrue(image, w, h, x+1, y+1, x-1, y-1, x-1, y+1, x+1, y-1, BLUE) ;
+
+			} else if (bayer == p1) {
+
+				/* green. red lr, blue tb */
+				div = value = 0;
+				if (x < (w - 1)) {
+					value += image[AD(x+1,y,w)+RED];
+					div++;
+				}
+				if (x) {
+					value += image[AD(x-1,y,w)+RED];
+					div++;
+				}
+				image[AD(x,y,w)+RED] = value / div;
+
+				div = value = 0;
+				if (y < (h - 1)) {
+					value += image[AD(x,y+1,w)+BLUE];
+					div++;
+				}
+				if (y) {
+					value += image[AD(x,y-1,w)+BLUE];
+					div++;
+				}
+				image[AD(x,y,w)+BLUE] = value / div;
+
+			} else if ( bayer == p2 ) {
+
+				/* green. blue lr, red tb */
+				div = value = 0;
+
+				if (x < (w - 1)) {
+					value += image[AD(x+1,y,w)+BLUE];
+					div++;
+				}
+				if (x) {
+					value += image[AD(x-1,y,w)+BLUE];
+					div++;
+				}
+				image[AD(x,y,w)+BLUE] = value / div;
+
+				div = value = 0;
+				if (y < (h - 1)) {
+					value += image[AD(x,y+1,w)+RED];
+					div++;
+				}
+				if (y) {
+					value += image[AD(x,y-1,w)+RED];
+					div++;
+				}
+				image[AD(x,y,w)+RED] = value / div;
+
+			} else {
+
+				/* blue. green lrtb, red diagonals */
+				image[AD(x,y,w)+GREEN] =
+					gp_bayer_accrue (image, w, h, x-1, y, x+1, y, x, y-1, x, y+1, GREEN) ;
+
+				image[AD(x,y,w)+RED] =
+					gp_bayer_accrue (image, w, h, x+1, y+1, x-1, y-1, x-1, y+1, x+1, y-1, RED) ;
+			}
+		}
+
+	return 0;
+}
+
+/* Accrue four surrounding values.  If three values are one side of the average value,
+	the fourth value is ignored. This will sharpen up boundaries. B.R.Harris 13Nov03*/
+int
+gp_bayer_accrue (unsigned char *image, int w, int h, int x0, int y0,
+		int x1, int y1, int x2, int y2, int x3, int y3, int colour)
+{	int x [4] ;
+	int y [4] ;
+	int value [4] ;
+	int above [4] ;
+	int counter	; // counter
+	int total_value	; // total value
+	int average ;
+	int i ;
+	x[0] = x0 ; x[1] = x1 ; x[2] = x2 ; x[3] = x3 ;
+	y[0] = y0 ; y[1] = y1 ; y[2] = y2 ; y[3] = y3 ;
+
+	// special treatment for green
+	counter = total_value = 0 ;
+	if(colour == GREEN)
+	{
+	  	// we need to make sure that horizontal or vertical lines become horizontal
+	  	// and vertical lines even in this interpolation procedure
+	  	// therefore, we determine whether we might have such a line structure
+	  	for (i = 0 ; i < 4 ; i++)
+	  	{	if ((x[i] >= 0) && (x[i] < w) && (y[i] >= 0) && (y[i] < h))
+			{
+				value [i] = image[AD(x[i],y[i],w) + colour] ;
+				counter++;
+			}
+			else
+			{
+				value [i] = -1 ;
+			}
+	  	}
+		if(counter == 4)
+		{
+			// we must assume that x0,y0 and x1,y1 are on the horizontal axis and
+			// x2,y2 and x3,y3 are on the vertical axis
+			int hdiff ;
+			int vdiff ;
+			hdiff = value [1] - value [0] ;
+			hdiff *= hdiff ;	// make value positive by squaring it
+			vdiff = value [3] - value [2] ;
+			vdiff *= vdiff ;	// make value positive by squaring it
+			if(hdiff > 2*vdiff)
+			{
+				// we might have a vertical structure here
+				return (value [3] + value [2])/2 ;
+			}
+			if(vdiff > 2*hdiff)
+			{
+				// we might have a horizontal structure here
+				return (value [1] + value [0])/2 ;
+			}
+			// else we proceed as with blue and red
+		}
+		// if we do not have four points then we proceed as we do for blue and red
+	}
+
+	// for blue and red as it was before
+	counter = total_value = 0 ;
+	for (i = 0 ; i < 4 ; i++)
+	{	if ((x[i] >= 0) && (x[i] < w) && (y[i] >= 0) && (y[i] < h))
+		{	value [i] = image[AD(x[i],y[i],w) + colour] ;
+			total_value += value [i] ;
+			counter++ ;
+		}
+	}
+	average = total_value / counter ;
+	if (counter < 4) return average ;  // Less than four surrounding - just take average
+	counter = 0 ;
+	for (i = 0 ; i < 4 ; i++)
+	{	above[i] = value[i] > average ;
+		if (above[i]) counter++ ;
+	}
+	// Note: counter == 0 indicates all values the same
+	if ((counter == 2) || (counter == 0)) return average ;
+	total_value = 0 ;
+	for (i = 0 ; i < 4 ; i++)
+	{	if ((counter == 3) == above[i])
+		{	total_value += value[i] ; }
+	}
+	return total_value / 3 ;
+}
+
+
+int
+gp_bayer_decode (unsigned char *input, int w, int h, unsigned char *output,
+		 BayerTile tile)
+{
+	gp_bayer_expand (input, w, h, output, tile);
+	gp_bayer_interpolate (output, w, h, tile);
+	return 0;
+}
+
+
+/* Gamma correction routine. Credit to libgphoto2/bayer.c, by Lutz M\"uller.
+*/
+
+
+int
+gp_gamma_correct_triple (unsigned char *table_red,
+			 unsigned char *table_green,
+			 unsigned char *table_blue,
+			 unsigned char *data, unsigned int size)
+{
+	int x;
+
+	for (x = 0; x < (size * 3); x += 3) {
+		data[x + 0] = table_red  [data[x + 0]];
+		data[x + 1] = table_green[data[x + 1]];
+		data[x + 2] = table_blue [data[x + 2]];
+	}
+	return 0;
+}
+
+int
+gp_gamma_correct_single (unsigned char *table, unsigned char *data,
+			 unsigned int size)
+{
+	return (gp_gamma_correct_triple (table, table, table, data, size));
+}
+
+
+int
+gp_gamma_fill_table (unsigned char *table, double g)
+{
+	int x;
+	for (x = 0; x < 256; x++)
+		table[x] = 255 * pow ((double) x/255., g);
+	return 0;
+}
+


Property changes on: trunk/playground/raw_converters/sonix_raw_converter/byr2ppm.c
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Added: trunk/playground/raw_converters/sonix_raw_converter/convert_all_show
===================================================================
--- trunk/playground/raw_converters/sonix_raw_converter/convert_all_show	                        (rev 0)
+++ trunk/playground/raw_converters/sonix_raw_converter/convert_all_show	2008-02-13 23:39:36 UTC (rev 10950)
@@ -0,0 +1,19 @@
+
+i=1
+
+while [ "$i" -le 100 ]
+do
+    echo $i
+    ls raw*$i.raw > /dev/null
+    if [ $? -ne 0 ]
+    then
+	exit 1
+    else 
+	# choose one of the following lines, as appropriate
+#	show_sonix_raw raw*$i.raw
+#	show_sonix_raw -qvga raw*$i.raw
+	show_sonix_raw -useoffset raw*$i.raw
+#	show_sonix_raw -useoffset -invert raw*$i.raw
+	i=`expr "$i" + 1`
+    fi
+done
\ No newline at end of file


Property changes on: trunk/playground/raw_converters/sonix_raw_converter/convert_all_show
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Added: trunk/playground/raw_converters/sonix_raw_converter/gamma.h
===================================================================
--- trunk/playground/raw_converters/sonix_raw_converter/gamma.h	                        (rev 0)
+++ trunk/playground/raw_converters/sonix_raw_converter/gamma.h	2008-02-13 23:39:36 UTC (rev 10950)
@@ -0,0 +1,28 @@
+/* gamma.h
+ *
+ * Copyright \xA9 2001 Lutz M\xFCller <lutz@...>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, 
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details. 
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __GAMMA_H__
+#define __GAMMA_H__
+
+int gp_gamma_fill_table     (unsigned char *table, double g);
+int gp_gamma_correct_single (unsigned char *table, unsigned char *data, 
+			     unsigned int data_size);
+
+#endif /* __GAMMA_H__ */


Property changes on: trunk/playground/raw_converters/sonix_raw_converter/gamma.h
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Added: trunk/playground/raw_converters/sonix_raw_converter/show_sonix_raw.c
===================================================================
--- trunk/playground/raw_converters/sonix_raw_converter/show_sonix_raw.c	                        (rev 0)
+++ trunk/playground/raw_converters/sonix_raw_converter/show_sonix_raw.c	2008-02-13 23:39:36 UTC (rev 10950)
@@ -0,0 +1,303 @@
+/* show_sonix_raw.c
+ *
+ * Copyright  2008 Theodore Kilgore
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+#include "gamma.h"
+#include "bayer.h"
+#include "sonix_process.h"
+
+#include <gtk/gtk.h>
+
+
+gint delete_event( GtkWidget *widget,
+                   GdkEvent  *event,
+		   gpointer   data )
+{
+    gtk_main_quit ();
+    /* Change TRUE to FALSE and the main window will be destroyed with
+     * a "delete_event". */
+
+    return FALSE;
+}
+
+int load_image( GtkWidget *window, GtkWidget *image  )
+{
+
+	
+
+	gtk_container_add(GTK_CONTAINER(window), image);
+	gtk_widget_show (image);
+
+        gtk_widget_show (window);
+        gtk_main ();
+        return 0;
+}
+
+
+int main(int argc, char *argv[])
+{
+	
+	image_info *info;
+
+
+	int i;
+	BYTE *bufp;
+	BYTE *ppm, *ptr;
+	FILE *fp_src, *fp_dest;
+	char *dest;
+	BYTE invert=0;
+	BYTE qvga = 0;
+	int size;
+	float gamma_factor;
+	BYTE gtable[256];
+	int b;
+	BYTE *buf;
+	BYTE *buf2;
+	int WIDTH=176, HEIGHT=144;
+	BYTE outdoors;
+        GtkWidget *window;
+	GtkWidget *image;
+	GtkWidget *event_box;
+	int current = 1;
+	int offset_correct = 0;
+
+	if ( !(argc > 1) ){
+		printf("Syntax: show_sonix_raw sourcefile, or \n");
+		printf("Syntax: show_sonix_raw -useoffset sourcefile, or \n");
+		printf("Syntax: show_sonix_raw -useoffset -invert sourcefile\n");
+		return 0;
+	}
+
+	if ((strcmp(argv[current], "-qvga") == 0) && (current+1 < argc)) 
+	{ 
+		qvga = 1;
+		current += 1;
+		if (argc != 3) {
+			printf("Syntax: show_sonix_raw -qvga sourcefile\n");
+			return 0;
+		}
+	}
+
+
+	if ( !(argc > 2) && (strcmp(argv[current], "-useoffset") == 0) )
+	{
+		printf("Syntax: show_sonix_raw sourcefile, or \n");
+		printf("Syntax: show_sonix_raw -useoffset sourcefile \n");
+		printf("Syntax: show_sonix_raw -useoffset -invert sourcefile\n");
+		return 0;
+	}
+/*
+	if ( !(argc > 3) && (strcmp(argv[current+1], "-invert") == 0) )
+	{
+		printf("Syntax: show_sonix_raw sourcefile, or \n");
+		printf("Syntax: show_sonix_raw -useoffset sourcefile, or \n");
+		printf("Syntax: show_sonix_raw -useoffset -invert sourcefile\n");
+		return 0;
+	}
+*/
+
+		printf("argc=%i\n", argc);
+
+
+	if ((strcmp(argv[current], "-useoffset") == 0) && (current+1 < argc)) {
+		offset_correct = 8;
+		current += 1;
+		printf("useoffset option used\n");
+		printf("current=%i\n", current);
+		if ( !(argc > 2) || !(argc < 5) ){
+			printf("Syntax: show_sonix_raw sourcefile, or \n");
+			printf("Syntax: show_sonix_raw -useoffset sourcefile, or \n");
+			printf("Syntax: show_sonix_raw -useoffset -invert sourcefile, or\n");
+			printf("Syntax: show_sonix_raw -qvga sourcefile\n");
+			return 0;
+		}
+	}
+
+
+
+
+
+	if ( !(argc > 3) && (strcmp(argv[current], "-invert") == 0) )
+	{
+		printf("Syntax: show_sonix_raw sourcefile, or \n");
+		printf("Syntax: show_sonix_raw -useoffset sourcefile, or \n");
+		printf("Syntax: show_sonix_raw -useoffset -invert sourcefile\n");
+		return 0;
+	}
+
+	if ((strcmp(argv[current], "-invert") == 0) && (current+1 < argc)) {
+		invert = 1;
+		current += 1;
+		printf("invert option used\n");
+		printf("current=%i\n", current);
+		if ( !(argc > 3) || !(argc < 5) ){
+			printf("Syntax: show_sonix_raw sourcefile, or \n");
+			printf("Syntax: show_sonix_raw -useoffset sourcefile, or \n");
+			printf("Syntax: show_sonix_raw -useoffset -invert sourcefile \n");
+			return 0;
+		}
+
+	}
+
+	printf("Options: offset=%i invert=%i\n", offset_correct, invert);
+
+
+	fprintf (stderr, "Name of source file is %s\n", argv[current]);
+	
+	/* input file is raw_(some characters).raw, so, first thing, we find 
+	 * the "." in the name.
+	 */
+
+	dest = malloc(strlen(argv[current]));
+	if (!dest){
+		free(dest);
+		return -1;
+	}
+
+	if ((!strchr(argv[current], 0x2e))|| (strncmp(argv[current], "raw", 3))) {
+		fprintf (stderr, "Source file appears not to be a gphoto2 raw file.\n");
+		fprintf (stderr, "Its name should begin with raw_ and end with .raw\n");		
+		fprintf (stderr, "Exiting.\n");
+		return 0; 
+	}
+
+	i = strchr(argv[current], 0x2e) - argv[current];
+
+	/* and throw away the period (to avoid clobbering any finished images
+	 * from gphoto2 which are in the same directory) and throw away the 
+	 * suffix.
+	 */
+
+	strncpy(dest, argv[current] + 4, i - 4);
+	/* then affix "ppm" as a suffix (no preceding period) */
+	strcat (dest, "ppm");
+	fprintf (stderr, "Destination file will be called %s\n", dest);
+	/* now open the raw file */
+	if ( (fp_src = fopen(argv[current], "rb") ) == NULL )
+	{
+		fprintf (stderr, "Error opening source file.\n");
+		return 0;
+	}
+	/* get the size of the raw file and assign that size to "b" */    
+	fseek(fp_src, 0, 2);
+	b = ftell(fp_src);
+	fseek(fp_src, 0, 0);
+
+	buf = malloc(b);
+	if (!buf) return -1;
+
+	/* read the raw file to "buf", and close it */
+	fread (buf, 1, b, fp_src);
+	fclose (fp_src);
+
+	info = malloc(512);
+	if (!info) { free(info); return -1; }
+
+
+	get_image_info( info, buf, b, qvga);
+
+	/* If there is a header, then we print it as debug output, then 
+	 * move past it, to the data. 
+	 */
+	bufp = buf+offset_correct;
+	/* show header */
+	for (i = 0; i < HEADER_LEN; i++) {
+		fprintf(stderr, " %02X", buf[i]);
+	}
+	fprintf(stderr, "\n");
+
+	WIDTH = info->width;
+	HEIGHT = info->height;
+	outdoors = info->outdoors;
+	gamma_factor = info->gamma;
+	gp_gamma_fill_table(gtable, gamma_factor);
+	buf2 = malloc(WIDTH * HEIGHT+256);
+	if (!buf2) {
+		free (buf2);
+		return -1;
+	}
+	if(offset_correct) {
+		info->reverse = 1;
+		info->bayer = BAYER_TILE_BGGR;
+	}
+	if (info->compression) { /* non-zero if compression in use */
+		sonix_decode(buf2, bufp, WIDTH,HEIGHT);	
+	 } else {
+		memcpy(buf2, bufp, WIDTH*HEIGHT);
+	}
+	if (invert)
+		reverse_bytes(buf2, WIDTH*HEIGHT);
+	ppm = malloc (WIDTH * HEIGHT * 3 + 256); /* Data + header */
+	if (!ppm) {
+		free (buf2);
+		return 0;
+	}
+
+	memset (ppm, 0, WIDTH * HEIGHT * 3 + 256);
+
+	sprintf ((char *)ppm,
+        	"P6\n"
+        	"#CREATOR: My_decoder\n"
+        	"%d %d\n"
+        	"255\n", WIDTH, HEIGHT);
+
+        ptr = ppm + strlen ((char *)ppm);
+        size = strlen ((char *)ppm) + (WIDTH * HEIGHT * 3);
+	gp_bayer_decode(buf2, WIDTH, HEIGHT, ptr, info->bayer);
+        white_balance(ptr, WIDTH * HEIGHT, 1.2);
+
+	if ( (fp_dest = fopen(dest, "wb") ) == NULL )
+	{
+		fprintf (stderr, "Error opening dest file.\n");
+		return 0;
+	}
+	fwrite(ppm, 1, size, fp_dest);
+	fclose (fp_dest);
+	free (ppm);
+
+	/* The file has been saved. The GUI effects follow now. */
+        gtk_init (&argc, &argv);
+        window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+
+
+	event_box = gtk_event_box_new();
+	gtk_container_add(GTK_CONTAINER (window), event_box);
+	gtk_widget_show(event_box);
+
+	/* This lets the Window Manager to close the window _and_ sets up 
+	 * this program to exit when the window is closed. 
+	 */
+
+        g_signal_connect (G_OBJECT (window), "delete_event",
+                          G_CALLBACK (delete_event), NULL);
+	/* This displays the image file. */
+	image = gtk_image_new_from_file(dest);
+	gtk_container_add(GTK_CONTAINER(event_box), image);
+	gtk_widget_show (image);
+        gtk_widget_show (window);
+        gtk_main ();
+
+
+
+	return 0;
+}


Property changes on: trunk/playground/raw_converters/sonix_raw_converter/show_sonix_raw.c
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Added: trunk/playground/raw_converters/sonix_raw_converter/sonix_process.c
===================================================================
--- trunk/playground/raw_converters/sonix_raw_converter/sonix_process.c	                        (rev 0)
+++ trunk/playground/raw_converters/sonix_raw_converter/sonix_process.c	2008-02-13 23:39:36 UTC (rev 10950)
@@ -0,0 +1,394 @@
+/*
+ * sonix_process.c
+ *
+ * Part of a processor program for raw data from Sonix SN9C2028 cameras. 
+ * 
+ * Copyright (c) 2008 Theodore Kilgore <kilgota@...>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * A previous version of the white_balance() function intended for use in 
+ * libgphoto2/camlibs/aox is copyright (c) 2008 Amauri Magagna.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+#include "gamma.h"
+#include "bayer.h"
+#include "sonix_process.h"
+
+/*********************************************************/
+
+int get_image_info( image_info *info, unsigned char *photo, int filesize, 
+						unsigned char qvga_setting) {
+
+	int w, h;
+
+	info->compression = 0;
+
+	fprintf (stderr,"filesize is 0x%x=%i\n",filesize,filesize);
+	switch (photo[filesize-5]&0x0f) {
+	case  0x02: 
+	case  0x03:	if (qvga_setting) {
+				w = 176; 
+				h = 144; 
+			} else {
+				w = 320;
+				h = 240;
+			}
+			break;
+	case  0x00:
+	case  0x01:	if (qvga_setting) {
+				w = 352; 
+				h = 288; 
+			} else {
+				w = 640;
+				h = 480;
+			}
+			break;
+	default: return -1;
+	}
+	info->reverse=0;
+	
+	fprintf (stderr,"size code is %02X\n",photo[filesize-5]);
+	info->width = w;
+	info->height= h;
+	info->compression = 0;
+	if (photo[filesize-5]&0x01) {
+		info->compression = 1;
+		info->bayer= BAYER_TILE_RGGB;
+	}  else 
+		info->bayer= BAYER_TILE_RGGB;
+	fprintf (stderr,"compression is %i\n",info->compression);
+	if (photo[filesize - 6] > 0x60) {
+		info->gamma = .60;	
+		info->outdoors	  = 0; 
+	} else {
+		info->gamma = .65;
+		info->outdoors	  = 1; 
+	}
+	printf("reverse is %i\n", info->reverse);
+	printf("gamma is %f\n", info->gamma);
+	return 0;
+}
+
+
+int reverse_bytes(unsigned char *some_data, int size) {
+
+	int i;
+	unsigned char temp;
+	for (i=0; i < size/2; ++i) {
+                temp = some_data[i];
+                some_data[i] = some_data[size - 1 - i];
+                some_data[size - 1 - i] = temp;
+	}
+	return 0;
+}
+
+
+/* 
+ * The decoding algorithm originates with Bertrik Sikken. This version adapted
+ * from the webcam-osx (macam) project. See README for details.
+ */
+
+/* Four defines for bitstream operations, for the decode function */
+
+#define PEEK_BITS(num,to) {\
+    	if (bitBufCount<num){\
+    		do {\
+    			bitBuf=(bitBuf<<8)|(*(src++));\
+    			bitBufCount+=8; \
+		}\
+		while(bitBufCount<24);\
+	}\
+	to=bitBuf>>(bitBufCount-num);\
+}
+
+/*
+ * PEEK_BITS puts the next <num> bits into the low bits of <to>. 
+ * when the buffer is empty, it is completely refilled. 
+ * This strategy tries to reduce memory access. Note that the high bits 
+ * are NOT set to zero!
+ */
+
+#define EAT_BITS(num) { bitBufCount-=num; bits_eaten += num;}
+
+/*
+ * EAT_BITS consumes <num> bits (PEEK_BITS does not consume anything, 
+ * it just peeks)
+ */
+  
+#define PARSE_PIXEL(val) {\
+    PEEK_BITS(10,bits);\
+    if ((bits&0x200)==0) { \
+	EAT_BITS(1); \
+    } \
+    else if ((bits&0x380)==0x280) { \
+	EAT_BITS(3); \
+	val+=3; \
+	if (val>255) val=255; \
+    }\
+    else if ((bits&0x380)==0x300) { \
+	EAT_BITS(3); \
+	val-=3; \
+	if (val<0) val=0; \
+    }\
+    else if ((bits&0x3c0)==0x200) { \
+	EAT_BITS(4); \
+	val+=8; \
+	if (val>255) val=255;\
+    }\
+    else if ((bits&0x3c0)==0x240) { \
+	EAT_BITS(4); \
+	val-=8; \
+	if (val<0) val=0;\
+    }\
+    else if ((bits&0x3c0)==0x3c0) { \
+	EAT_BITS(4); \
+	val-=20; \
+	if (val<0) val=0;\
+    }\
+    else if ((bits&0x3e0)==0x380) { \
+	EAT_BITS(5); \
+	val+=20; \
+	if (val>255) val=255;\
+    }\
+    else { \
+	EAT_BITS(10); \
+	val=8*(bits&0x1f)+0; \
+    }\
+}
+
+
+#define PUT_PIXEL_PAIR {\
+    long pp;\
+    pp=(c1val<<8)+c2val;\
+    *((unsigned short *) (dst+dst_index))=pp;\
+    dst_index+=2; }
+
+
+/* Now the decode function itself */
+
+
+int 
+sonix_decode(unsigned char * dst, unsigned char * src, int width, int height) 
+{
+	long dst_index = 0;
+	int starting_row = 0;
+	unsigned short bits;
+	short c1val, c2val; 
+	int x, y;
+	unsigned long bitBuf = 0;
+	unsigned long bitBufCount = 0;
+	unsigned long bits_eaten = 0;
+
+	
+	for (y = starting_row; y < height; y++) {
+		PEEK_BITS(8, bits);
+		EAT_BITS(8);
+		c2val = (bits & 0xff);
+		PEEK_BITS(8, bits);
+		EAT_BITS(8);
+		c1val = (bits & 0xff);
+
+		PUT_PIXEL_PAIR;
+
+		for (x = 2; x < width ; x += 2) {
+			/* columns are reversed for most Sonix cameras. */
+			PARSE_PIXEL(c2val);
+			PARSE_PIXEL(c1val);
+    			PUT_PIXEL_PAIR;
+		}
+	}
+
+	fprintf(stderr, "Bytes used = %lu = %#x\n", bits_eaten/8,(unsigned int)bits_eaten/8);
+	fprintf(stderr, "Bits remaining = %lu\n", bits_eaten%8);
+	return 0;
+}
+
+
+/*	========= White Balance / Color Enhance / Gamma adjust (experimental) ==========
+
+	Get histogram for each color plane
+	Expand to reach 0.5% of white dots in image
+
+	Get new histogram for each color plane
+	Expand to reach 0.5% of black dots in image
+
+	Get new histogram
+	Calculate and apply gamma correction
+
+	if not a dark image:
+	For each dot, increases color separation
+
+	================================================================================== */
+
+int
+histogram (unsigned char *data, unsigned int size, int *htable_r, int *htable_g, int *htable_b)
+{
+	int x;
+	/* Initializations */
+	for (x = 0; x < 256; x++) { 
+		htable_r[x] = 0; 
+		htable_g[x] = 0; 
+		htable_b[x] = 0; 
+	}
+	/* Building the histograms */
+	for (x = 0; x < (size * 3); x += 3)
+	{
+		htable_r[data[x+0]]++;	/* red histogram */
+		htable_g[data[x+1]]++;	/* green histogram */
+		htable_b[data[x+2]]++;	/* blue histogram */
+	}
+	return 0;
+}
+
+
+int
+white_balance (unsigned char *data, unsigned int size, float saturation)
+{
+	int x, r, g, b, max, d;
+	double r_factor, g_factor, b_factor, max_factor;
+	int htable_r[256], htable_g[256], htable_b[256];
+	BYTE gtable[256];
+	double new_gamma;
+
+	/* ------------------- GAMMA CORRECTION ------------------- */
+
+	histogram(data, size, htable_r, htable_g, htable_b);
+	x = 1;
+	for (r = 64; r < 192; r++)
+	{
+		x += htable_r[r]; 
+		x += htable_g[r];
+		x += htable_b[r];
+	}
+	new_gamma = sqrt((double) (x * 1.5) / (double) (size * 3));
+	printf("Provisional gamma correction = %1.2f\n", new_gamma);
+	/* Recalculate saturation factor for later use. */
+	if (new_gamma < 0.75) new_gamma = 0.75;
+	if (new_gamma > 1.2) new_gamma = 1.2;
+	printf("Gamma correction = %1.2f\n", new_gamma);
+	gp_gamma_fill_table(gtable, new_gamma);
+	gp_gamma_correct_single(gtable,data,size);
+
+	/* ---------------- BRIGHT DOTS ------------------- */
+	max = size / 200; 
+	histogram(data, size, htable_r, htable_g, htable_b);
+
+	for (r=254, x=0; (r > 64) && (x < max); r--)  
+		x += htable_r[r]; 
+	for (g=254, x=0; (g > 64) && (x < max); g--) 
+		x += htable_g[g];
+	for (b=254, x=0; (b > 64) && (x < max); b--) 
+		x += htable_b[b];
+
+	r_factor = (double) 254 / r;
+	g_factor = (double) 254 / g;
+	b_factor = (double) 254 / b;
+	max_factor = r_factor;
+	if (g_factor > max_factor) max_factor = g_factor;
+	if (b_factor > max_factor) max_factor = b_factor;
+
+	if (max_factor > 3.0) {
+		r_factor = (r_factor / max_factor) * 3.0;
+		g_factor = (g_factor / max_factor) * 3.0;
+		b_factor = (b_factor / max_factor) * 3.0;
+	}
+
+	printf("White balance (bright): r=%1d, g=%1d, b=%1d, fr=%1.3f, fg=%1.3f, fb=%1.3f\n", r, g, b, r_factor, g_factor, b_factor);
+
+	for (x = 0; x < (size * 3); x += 3)
+	{
+		d = (int) data[x+0] * r_factor;
+		if (d > 255) { d = 255; }
+		data[x+0] = d;
+		d = (int) data[x+1] * g_factor;
+		if (d > 255) { d = 255; }
+		data[x+1] = d;
+		d = (int) data[x+2] * b_factor;
+		if (d > 255) { d = 255; }
+		data[x+2] = d;
+	}
+	/* ---------------- DARK DOTS ------------------- */
+
+
+	max = size / 200;  /*  1/200 = 0.5%  */
+
+	histogram(data, size, htable_r, htable_g, htable_b);
+
+	for (r=0, x=0; (r < 64) && (x < max); r++)  
+		x += htable_r[r]; 
+	for (g=0, x=0; (g < 64) && (x < max); g++) 
+		x += htable_g[g];
+	for (b=0, x=0; (b < 64) && (x < max); b++) 
+		x += htable_b[b];
+
+	r_factor = (double) 254 / (255-r);
+	g_factor = (double) 254 / (255-g);
+	b_factor = (double) 254 / (255-b);
+
+	printf("White balance (dark): r=%1d, g=%1d, b=%1d, fr=%1.3f, fg=%1.3f, fb=%1.3f\n", r, g, b, r_factor, g_factor, b_factor);
+
+	for (x = 0; x < (size * 3); x += 3)
+	{
+		d = (int) 255-((255-data[x+0]) * r_factor);
+		if (d < 0) { d = 0; }
+		data[x+0] = d;
+		d = (int) 255-((255-data[x+1]) * g_factor);
+		if (d < 0) { d = 0; }
+		data[x+1] = d;
+		d = (int) 255-((255-data[x+2]) * b_factor);
+		if (d < 0) { d = 0; }
+		data[x+2] = d;
+	}
+
+	/* ------------------ COLOR ENHANCE ------------------ */
+
+
+	for (x = 0; x < (size * 3); x += 3)
+	{
+		r = data[x+0]; g = data[x+1]; b = data[x+2];
+		d = (int) (r + 2*g + b) / 4.;
+		if ( r > d )
+			r = r + (int) ((r - d) * (255-r)/(256-d) * saturation);
+		else 
+			r = r + (int) ((r - d) * (255-d)/(256-r) * saturation);
+		if (g > d)
+			g = g + (int) ((g - d) * (255-g)/(256-d) * saturation);
+		else 
+			g = g + (int) ((g - d) * (255-d)/(256-g) * saturation);
+		if (b > d)
+			b = b + (int) ((b - d) * (255-b)/(256-d) * saturation);
+		else 
+			b = b + (int) ((b - d) * (255-d)/(256-b) * saturation);
+
+		if (r < 0) { r = 0; }
+		if (r > 255) { r = 255; }
+		data[x+0] = r;
+		if (g < 0) { g = 0; }
+		if (g > 255) { g = 255; }
+		data[x+1] = g;
+		if (b < 0) { b = 0; }
+		if (b > 255) { b = 255; }
+		data[x+2] = b;
+	}
+
+	
+	return 0;
+}


Property changes on: trunk/playground/raw_converters/sonix_raw_converter/sonix_process.c
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Added: trunk/playground/raw_converters/sonix_raw_converter/sonix_process.h
===================================================================
--- trunk/playground/raw_converters/sonix_raw_converter/sonix_process.h	                        (rev 0)
+++ trunk/playground/raw_converters/sonix_raw_converter/sonix_process.h	2008-02-13 23:39:36 UTC (rev 10950)
@@ -0,0 +1,54 @@
+/* sonix_process.h
+ *
+ * Header file for image processor for raw files from Sonix SN9C2028 cameras.
+ *
+ * Copyright (C) 2008 Theodore Kilgore <kilgota@...>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, 
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details. 
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __SONIX_PROCESS_H__
+#define __SONIX_PROCESS_H__
+
+#define BYTE	unsigned char
+#define HEADER_LEN	8
+
+typedef struct {
+	int width;
+	int height;
+	int bayer;
+	unsigned char reverse;
+	unsigned char compression;
+	float	gamma;
+	unsigned char outdoors;
+} image_info;
+
+int get_image_info( image_info *info, unsigned char *photo, int filesize, 
+						unsigned char qvga_setting);
+
+int reverse_bytes(unsigned char *some_data, int size);
+
+
+int sonix_decode		(unsigned char * dst, unsigned char * src, 
+				    int width, int height);
+int
+histogram (unsigned char *data, unsigned int size, int *htable_r, int *htable_g, int *htable_b);
+
+int
+white_balance (unsigned char *data, unsigned int size, float saturation);
+
+
+#endif 


Property changes on: trunk/playground/raw_converters/sonix_raw_converter/sonix_process.h
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[gphoto-cvs] SF.net SVN: gphoto: [10953] trunk/playground/raw_converters

From: <kilgota@us...> - 2008-02-19 04:29

Revision: 10953
          http://gphoto.svn.sourceforge.net/gphoto/?rev=10953&view=rev
Author:   kilgota
Date:     2008-02-18 20:29:26 -0800 (Mon, 18 Feb 2008)

Log Message:
-----------
mars_raw_converter added in playground/raw_converters

Added Paths:
-----------
    trunk/playground/raw_converters/mars_raw_converter/
    trunk/playground/raw_converters/mars_raw_converter/Makefile
    trunk/playground/raw_converters/mars_raw_converter/README
    trunk/playground/raw_converters/mars_raw_converter/bayer.h
    trunk/playground/raw_converters/mars_raw_converter/byr2ppm.c
    trunk/playground/raw_converters/mars_raw_converter/convert_all_show
    trunk/playground/raw_converters/mars_raw_converter/gamma.h
    trunk/playground/raw_converters/mars_raw_converter/main.c
    trunk/playground/raw_converters/mars_raw_converter/mr_process.c
    trunk/playground/raw_converters/mars_raw_converter/mr_process.h

Added: trunk/playground/raw_converters/mars_raw_converter/Makefile
===================================================================
--- trunk/playground/raw_converters/mars_raw_converter/Makefile	                        (rev 0)
+++ trunk/playground/raw_converters/mars_raw_converter/Makefile	2008-02-19 04:29:26 UTC (rev 10953)
@@ -0,0 +1,14 @@
+CC = gcc
+CFLAGS = -g -Wall -O3 `pkg-config --cflags --libs gtk+-2.0`
+OBJS = main.o mr_process.o byr2ppm.o
+EXE = show_mr_raw
+
+all: $(EXE)
+
+$(EXE): $(OBJS)
+	gcc  $(CFLAGS) $(OBJS) -o $(EXE)
+	
+# rule to build $(OBJS) is implicit
+
+clean:
+	rm $(EXE) *.o


Property changes on: trunk/playground/raw_converters/mars_raw_converter/Makefile
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Added: trunk/playground/raw_converters/mars_raw_converter/README
===================================================================
--- trunk/playground/raw_converters/mars_raw_converter/README	                        (rev 0)
+++ trunk/playground/raw_converters/mars_raw_converter/README	2008-02-19 04:29:26 UTC (rev 10953)
@@ -0,0 +1,102 @@
+/* README.show_mr_raw
+ *
+ * Part of a processor program for raw data from Mars MR97310 cameras.
+ * 
+ * Copyright (C) 2008 Theodore Kilgore <kilgota@...>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+The program show_mr_raw will convert a raw file from most of the known 
+cameras supported in libgphoto2/camlibs/mars into a viewable PPM file. The 
+file will be saved, and the image contained in the file will be displayed in 
+an X window. To close the program, close the window. The output file will be
+saved. The name of the output file will look like mrpic***ppm. An image file 
+created by libgphoto2/camlibs/mars will have a similar name, but with a "." 
+before the ppm. The reason why the filenames put out from this program are 
+slightly different is that the output of this program and of the mars camera 
+library will be close together if in the same directory, whereas at the same 
+time there will be no name conflicts. As one of the purposes of the 
+show_mr_raw program is to try to improve the image processing for the Mars
+cameras, this feature will therefore allow easy comparison of the image 
+resulting from two different processing routines. 
+
+The program should automatically detect and handle compressed files, and also 
+should automatically detect the output dimensions. The user is warned, however,
+that raw files created with a version of camlibs/mars/library,c prior to 
+September 23, 2006 do _not_ contain the needed information about the output 
+dimensions of the finished photo. The default dimensions of the output file 
+are considered here as 176*144, which will give rather bad results unless that 
+really is the appropriate resolution setting. If you have such old raw files 
+from a Mars camera lying around and really want to get photos from them, then 
+it is of course possible to add the needed information. Please see the 
+sourcecode or the file README.mars in libgphoto2/camlibs/mars to see how I 
+added this information to the raw files. 
+
+The program is written to accept raw files which were the output of 
+gphoto2 --get-all-raw-data 
+or 
+gphoto2 --get-raw-data (number or range of numbers, or file name(s)). The  
+raw files will have names which look like raw_mrpic***.raw in which *** is the 
+number of the photo. A sample script file should also be present here, which 
+will successively run the program through all of the raw files in a directory, 
+provided that the numbering of those raw files is consecutive and starts with 
+001. Just put the script and the show_mr_raw executable in the same 
+directory with the raw files and run the script. The first image will be 
+displayed and will remain displayed until you close the window in which it sits.
+At that point, the second image will be displayed, and so on until you have 
+opened all of the photos.  
+
+There are many MR97310 cameras. Some of them use a compression algorithm for 
+all photos; some of them run only in uncompressed mode, and some of them offer
+the user a choice of compressed mode or uncomrpressed mode. Unfortunately, 
+too, it is known that there exist two compression algorithms which are used 
+in Mars cameras. The decompression of photos taken with one of these algorithms 
+is supported, but the other decompression algorithm, alas, is different. If 
+your camera is running that "bad" compression algorithm, then I am sorry that
+I cannot help you at this time. Rather, perhaps I am lucky enough that you will 
+be able to help _me_. For a discussion of the known cameras, whether they use 
+a compression algorithm or not, and if so, which one, please consult 
+libgphoto2/camlibs/mars/README.mars. 
+
+As stated, there are many MR97310 cameras. Another consequence of this is that 
+there is a bewildering variety of sensors used behind the lens. As a reault, 
+it is very difficult to write an image postprocessing routine which works 
+equally well for all of these cameras. The worst problem is that what appears 
+to work very well for some subset of the cameras seems to work atrociously for 
+some other subset. The main problem lies in the different color sensitivities 
+of the various sensors. The most common problem is that the finished photo 
+often looks too green or too blue with some of the cameras. Some of what is 
+done here helps a bit with this problem, but the problem still exists. 
+Moreover, the USB routines of the Mars cameras have nothing in them which will 
+distinguish one camera from a too-large set of other cameras. Unlike what 
+happens with some other cameras, there is no such thing as a firmware version 
+or other ID string at all. In other words, there is no way that a raw file 
+could automatically be marked as coming from a certain camera. 
+
+
+If you encounter any MR97310 camera which seems to require other processing 
+options which are not incorporated here and which are not already listed and 
+described in README.mars, or if there are any other problems 
+remaining with the raw conversion program which prevent it from doing its job, 
+then please let me know. 
+
+The standard warranty disclaimer applies to this program. I do hope that you 
+find the program useful and enjoyable. If you are a developer working on 
+support for these or similar digital cameras, I hope that you will find it 
+helpful in your work. 
+
+Theodore Kilgore (February 18, 2007).
\ No newline at end of file


Property changes on: trunk/playground/raw_converters/mars_raw_converter/README
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Added: trunk/playground/raw_converters/mars_raw_converter/bayer.h
===================================================================
--- trunk/playground/raw_converters/mars_raw_converter/bayer.h	                        (rev 0)
+++ trunk/playground/raw_converters/mars_raw_converter/bayer.h	2008-02-19 04:29:26 UTC (rev 10953)
@@ -0,0 +1,45 @@
+/** bayer.h
+ *
+ * Copyright 2001 Lutz Mller <lutz@...>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __BAYER_H__
+#define __BAYER_H__
+
+/*
+ * This enumeration defines how the CCD bayer array is laid out.
+ */
+
+
+typedef enum {
+	BAYER_TILE_RGGB,
+	BAYER_TILE_GRBG,
+	BAYER_TILE_BGGR,
+	BAYER_TILE_GBRG,
+	BAYER_TILE_RGGB_INTERLACED,
+	BAYER_TILE_GRBG_INTERLACED,
+	BAYER_TILE_BGGR_INTERLACED,
+	BAYER_TILE_GBRG_INTERLACED
+} BayerTile;
+
+int
+gp_bayer_decode (unsigned char *input, int w, int h, unsigned char *output,
+		 BayerTile tile);
+#endif /* __BAYER_H__ */


Property changes on: trunk/playground/raw_converters/mars_raw_converter/bayer.h
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Added: trunk/playground/raw_converters/mars_raw_converter/byr2ppm.c
===================================================================
--- trunk/playground/raw_converters/mars_raw_converter/byr2ppm.c	                        (rev 0)
+++ trunk/playground/raw_converters/mars_raw_converter/byr2ppm.c	2008-02-19 04:29:26 UTC (rev 10953)
@@ -0,0 +1,355 @@
+/** byr2ppm.c (equivalent to libgphoto2/libgphoto2/bayer.c)
+ * Bayer array conversion routines.
+ * 
+ * Copyright 2001 Lutz Mller <lutz@...>
+ * Copyright 2007 Theodore Kilgore <kilgota@...>
+ *
+ * 
+ * gp_bayer_accrue() from Theodore Kilgore <kilgota@...>
+ * contains suggestions by B. R. Harris (e-mail address disappeared) and
+ * Werner Eugster <eugster@...>
+ *
+ * License
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * 
+ * You should have received a copy of the GNU General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+ 
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+
+/* The tiles will be used in the Bayer interpolation routine. */
+#include "bayer.h"
+#include "gamma.h"
+
+static int tile_colors[8][4] = {
+	{0, 1, 1, 2},
+	{1, 0, 2, 1},
+	{2, 1, 1, 0},
+	{1, 2, 0, 1},
+	{0, 1, 1, 2},
+	{1, 0, 2, 1},
+	{2, 1, 1, 0},
+	{1, 2, 0, 1}};
+
+#define RED 0
+#define GREEN 1
+#define BLUE 2
+
+
+/* Bayer interpolation routine. Credit to libgphoto2/bayer.c, by Lutz M\"uller.
+*/
+
+int
+gp_bayer_accrue (unsigned char *image, int w, int h, int x0, int y0,
+		int x1, int y1, int x2, int y2, int x3, int y3, int colour) ;
+
+int
+gp_bayer_expand (unsigned char *input, int w, int h, unsigned char *output,
+		 BayerTile tile)
+{
+	int x, y, i;
+	int colour, bayer;
+	unsigned char *ptr = input;
+
+	switch (tile) {
+
+		case BAYER_TILE_RGGB:
+		case BAYER_TILE_GRBG:
+		case BAYER_TILE_BGGR:
+		case BAYER_TILE_GBRG:
+			for (y = 0; y < h; ++y)
+				for (x = 0; x < w; ++x, ++ptr) {
+					bayer = (x&1?0:1) + (y&1?0:2);
+
+					colour = tile_colors[tile][bayer];
+
+					i = (y * w + x) * 3;
+
+					output[i+RED]    = 0;
+					output[i+GREEN]  = 0;
+					output[i+BLUE]   = 0;
+					output[i+colour] = *ptr;
+				}
+			break;
+
+		case BAYER_TILE_RGGB_INTERLACED:
+		case BAYER_TILE_GRBG_INTERLACED:
+		case BAYER_TILE_BGGR_INTERLACED:
+		case BAYER_TILE_GBRG_INTERLACED:
+			for (y = 0; y < h; ++y, ptr+=w)
+				for (x = 0; x < w; ++x) {
+					bayer = (x&1?0:1) + (y&1?0:2);
+
+					colour = tile_colors[tile][bayer];
+
+					i = (y * w + x) * 3;
+
+					output[i+RED]    = 0;
+					output[i+GREEN]  = 0;
+					output[i+BLUE]   = 0;
+					output[i+colour] = (x&1)? ptr[x>>1]:ptr[(w>>1)+(x>>1)];
+				}
+			break;
+	}
+
+	return 0;
+}
+
+#define AD(x, y, w) ((y)*(w)*3+3*(x))
+
+int
+gp_bayer_interpolate (unsigned char *image, int w, int h, BayerTile tile)
+{
+	int x, y, bayer;
+	int p0, p1, p2, p3;
+	int value, div ;
+
+	switch (tile) {
+	default:
+	case BAYER_TILE_RGGB:
+	case BAYER_TILE_RGGB_INTERLACED:
+		p0 = 0; p1 = 1; p2 = 2; p3 = 3;
+		break;
+	case BAYER_TILE_GRBG:
+	case BAYER_TILE_GRBG_INTERLACED:
+		p0 = 1; p1 = 0; p2 = 3; p3 = 2;
+		break;
+	case BAYER_TILE_BGGR:
+	case BAYER_TILE_BGGR_INTERLACED:
+		p0 = 3; p1 = 2; p2 = 1; p3 = 0;
+		break;
+	case BAYER_TILE_GBRG:
+	case BAYER_TILE_GBRG_INTERLACED:
+		p0 = 2; p1 = 3; p2 = 0; p3 = 1;
+		break;
+	}
+
+	for (y = 0; y < h; y++)
+		for (x = 0; x < w; x++) {
+			bayer = (x&1?0:1) + (y&1?0:2);
+
+			if ( bayer == p0 ) {
+
+				/* red. green lrtb, blue diagonals */
+				image[AD(x,y,w)+GREEN] =
+					gp_bayer_accrue(image, w, h, x-1, y, x+1, y, x, y-1, x, y+1, GREEN) ;
+
+				image[AD(x,y,w)+BLUE] =
+					gp_bayer_accrue(image, w, h, x+1, y+1, x-1, y-1, x-1, y+1, x+1, y-1, BLUE) ;
+
+			} else if (bayer == p1) {
+
+				/* green. red lr, blue tb */
+				div = value = 0;
+				if (x < (w - 1)) {
+					value += image[AD(x+1,y,w)+RED];
+					div++;
+				}
+				if (x) {
+					value += image[AD(x-1,y,w)+RED];
+					div++;
+				}
+				image[AD(x,y,w)+RED] = value / div;
+
+				div = value = 0;
+				if (y < (h - 1)) {
+					value += image[AD(x,y+1,w)+BLUE];
+					div++;
+				}
+				if (y) {
+					value += image[AD(x,y-1,w)+BLUE];
+					div++;
+				}
+				image[AD(x,y,w)+BLUE] = value / div;
+
+			} else if ( bayer == p2 ) {
+
+				/* green. blue lr, red tb */
+				div = value = 0;
+
+				if (x < (w - 1)) {
+					value += image[AD(x+1,y,w)+BLUE];
+					div++;
+				}
+				if (x) {
+					value += image[AD(x-1,y,w)+BLUE];
+					div++;
+				}
+				image[AD(x,y,w)+BLUE] = value / div;
+
+				div = value = 0;
+				if (y < (h - 1)) {
+					value += image[AD(x,y+1,w)+RED];
+					div++;
+				}
+				if (y) {
+					value += image[AD(x,y-1,w)+RED];
+					div++;
+				}
+				image[AD(x,y,w)+RED] = value / div;
+
+			} else {
+
+				/* blue. green lrtb, red diagonals */
+				image[AD(x,y,w)+GREEN] =
+					gp_bayer_accrue (image, w, h, x-1, y, x+1, y, x, y-1, x, y+1, GREEN) ;
+
+				image[AD(x,y,w)+RED] =
+					gp_bayer_accrue (image, w, h, x+1, y+1, x-1, y-1, x-1, y+1, x+1, y-1, RED) ;
+			}
+		}
+
+	return 0;
+}
+
+/* Accrue four surrounding values.  If three values are one side of the average value,
+	the fourth value is ignored. This will sharpen up boundaries. B.R.Harris 13Nov03*/
+int
+gp_bayer_accrue (unsigned char *image, int w, int h, int x0, int y0,
+		int x1, int y1, int x2, int y2, int x3, int y3, int colour)
+{	int x [4] ;
+	int y [4] ;
+	int value [4] ;
+	int above [4] ;
+	int counter	; // counter
+	int total_value	; // total value
+	int average ;
+	int i ;
+	x[0] = x0 ; x[1] = x1 ; x[2] = x2 ; x[3] = x3 ;
+	y[0] = y0 ; y[1] = y1 ; y[2] = y2 ; y[3] = y3 ;
+
+	// special treatment for green
+	counter = total_value = 0 ;
+	if(colour == GREEN)
+	{
+	  	// we need to make sure that horizontal or vertical lines become horizontal
+	  	// and vertical lines even in this interpolation procedure
+	  	// therefore, we determine whether we might have such a line structure
+	  	for (i = 0 ; i < 4 ; i++)
+	  	{	if ((x[i] >= 0) && (x[i] < w) && (y[i] >= 0) && (y[i] < h))
+			{
+				value [i] = image[AD(x[i],y[i],w) + colour] ;
+				counter++;
+			}
+			else
+			{
+				value [i] = -1 ;
+			}
+	  	}
+		if(counter == 4)
+		{
+			// we must assume that x0,y0 and x1,y1 are on the horizontal axis and
+			// x2,y2 and x3,y3 are on the vertical axis
+			int hdiff ;
+			int vdiff ;
+			hdiff = value [1] - value [0] ;
+			hdiff *= hdiff ;	// make value positive by squaring it
+			vdiff = value [3] - value [2] ;
+			vdiff *= vdiff ;	// make value positive by squaring it
+			if(hdiff > 2*vdiff)
+			{
+				// we might have a vertical structure here
+				return (value [3] + value [2])/2 ;
+			}
+			if(vdiff > 2*hdiff)
+			{
+				// we might have a horizontal structure here
+				return (value [1] + value [0])/2 ;
+			}
+			// else we proceed as with blue and red
+		}
+		// if we do not have four points then we proceed as we do for blue and red
+	}
+
+	// for blue and red as it was before
+	counter = total_value = 0 ;
+	for (i = 0 ; i < 4 ; i++)
+	{	if ((x[i] >= 0) && (x[i] < w) && (y[i] >= 0) && (y[i] < h))
+		{	value [i] = image[AD(x[i],y[i],w) + colour] ;
+			total_value += value [i] ;
+			counter++ ;
+		}
+	}
+	average = total_value / counter ;
+	if (counter < 4) return average ;  // Less than four surrounding - just take average
+	counter = 0 ;
+	for (i = 0 ; i < 4 ; i++)
+	{	above[i] = value[i] > average ;
+		if (above[i]) counter++ ;
+	}
+	// Note: counter == 0 indicates all values the same
+	if ((counter == 2) || (counter == 0)) return average ;
+	total_value = 0 ;
+	for (i = 0 ; i < 4 ; i++)
+	{	if ((counter == 3) == above[i])
+		{	total_value += value[i] ; }
+	}
+	return total_value / 3 ;
+}
+
+
+int
+gp_bayer_decode (unsigned char *input, int w, int h, unsigned char *output,
+		 BayerTile tile)
+{
+	gp_bayer_expand (input, w, h, output, tile);
+	gp_bayer_interpolate (output, w, h, tile);
+	return 0;
+}
+
+
+/* Gamma correction routine. Credit to libgphoto2/bayer.c, by Lutz M\"uller.
+*/
+
+
+int
+gp_gamma_correct_triple (unsigned char *table_red,
+			 unsigned char *table_green,
+			 unsigned char *table_blue,
+			 unsigned char *data, unsigned int size)
+{
+	int x;
+
+	for (x = 0; x < (size * 3); x += 3) {
+		data[x + 0] = table_red  [data[x + 0]];
+		data[x + 1] = table_green[data[x + 1]];
+		data[x + 2] = table_blue [data[x + 2]];
+	}
+	return 0;
+}
+
+int
+gp_gamma_correct_single (unsigned char *table, unsigned char *data,
+			 unsigned int size)
+{
+	return (gp_gamma_correct_triple (table, table, table, data, size));
+}
+
+
+int
+gp_gamma_fill_table (unsigned char *table, double g)
+{
+	int x;
+	for (x = 0; x < 256; x++)
+		table[x] = 255 * pow ((double) x/255., g);
+	return 0;
+}
+


Property changes on: trunk/playground/raw_converters/mars_raw_converter/byr2ppm.c
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Added: trunk/playground/raw_converters/mars_raw_converter/convert_all_show
===================================================================
--- trunk/playground/raw_converters/mars_raw_converter/convert_all_show	                        (rev 0)
+++ trunk/playground/raw_converters/mars_raw_converter/convert_all_show	2008-02-19 04:29:26 UTC (rev 10953)
@@ -0,0 +1,15 @@
+i=1
+
+
+while [ "$i" -le 100 ]
+do
+    echo $i
+ls raw*$i.raw > /dev/null
+if [ $? -ne 0 ]
+then
+exit 1
+else 
+show_mr_raw raw*$i.raw
+    i=`expr "$i" + 1`
+fi
+done
\ No newline at end of file


Property changes on: trunk/playground/raw_converters/mars_raw_converter/convert_all_show
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Added: trunk/playground/raw_converters/mars_raw_converter/gamma.h
===================================================================
--- trunk/playground/raw_converters/mars_raw_converter/gamma.h	                        (rev 0)
+++ trunk/playground/raw_converters/mars_raw_converter/gamma.h	2008-02-19 04:29:26 UTC (rev 10953)
@@ -0,0 +1,32 @@
+/* gamma.h
+ *
+ * Copyright \xA9 2001 Lutz M\xFCller <lutz@...>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, 
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details. 
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __GAMMA_H__
+#define __GAMMA_H__
+
+int gp_gamma_fill_table     (unsigned char *table, double g);
+int gp_gamma_correct_single (unsigned char *table, unsigned char *data, 
+			     unsigned int data_size);
+int gp_gamma_correct_triple (unsigned char *table_red,
+			 unsigned char *table_green,
+			 unsigned char *table_blue,
+			 unsigned char *data, unsigned int size);
+
+#endif /* __GAMMA_H__ */


Property changes on: trunk/playground/raw_converters/mars_raw_converter/gamma.h
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Added: trunk/playground/raw_converters/mars_raw_converter/main.c
===================================================================
--- trunk/playground/raw_converters/mars_raw_converter/main.c	                        (rev 0)
+++ trunk/playground/raw_converters/mars_raw_converter/main.c	2008-02-19 04:29:26 UTC (rev 10953)
@@ -0,0 +1,213 @@
+/* main.c for mars_raw_converter
+ *
+ * Part of a processor program for raw data from Mars MR97310 cameras.
+ *
+ * Copyright  2008 Theodore Kilgore
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+#include "gamma.h"
+#include "bayer.h"
+#include "mr_process.h"
+
+#include <gtk/gtk.h>
+
+
+gint delete_event( GtkWidget *widget,
+                   GdkEvent  *event,
+		   gpointer   data )
+{
+    gtk_main_quit ();
+    /* Change TRUE to FALSE and the main window will be destroyed with
+     * a "delete_event". */
+
+    return FALSE;
+}
+
+int load_image( GtkWidget *window, GtkWidget *image  )
+{
+	gtk_container_add(GTK_CONTAINER(window), image);
+	gtk_widget_show (image);
+        gtk_widget_show (window);
+        gtk_main ();
+        return 0;
+}
+
+
+int main(int argc, char *argv[])
+{
+	image_info *info;
+	int i;
+	BYTE *bufp;
+	BYTE *ppm, *ptr;
+	FILE *fp_src, *fp_dest;
+	char *dest;
+	int size;
+	float gamma_factor;
+	BYTE gtable[256];
+	int b;
+	BYTE *buf;
+	BYTE *buf2;
+	int WIDTH=176, HEIGHT=144;		
+	BYTE lighting;
+        GtkWidget *window;
+	GtkWidget *image;
+	GtkWidget *event_box;
+
+
+	if(argc < 2) {
+		printf("Syntax: show_mr_raw sourcefile\n");
+		printf("Exiting.\n");
+		return 0;
+	}
+	info = malloc(512);
+	if (!info) { free(info); return -1; }
+	fprintf (stderr, "Source file is %s\n", argv[1]);
+	
+	/* input file is raw_(some characters).raw, so, first thing, we find 
+	 * the "." in the name.
+	 */
+	dest = malloc(strlen(argv[1]));
+	if (!dest){free(dest);return -1;}
+	if (!((strncmp(argv[1],"raw_",4)==0))) {
+		printf("Sourcefile name does not begin with raw_\n");
+		printf("Exiting.\n");
+		return 0;
+	}
+	
+
+
+	i = strchr(argv[1], 0x2e) - argv[1];
+	/* and throw away the period (to avoid clobbering any finished images
+	 * from gphoto2 which are in the same directory) and throw away the 
+	 * suffix.
+	 */
+
+	strncpy(dest, argv[1] + 4, i - 4);
+	/* then affix "ppm" as a suffix (no preceding period) */
+	strncat (dest, "ppm", 3);
+	fprintf (stderr, "Destination file will be called %s\n", dest);
+	/* now open the raw file */
+	if ( (fp_src = fopen(argv[1], "rb") ) == NULL )
+	{
+		fprintf (stderr, "Error opening src file.\n");
+		return 0;
+	}
+	fprintf(stderr, "Source file %s successfully opened in mode %s.\n", argv[1], "r");
+
+	/* get the size of the raw file and assign that size to "b" */    
+
+	fseek(fp_src, 0, 2);
+	b = ftell(fp_src);	
+	fseek(fp_src, 0, 0);
+
+	buf = malloc(b);
+	if (!buf) return -1;
+
+	/* read the raw file to "buf", and close it */
+	fread (buf, 1, b, fp_src);
+	fprintf(stderr, "size of %s is 0x%x\n", argv[1], b);
+	fclose (fp_src);
+
+	get_image_info( info, buf);
+
+
+	/* If there is a header, then we print it as debug output, then 
+	 * move past it, to the data. 
+	 */
+	bufp = buf;
+	/* show header */
+	for (i = 0; i < HEADER_LEN; i++) {
+		fprintf(stderr, " %02X", buf[i]);
+	}
+	fprintf(stderr, "\n");
+
+	bufp += HEADER_LEN; /* now move past the header */
+
+	WIDTH = info->width;
+	printf("width is %i\n", WIDTH);
+	HEIGHT = info->height;
+	lighting = info->lighting;
+	gamma_factor = info->gamma;
+		fprintf(stderr, "gamma_factor = %f\n", gamma_factor);
+
+	gp_gamma_fill_table(gtable, gamma_factor);
+	fprintf(stderr, "gammma done\n");
+
+	buf2 = malloc(WIDTH * HEIGHT+256);
+	if (!buf2) {
+		free (buf2);
+		return -1;
+	}
+	
+	if (info->compression) /* non-zero if compression in use */
+		mars_decompress(bufp, buf2, WIDTH,HEIGHT);
+	else 
+		memcpy(buf2, bufp, WIDTH*HEIGHT);
+
+	ppm = malloc (WIDTH * HEIGHT * 3 + 256); /* Data + header */
+	if (!ppm) {
+		free (buf2);
+		printf("Exiting. Out of memory\n");
+		return 0;
+	}
+
+	memset (ppm, 0, WIDTH * HEIGHT * 3 + 256);
+
+	snprintf ((char *)ppm,64,
+        	"P6\n"
+        	"#CREATOR: show_mr_raw\n"
+        	"%d %d\n"
+        	"255\n", WIDTH, HEIGHT);
+
+        ptr = ppm + strlen ((char *)ppm);
+        size = strlen ((char *)ppm) + (WIDTH * HEIGHT * 3);
+	normalize (WIDTH, HEIGHT, ptr);
+	gp_bayer_decode(buf2, WIDTH, HEIGHT, ptr, THIS_CAM_TILE);
+
+	gp_gamma_correct_single(gtable,ptr,WIDTH*HEIGHT);
+	white_balance (ptr, WIDTH*HEIGHT, 1.4, info);
+	if ( (fp_dest = fopen(dest, "wb") ) == NULL )
+	{
+		fprintf (stderr, "Error opening dest file.\n");
+		return 0;
+	}
+	printf("Successful in creating %s in mode %s.\n", dest, "w");
+	fwrite(ppm, 1, size, fp_dest);
+	fclose (fp_dest);
+	free (ppm);
+	/* Output file is written. The rest is GUI stuff. */
+        gtk_init (&argc, &argv);
+        window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+	event_box = gtk_event_box_new();
+	gtk_container_add(GTK_CONTAINER (window), event_box);
+	gtk_widget_show(event_box);
+	/* This lets the Window Manager to close the window and exit the program. */
+        g_signal_connect (G_OBJECT (window), "delete_event",
+                          G_CALLBACK (delete_event), NULL);
+	/* Creates and fills image window */
+	image = gtk_image_new_from_file(dest);
+	gtk_container_add(GTK_CONTAINER(event_box), image);
+	gtk_widget_show (image);
+        gtk_widget_show (window);
+        gtk_main ();
+	return 0;
+}


Property changes on: trunk/playground/raw_converters/mars_raw_converter/main.c
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Added: trunk/playground/raw_converters/mars_raw_converter/mr_process.c
===================================================================
--- trunk/playground/raw_converters/mars_raw_converter/mr_process.c	                        (rev 0)
+++ trunk/playground/raw_converters/mars_raw_converter/mr_process.c	2008-02-19 04:29:26 UTC (rev 10953)
@@ -0,0 +1,445 @@
+/*
+ * mr_process.c
+ *
+ * Part of a processor program for raw data from Mars MR97310 cameras. 
+ * 
+ * Copyright (c) 2008 Theodore Kilgore <kilgota@...>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * A previous version of the white_balance() function intended for use in 
+ * libgphoto2/camlibs/aox is copyright (c) 2008 Amauri Magagna.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+#include "gamma.h"
+#include "bayer.h"
+#include "mr_process.h"
+
+/*********************************************************/
+int get_image_info( image_info *info, unsigned char *photo) {
+
+	int w, h;
+
+	switch (photo[6]&0x0f) {
+	case  0x00: w = 176; h = 144; break;
+	case  0x02: w = 352; h = 288; break;
+	case  0x06: w = 320; h = 240; break;
+	case  0x08: w = 640; h  = 480; break;
+	default: return -1;
+	}
+	fprintf (stderr,"%02X\n",photo[6]&0x0f);
+	printf("w is %i\n", w);
+	info->width = w;
+	info->height= h;
+	info->compression = (photo[6] >>4) & 0x0f;
+	info->lighting	  = photo[7];
+	printf("lighting indicator is %#x\n", info->lighting);
+	info->gamma = MAX(sqrt((float)photo[7]/100.), .60);
+	printf("gamma is %f\n", info->gamma);
+	return 0;
+}
+
+
+
+
+
+void precalc_table(code_table_t *table)
+{
+  int i;
+  int is_abs, val, len;
+
+  for (i = 0; i < 256; i++) {
+    is_abs = 0;
+    val = 0;
+    len = 0;
+    if ((i & 0x80) == 0) {
+      /* code 0 */
+      val = 0;
+      len = 1;
+    }else if ((i & 0xE0) == 0xC0) {
+      /* code 110 */
+      val = -3;
+      len = 3;
+    }else if ((i & 0xE0) == 0xA0) {
+      /* code 101 */
+      val = +3;
+      len = 3;
+    }else if ((i & 0xF0) == 0x80) {
+      /* code 1000 */
+      val = +8;
+      len = 4;
+    }else if ((i & 0xF0) == 0x90) {
+      /* code 1001 */
+      val = -8;
+      len = 4;
+    }else if ((i & 0xF0) == 0xF0) {
+      /* code 1111 */
+      val = -20;
+      len = 4;
+    }else if ((i & 0xF8) == 0xE0) {
+      /* code 11100 */
+      val = +20;
+      len = 5;
+    }
+
+    else if ((i & 0xF8) == 0xE8) {
+      /* code 11101 */
+      is_abs = 1;
+      val = 0;
+      len = 5;
+    }
+
+
+    table[i].is_abs = is_abs;
+    table[i].val = val;
+    table[i].len = len;
+  }
+}
+
+
+int mars_decompress (unsigned char *inp, unsigned char *outp, int width,
+   int height)
+{
+	int row, col;
+	unsigned char code;
+	int val;
+	code_table_t table[256];
+	unsigned char *addr;
+	unsigned long bitpos;
+	unsigned char lp=0,tp=0,tlp=0,trp=0,predictor = 0;
+
+
+
+	/* First calculate the Huffman table */
+	precalc_table(table);
+	bitpos = 0;
+	#define GET_CODE addr = inp + (bitpos >> 3);\
+	code = (addr[0] << (bitpos & 7)) | (addr[1] >> (8 - (bitpos & 7)))
+
+	/* main decoding loop */
+	for (row = 0; row < height; row++) {
+		col = 0;
+
+		/* first two pixels in first two rows are stored as raw 8-bit */
+		if (row < 2) {
+    			GET_CODE;
+    			bitpos += 8;
+    			*outp++ = code;
+
+    			GET_CODE;
+    			bitpos += 8;
+    			*outp++ = code;
+    			col += 2;
+		}
+
+		while (col < width) {
+    			/* get bitcode */
+    			GET_CODE;
+    			/* update bit position */
+    			bitpos += table[code].len;
+
+    			/* calculate pixel value */
+    			if (table[code].is_abs) {
+    			/* get 5 more bits and use them as absolute value */
+    				GET_CODE;
+    				val = (code & 0xF8);
+    				bitpos += 5;
+    			} else {
+    			/* value is relative to top or left pixel */
+				
+				predictor=0;
+    				val = table[code].val;
+    				lp =  outp[-2];
+    				if (row > 1) {
+        				tp  = outp[-2*width];
+        				tlp  = outp[-2*width-2];
+        				if(col < width-2)
+        					trp = outp[-2*width+2];
+    				}
+				if (row < 2) {
+        			/* top row: relative to left pixel */
+					val += lp;
+    				}else if (col < 2) {
+					val += (tp+trp)/2;
+    				}else if (col > width - 3) {
+					val += (lp+tp+tlp+1)/3;
+    				/* main area: average of left pixel and top pixel */
+    				} 
+    				else {
+    				/* main area */
+        				/* initial estimate for predictor */
+					tlp>>=1;
+					trp>>=1;
+					val += (lp + tp + tlp + trp + 1)/3;
+				}
+    			}
+    			/* store pixel */
+    			*outp++ = CLAMP(val);
+    			col++;
+		}
+	}
+	return 0;
+}
+
+
+#define RED(p,x,y,w) *((p)+3*((y)*(w)+(x))  )
+#define GREEN(p,x,y,w) *((p)+3*((y)*(w)+(x))+1)
+#define BLUE(p,x,y,w) *((p)+3*((y)*(w)+(x))+2)
+
+//#define MINMAX(a,min,max) { (min)=MIN(min,a); (max)=MAX(max,a); }
+
+int normalize(int width, int height, unsigned char* rgb)
+{
+	int
+		x,y,
+		red_min=255, red_max=0, 
+		blue_min=255, blue_max=0, 
+		green_min=255, green_max=0;
+	double
+		min, max, amplify; 
+
+	/* determine min and max per color... */
+
+	for( y=0; y<height; y++){
+		for( x=0; x<width; x++ ){
+			MINMAX( RED(rgb,x,y,width), red_min,   red_max  );
+			MINMAX( GREEN(rgb,x,y,width), green_min, green_max);
+			MINMAX( BLUE(rgb,x,y,width), blue_min,  blue_max );
+		}
+	}
+
+	/* determine min and max per color... */
+
+	for( y=0; y<height; y++){
+		for( x=0; x<width; x++ ){
+			MINMAX( RED(rgb,x,y,width), red_min,   red_max  );
+			MINMAX( GREEN(rgb,x,y,width), green_min, green_max);
+			MINMAX( BLUE(rgb,x,y,width), blue_min,  blue_max );
+		}
+	}
+
+	/* Normalize brightness ... */
+
+	max = MAX( MAX( red_max, green_max ), blue_max);
+	min = MIN( MIN( red_min, green_min ), blue_min);
+	amplify = 255.0/(max-min);
+
+
+	printf("min=%f max=%f amplify=%f\n",min,max,amplify);
+	if (max == 255)
+		printf("max is already max'ed at 255. Exiting from normalize()\n");
+		return 0;
+
+
+
+	for( y=0; y<height; y++){
+		for( x=0; x<width; x++ ){
+			RED(rgb,x,y,width)= MIN(amplify*(double)(RED(rgb,x,y,width)-min),255);
+			GREEN(rgb,x,y,width)= MIN(amplify*(double)(GREEN(rgb,x,y,width)-min),255);
+			BLUE(rgb,x,y,width)= MIN(amplify*(double)(BLUE(rgb,x,y,width)-min),255);
+		}
+	}
+
+	return 0;
+}
+
+
+
+/*	========= White Balance / Color Enhance / Gamma adjust (experimental) ==========
+
+	Get histogram for each color plane
+	Expand to reach 0.5% of white dots in image
+
+	Get new histogram for each color plane
+	Expand to reach 0.5% of black dots in image
+
+	Get new histogram
+	Calculate and apply gamma correction
+
+	if not a dark image:
+	For each dot, increases color separation
+
+	================================================================================== */
+
+int
+histogram (unsigned char *data, unsigned int size, int *htable_r, int *htable_g, int *htable_b)
+{
+	int x;
+	/* Initializations */
+	for (x = 0; x < 0x100; x++) { 
+		htable_r[x] = 0; 
+		htable_g[x] = 0; 
+		htable_b[x] = 0; 
+	}
+	/* Building the histograms */
+	for (x = 0; x < (size * 3); x += 3)
+	{
+		htable_r[data[x+0]]++;	/* red histogram */
+		htable_g[data[x+1]]++;	/* green histogram */
+		htable_b[data[x+2]]++;	/* blue histogram */
+	}
+	return 0;
+}
+
+int
+white_balance (unsigned char *data, unsigned int size, float saturation, 
+				    image_info *info)
+{
+	int x, r, g, b, max, d;
+	double r_factor, g_factor, b_factor, max_factor;
+	int htable_r[0x100], htable_g[0x100], htable_b[0x100];
+	BYTE gtable[0x100];
+	double new_gamma, gamma=1.0;
+
+	/* ------------------- GAMMA CORRECTION ------------------- */
+
+	histogram(data, size, htable_r, htable_g, htable_b);
+	x = 1;
+	for (r = 48; r < 208; r++)
+	{
+		x += htable_r[r]; 
+		x += htable_g[r];
+		x += htable_r[r]; 
+	}
+	new_gamma = sqrt((double) (x * 1.5) / (double) (size * 3));
+	x=0;
+	printf("Provisional gamma correction = %1.2f\n", new_gamma);
+	/* Recalculate saturation factor for later use. */
+	saturation=saturation*new_gamma*new_gamma;
+	printf("saturation = %1.2f\n", saturation);
+	if(new_gamma >= 1.0)
+		gamma = new_gamma;
+	else
+		gamma = info->gamma;
+
+	printf("Gamma correction = %1.2f\n", gamma);
+	gp_gamma_fill_table(gtable, gamma);
+
+	/* ---------------- BRIGHT DOTS ------------------- */
+	max = size / 200; 
+	histogram(data, size, htable_r, htable_g, htable_b);
+
+	for (r=0xfe, x=0; (r > 32) && (x < max); r--)  
+		x += htable_r[r]; 
+	for (g=0xfe, x=0; (g > 32) && (x < max); g--) 
+		x += htable_g[g];
+	for (b=0xfe, x=0; (b > 32) && (x < max); b--) 
+		x += htable_b[b];
+	r_factor = (double) 0xfd / r;
+	g_factor = (double) 0xfd / g;
+	b_factor = (double) 0xfd / b;
+
+	max_factor = r_factor;
+	if (g_factor > max_factor) max_factor = g_factor;
+	if (b_factor > max_factor) max_factor = b_factor;
+
+	if (max_factor >= 2.5) {
+		r_factor = (r_factor / max_factor) * 2.5;
+		g_factor = (g_factor / max_factor) * 2.5;
+		b_factor = (b_factor / max_factor) * 2.5;
+	}
+	printf("White balance (bright): r=%1d, g=%1d, b=%1d, fr=%1.3f, fg=%1.3f, fb=%1.3f\n", r, g, b, r_factor, g_factor, b_factor);
+	if (max_factor <= 2.5) {
+		for (x = 0; x < (size * 3); x += 3)
+		{
+			d = (data[x+0]<<8) * r_factor;
+			d >>=8;
+			if (d > 0xff) { d = 0xff; }
+			data[x+0] = d;
+			d = (data[x+1]<<8) * g_factor;
+			d >>=8;
+			if (d > 0xff) { d = 0xff; }
+			data[x+1] = d;
+			d = (data[x+2]<<8) * b_factor;
+			d >>=8;
+			if (d > 0xff) { d = 0xff; }
+			data[x+2] = d;
+		}
+	}
+	/* ---------------- DARK DOTS ------------------- */
+	max = size / 200;  /*  1/200 = 0.5%  */
+	histogram(data, size, htable_r, htable_g, htable_b);
+
+	for (r=0, x=0; (r < 96) && (x < max); r++)  
+		x += htable_r[r]; 
+	for (g=0, x=0; (g < 96) && (x < max); g++) 
+		x += htable_g[g];
+	for (b=0, x=0; (b < 96) && (x < max); b++) 
+		x += htable_b[b];
+
+	r_factor = (double) 0xfe / (0xff-r);
+	g_factor = (double) 0xfe / (0xff-g);
+	b_factor = (double) 0xfe / (0xff-b);
+
+	max_factor = r_factor;
+	if (g_factor > max_factor) max_factor = g_factor;
+	if (b_factor > max_factor) max_factor = b_factor;
+
+	if (max_factor >= 1.15) {
+		r_factor = (r_factor / max_factor) * 1.15;
+		g_factor = (g_factor / max_factor) * 1.15;
+		b_factor = (b_factor / max_factor) * 1.15;
+	}
+	printf(
+	"White balance (dark): r=%1d, g=%1d, b=%1d, fr=%1.3f, fg=%1.3f, fb=%1.3f\n", 
+				r, g, b, r_factor, g_factor, b_factor);
+
+	for (x = 0; x < (size * 3); x += 3)
+	{
+		d = (int) 0xff08-(((0xff-data[x+0])<<8) * r_factor);
+		d >>= 8;
+		if (d < 0) { d = 0; }
+		data[x+0] = d;
+		d = (int) 0xff08-(((0xff-data[x+1])<<8) * g_factor);
+		d >>= 8;
+		if (d < 0) { d = 0; }
+		data[x+1] = d;
+		d = (int) 0xff08-(((0xff-data[x+2])<<8) * b_factor);
+		d >>= 8;
+		if (d < 0) { d = 0; }
+		data[x+2] = d;
+	}
+
+	/* ------------------ COLOR ENHANCE ------------------ */
+
+	if(saturation > 0.0) {
+		for (x = 0; x < (size * 3); x += 3)
+		{
+			r = data[x+0]; g = data[x+1]; b = data[x+2];
+			d = (int) (r + g + b) /3.;
+			if ( r > d )
+				r = r + (int) ((r - d) * (0xff-r)/(0x100-d) * saturation);
+			else 
+				r = r + (int) ((r - d) * (0xff-d)/(0x100-r) * saturation);
+			if (g > d)
+				g = g + (int) ((g - d) * (0xff-g)/(0x100-d) * saturation);
+			else 
+				g = g + (int) ((g - d) * (0xff-d)/(0x100-g) * saturation);
+			if (b > d)
+				b = b + (int) ((b - d) * (0xff-b)/(0x100-d) * saturation);
+			else 
+				b = b + (int) ((b - d) * (0xff-d)/(0x100-b) * saturation);
+			data[x+0] = CLAMP(r);
+			data[x+1] = CLAMP(g);
+			data[x+2] = CLAMP(b);
+		}
+	}
+	return 0;
+}


Property changes on: trunk/playground/raw_converters/mars_raw_converter/mr_process.c
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Added: trunk/playground/raw_converters/mars_raw_converter/mr_process.h
===================================================================
--- trunk/playground/raw_converters/mars_raw_converter/mr_process.h	                        (rev 0)
+++ trunk/playground/raw_converters/mars_raw_converter/mr_process.h	2008-02-19 04:29:26 UTC (rev 10953)
@@ -0,0 +1,60 @@
+/* mr_process.h
+ *
+ * Header file for image processor for raw files from Mars MR97310 cameras.
+ *
+ * Copyright (C) 2008 Theodore Kilgore <kilgota@...>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, 
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details. 
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __MR_PROCESS_H__
+#define __MR_PROCESS_H__
+
+#define BYTE	unsigned char
+#define CLAMP(x)	((x)<0?0:((x)>255)?255:(x))
+#define	MAX(a,b) 	((a)>(b)?(a):(b)) 
+#define 	MIN(a,b)	((a)<(b)?(a):(b))
+#define MINMAX(a,min,max) { (min)=MIN(min,a); (max)=MAX(max,a); }
+
+#define THIS_CAM_TILE	BAYER_TILE_RGGB 
+#define HEADER_LEN	12
+
+typedef struct {
+	int width;
+	int height;
+	unsigned char lighting;
+	unsigned char compression;
+	float	gamma;
+} image_info;
+
+int get_image_info( image_info *info, unsigned char *photo);
+
+
+typedef struct {
+	int is_abs;
+	int len;
+	int val;
+} code_table_t;
+
+void precalc_table(code_table_t *table);
+int mars_decompress (unsigned char *inp, unsigned char *outp, int width,
+					int height);
+int normalize(int width, int height, unsigned char* rgb);
+int histogram (unsigned char *data, unsigned int size, int *htable_r, 
+                                        int *htable_g, int *htable_b);
+int white_balance (unsigned char *data, unsigned int size, float saturation, 
+					image_info *info);
+#endif


Property changes on: trunk/playground/raw_converters/mars_raw_converter/mr_process.h
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[gphoto-cvs] SF.net SVN: gphoto: [10957] trunk/playground/raw_converters

From: <kilgota@us...> - 2008-02-19 22:20

Revision: 10957
          http://gphoto.svn.sourceforge.net/gphoto/?rev=10957&view=rev
Author:   kilgota
Date:     2008-02-19 14:20:36 -0800 (Tue, 19 Feb 2008)

Log Message:
-----------
 added Changelog file in sonix_, mars_, and jl2005a_raw_converter directories

Added Paths:
-----------
    trunk/playground/raw_converters/jl2005a_raw_converter/ChangeLog
    trunk/playground/raw_converters/sonix_raw_converter/ChangeLog

Added: trunk/playground/raw_converters/jl2005a_raw_converter/ChangeLog
===================================================================
--- trunk/playground/raw_converters/jl2005a_raw_converter/ChangeLog	                        (rev 0)
+++ trunk/playground/raw_converters/jl2005a_raw_converter/ChangeLog	2008-02-19 22:20:36 UTC (rev 10957)
@@ -0,0 +1,3 @@
+2007-12-23  Theodore Kilgore <kilgota@...>                               
+                                                                                
+        * *.[c,h]: First check-in.
\ No newline at end of file


Property changes on: trunk/playground/raw_converters/jl2005a_raw_converter/ChangeLog
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Added: trunk/playground/raw_converters/sonix_raw_converter/ChangeLog
===================================================================
--- trunk/playground/raw_converters/sonix_raw_converter/ChangeLog	                        (rev 0)
+++ trunk/playground/raw_converters/sonix_raw_converter/ChangeLog	2008-02-19 22:20:36 UTC (rev 10957)
@@ -0,0 +1,3 @@
+2008-2-13  Theodore Kilgore <kilgota@...>                               
+                                                                                
+        * *.[c,h]: First check-in.
\ No newline at end of file


Property changes on: trunk/playground/raw_converters/sonix_raw_converter/ChangeLog
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[gphoto-cvs] SF.net SVN: gphoto: [10956] trunk/playground/raw_converters/ mars_raw_converter/ChangeLog

From: <kilgota@us...> - 2008-02-19 22:19

Revision: 10956
          http://gphoto.svn.sourceforge.net/gphoto/?rev=10956&view=rev
Author:   kilgota
Date:     2008-02-19 14:19:07 -0800 (Tue, 19 Feb 2008)

Log Message:
-----------
 added Changelog file in sonix_, mars_, and jl2005a_raw_converter directories

Added Paths:
-----------
    trunk/playground/raw_converters/mars_raw_converter/ChangeLog

Added: trunk/playground/raw_converters/mars_raw_converter/ChangeLog
===================================================================
--- trunk/playground/raw_converters/mars_raw_converter/ChangeLog	                        (rev 0)
+++ trunk/playground/raw_converters/mars_raw_converter/ChangeLog	2008-02-19 22:19:07 UTC (rev 10956)
@@ -0,0 +1,3 @@
+2008-02-18  Theodore Kilgore <kilgota@...>                               
+                                                                                
+        * *.[c,h]: First check-in.
\ No newline at end of file


Property changes on: trunk/playground/raw_converters/mars_raw_converter/ChangeLog
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[gphoto-cvs] SF.net SVN: gphoto: [10955] branches/libgphoto2-2_4/libgphoto2/camlibs/ptp2 /config.c

From: <marcusmeissner@us...> - 2008-02-19 20:16

Revision: 10955
          http://gphoto.svn.sourceforge.net/gphoto/?rev=10955&view=rev
Author:   marcusmeissner
Date:     2008-02-19 12:16:07 -0800 (Tue, 19 Feb 2008)

Log Message:
-----------
handle widget changed flags better

Modified Paths:
--------------
    branches/libgphoto2-2_4/libgphoto2/camlibs/ptp2/config.c

Modified: branches/libgphoto2-2_4/libgphoto2/camlibs/ptp2/config.c
===================================================================
--- branches/libgphoto2-2_4/libgphoto2/camlibs/ptp2/config.c	2008-02-19 19:52:09 UTC (rev 10954)
+++ branches/libgphoto2-2_4/libgphoto2/camlibs/ptp2/config.c	2008-02-19 20:16:07 UTC (rev 10955)
@@ -2788,8 +2788,12 @@
 			if (!gp_widget_changed (widget))
 				continue;
 
+			/* restore the "changed flag" */
+			gp_widget_set_changed (widget, TRUE);
+
 			gp_log (GP_LOG_DEBUG, "camera_set_config", "Found and setting Property %04x (%s)", cursub->propid, cursub->label);
 			if (have_prop(camera,cursub->vendorid,cursub->propid)) {
+				gp_widget_changed (widget); /* clear flag */
 				if (cursub->propid) {
 					PTPDevicePropDesc dpd;
 
@@ -2807,6 +2811,7 @@
 			if (have_eos_prop(camera,cursub->vendorid,cursub->propid)) {
 				PTPDevicePropDesc	dpd;
 
+				gp_widget_changed (widget); /* clear flag */
 				gp_log (GP_LOG_DEBUG, "camera_set_config", "Found and setting EOS Property %04x (%s)", cursub->propid, cursub->label);
 				memset(&dpd,0,sizeof(dpd));
 				ptp_canon_eos_getdevicepropdesc (&camera->pl->params,cursub->propid, &dpd);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[gphoto-cvs] SF.net SVN: gphoto: [10952] trunk/libgphoto2/camlibs/sonix

From: <kilgota@us...> - 2008-02-17 02:04

Revision: 10952
          http://gphoto.svn.sourceforge.net/gphoto/?rev=10952&view=rev
Author:   kilgota
Date:     2008-02-16 18:02:48 -0800 (Sat, 16 Feb 2008)

Log Message:
-----------
camlibs/sonix: Camera ID byte saved in rawfile footers.

Modified Paths:
--------------
    trunk/libgphoto2/camlibs/sonix/ChangeLog
    trunk/libgphoto2/camlibs/sonix/library.c

Modified: trunk/libgphoto2/camlibs/sonix/ChangeLog
===================================================================
--- trunk/libgphoto2/camlibs/sonix/ChangeLog	2008-02-14 07:29:21 UTC (rev 10951)
+++ trunk/libgphoto2/camlibs/sonix/ChangeLog	2008-02-17 02:02:48 UTC (rev 10952)
@@ -1,3 +1,6 @@
+2008-02-16   Theodore Kilgore <kilgota@...>
+	* library.c: Camera ID byte saved in rawfile footers. 
+
 2007-12-27   Theodore Kilgore <kilgota@...>
 	* library.c: added Wild Planet Digital Spy Camera, contributed by 
 		     Jorma Laaksonen <jorma.laaksonen@...>

Modified: trunk/libgphoto2/camlibs/sonix/library.c
===================================================================
--- trunk/libgphoto2/camlibs/sonix/library.c	2008-02-14 07:29:21 UTC (rev 10951)
+++ trunk/libgphoto2/camlibs/sonix/library.c	2008-02-17 02:02:48 UTC (rev 10952)
@@ -445,6 +445,9 @@
 		free (data);
 		return GP_OK;
 	case GP_FILE_TYPE_RAW: 
+				/* Save the fwversion code in the data */
+				data[endpoint-10]=camera->pl->fwversion[1];
+
 		gp_file_set_mime_type(file, GP_MIME_RAW);
 		gp_file_set_name(file, filename);
 		gp_file_append( file, (char *)data, rawsize);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[gphoto-cvs] SF.net SVN: gphoto: [10951] trunk/libgphoto2/camlibs/ptp2/ptpip.c

From: <marcusmeissner@us...> - 2008-02-14 07:29

Revision: 10951
          http://gphoto.svn.sourceforge.net/gphoto/?rev=10951&view=rev
Author:   marcusmeissner
Date:     2008-02-13 23:29:21 -0800 (Wed, 13 Feb 2008)

Log Message:
-----------
fixed wrong comparison

Modified Paths:
--------------
    trunk/libgphoto2/camlibs/ptp2/ptpip.c

Modified: trunk/libgphoto2/camlibs/ptp2/ptpip.c
===================================================================
--- trunk/libgphoto2/camlibs/ptp2/ptpip.c	2008-02-13 23:39:36 UTC (rev 10950)
+++ trunk/libgphoto2/camlibs/ptp2/ptpip.c	2008-02-14 07:29:21 UTC (rev 10951)
@@ -259,7 +259,7 @@
 		htod32a(&xdata[ptpip_data_transid+8], ptp->Transaction_ID);
 		gp_log_data("ptpip/senddata", (char*)xdata, towrite2);
 		written = 0;
-		while (written > towrite2) {
+		while (written < towrite2) {
 			ret = write (params->cmdfd, xdata+written, towrite2-written);
 			if (ret == -1) {
 				perror ("write in senddata failed");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[gphoto-cvs] SF.net SVN: gphoto: [10949] trunk/libgphoto2/libgphoto2_port

From: <marcusmeissner@us...> - 2008-02-13 16:59

Revision: 10949
          http://gphoto.svn.sourceforge.net/gphoto/?rev=10949&view=rev
Author:   marcusmeissner
Date:     2008-02-13 08:59:41 -0800 (Wed, 13 Feb 2008)

Log Message:
-----------
do not recursively go into "gphotofs" mounts when using gphotofs.

Modified Paths:
--------------
    trunk/libgphoto2/libgphoto2_port/ChangeLog
    trunk/libgphoto2/libgphoto2_port/disk/disk.c

Modified: trunk/libgphoto2/libgphoto2_port/ChangeLog
===================================================================
--- trunk/libgphoto2/libgphoto2_port/ChangeLog	2008-02-11 10:42:14 UTC (rev 10948)
+++ trunk/libgphoto2/libgphoto2_port/ChangeLog	2008-02-13 16:59:41 UTC (rev 10949)
@@ -1,3 +1,8 @@
+2008-02-13  Marcus Meissner  <meissner@...>
+
+	* disk/disk.c: Do not check "gphotofs" filesystems, to avoid
+	  recursion in gphotofs.
+
 2007-12-28  Marcus Meissner  <marcus@...>
 
 	* Migrated libgphoto2_port to use symbol versions.

Modified: trunk/libgphoto2/libgphoto2_port/disk/disk.c
===================================================================
--- trunk/libgphoto2/libgphoto2_port/disk/disk.c	2008-02-11 10:42:14 UTC (rev 10948)
+++ trunk/libgphoto2/libgphoto2_port/disk/disk.c	2008-02-13 16:59:41 UTC (rev 10949)
@@ -206,10 +206,11 @@
 			gp_log(GP_LOG_DEBUG, "gphoto2-port/disk",
 			       "found fstab fsname %s", mntent->mnt_fsname);
 
-			if ((NULL != strstr(mntent->mnt_fsname,"fd")) ||
+			if ((NULL != strstr(mntent->mnt_fsname,"fd"))	||
 			    (NULL != strstr(mntent->mnt_fsname,"floppy")) ||
-			    (NULL != strstr(mntent->mnt_fsname, "fuse")))
-			{
+			    (NULL != strstr(mntent->mnt_fsname,"fuse"))	||
+			    (NULL != strstr(mntent->mnt_fsname,"gphotofs"))
+			) {
 				continue;
 			}
 			snprintf (path, sizeof(path), "%s/DCIM", mntent->mnt_dir);
@@ -233,10 +234,11 @@
 			gp_log(GP_LOG_DEBUG, "gphoto2-port/disk",
 			       "found mtab fsname %s", mntent->mnt_fsname);
 
-			if ((NULL != strstr(mntent->mnt_fsname,"fd")) ||
+			if ((NULL != strstr(mntent->mnt_fsname,"fd"))	||
 			    (NULL != strstr(mntent->mnt_fsname,"floppy")) ||
-			    (NULL != strstr(mntent->mnt_fsname, "fuse")))
-			{
+			    (NULL != strstr(mntent->mnt_fsname,"fuse"))	||
+			    (NULL != strstr(mntent->mnt_fsname,"gphotofs"))
+			) {
 				continue;
 			}
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Next Messages