darktable/libgphoto2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix typos throughout the codebase

Browse Source
This commit is contained in:
Sijawusz Pur Rahnama
2020-05-25 17:49:22 +02:00
parent acafc33246
commit fd0be84db5
114 changed files with 229 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis-translate-pkgs
View File

@@ -8,7 +8,7 @@ ubuntu2osx() {
gettext) echo "gettext" ;;
libusb-dev) echo "libusb-compat" ;;
libusb-1.0-0-dev) echo "" ;; # libusb1 default installed on MacOSX currently, formerly was libusb
libcurl4-openssl-dev) echo "" ;; # perhaps defualt installed, lets check
libcurl4-openssl-dev) echo "" ;; # perhaps default installed, lets check
libgd2-xpm-dev) echo "gd" ;;
*)
echo "Error: Unknown package name: '$1'" >&2

24
ChangeLog
View File

@@ -1200,7 +1200,7 @@
2002-02-26 Marcus Meissner <marcus@jet.franken.de>
* libgphoto2/gphoto-camera.c: do gp_close_port() unconditionaly
* libgphoto2/gphoto-camera.c: do gp_close_port() unconditionally
in gp_camera_exit().
2002-02-26 Lutz Müller <lutz@users.sourceforge.net>
@@ -1337,7 +1337,7 @@
for_each_subfolder() did not descend into subfolders of
subfolders when recursive.
* frontends/command-line/main.c: Be even more carefull in
* frontends/command-line/main.c: Be even more careful in
checking the ID passed to the context functions by camera
drivers.
@@ -1395,7 +1395,7 @@
* frontends/command-line/foreach.c: Check return values
of recursive calls to for_each_subfolder(). Fixes bug
where errors was not detected if they occured in
where errors was not detected if they occurred in
subfolders of subfolders when doing recursive actions
(like -P).
@@ -2285,7 +2285,7 @@
2001-11-15 Mariusz Woloszyn <emsi@ipartners.pl>
* camlibs/ptp/: Started PTP support library developement
* camlibs/ptp/: Started PTP support library development
2001-11-15 Colin Marquardt <colin@marquardt-home.de>
@@ -2378,7 +2378,7 @@
2001-11-09 Lutz Müller <urc8@rz.uni-karlsruhe.de>
Patch from Greg Ingram <ingram@symsys.com>, unfortunatelly without
Patch from Greg Ingram <ingram@symsys.com>, unfortunately without
ChangeLog entry...
* camlibs/polaroid/pdc700.c: Report lcd state and caption (?) in
@@ -2955,7 +2955,7 @@
and made a new psa50_usb_long_dialogue() that handles these correctly.
This should fix a number of problems with those kinds of transfers (I
previously fixed this for get_file, now it is fixed for all functions
using this). Large directorys filling more than one USB bulk packet
using this). Large directories filling more than one USB bulk packet
probably never worked before, but should work now.
* camlibs/canon/canon.c:
@@ -3293,7 +3293,7 @@
2001-10-14 Lutz Müller <urc8@rz.uni-karlsruhe.de>
* camlibs/polaroid/pdc640.c: Remove non-existant
* camlibs/polaroid/pdc640.c: Remove non-existent
GP_ERROR_NO_CAMERA_FOUND.
2001-10-14 Lutz Müller <urc8@rz.uni-karlsruhe.de>
@@ -4650,7 +4650,7 @@
camlibs/stv0680/Makefile.am, camlibs/template/Makefile.am: It
adds code in configure.in to detect when '.libs' is not detected
and in this case defined a variable "dotlibs" which is then
substitued in all Makefile.in. This fix a build problem with
substitute in all Makefile.in. This fix a build problem with
newer libtool (1.4)
2001-08-15 Hubert Figuiere <hfiguiere@teaser.fr>
@@ -4714,7 +4714,7 @@
2001-08-04 Lutz Müller <urc8@rz.uni-karlsruhe.de>
* camlibs/sierra/sierra.c: The C-2100UZ is supported, too.
Unfortunatelly, the product id is the same for the C-2100UZ, the
Unfortunately, the product id is the same for the C-2100UZ, the
C-3000Z, and the C-3030Z. This results in three entries for this camera
("gphoto2 --auto-detect"). This has to be fixed somehow, sometime.
@@ -4786,7 +4786,7 @@
2000-08-19 11:53 jgangemi
* frontends/gtk/src/main.c: - gphoto-backend correctly initalized
* frontends/gtk/src/main.c: - gphoto-backend correctly initialized
2000-08-19 11:52 jgangemi
@@ -5137,7 +5137,7 @@
2000-08-06 06:01 mariusz
* camlibs/panasonic/: README, dc1000.c, dc1580.c: abilities
accomodated to the new API
accommodated to the new API
2000-08-05 09:57 mariusz
@@ -5824,7 +5824,7 @@
2000-07-19 13:08 scottf
* libgphoto2/file.c: null terminater the file->data in gp_file_open
* libgphoto2/file.c: null terminator the file->data in gp_file_open
2000-07-19 11:35 scottf

2
NEWS
View File

@@ -1345,7 +1345,7 @@ This is a 2.4 release branch update.
PTP2 driver:
* Increased timeout for Canon Viewfinder enable.
* Fixed intial Canon timeout (0.5 -> 1.5 seconds), was too small
* Fixed initial Canon timeout (0.5 -> 1.5 seconds), was too small
for some Canons.
* Canon EOS capture mode and tethered mode bugfixes.
* Nikon DSLR LiveView support, with Autofocus and ManualFocus Drive possibility.

2
RELEASE-HOWTO.md
View File

@@ -88,7 +88,7 @@
### index.php
Use a entry similar to the current ones. Drop older ones occasionaly.
Use a entry similar to the current ones. Drop older ones occasionally.
### news/index.php

2
camlibs/adc65/README.adc65
View File

@@ -46,7 +46,7 @@ structure, but will work on using this do some image enhancement in the future.
The hardest part of this project was figuring out the image format and I
was often led astray by typos and small logic errors while reprogramming that
portion of the code again and again (and again) due to the number of possible
pertubations. Two packages were very helpful, netpbm and the Gimp. By using
perturbations. Two packages were very helpful, netpbm and the Gimp. By using
rawtopgm (from netpbm) I was able to visually analyze the data. Much better
than trying to understand hexdumps :) I am inspired to write some kind of tool
to help with analyzing this sort of data, perhaps interactively testing

2
camlibs/agfa-cl20/RANDOM
View File

@@ -10,7 +10,7 @@ It does not use an interrupt or anything, but you have to send:
usb_control_msg( cl20_dev, 0xC1, 0x00, 0x0000, 0x8985, data, 1, 5000);
which is: C1 00 00 00 85 89 00 01
If *data now contains "0", nothing happend.
If *data now contains "0", nothing happened.
If *data is now "8", the user is PRESSING the button.
Notice I say "PRESSING" :-) it has no memory, if you miss the moment the

2
camlibs/agfa-cl20/protocol.txt
View File

@@ -92,7 +92,7 @@ That was the setup process. Now the camera should talk to us.
* got the thumbnail and deleted it. Then I switched the camera
* off.
*
* In further experiemnts we have to try out, where our magic numbers
* In further experiments we have to try out, where our magic numbers
* are: Like: How many pictures are on the camera, which one is going
* to be downloaded...
*****************************

2
camlibs/agfa-cl20/protocol2.txt
View File

@@ -21,7 +21,7 @@ http://www.pima.net/standards/it10/PIMA15740/Exif_2-1.PDF
This is a special format which INCLUDES THUMBNAILS. This means, that the picture and the thmbnail are ONE file.
So what basicallly happens in the windows driver:
It retrieves the EXIF File complete, for example 173kb. I calcualted it. It fits. I had 685 Bulk Transfers, 256Bytes each, which makes a total of 175360 Bytes --> my picture (Exif=Thumbnail+picture).
It retrieves the EXIF File complete, for example 173kb. I calculated it. It fits. I had 685 Bulk Transfers, 256Bytes each, which makes a total of 175360 Bytes --> my picture (Exif=Thumbnail+picture).
The Windows driver then extracts the Thumbnail out of the Exif, saves i as JFIF (JPEG) and displays it in the thumbnail overview.
So, if you have the Exif you automatically have the Thumbnail AND the picture. So there is only one transfer for both.

8
camlibs/ax203/ax203.c
View File

@@ -405,7 +405,7 @@ ax203_eeprom_wait_ready(Camera *camera)
count = 64;
break;
case AX3003_FIRMWARE_3_5_x:
/* On the ax3003 contineously reading the status word
/* On the ax3003 continuously reading the status word
does not work. */
count = 1;
break;
@@ -585,7 +585,7 @@ ax203_write_mem(Camera *camera, int offset,
/* This function reads the parameter block from the eeprom and:
1) checks some hopefully constant bytes to make sure it is not reading
garbage
2) Gets the lcd size from the paramter block (ax203_get_lcd_size seems
2) Gets the lcd size from the parameter block (ax203_get_lcd_size seems
to result in all frames being detected as being 128x128 pixels).
3) Determines the compression type for v3.4.x frames
4) Determines the start of the ABFS
@@ -1306,7 +1306,7 @@ ax203_defrag_memory(Camera *camera)
ret = ax203_delete_all (camera);
if (ret < 0) goto cleanup;
/* An last write them back (in one contineous block) */
/* An last write them back (in one continuous block) */
for (i = 0; i < count; i++) {
if (!fileinfo[i].present)
continue;
@@ -1499,7 +1499,7 @@ retry:
if (free >= size) {
gp_log (GP_LOG_DEBUG, "ax203",
"not enough contineous freespace to add file, "
"not enough continuous freespace to add file, "
"defragmenting memory");
CHECK (ax203_defrag_memory (camera))
goto retry;

2
camlibs/ax203/ax203_decode_yuv.c
View File

@@ -244,7 +244,7 @@ main(int argc, char *argv[])
goto exit;
}
} else {
fprintf (stderr, "%s: unkown option: %s\n", argv[0], argv[1]);
fprintf (stderr, "%s: unknown option: %s\n", argv[0], argv[1]);
ret = 1;
goto exit;
}

2
camlibs/ax203/ax203_decode_yuv_delta.c
View File

@@ -437,7 +437,7 @@ main(int argc, char *argv[])
ax203_decode(buf, im->tpixels, width, height);
gdImagePng (im, fout);
} else {
fprintf (stderr, "%s: unkown option: %s\n", argv[0], argv[1]);
fprintf (stderr, "%s: unknown option: %s\n", argv[0], argv[1]);
ret = 1;
goto exit;
}

8
camlibs/canon/ChangeLog
View File

@@ -824,7 +824,7 @@
2002-01-14 Fredrik <fredrik@krixor.xy.org>
* canon.c, library.c: More carefull buffer size checking in some
* canon.c, library.c: More careful buffer size checking in some
places. We should do a real audit of these.
* library.c: Fixed mkdir and rmdir functions which did not convert
@@ -832,7 +832,7 @@
2002-01-13 Lutz Müller <urc8@rz.uni-karlsruhe.de>
* *.[c,h]: Replase last call to gp_camera_set_error (I oversaw one
* *.[c,h]: Replaces last call to gp_camera_set_error (I oversaw one
hidden in the header file).
2002-01-13 Lutz Müller <urc8@rz.uni-karlsruhe.de>
@@ -885,7 +885,7 @@
* canon.c, library.c: Improve error checking and
debug diagnostics when camera does not return the
expected ammount of data.
expected amount of data.
2002-01-01 Fredrik <fredrik@krixor.xy.org>
@@ -1003,7 +1003,7 @@
* canon.h: added CANON_MINIMUM_DIRENT_SIZE.
* canon.c, canon.h:
Exchanged canon_int_list_directorys() with my
Exchanged canon_int_list_directory() with my
rewritten version. At least some hypothetical bugs
fixed, easier to understand and proper error-checking.
This should hopefully not break serial, since this is

10
camlibs/canon/canon.c
View File

@@ -1215,7 +1215,7 @@ canon_int_capture_preview (Camera *camera, unsigned char **data, unsigned int *l
/* Shutter Release
Can't use normal "canon_int_do_control_command", as
we must read the interrupt pipe before the response
comes back for this commmand. */
comes back for this command. */
*data = canon_usb_capture_dialogue ( camera, &return_length, &photo_status, context );
if ( *data == NULL ) {
/* Try to leave camera in a usable state. */
@@ -1604,7 +1604,7 @@ canon_int_capture_image (Camera *camera, CameraFilePath *path,
/* Shutter Release
Can't use normal "canon_int_do_control_command", as
we must read the interrupt pipe before the response
comes back for this commmand. */
comes back for this command. */
data = canon_usb_capture_dialogue ( camera, &return_length, &photo_status, context );
if ( data == NULL ) {
/* Try to leave camera in a usable state. */
@@ -3324,7 +3324,7 @@ canon_int_list_directory (Camera *camera, const char *folder, CameraList *list,
in this block */
memset (&info, 0, sizeof (info));
/* we start with nothing and continously add stuff */
/* we start with nothing and continuously add stuff */
info.file.fields = GP_FILE_INFO_NONE;
info.file.mtime = dirent_time;
@@ -3511,7 +3511,7 @@ canon_int_get_file (Camera *camera, const char *name, unsigned char **data, unsi
*
* NOTE: Since cameras that do not store the thumbnail in a separate
* file does not return just the thumbnail but the first 10813 bytes
* of the image (most oftenly the EXIF header with thumbnail data in
* of the image (most often the EXIF header with thumbnail data in
* it) this must be treated before called a true thumbnail.
*
* Returns: result from canon_usb_get_thumbnail()
@@ -3885,7 +3885,7 @@ canon_int_get_info_func (Camera *camera, const char *folder,
/* we're going to fill out the info structure
in this block */
/* We start with nothing and continously add stuff */
/* We start with nothing and continuously add stuff */
info->file.fields = GP_FILE_INFO_NONE;
info->file.mtime = dirent_time;

2
camlibs/canon/doc/Protocol.xml
View File

@@ -460,7 +460,7 @@
<row><entry align="center">&boxv;</entry><entry align="center">&uarr;</entry><entry></entry></row>
<row><entry align="center">&boxv;</entry><entry align="center">&boxv;</entry><entry>00 C0 01</entry></row>
<row><entry namest="col1" nameend="col2" align="center">&lt;CRC&gt;</entry><entry></entry></row>
<row><entry align="center">&boxv;</entry><entry align="center">&boxv;</entry><entry>00 C0 01 12 34 (fictious CRC)</entry></row>
<row><entry align="center">&boxv;</entry><entry align="center">&boxv;</entry><entry>00 C0 01 12 34 (fictitious CRC)</entry></row>
<row><entry namest="col1" nameend="col2" align="center">&lt;Escaping&gt;</entry><entry></entry></row>
<row><entry align="center">&boxv;</entry><entry align="center">&boxv;</entry><entry>00 7E E0 01 12 34</entry></row>
<row><entry namest="col1" nameend="col2" align="center">&lt;Framing&gt;</entry><entry></entry></row>

2
camlibs/canon/ps350/ps350proto.txt
View File

@@ -589,7 +589,7 @@ Resume communication at chosen speed:
After this, communication is as described in the next section.
It's not needed to try all speeds. The following sequence has been tried
succesfully: 1, 2, 3, 4, 5, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65 (but
successfully: 1, 2, 3, 4, 5, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65 (but
then 64 and 65 with count=01).

2
camlibs/casio/ChangeLog
View File

@@ -13,7 +13,7 @@
* casio-qv.c:
corrected preview type to PPM
do not explictly append filename of captured image to filesystem
do not explicitly append filename of captured image to filesystem
reset line speed and power down interface on exit
* casio-qv-commands.c:
capture works now

18
camlibs/casio/PROTOCOL.txt
View File

@@ -30,7 +30,7 @@ S E R I A L P R O T O C O L
CASIO's QV-10 serial cable is a level converter. It converts RS-232C
voltage levels to QV-10's voltage levels. This voltage converter circuit
uses the electrical power supplied by the host computer's RS-232C
connector. (V+ is CTS, V- is RTS.) To recieve digital data from QV-10,
connector. (V+ is CTS, V- is RTS.) To receive digital data from QV-10,
set the CTS terminal to ON, RTS terminal to OFF.
On power-up, QV-10 serial communication speed defaults to 9600baud. This
@@ -54,7 +54,7 @@ C O M M A N D L I S T
above the line: data sent to QV-10
---------------------------------------
below the line: data recieved from QV-10
below the line: data received from QV-10
ASCII code values are quoted.
All other values are hex.
@@ -137,7 +137,7 @@ FORMAT OF [Picture Data]
Comment:
WW WW: Data Block Size (2 bytes): (Normally 0x00 0x80, 128 bytes)
The data preceeding the endmark(02 00 00 03 FC) is its
The data preceding the endmark(02 00 00 03 FC) is its
block size(under 0x00 0x80).
JJ: Picture data. (Image Area of CAM format)
(Please refer to the CAM format information below).
@@ -162,7 +162,7 @@ SEND JPEG FORMAT PICTURE DATA TO QV-10
Comment:
The return byte 6a is checksum.
The return byte ZZ(normaly 06 ?) is unknown.
The return byte ZZ(normally 06 ?) is unknown.
[Picture Data] format is the same as above.
The procedure of send a 'fine mode(640x480)' picture for QV100 is unknown.
@@ -191,7 +191,7 @@ FORMAT OF [PICTURE DATA]
Comment:
WW WW: Data block size. (2byte).
Normally 0x00 0x80 (128 bytes)
The data preceeding the endmark(02 00 00 03 FC) is its
The data preceding the endmark(02 00 00 03 FC) is its
block size(under 0x00 0x80).
TT: Picture data. (YCC format)
SS: Check sum.
@@ -236,8 +236,8 @@ FORMAT OF [PICTURE DATA]
Comment:
WW WW: Data block size. (2bytes).
Normaly 0x00 0x80, 128 bytes.
The data preceeding the endmark(02 00 00 03 FC) is its
Normally 0x00 0x80, 128 bytes.
The data preceding the endmark(02 00 00 03 FC) is its
block size(under 0x00 0x80).
TT: Picture Data. (YCC format)
SS: Check sum.
@@ -387,7 +387,7 @@ REPORT BATTERY VOLTAGE
Comment:
Fetch battery boltage.
XX: battery voltage.
XX/0x10 (devide by 0x10) is an approximate voltage value.
XX/0x10 (divide by 0x10) is an approximate voltage value.
The return byte 83 is checksum.
(at QV-700/770 this function report another value.)
@@ -586,7 +586,7 @@ FORMAT OF [Picture Data]
Comment:
WW WW: Data Block Size (2 bytes): (Normally 0x00 0x80, 128 bytes)
The data preceeding the endmark(02 00 00 03 FC) is its
The data preceding the endmark(02 00 00 03 FC) is its
block size(under 0x00 0x80).
JJ: Picture data. (JFIF format)
SS: Check sum. Reverse bits of all sum of second byte (after 0x02)

2
camlibs/digigr8/digigr8.c
View File

@@ -59,7 +59,7 @@ digi_init (GPPort *port, CameraPrivateLibrary *priv)
gp_port_read(port, (char *)catalog, 0x4000); /* We need 16 bytes for each photo. */
digi_reset (port);
/* The first occurence of a zero denotes end of files entries */
/* The first occurrence of a zero denotes end of files entries */
for (i=0; i<0x4000 && catalog[i]; i+=16);
priv->nb_entries = i>>4;
catalog_tmp = realloc(catalog, i+16);

2
camlibs/dimera/mesalib.c
View File

@@ -440,7 +440,7 @@ mesa_black_levels( GPPort *port, uint8_t r[2] )
*
* exposure is * 1/50000 seconds.
*
* download specifies how, of if thge image is downloaded.
* download specifies how, of if the image is downloaded.
* 0-47 returns one 32 byte (64 pixel) row.
* 128-223 returns on 64 byte row.
* 249 returns all odd rows of a hi-res image 1536 bytes.

2
camlibs/enigma13/README.enigma13
View File

@@ -20,6 +20,6 @@ Compatible hardware
Thanks
------
- spca50x & blink2 developpers for their code. It inspired me a lot.
- spca50x & blink2 developers for their code. It inspired me a lot.
- Benoit Papillault for snoopy
- Irc & mailing list people.

4
camlibs/enigma13/enigma13.c
View File

@@ -128,8 +128,8 @@ enigma13_flash_delete_all(CameraFilesystem *fs, const char *folder, void *data,
/*
* This function waits camera is ready
*
* Status: Not sure what it realy does, but the camera replies
* Can this be some kind of ping for keepalive, or realy a ready status ?
* Status: Not sure what it really does, but the camera replies
* Can this be some kind of ping for keepalive, or really a ready status ?
*/
static int enigma13_wait_for_ready(Camera *camera)
{

2
camlibs/enigma13/protocol.txt
View File

@@ -87,7 +87,7 @@ USB_WRITE :41 54 01 00 03 00 00 00
| +----------------> 0x03 for thrumbnail, 0x02 for the real photo
+----------------------> Image number (01 is the first, NO zero index)
HERE, YOU CAN SLEEP 300 MILISECOND
HERE, YOU CAN SLEEP 300 MILLISECOND
There follows 3 packets with the cam (don't know what they are used for) but i play them.

2
camlibs/hp215/PROTOCOL
View File

@@ -122,7 +122,7 @@ TAKE_PREVIEW = 0xb5,
No arguments -> returns data.
Returns image date (jpeg) in the large reply blob.
Occasionaly causes next command to result in NAK.
Occasionally causes next command to result in NAK.
SELF_TEST = 0xb6,

4
camlibs/jd11/jd11.html
View File

@@ -14,7 +14,7 @@ Reverse Engineering the JD11 - A drama in n chapters</h1>
<hr>
<h2>
What is the JD11?</h2>
The JD11 is a cheap digital camera produced by JenOptik (apparenly a subsidary
The JD11 is a cheap digital camera produced by JenOptik (apparenly a subsidiary
of Zeiss Jena). It was at the time of writing this available for around
250 DM.
<p>There is software available, a windows program called <i>FotoBee</i>
@@ -27,7 +27,7 @@ Chapter 1:The lowlevel serial protocol</h2>
The JD11 comes with a serial cable with a DB9 connector on the computerside
and a small klinkenstecker at the camera end. So just 2 lines (RX, TX)
and GND.
<p>There is no documenation on the serial protocol in the inlaying documentation.
<p>There is no documentation on the serial protocol in the inlaying documentation.
<p>The FotoBee.exe program uses the Windows serial communications interface,
which is fortunately implemented in WINE. By snooping the setup calls,
the serial parameters are:

2
camlibs/kodak/dc120/dc120.h
View File

@@ -40,7 +40,7 @@
Commands & Byte field descriptions
--------------------------------------------------------------
These are ones relavent to gPhoto
These are ones relevant to gPhoto
* Album #0 is the root folder (directory/album/etc...)

4
camlibs/kodak/dc210/library.c
View File

@@ -155,7 +155,7 @@ static void cfa2ppm
static void dc210_cmd_init
(char * cmd, unsigned char command_byte)
{
/* utility procedure to initalize a command string */
/* utility procedure to initialize a command string */
memset (cmd, 0, 8);
@@ -1183,7 +1183,7 @@ int dc210_get_status (Camera *camera, dc210_status *status) {
char data[DC210_STATUS_SIZE];
char cmd[8];
/* you have to check the battery status explicitely
/* you have to check the battery status explicitly
before reading the status table*/
dc210_check_battery(camera);

6
camlibs/kodak/dc240/library.c
View File

@@ -241,7 +241,7 @@ static int dc240_wait_for_completion (Camera *camera) {
break;
case GP_ERROR_TIMEOUT:
GP_DEBUG ("GP_ERROR_TIMEOUT\n");
/* in busy state, GP_ERROR_IO_READ can happend */
/* in busy state, GP_ERROR_IO_READ can happened */
break;
default:
done = 1;
@@ -277,7 +277,7 @@ static int dc240_wait_for_busy_completion (Camera *camera)
break;
case GP_ERROR_IO_READ:
case GP_ERROR_TIMEOUT:
/* in busy state, GP_ERROR_IO_READ can happend */
/* in busy state, GP_ERROR_IO_READ can happened */
break;
default:
if (*p != DC240_SC_BUSY) {
@@ -625,7 +625,7 @@ const char * dc240_get_memcard_status_str(uint8_t status)
/*
Feed manually the stucture from data.
Feed manually the structure from data.
*/
static int dc240_load_status_data_to_table (const unsigned char *fdata, DC240StatusTable *table)
{

2
camlibs/kodak/dc3200/library.c
View File

@@ -545,7 +545,7 @@ int dc3200_send_command(Camera *camera, unsigned char *cmd, int cmd_len, unsigne
while(sends > 0) {
reads = READ_RETRIES;
/* check that we are acutally sending a command
/* check that we are actually sending a command
* and not just waiting for data
*/
if(cmd != NULL && cmd_len > 0) {

2
camlibs/konica/EXPERTS
View File

@@ -42,7 +42,7 @@ You can select the different menus by pressing the "Menu" button. If a menu cont
| | - | (Range: 300, 310-316) |
| End | - | Exit the expert mode |
--------------------------------------------------------------------------
Start a process (e.g. self test) or store a value by pressing the release button. Values can be selected by pressing "<" or ">". When a process has been sucessfully started or a value stored, the camera will beep.
Start a process (e.g. self test) or store a value by pressing the release button. Values can be selected by pressing "<" or ">". When a process has been successfully started or a value stored, the camera will beep.
How to exit
-----------

2
camlibs/konica/qm150.c
View File

@@ -659,7 +659,7 @@ camera_capture (Camera* camera, CameraCaptureType type, CameraFilePath* path,
return (GP_ERROR);
}
/* Wait image writting in camera's memory */
/* Wait image writing in camera's memory */
for (i=0; i<=15; i++) {
sleep(1);
if ((ret = k_ping(camera->port)) == GP_OK)

2
camlibs/lumix/lumix.c
View File

@@ -380,7 +380,7 @@ write_callback(char *contents, size_t size, size_t nmemb, void *userp)
LumixMemoryBuffer *lmb = userp;
oldsize = lmb->size;
/* 1 additionaly byte for 0x00 */
/* 1 additionally byte for 0x00 */
lmb->data = realloc(lmb->data, lmb->size+realsize+1);
lmb->size += realsize;
lmb->data[lmb->size] = 0x00;

2
camlibs/minolta/dimagev/README.minolta-dimagev
View File

@@ -43,7 +43,7 @@ Notes on specific functions:
More information on the file format can be obtained in the code itself.
Deleting all images is now implemented correctly. This beats iterating
accross all of them, hands down.
across all of them, hands down.
Here are the pinouts for the serial cable:
_____________ /-----\

2
camlibs/minolta/dimagev/dimagev.h
View File

@@ -47,7 +47,7 @@
#define DIMAGEV_VERSION "$Revision$"
/* These are the repsonse codes. */
/* These are the response codes. */
#define DIMAGEV_STX 0x02
#define DIMAGEV_ETX 0x03
#define DIMAGEV_EOT 0x04

2
camlibs/mustek/README.mustek
View File

@@ -14,7 +14,7 @@ History :
10.01.2000 The Library was ported to the ne iolib. It uses also
the USB Interfave from Johannes Erdfeld. This makes it
unneccessary to have a special Kernelmodul for the
unnecessary to have a special Kernelmodul for the
Mustek.
In camera.h there is added a new entry, so you can select
wether you want to use USB or rs232. This is needed

2
camlibs/mustek/STATUS
View File

@@ -3,7 +3,7 @@ Current Status:
It compiles.
Due to the USB Interrupt reading the driver is not yet working with USB.
Sometimes the correct interrupt data is transfered, most time it isn't.
Sometimes the correct interrupt data is transferred, most time it isn't.
I do not have a serial cable :/

2
camlibs/mustek/io.c
View File

@@ -41,7 +41,7 @@
#include "mdc800_spec.h"
/*
* Send a Command to the Camera. It is unimportent wether this
* Send a Command to the Camera. It is unimportant wether this
* is a USB or a RS232 Command. The Function implements an automatic
* retry of a failed command.
*

2
camlibs/mustek/mdc800_spec.h
View File

@@ -17,7 +17,7 @@
*/
/*
* Definition of Commands and usefull structs.
* Definition of Commands and useful structs.
*/
#ifndef DEFINE_MDC800_SPEC_H

2
camlibs/mustek/mustek-config.c
View File

@@ -291,7 +291,7 @@ void mdc800_disposeDialog (void)
/*****************************************************************************
Set Dialog Field / Set Konfiguration from Dialog
Set Dialog Field / Set Configuration from Dialog
******************************************************************************/
int mdc800_setupDialog (void)

2
camlibs/mustek/usb.c
View File

@@ -104,7 +104,7 @@ static int mdc800_usb_readFromIrq (GPPort *port,int type,unsigned char* data,int
{
if (!(mdc800_usb_isReady(data)||mdc800_usb_isBusy(data))) {
fprintf(stderr,"got data.\n");
/* Data received successfull */
/* Data received successfully */
return GP_OK;
}
} else {

2
camlibs/panasonic/README.panasonic
View File

@@ -32,7 +32,7 @@ Changes
* 5 August, 2000
- filename based communication between library and core
- abilities accomodated to the new API
- abilities accommodated to the new API
* 28 July, 2000
- added library for DC1000 series

2
camlibs/panasonic/dc.h
View File

@@ -68,7 +68,7 @@ int dsc1_retrcmd(Camera *camera);
int dsc1_setbaudrate(Camera *camera, int speed);
/* Set baud rate of connection. Part of hand shake procedure */
/* Returns GP_OK if succesful and GP_ERROR otherwise. */
/* Returns GP_OK if successful and GP_ERROR otherwise. */
int dsc1_getmodel(Camera *camera);
/* Returns camera (sub)model, DSC1: DC1000, DSC2: DC1580, */

2
camlibs/pentax/js0n.c
View File

@@ -3,7 +3,7 @@
#include <string.h> // one strncmp() is used to do key comparison, and a strlen(key) if no len passed in
// gcc started warning for the init syntax used here, is not helpful so don't generate the spam, supressing the warning is really inconsistently supported across versions
// gcc started warning for the init syntax used here, is not helpful so don't generate the spam, suppressing the warning is really inconsistently supported across versions
#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
#pragma GCC diagnostic push
#endif

2
camlibs/pentax/pslr_model.c
View File

@@ -757,7 +757,7 @@ void ipslr_status_parse_k200d(ipslr_handle_t *p, pslr_status *status) {
status->zoom.nom = get_uint32_be(&buf[0x17c]);
status->zoom.denom = get_uint32_be(&buf[0x180]);
status->focus = get_int32_be(&buf[0x184]);
// Drive mode: 0=Single shot, 1= Continous Hi, 2= Continous Low or Self timer 12s, 3=Self timer 2s
// Drive mode: 0=Single shot, 1= Continuous Hi, 2= Continuous Low or Self timer 12s, 3=Self timer 2s
// 4= remote, 5= remote 3s delay
}

10
camlibs/ptp2/ChangeLog
View File

@@ -116,7 +116,7 @@
2009-07-10 Marcus Meissner <marcus@jet.franken.de>
* ptp.c,ptp.h: Generic PTP wrapper function (no data, no output)
to avoid coding all generic functions as seperate functions.
to avoid coding all generic functions as separate functions.
Converted all convertable functions to macros.
2009-07-09 Axel Waggershauser <awagger@web.de>
@@ -305,7 +305,7 @@
* library.c: Added Nikon Coolpix L16 , Nikon D700.
* ptp-unpack.c: Fixed a property handling issue
with empty/non existant strings in the unpacker,
with empty/non existent strings in the unpacker,
triggered by the D700.
* README.ptp2: Added link to now official MTP 1.0 spec.
@@ -1091,7 +1091,7 @@
2006-04-27 Marcus Meissner <marcus@jet.franken.de>
* ptp.c: The iRiver devices occasionaly send a byte more than
* ptp.c: The iRiver devices occasionally send a byte more than
we requested which could lead to memory corruption due to
logic that did not expect that.
@@ -1760,7 +1760,7 @@
2004-05-29 Mariusz Woloszyn
* library.c: Fixed a small problem that caused objects of undefined
type not beeing downloadable. Now they are downloadable if the Thumb
type not being downloadable. Now they are downloadable if the Thumb
type is known.
2004-05-24 Marcus Meissner <marcus@jet.franken.de>
@@ -2129,7 +2129,7 @@
* Makefile.am: changed driver name to ptp2
2003-01-03 Mariusz Woloszyn
* Commited version 2 of libptp2 and ptp driver.
* Committed version 2 of libptp2 and ptp driver.
This code is unfinished yet, but it's meant to be transport layer
independent. It fixes a lot of other bugs also.

2
camlibs/ptp2/cameras/nikon-d2x.txt
View File

@@ -442,7 +442,7 @@ Property 0xd015:(readwrite) (type=0x2) Range [0 - 1, step 1] value: 0
Property 0xd016:(readwrite) (type=0x2) Range [0 - 1, step 1] value: 0
Auto White Balance Bias(0xd017):(readwrite) (type=0x1) Range [-3 - 3, step 1] value: 0
Tungsten White Balance Bias(0xd018):(readwrite) (type=0x1) Range [-3 - 3, step 1] value: 0
Flourescent White Balance Bias(0xd019):(readwrite) (type=0x1) Range [-3 - 3, step 1] value: 0
Fluorescent White Balance Bias(0xd019):(readwrite) (type=0x1) Range [-3 - 3, step 1] value: 0
Daylight White Balance Bias(0xd01a):(readwrite) (type=0x1) Range [-3 - 3, step 1] value: 0
Flash White Balance Bias(0xd01b):(readwrite) (type=0x1) Range [-3 - 3, step 1] value: 0
Cloudy White Balance Bias(0xd01c):(readwrite) (type=0x1) Range [-3 - 3, step 1] value: 0

4
camlibs/ptp2/cameras/nikon-d300s.txt
View File

@@ -479,7 +479,7 @@ Flash Exposure Compensation(0xd126):(readwrite) (type=0x1) Range [-18 - 6, step
Slot 2 Save Mode(0xd148):(readwrite) (type=0x2) Range [0 - 2, step 1] value: 0
Raw Bit Mode(0xd149):(readwrite) (type=0x2) Range [0 - 1, step 1] value: 0
ISO Auto Time(0xd14e):(readwrite) (type=0x2) Range [0 - 5, step 1] value: 4
Flourescent Type(0xd14f):(readwrite) (type=0x2) Range [0 - 6, step 1] value: 3
Fluorescent Type(0xd14f):(readwrite) (type=0x2) Range [0 - 6, step 1] value: 3
Tune Colour Temperature(0xd150):(readwrite) (type=0x2) Range [0 - 168, step 1] value: 84
Tune Preset 0(0xd151):(readwrite) (type=0x2) Range [0 - 168, step 1] value: 84
Tune Preset 1(0xd152):(readwrite) (type=0x2) Range [0 - 168, step 1] value: 84
@@ -3687,7 +3687,7 @@ Change Pic Ctrl Item(0xd201):(read only) (type=0x4) Enumeration [] value: 0
Choice: 4 4
Choice: 5 5
/main/other/d14f
Label: Flourescent Type
Label: Fluorescent Type
Type: MENU
Current: 3
Choice: 0 0

4
camlibs/ptp2/cameras/nikon-d3s.txt
View File

@@ -509,7 +509,7 @@ External Flash Mode(0xd125):(read only) (type=0x2) Range [0 - 7, step 1] value:
Slot 2 Save Mode(0xd148):(readwrite) (type=0x2) Range [0 - 2, step 1] value: 0
Raw Bit Mode(0xd149):(readwrite) (type=0x2) Range [0 - 1, step 1] value: 0
ISO Auto Time(0xd14e):(readwrite) (type=0x2) Range [0 - 5, step 1] value: 4
Flourescent Type(0xd14f):(readwrite) (type=0x2) Range [0 - 6, step 1] value: 3
Fluorescent Type(0xd14f):(readwrite) (type=0x2) Range [0 - 6, step 1] value: 3
Tune Colour Temperature(0xd150):(readwrite) (type=0x2) Range [0 - 168, step 1] value: 84
Tune Preset 0(0xd151):(readwrite) (type=0x2) Range [0 - 168, step 1] value: 84
Tune Preset 1(0xd152):(readwrite) (type=0x2) Range [0 - 168, step 1] value: 84
@@ -3497,7 +3497,7 @@ Choice: 3 3
Choice: 4 4
Choice: 5 5
/main/other/d14f
Label: Flourescent Type
Label: Fluorescent Type
Type: MENU
Current: 3
Choice: 0 0

4
camlibs/ptp2/cameras/nikon-d4.txt
View File

@@ -178,7 +178,7 @@ Property 0xd141:(readwrite) (type=0x2) Range [0 - 1, step 1] value: 0
Slot 2 Save Mode(0xd148):(readwrite) (type=0x2) Range [0 - 2, step 1] value: 0
Raw Bit Mode(0xd149):(readwrite) (type=0x2) Range [0 - 1, step 1] value: 1
ISO Auto Time(0xd14e):(readwrite) (type=0x2) Range [0 - 8, step 1] value: 7
Flourescent Type(0xd14f):(readwrite) (type=0x2) Range [0 - 6, step 1] value: 3
Fluorescent Type(0xd14f):(readwrite) (type=0x2) Range [0 - 6, step 1] value: 3
Tune Colour Temperature(0xd150):(readwrite) (type=0x2) Range [0 - 12, step 1] value: 6
Tune Preset 1(0xd152):(readwrite) (type=0x2) Range [0 - 168, step 1] value: 84
Tune Preset 2(0xd153):(readwrite) (type=0x2) Range [0 - 168, step 1] value: 84
@@ -2633,7 +2633,7 @@ Choice: 6 6
Choice: 7 7
Choice: 8 8
/main/other/d14f
Label: Flourescent Type
Label: Fluorescent Type
Type: MENU
Current: 3
Choice: 0 0

4
camlibs/ptp2/cameras/nikon-d500.txt
View File

@@ -203,7 +203,7 @@ Property 0xd141:(readwrite) (type=0x2) Range [0 - 2, step 1] value: 2
Slot 2 Save Mode(0xd148):(readwrite) (type=0x2) Range [0 - 2, step 1] value: 0
Raw Bit Mode(0xd149):(readwrite) (type=0x2) Range [0 - 1, step 1] value: 1
Active D-Lighting(0xd14e):(readwrite) (type=0x2) Range [0 - 5, step 1] value: 0
Flourescent Type(0xd14f):(readwrite) (type=0x2) Range [0 - 6, step 1] value: 3
Fluorescent Type(0xd14f):(readwrite) (type=0x2) Range [0 - 6, step 1] value: 3
Tune Colour Temperature(0xd150):(readwrite) (type=0x2) Range [0 - 48, step 1] value: 24
Tune Preset 1(0xd152):(readwrite) (type=0x4) Range [0 - 1224, step 1] value: 612
Tune Preset 2(0xd153):(readwrite) (type=0x4) Range [0 - 1224, step 1] value: 612
@@ -2786,7 +2786,7 @@ Choice: 3 3
Choice: 4 4
Choice: 5 5
/main/other/d14f
Label: Flourescent Type
Label: Fluorescent Type
Type: MENU
Current: 3
Choice: 0 0

4
camlibs/ptp2/cameras/nikon-d5000.txt
View File

@@ -315,7 +315,7 @@ External Flash Compensation(0xd124):(read only) (type=0x1) Range [-18 - 18, step
External Flash Mode(0xd125):(read only) (type=0x2) Range [0 - 7, step 1] value: 0
Flash Exposure Compensation(0xd126):(readwrite) (type=0x1) Range [-18 - 6, step 2] value: 0.0 stops (0)
ISO Auto Time(0xd14e):(readwrite) (type=0x2) Range [0 - 5, step 1] value: 5
Flourescent Type(0xd14f):(readwrite) (type=0x2) Range [0 - 6, step 1] value: 3
Fluorescent Type(0xd14f):(readwrite) (type=0x2) Range [0 - 6, step 1] value: 3
AF Beep Mode(0xd160):(readwrite) (type=0x2) Range [0 - 2, step 1] value: On (0)
Autofocus Mode(0xd161):(readwrite) (type=0x2) Range [0 - 4, step 1] value: AF-A (2)
AF Assist Lamp(0xd163):(readwrite) (type=0x2) Range [0 - 1, step 1] value: On (0)
@@ -1930,7 +1930,7 @@ Change Pic Ctrl Item(0xd201):(read only) (type=0x4) Enumeration [] value: 0
Choice: 4 4
Choice: 5 5
/main/other/d14f
Label: Flourescent Type
Label: Fluorescent Type
Type: MENU
Current: 3
Choice: 0 0

6
camlibs/ptp2/cameras/nikon-d5100.txt
View File

@@ -116,7 +116,7 @@ Property 0xd130:(readwrite) (type=0x2) Range [0 - 1, step 1] value: 0
Property 0xd131:(readwrite) (type=0x2) Range [0 - 3, step 1] value: 0
Property 0xd132:(readwrite) (type=0x2) Range [0 - 2, step 1] value: 1
ISO Auto Time(0xd14e):(readwrite) (type=0x2) Range [0 - 5, step 1] value: 5
Flourescent Type(0xd14f):(readwrite) (type=0x2) Range [0 - 6, step 1] value: 3
Fluorescent Type(0xd14f):(readwrite) (type=0x2) Range [0 - 6, step 1] value: 3
Autofocus Mode(0xd161):(readwrite) (type=0x2) Range [0 - 4, step 1] value: MF (fixed) (3)
Auto ISO P/A/DVP Setting(0xd164):(readwrite) (type=0x2) Range [0 - 23, step 1] value: 18
Property 0xd16a:(readwrite) (type=0x2) Range [0 - 1, step 1] value: 0
@@ -255,7 +255,7 @@ Property 0xd130:(readwrite) (type=0x2) Range [0 - 1, step 1] value: 0
Property 0xd131:(readwrite) (type=0x2) Range [0 - 3, step 1] value: 0
Property 0xd132:(readwrite) (type=0x2) Range [0 - 2, step 1] value: 1
ISO Auto Time(0xd14e):(readwrite) (type=0x2) Range [0 - 5, step 1] value: 5
Flourescent Type(0xd14f):(readwrite) (type=0x2) Range [0 - 6, step 1] value: 3
Fluorescent Type(0xd14f):(readwrite) (type=0x2) Range [0 - 6, step 1] value: 3
Autofocus Mode(0xd161):(readwrite) (type=0x2) Range [0 - 4, step 1] value: MF (fixed) (3)
Auto ISO P/A/DVP Setting(0xd164):(readwrite) (type=0x2) Range [0 - 23, step 1] value: 18
Property 0xd16a:(readwrite) (type=0x2) Range [0 - 1, step 1] value: 1
@@ -441,7 +441,7 @@ Device Properties Supported:
0xd131 (HDR High Dynamic)
0xd132 (HDR Smoothing)
0xd14e (Active D-Lighting)
0xd14f (Flourescent Type)
0xd14f (Fluorescent Type)
0xd161 (Autofocus Mode)
0xd164 (Auto ISO P/A/DVP Setting)
0xd16a (ISO Auto)

4
camlibs/ptp2/cameras/nikon-d5200.txt
View File

@@ -120,7 +120,7 @@ External Flash Mode(0xd125):(read only) (type=0x2) Range [0 - 7, step 1] value:
Flash Exposure Compensation(0xd126):(readwrite) (type=0x1) Range [-18 - 6, step 2] value: 0.0 stops (0)
HDR Mode(0xd130):(readwrite) (type=0x2) Range [0 - 5, step 1] value: 0
ISO Auto Time(0xd14e):(readwrite) (type=0x2) Range [0 - 5, step 1] value: 5
Flourescent Type(0xd14f):(readwrite) (type=0x2) Range [0 - 6, step 1] value: 3
Fluorescent Type(0xd14f):(readwrite) (type=0x2) Range [0 - 6, step 1] value: 3
Autofocus Mode(0xd161):(readwrite) (type=0x2) Range [0 - 4, step 1] value: MF (fixed) (3)
AF Assist Lamp(0xd163):(readwrite) (type=0x2) Range [0 - 1, step 1] value: On (0)
Auto ISO P/A/DVP Setting(0xd164):(readwrite) (type=0x2) Range [0 - 24, step 1] value: 24
@@ -2032,7 +2032,7 @@ Choice: 3 3
Choice: 4 4
Choice: 5 5
/main/other/d14f
Label: Flourescent Type
Label: Fluorescent Type
Type: MENU
Current: 3
Choice: 0 0

4
camlibs/ptp2/cameras/nikon-d5500.txt
View File

@@ -132,7 +132,7 @@ Property 0xd12d:(read only) (type=0x2) Range [0 - 1, step 1] value: 0
HDR Mode(0xd130):(readwrite) (type=0x2) Range [0 - 5, step 1] value: 0
Raw Bit Mode(0xd149):(readwrite) (type=0x2) Range [0 - 1, step 1] value: 1
Active D-Lighting(0xd14e):(readwrite) (type=0x2) Range [0 - 5, step 1] value: 1
Flourescent Type(0xd14f):(readwrite) (type=0x2) Range [0 - 6, step 1] value: 3
Fluorescent Type(0xd14f):(readwrite) (type=0x2) Range [0 - 6, step 1] value: 3
Autofocus Mode(0xd161):(readwrite) (type=0x2) Range [0 - 4, step 1] value: MF (fixed) (3)
AF Assist Lamp(0xd163):(readwrite) (type=0x2) Range [0 - 1, step 1] value: On (0)
Auto ISO P/A/DVP Setting(0xd164):(readwrite) (type=0x2) Range [0 - 29, step 1] value: 29
@@ -2043,7 +2043,7 @@ Choice: 3 3
Choice: 4 4
Choice: 5 5
/main/other/d14f
Label: Flourescent Type
Label: Fluorescent Type
Type: MENU
Current: 3
Choice: 0 0

4
camlibs/ptp2/cameras/nikon-d5600.txt
View File

@@ -131,7 +131,7 @@ Property 0xd12d:(read only) (type=0x2) Range [0 - 1, step 1] value: 0
HDR Mode(0xd130):(readwrite) (type=0x2) Range [0 - 5, step 1] value: 0
Raw Bit Mode(0xd149):(readwrite) (type=0x2) Range [0 - 1, step 1] value: 1
Active D-Lighting(0xd14e):(readwrite) (type=0x2) Range [0 - 5, step 1] value: 0
Flourescent Type(0xd14f):(readwrite) (type=0x2) Range [0 - 6, step 1] value: 3
Fluorescent Type(0xd14f):(readwrite) (type=0x2) Range [0 - 6, step 1] value: 3
Autofocus Mode(0xd161):(readwrite) (type=0x2) Range [0 - 4, step 1] value: AF-S (0)
AF Assist Lamp(0xd163):(readwrite) (type=0x2) Range [0 - 1, step 1] value: On (0)
Auto ISO P/A/DVP Setting(0xd164):(readwrite) (type=0x2) Range [0 - 29, step 1] value: 29
@@ -1913,7 +1913,7 @@ Choice: 3 3
Choice: 4 4
Choice: 5 5
/main/other/d14f
Label: Flourescent Type
Label: Fluorescent Type
Type: MENU
Current: 3
Choice: 0 0

4
camlibs/ptp2/cameras/nikon-d600.txt
View File

@@ -418,7 +418,7 @@ Property 0xd141:(readwrite) (type=0x2) Range [0 - 1, step 1] value: 0
Slot 2 Save Mode(0xd148):(readwrite) (type=0x2) Range [0 - 2, step 1] value: 0
Raw Bit Mode(0xd149):(readwrite) (type=0x2) Range [0 - 1, step 1] value: 1
ISO Auto Time(0xd14e):(readwrite) (type=0x2) Range [0 - 5, step 1] value: 4
Flourescent Type(0xd14f):(readwrite) (type=0x2) Range [0 - 6, step 1] value: 3
Fluorescent Type(0xd14f):(readwrite) (type=0x2) Range [0 - 6, step 1] value: 3
Tune Colour Temperature(0xd150):(readwrite) (type=0x2) Range [0 - 168, step 1] value: 84
Tune Preset 1(0xd152):(readwrite) (type=0x2) Range [0 - 168, step 1] value: 84
Tune Preset 2(0xd153):(readwrite) (type=0x2) Range [0 - 168, step 1] value: 84
@@ -2781,7 +2781,7 @@ Choice: 3 3
Choice: 4 4
Choice: 5 5
/main/other/d14f
Label: Flourescent Type
Label: Fluorescent Type
Type: MENU
Current: 3
Choice: 0 0

2
camlibs/ptp2/cameras/nikon-d70.txt
View File

@@ -356,7 +356,7 @@ Burst Number(0x5018):(readwrite) (type=0x4) Range [1 - 49, step 1] value: 1
Auto White Balance Bias(0xd017):(readwrite) (type=0x1) Range [-3 - 3, step 1] value: 0
Tungsten White Balance Bias(0xd018):(readwrite) (type=0x1) Range [-3 - 3, step 1] value: 0
Flourescent White Balance Bias(0xd019):(readwrite) (type=0x1) Range [-3 - 3, step 1] value: 0
Fluorescent White Balance Bias(0xd019):(readwrite) (type=0x1) Range [-3 - 3, step 1] value: 0
Daylight White Balance Bias(0xd01a):(readwrite) (type=0x1) Range [-3 - 3, step 1] value: 0
Flash White Balance Bias(0xd01b):(readwrite) (type=0x1) Range [-3 - 3, step 1] value: 0
Cloudy White Balance Bias(0xd01c):(readwrite) (type=0x1) Range [-3 - 3, step 1] value: 0

6
camlibs/ptp2/cameras/nikon-d7000.txt
View File

@@ -192,7 +192,7 @@ Property 0xd141:(readwrite) (type=0x2) Range [0 - 1, step 1] value: 0
Slot 2 Save Mode(0xd148):(readwrite) (type=0x2) Range [0 - 2, step 1] value: 0
Raw Bit Mode(0xd149):(readwrite) (type=0x2) Range [0 - 1, step 1] value: 1
ISO Auto Time(0xd14e):(readwrite) (type=0x2) Range [0 - 5, step 1] value: 5
Flourescent Type(0xd14f):(readwrite) (type=0x2) Range [0 - 6, step 1] value: 3
Fluorescent Type(0xd14f):(readwrite) (type=0x2) Range [0 - 6, step 1] value: 3
Tune Colour Temperature(0xd150):(readwrite) (type=0x2) Range [0 - 168, step 1] value: 84
Tune Preset 0(0xd151):(readwrite) (type=0x2) Range [0 - 168, step 1] value: 84
Tune Preset 1(0xd152):(readwrite) (type=0x2) Range [0 - 168, step 1] value: 84
@@ -3239,7 +3239,7 @@ Choice: 3 3
Choice: 4 4
Choice: 5 5
/main/other/d14f
Label: Flourescent Type
Label: Fluorescent Type
Type: MENU
Current: 3
Choice: 0 0
@@ -4191,7 +4191,7 @@ PTP Standard Version: 100
0xd063: #define PTP_DPC_NIKON_SelfTimer 0xD063
0xd065: #define PTP_DPC_NIKON_ImgConfTime 0xD065
0xd067: #define PTP_DPC_NIKON_AngleLevel 0xD067
0xd068: #define PTP_DPC_NIKON_D1ShootingSpeed 0xD068 /* continous speed low */
0xd068: #define PTP_DPC_NIKON_D1ShootingSpeed 0xD068 /* continuous speed low */
0xd069: #define PTP_DPC_NIKON_D2MaximumShots 0xD069
0xd06a: #define PTP_DPC_NIKON_ExposureDelayMode 0xD06A
0xd06b: #define PTP_DPC_NIKON_LongExposureNoiseReduction 0xD06B

2
camlibs/ptp2/cameras/nikon-d70s.txt
View File

@@ -201,7 +201,7 @@ Exposure Bias Compensation(0x5010):(readwrite) (type=0x3) Enumeration [-5000,-46
Focus Metering Mode(0x501c):(readwrite) (type=0x4) Enumeration [2,32784,32785] value: Single Area (32784)
Auto White Balance Bias(0xd017):(readwrite) (type=0x1) Range [-3 - 3, step 1] value: 0
Tungsten White Balance Bias(0xd018):(readwrite) (type=0x1) Range [-3 - 3, step 1] value: 0
Flourescent White Balance Bias(0xd019):(readwrite) (type=0x1) Range [-3 - 3, step 1] value: 0
Fluorescent White Balance Bias(0xd019):(readwrite) (type=0x1) Range [-3 - 3, step 1] value: 0
Daylight White Balance Bias(0xd01a):(readwrite) (type=0x1) Range [-3 - 3, step 1] value: 0
Flash White Balance Bias(0xd01b):(readwrite) (type=0x1) Range [-3 - 3, step 1] value: 0
Cloudy White Balance Bias(0xd01c):(readwrite) (type=0x1) Range [-3 - 3, step 1] value: 0

4
camlibs/ptp2/cameras/nikon-d7100.txt
View File

@@ -165,7 +165,7 @@ Property 0xd141:(readwrite) (type=0x2) Range [0 - 1, step 1] value: 0
Slot 2 Save Mode(0xd148):(readwrite) (type=0x2) Range [0 - 2, step 1] value: 0
Raw Bit Mode(0xd149):(readwrite) (type=0x2) Range [0 - 1, step 1] value: 1
ISO Auto Time(0xd14e):(readwrite) (type=0x2) Range [0 - 5, step 1] value: 4
Flourescent Type(0xd14f):(readwrite) (type=0x2) Range [0 - 6, step 1] value: 3
Fluorescent Type(0xd14f):(readwrite) (type=0x2) Range [0 - 6, step 1] value: 3
Tune Colour Temperature(0xd150):(readwrite) (type=0x2) Range [0 - 168, step 1] value: 84
Tune Preset 1(0xd152):(readwrite) (type=0x2) Range [0 - 168, step 1] value: 84
Tune Preset 2(0xd153):(readwrite) (type=0x2) Range [0 - 168, step 1] value: 84
@@ -2733,7 +2733,7 @@ Choice: 3 3
Choice: 4 4
Choice: 5 5
/main/other/d14f
Label: Flourescent Type
Label: Fluorescent Type
Type: MENU
Current: 3
Choice: 0 0

4
camlibs/ptp2/cameras/nikon-d7200.txt
View File

@@ -186,7 +186,7 @@ Property 0xd141:(readwrite) (type=0x2) Range [0 - 1, step 1] value: 0
Slot 2 Save Mode(0xd148):(readwrite) (type=0x2) Range [0 - 2, step 1] value: 0
Raw Bit Mode(0xd149):(readwrite) (type=0x2) Range [0 - 1, step 1] value: 1
Active D-Lighting(0xd14e):(readwrite) (type=0x2) Range [0 - 5, step 1] value: 4
Flourescent Type(0xd14f):(readwrite) (type=0x2) Range [0 - 6, step 1] value: 3
Fluorescent Type(0xd14f):(readwrite) (type=0x2) Range [0 - 6, step 1] value: 3
Tune Colour Temperature(0xd150):(readwrite) (type=0x2) Range [0 - 48, step 1] value: 24
Tune Preset 1(0xd152):(readwrite) (type=0x4) Range [0 - 1224, step 1] value: 612
Tune Preset 2(0xd153):(readwrite) (type=0x4) Range [0 - 1224, step 1] value: 612
@@ -2784,7 +2784,7 @@ Choice: 3 3
Choice: 4 4
Choice: 5 5
/main/other/d14f
Label: Flourescent Type
Label: Fluorescent Type
Type: MENU
Current: 3
Choice: 0 0

4
camlibs/ptp2/cameras/nikon-d7500.txt
View File

@@ -177,7 +177,7 @@ HDR Smoothing(0xd132):(readwrite) (type=0x2) Range [0 - 4, step 1] value: 3
Property 0xd141:(readwrite) (type=0x2) Range [0 - 1, step 1] value: 0
Raw Bit Mode(0xd149):(readwrite) (type=0x2) Range [0 - 1, step 1] value: 1
Active D-Lighting(0xd14e):(readwrite) (type=0x2) Range [0 - 5, step 1] value: 1
Flourescent Type(0xd14f):(readwrite) (type=0x2) Range [0 - 6, step 1] value: 3
Fluorescent Type(0xd14f):(readwrite) (type=0x2) Range [0 - 6, step 1] value: 3
Tune Colour Temperature(0xd150):(readwrite) (type=0x2) Range [0 - 48, step 1] value: 24
Tune Preset 1(0xd152):(readwrite) (type=0x4) Range [0 - 1224, step 1] value: 612
Tune Preset 2(0xd153):(readwrite) (type=0x4) Range [0 - 1224, step 1] value: 612
@@ -2918,7 +2918,7 @@ Choice: 3 3
Choice: 4 4
Choice: 5 5
/main/other/d14f
Label: Flourescent Type
Label: Fluorescent Type
Type: MENU
Current: 3
Choice: 0 0

2
camlibs/ptp2/cameras/nikon-d800e.txt
View File

@@ -194,7 +194,7 @@ Property 0xd141:(readwrite) (type=0x2) Range [0 - 1, step 1] value: 0
Slot 2 Save Mode(0xd148):(readwrite) (type=0x2) Range [0 - 2, step 1] value: 1
Raw Bit Mode(0xd149):(readwrite) (type=0x2) Range [0 - 1, step 1] value: 1
ISO Auto Time(0xd14e):(readwrite) (type=0x2) Range [0 - 5, step 1] value: 4
Flourescent Type(0xd14f):(readwrite) (type=0x2) Range [0 - 6, step 1] value: 3
Fluorescent Type(0xd14f):(readwrite) (type=0x2) Range [0 - 6, step 1] value: 3
Tune Colour Temperature(0xd150):(readwrite) (type=0x2) Range [0 - 12, step 1] value: 6
Tune Preset 1(0xd152):(readwrite) (type=0x2) Range [0 - 168, step 1] value: 84
Tune Preset 2(0xd153):(readwrite) (type=0x2) Range [0 - 168, step 1] value: 84

2
camlibs/ptp2/cameras/nikon-d850.txt
View File

@@ -206,7 +206,7 @@ Property 0xd141:(readwrite) (type=0x2) Range [0 - 2, step 1] value: 2
Slot 2 Save Mode(0xd148):(readwrite) (type=0x2) Range [0 - 2, step 1] value: 1
Raw Bit Mode(0xd149):(readwrite) (type=0x2) Range [0 - 1, step 1] value: 1
Active D-Lighting(0xd14e):(readwrite) (type=0x2) Range [0 - 5, step 1] value: 1
Flourescent Type(0xd14f):(readwrite) (type=0x2) Range [0 - 6, step 1] value: 3
Fluorescent Type(0xd14f):(readwrite) (type=0x2) Range [0 - 6, step 1] value: 3
Tune Colour Temperature(0xd150):(readwrite) (type=0x2) Range [0 - 48, step 1] value: 24
Tune Preset 1(0xd152):(readwrite) (type=0x4) Range [0 - 1224, step 1] value: 612
Tune Preset 2(0xd153):(readwrite) (type=0x4) Range [0 - 1224, step 1] value: 612

4
camlibs/ptp2/cameras/nikon-d90.txt
View File

@@ -236,7 +236,7 @@ Externer Blitz Belichtungskompensation(0xd124):(read only) (type=0x1) Range [-18
Externer Blitzmodus(0xd125):(read only) (type=0x2) Range [0 - 7, step 1] value: 0
Blitz Belichtungskompensation(0xd126):(readwrite) (type=0x1) Range [-18 - 6, step 2] value: 0,0 stops (0)
ISO Auto Time(0xd14e):(readwrite) (type=0x2) Range [0 - 5, step 1] value: 5
Flourescent Type(0xd14f):(readwrite) (type=0x2) Range [0 - 6, step 1] value: 3
Fluorescent Type(0xd14f):(readwrite) (type=0x2) Range [0 - 6, step 1] value: 3
Tune Colour Temperature(0xd150):(readwrite) (type=0x2) Range [0 - 168, step 1] value: 84
Tune Preset 0(0xd151):(readwrite) (type=0x2) Range [0 - 168, step 1] value: 84
Tune Preset 1(0xd152):(readwrite) (type=0x2) Range [0 - 168, step 1] value: 84
@@ -2209,7 +2209,7 @@ Change Pic Ctrl Item(0xd201):(read only) (type=0x4) Enumeration [] value: 0
Choice: 4 4
Choice: 5 5
/main/other/d14f
Label: Flourescent Type
Label: Fluorescent Type
Type: MENU
Current: 3
Choice: 0 0

2
camlibs/ptp2/cameras/nikon-s1.txt
View File

@@ -219,7 +219,7 @@ Type: RADIO
Current: Auto
Choice: 0 Auto
Choice: 1 Tungsten
Choice: 2 Flourescent
Choice: 2 Fluorescent
Choice: 3 Daylight
Choice: 4 Flash
Choice: 5 Cloudy

6
camlibs/ptp2/cameras/nikon-z6.txt
View File

@@ -193,7 +193,7 @@ VibrationReduction(0xd138):(readwrite) (type=0x2) Enumeration [0,1,2] value: 1
WBAutoType(0xd141):(readwrite) (type=0x2) Range [0 - 2, step 1] value: 0
Raw Bit Mode(0xd149):(readwrite) (type=0x2) Range [0 - 1, step 1] value: 1
Active D-Lighting(0xd14e):(readwrite) (type=0x2) Range [0 - 5, step 1] value: 1
Flourescent Type(0xd14f):(readwrite) (type=0x2) Range [0 - 6, step 1] value: 3
Fluorescent Type(0xd14f):(readwrite) (type=0x2) Range [0 - 6, step 1] value: 3
Tune Colour Temperature(0xd150):(readwrite) (type=0x2) Range [0 - 48, step 1] value: 24
Tune Preset 1(0xd152):(readwrite) (type=0x4) Range [0 - 1224, step 1] value: 612
Tune Preset 2(0xd153):(readwrite) (type=0x4) Range [0 - 1224, step 1] value: 612
@@ -583,7 +583,7 @@ Device Properties Supported:
0xd141 (Unknown DPC code)
0xd149 (Raw Bit Mode)
0xd14e (Active D-Lighting)
0xd14f (Flourescent Type)
0xd14f (Fluorescent Type)
0xd150 (Tune Colour Temperature)
0xd152 (Tune Preset 1)
0xd153 (Tune Preset 2)
@@ -3716,7 +3716,7 @@ Choice: 4 4
Choice: 5 5
END
/main/other/d14f
Label: Flourescent Type
Label: Fluorescent Type
Readonly: 0
Type: MENU
Current: 3

4
camlibs/ptp2/cameras/nikon-z7.txt
View File

@@ -193,7 +193,7 @@ Property 0xd138:(readwrite) (type=0x2) Enumeration [0,1,2] value: 0
Property 0xd141:(readwrite) (type=0x2) Range [0 - 2, step 1] value: 0
Raw Bit Mode(0xd149):(readwrite) (type=0x2) Range [0 - 1, step 1] value: 1
Active D-Lighting(0xd14e):(readwrite) (type=0x2) Range [0 - 5, step 1] value: 1
Flourescent Type(0xd14f):(readwrite) (type=0x2) Range [0 - 6, step 1] value: 3
Fluorescent Type(0xd14f):(readwrite) (type=0x2) Range [0 - 6, step 1] value: 3
Tune Colour Temperature(0xd150):(readwrite) (type=0x2) Range [0 - 48, step 1] value: 24
Tune Preset 1(0xd152):(readwrite) (type=0x4) Range [0 - 1224, step 1] value: 612
Tune Preset 2(0xd153):(readwrite) (type=0x4) Range [0 - 1224, step 1] value: 612
@@ -2803,7 +2803,7 @@ Choice: 3 3
Choice: 4 4
Choice: 5 5
/main/other/d14f
Label: Flourescent Type
Label: Fluorescent Type
Type: MENU
Current: 3
Choice: 0 0

14
camlibs/ptp2/config.c
View File

@@ -426,7 +426,7 @@ camera_prepare_canon_eos_capture(Camera *camera, GPContext *context) {
ptp_free_EOS_DI (&x);
}
/* The new EOS occasionaly returned an empty event set ... likely because we are too fast. try again some times. */
/* The new EOS occasionally returned an empty event set ... likely because we are too fast. try again some times. */
C_PTP (ptp_check_eos_events (params));
tries = 10;
while (--tries && !have_eos_prop(params,PTP_VENDOR_CANON,PTP_DPC_CANON_EOS_EVFOutputDevice)) {
@@ -1372,7 +1372,7 @@ fallback: \
return GP_ERROR; \
} \
} \
} while (tries--);/* occasionaly we fail, make an escape path */ \
} while (tries--);/* occasionally we fail, make an escape path */ \
return GP_OK; \
}
@@ -3328,7 +3328,7 @@ static struct deviceproptableu8 nikon_1_whitebalance[] = {
/* values from a J3 */
{ N_("Auto"), 0x00, 0 },
{ N_("Tungsten"), 0x01, 0 },
{ N_("Flourescent"), 0x02, 0 },
{ N_("Fluorescent"), 0x02, 0 },
{ N_("Daylight"), 0x03, 0 },
{ N_("Flash"), 0x04, 0 },
{ N_("Cloudy"), 0x05, 0 },
@@ -4914,7 +4914,7 @@ static struct deviceproptableu8 canon_whitebalance[] = {
{ N_("Custom Whitebalance PC-2"), 11, 0 },
{ N_("Custom Whitebalance PC-3"), 12, 0 },
{ N_("Missing Number"), 13, 0 },
/*{ N_("Flourescent H"), 14, 0 }, ... dup? */
/*{ N_("Fluorescent H"), 14, 0 }, ... dup? */
};
GENERIC8TABLE(Canon_WhiteBalance,canon_whitebalance)
@@ -6315,7 +6315,7 @@ _get_Canon_EOS_RemoteRelease(CONFIG_GET_ARGS) {
/* On EOS 7D:
* 9128 1 0 (half?)
* 9128 2 0 (full?)
* paramters: press mode, ? afmode ? SDK seems to suggest 1==NonAF, 0 == AF
* parameters: press mode, ? afmode ? SDK seems to suggest 1==NonAF, 0 == AF
*/
static int
@@ -6327,7 +6327,7 @@ _put_Canon_EOS_RemoteRelease(CONFIG_PUT_ARGS) {
if (!ptp_operation_issupported(params, PTP_OC_CANON_EOS_RemoteReleaseOn))
return (GP_ERROR_NOT_SUPPORTED);
/* If someone has set the capture target inbetween */
/* If someone has set the capture target between */
CR (camera_canon_eos_update_capture_target( camera, context, -1 ));
gp_widget_get_value(widget, &val);
@@ -8861,7 +8861,7 @@ static struct submenu capture_settings_menu[] = {
/* these cameras also have PTP_DPC_ExposureTime, avoid overlap */
{ N_("Shutter Speed 2"), "shutterspeed2", PTP_DPC_NIKON_ExposureTime, PTP_VENDOR_NIKON, PTP_DTC_UINT32, _get_Nikon_ShutterSpeed, _put_Nikon_ShutterSpeed },
{ N_("Movie Shutter Speed 2"), "movieshutterspeed", PTP_DPC_NIKON_MovieShutterSpeed, PTP_VENDOR_NIKON, PTP_DTC_UINT32, _get_Nikon_ShutterSpeed, _put_Nikon_ShutterSpeed },
/* olympus uses also a 16 bit/16bit seperation */
/* olympus uses also a 16 bit/16bit separation */
{ N_("Shutter Speed"), "shutterspeed", PTP_DPC_OLYMPUS_Shutterspeed, PTP_VENDOR_GP_OLYMPUS_OMD, PTP_DTC_UINT32, _get_Olympus_ShutterSpeed, _put_Olympus_ShutterSpeed },
{ N_("Shutter Speed"), "shutterspeed", PTP_DPC_CANON_EOS_ShutterSpeed, PTP_VENDOR_CANON, PTP_DTC_UINT16, _get_Canon_ShutterSpeed, _put_Canon_ShutterSpeed },
{ N_("Shutter Speed"), "shutterspeed", PTP_DPC_FUJI_ShutterSpeed, PTP_VENDOR_FUJI, PTP_DTC_INT16, _get_Fuji_ShutterSpeed, _put_Fuji_ShutterSpeed },

4
camlibs/ptp2/device-flags.h
View File

@@ -171,7 +171,7 @@
*/
#define DEVICE_FLAG_ALWAYS_PROBE_DESCRIPTOR 0x00000800
/**
* Samsung has implimented its own playlist format as a .spl file
* Samsung has implemented its own playlist format as a .spl file
* stored in the normal file system, rather than a proper mtp
* playlist. There are multiple versions of the .spl format
* identified by a line in the file: VERSION X.XX
@@ -179,7 +179,7 @@
*/
#define DEVICE_FLAG_PLAYLIST_SPL_V1 0x00001000
/**
* Samsung has implimented its own playlist format as a .spl file
* Samsung has implemented its own playlist format as a .spl file
* stored in the normal file system, rather than a proper mtp
* playlist. There are multiple versions of the .spl format
* identified by a line in the file: VERSION X.XX

38
camlibs/ptp2/library.c
View File

@@ -75,7 +75,7 @@ static int capture_timeout = USB_TIMEOUT_CAPTURE;
/* below macro makes a copy of fn without leading character ('/'),
* removes the '/' at the end if present, and calls folder_to_handle()
* funtion proviging as the first argument the string after the second '/'.
* function proviging as the first argument the string after the second '/'.
* for example if fn is '/store_00010001/DCIM/somefolder/', the macro will
* call folder_to_handle() with 'DCIM/somefolder' as the very first argument.
* it's used to omit storage pseudofolder and remove trailing '/'
@@ -909,7 +909,7 @@ static struct {
/* Fernando Santoro <fernando.lopezjr@gmail.com> */
{"Sony:DSC-A100 (PTP mode)", 0x054c, 0x02c0, 0},
/* Sam Tseng <samtz1223@gmail.com> */
/* this seems not to have a seperate control mode id, see https://github.com/gphoto/libgphoto2/issues/288 */
/* this seems not to have a separate control mode id, see https://github.com/gphoto/libgphoto2/issues/288 */
{"Sony:DSC-A900 (PTP mode)", 0x054c, 0x02e7, PTP_CAP},
/* new id?! Reported by Ruediger Oertel. */
{"Sony:DSC-W200 (PTP mode)", 0x054c, 0x02f8, 0},
@@ -5065,7 +5065,7 @@ fallback:
CR (gp_port_set_timeout (camera->port, normal_timeout));
/* The standard defined way ... wait for some capture related events. */
/* The Nikon 1 series emits ObjectAdded occasionaly after
/* The Nikon 1 series emits ObjectAdded occasionally after
* the CaptureComplete event, while others do it the other way
* round. Handle that case with some bitmask. */
done = 0; tries = 20;
@@ -6908,14 +6908,14 @@ find_child (PTPParams *params,const char *file,uint32_t storage,uint32_t handle,
if (ret != PTP_RC_OK) {
/* NOTE: the "i" array entry might now be invalid, as object_want can remove objects from the list */
GP_LOG_D("failed getting info of oid 0x%08x?", oid);
/* could happen if file gets removed inbetween */
/* could happen if file gets removed between */
continue;
}
if ((ob->oi.StorageID==storage) && (ob->oi.ParentObject==handle)) {
ret = ptp_object_want (params, oid, PTPOBJECT_OBJECTINFO_LOADED, &ob);
if (ret != PTP_RC_OK) {
GP_LOG_D("failed getting info of oid 0x%08x?", oid);
/* could happen if file gets removed inbetween */
/* could happen if file gets removed between */
/* FIXME: should remove, but then we irritate our list */
continue;
}
@@ -6984,7 +6984,7 @@ file_list_func (CameraFilesystem *fs, const char *folder, CameraList *list,
/* compute storage ID value from folder patch */
folder_to_storage(folder,storage);
/* Get (parent) folder handle omiting storage pseudofolder */
/* Get (parent) folder handle omitting storage pseudofolder */
find_folder_handle(params,folder,storage,parent);
C_PTP_REP (ptp_list_folder (params, storage, parent));
@@ -7110,7 +7110,7 @@ folder_list_func (CameraFilesystem *fs, const char *folder, CameraList *list,
/* compute storage ID value from folder path */
folder_to_storage (folder,storage);
/* Get folder handle omiting storage pseudofolder */
/* Get folder handle omitting storage pseudofolder */
find_folder_handle (params,folder,storage,handler);
/* list this directory */
@@ -7524,7 +7524,7 @@ mtp_put_playlist(
/* compute storage ID value from folder patch */
folder_to_storage(fn,storage);
/* Get file number omiting storage pseudofolder */
/* Get file number omitting storage pseudofolder */
find_folder_handle(params, fn, storage, objectid);
objectid = find_child(params, filename, storage, objectid, NULL);
if (objectid != PTP_HANDLER_SPECIAL) {
@@ -7657,7 +7657,7 @@ read_file_func (CameraFilesystem *fs, const char *folder, const char *filename,
/* compute storage ID value from folder patch */
folder_to_storage(folder,storage);
/* Get file number omiting storage pseudofolder */
/* Get file number omitting storage pseudofolder */
find_folder_handle(params, folder, storage, oid);
oid = find_child(params, filename, storage, oid, &ob);
if (oid == PTP_HANDLER_SPECIAL) {
@@ -7783,7 +7783,7 @@ get_file_func (CameraFilesystem *fs, const char *folder, const char *filename,
/* compute storage ID value from folder patch */
folder_to_storage(folder,storage);
/* Get file number omiting storage pseudofolder */
/* Get file number omitting storage pseudofolder */
find_folder_handle(params, folder, storage, oid);
oid = find_child(params, filename, storage, oid, &ob);
if (oid == PTP_HANDLER_SPECIAL) {
@@ -8038,7 +8038,7 @@ put_file_func (CameraFilesystem *fs, const char *folder, const char *filename,
/* compute storage ID value from folder patch */
folder_to_storage(folder,storage);
/* Get file number omiting storage pseudofolder */
/* Get file number omitting storage pseudofolder */
find_folder_handle(params, folder, storage, object_id);
object_id = find_child(params, filename, storage, object_id, &ob);
if (object_id ==PTP_HANDLER_SPECIAL) {
@@ -8054,7 +8054,7 @@ put_file_func (CameraFilesystem *fs, const char *folder, const char *filename,
/* compute storage ID value from folder patch */
folder_to_storage(folder,storage);
/* get parent folder id omiting storage pseudofolder */
/* get parent folder id omitting storage pseudofolder */
find_folder_handle(params,folder,storage,parent);
/* if you desire to put file to root folder, you have to use
@@ -8147,7 +8147,7 @@ delete_file_func (CameraFilesystem *fs, const char *folder,
C_PTP_REP (ptp_check_event (params));
/* compute storage ID value from folder patch */
folder_to_storage(folder,storage);
/* Get file number omiting storage pseudofolder */
/* Get file number omitting storage pseudofolder */
find_folder_handle(params, folder, storage, oid);
oid = find_child(params, filename, storage, oid, NULL);
@@ -8194,7 +8194,7 @@ remove_dir_func (CameraFilesystem *fs, const char *folder,
C_PTP_REP (ptp_check_event (params));
/* compute storage ID value from folder patch */
folder_to_storage(folder,storage);
/* Get file number omiting storage pseudofolder */
/* Get file number omitting storage pseudofolder */
find_folder_handle(params, folder, storage, oid);
oid = find_child(params, foldername, storage, oid, NULL);
if (oid == PTP_HANDLER_SPECIAL)
@@ -8220,7 +8220,7 @@ set_info_func (CameraFilesystem *fs, const char *folder, const char *filename,
camera->pl->checkevents = TRUE;
/* compute storage ID value from folder patch */
folder_to_storage(folder,storage);
/* Get file number omiting storage pseudofolder */
/* Get file number omitting storage pseudofolder */
find_folder_handle(params, folder, storage, object_id);
object_id = find_child(params, filename, storage, object_id, &ob);
if (object_id == PTP_HANDLER_SPECIAL)
@@ -8264,7 +8264,7 @@ get_info_func (CameraFilesystem *fs, const char *folder, const char *filename,
/* compute storage ID value from folder patch */
folder_to_storage(folder,storage);
/* Get file number omiting storage pseudofolder */
/* Get file number omitting storage pseudofolder */
find_folder_handle(params, folder, storage, oid);
oid = find_child(params, filename, storage, oid, &ob);
if (oid == PTP_HANDLER_SPECIAL)
@@ -8361,7 +8361,7 @@ make_dir_func (CameraFilesystem *fs, const char *folder, const char *foldername,
memset(&oi, 0, sizeof (PTPObjectInfo));
/* compute storage ID value from folder patch */
folder_to_storage(folder,storage);
/* get parent folder id omiting storage pseudofolder */
/* get parent folder id omitting storage pseudofolder */
find_folder_handle(params,folder,storage,parent);
/* if you desire to make dir in 'root' folder, you have to use
@@ -8694,12 +8694,12 @@ camera_init (Camera *camera, GPContext *context)
XT(normal_timeout,USB_NORMAL_TIMEOUT);
XT(capture_timeout,USB_TIMEOUT_CAPTURE);
/* Choose a shorter timeout on inital setup to avoid
/* Choose a shorter timeout on initial setup to avoid
* having the user wait too long.
*/
if (a.usb_vendor == 0x4a9) { /* CANON */
/* our special canon friends get a shorter timeout, sinc ethey
* occasionaly need 2 retries. */
* occasionally need 2 retries. */
XT(canon_start_timeout,USB_CANON_START_TIMEOUT);
CR (gp_port_set_timeout (camera->port, canon_start_timeout));
} else {

10
camlibs/ptp2/music-players.h
View File

@@ -652,7 +652,7 @@
/*
* SanDisk
* several devices (c150 for sure) are definately dual-mode and must
* several devices (c150 for sure) are definitely dual-mode and must
* have the USB mass storage driver that hooks them unloaded first.
* They all have problematic dual-mode making the device unload effect
* uncertain on these devices.
@@ -2451,7 +2451,7 @@
/*
* Motorola Xoom (Wingray) variants
*
* These devices seem to use these product IDs simulatenously
* These devices seem to use these product IDs simultaneously
* https://code.google.com/p/android-source-browsing/source/browse/init.stingray.usb.rc?repo=device--moto--wingray
*
* 0x70a3 - Factory test - reported as early MTP ID
@@ -3233,7 +3233,7 @@
#if 1
/* after some review I commented it back in. There was apparently
* only one or two devices misbehaving (having this ID in mass storage mode),
* but more seem to use it regulary as MTP devices. Marcus 20150401 */
* but more seem to use it regularly as MTP devices. Marcus 20150401 */
/*
* This had to be commented out - the same VID+PID is used also for
* other modes than MTP, so we need to let mtp-probe do its job on this
@@ -3328,7 +3328,7 @@
#if 1
/* after some review I commented it back in. There was apparently
* only one or two devices misbehaving (having this ID in mass storage mode),
* but more seem to use it regulary as MTP devices. Marcus 20150401 */
* but more seem to use it regularly as MTP devices. Marcus 20150401 */
/*
* This had to be commented out - the same VID+PID is used also for
* other modes than MTP, so we need to let mtp-probe do its job on this
@@ -3737,7 +3737,7 @@
DEVICE_FLAGS_ANDROID_BUGS },
/* In update 4 the order of devices was changed for
better OS X / Windows suport and another device-id
better OS X / Windows support and another device-id
got assigned for the MTP */
{ "Jolla", 0x2931, "Sailfish (ID2)", 0x0a05,
DEVICE_FLAGS_ANDROID_BUGS },

2
camlibs/ptp2/ptp-pack.c
View File

@@ -1785,7 +1785,7 @@ ptp_unpack_EOS_FocusInfoEx (PTPParams* params, unsigned char** data, uint32_t da
}
/* every focuspoint gets 4 (16 bit number possible "-" sign and a x) and a ,*/
/* inital things around lets say 100 chars at most.
/* initial things around lets say 100 chars at most.
* FIXME: check selected when we decode it
*/
if (size < focus_points_in_struct*8) {

2
camlibs/ptp2/ptp-parse.pl
View File

@@ -249,7 +249,7 @@ sub xml_handle_end {
# type == 1 during send ... print parameters sent to camera
# type == 3 after response ... print data returned
# @bytes - bulk container in response (no data)
# @curdata - bulk data if command had seperate datastream
# @curdata - bulk data if command had separate datastream
sub
dump_ptp_line() {
my($type,$code,$bytesref,$curdataref) = @_;

12
camlibs/ptp2/ptp.c
View File

@@ -144,10 +144,10 @@ ptp_error (PTPParams *params, const char *format, ...)
* bytes, otherwise it's ignored.
* The data should contain an address of a pointer to data going to be sent
* or is filled with such a pointer address if data are received depending
* od dataphase direction (send or received) or is beeing ignored (no
* od dataphase direction (send or received) or is being ignored (no
* dataphase).
* The memory for a pointer should be preserved by the caller, if data are
* beeing retreived the appropriate amount of memory is beeing allocated
* being retreived the appropriate amount of memory is being allocated
* (the caller should handle that!).
*
* Return values: Some PTP_RC_* code.
@@ -1564,7 +1564,7 @@ ptp_getstorageinfo (PTPParams* params, uint32_t storageid,
* storage - StorageID
* objectformatcode - ObjectFormatCode (optional)
* associationOH - ObjectHandle of Association for
* wich a list of children is desired
* which a list of children is desired
* (optional)
* objecthandles - pointer to structute
*
@@ -1629,7 +1629,7 @@ ptp_getfilesystemmanifest (PTPParams* params, uint32_t storage,
* storage - StorageID
* objectformatcode - ObjectFormatCode (optional)
* associationOH - ObjectHandle of Association for
* wich a list of children is desired
* which a list of children is desired
* (optional)
* numobs - pointer to uint32_t that takes number of objects
*
@@ -2559,7 +2559,7 @@ ptp_canon_checkevent (PTPParams* params, PTPContainer* event, int* isevent)
PTP_CNT_INIT(ptp, PTP_OC_CANON_CheckEvent);
*isevent=0;
CHECK_PTP_RC(ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, &data, &size));
if (data && size) { /* check if we had a successfull call with data */
if (data && size) { /* check if we had a successful call with data */
ptp_unpack_EC(params, data, event, size);
*isevent=1;
free(data);
@@ -5734,7 +5734,7 @@ ptp_get_property_description(PTPParams* params, uint16_t dpc)
{PTP_DPC_NIKON_ActiveDLighting, /* 0xD14E */
N_("Active D-Lighting")},
{PTP_DPC_NIKON_FlourescentType, /* 0xD14F */
N_("Flourescent Type")},
N_("Fluorescent Type")},
{PTP_DPC_NIKON_TuneColourTemperature, /* 0xD150 */
N_("Tune Colour Temperature")},
{PTP_DPC_NIKON_TunePreset0, /* 0xD151 */

6
camlibs/ptp2/ptp.h
View File

@@ -177,7 +177,7 @@ typedef struct _PTPIPHeader PTPIPHeader;
/* not from standards papers, but from traces: */
#define PTP_VENDOR_SONY 0x00000011 /* observed in the A900 */
/* Vendor extension ID used for MTP (occasionaly, usualy 6 is used) */
/* Vendor extension ID used for MTP (occasionally, usually 6 is used) */
#define PTP_VENDOR_MTP 0xffffffff
/* gphoto overrides */
@@ -819,7 +819,7 @@ typedef struct _PTPIPHeader PTPIPHeader;
* AutofocusPush() = (1,0) ... same as AEStart?
* KeepCameraActive() = (0xe,0)
*/
#define PTP_OC_LEICA_LEReleaseStages 0x9004 /* lrplugin seeing 1 (push af control), 2 (release af control), 0x0c (continuos start), 0x0d (continuos end) as potential arguments */
#define PTP_OC_LEICA_LEReleaseStages 0x9004 /* lrplugin seeing 1 (push af control), 2 (release af control), 0x0c (continuous start), 0x0d (continuous end) as potential arguments */
#define PTP_OC_LEICA_LEOpenSession 0x9005 /* lrplugin one argument, possible 0 is ok? */
#define PTP_OC_LEICA_LECloseSession 0x9006 /* lrplugin */
#define PTP_OC_LEICA_RequestObjectTransferReady 0x9007
@@ -2192,7 +2192,7 @@ typedef struct _PTPCanonEOSDeviceInfo {
#define PTP_DPC_NIKON_ImgConfTime 0xD065
#define PTP_DPC_NIKON_AutoOffTimers 0xD066
#define PTP_DPC_NIKON_AngleLevel 0xD067
#define PTP_DPC_NIKON_D1ShootingSpeed 0xD068 /* continous speed low */
#define PTP_DPC_NIKON_D1ShootingSpeed 0xD068 /* continuous speed low */
#define PTP_DPC_NIKON_D2MaximumShots 0xD069 /* BurstMaxNumer */
#define PTP_DPC_NIKON_ExposureDelayMode 0xD06A
#define PTP_DPC_NIKON_LongExposureNoiseReduction 0xD06B

2
camlibs/ptp2/usb.c
View File

@@ -449,7 +449,7 @@ ptp_usb_getdata (PTPParams* params, PTPContainer* ptp, PTPDataHandler *handler)
ret = translate_gp_result_to_ptp(res);
break;
} else
do_retry = FALSE; /* once we have succesfully read any data, don't try again */
do_retry = FALSE; /* once we have successfully read any data, don't try again */
ret = handler->putfunc (params, handler->priv, res, data);
if (ret != PTP_RC_OK)
break;

2
camlibs/ricoh/ChangeLog
View File

@@ -19,7 +19,7 @@
2005-07-11 Marcus Meissner <marcus@jet.franken.de>
* g3.c: Added Ricoh R2 as reported.
Added some casts to supress warnings.
Added some casts to suppress warnings.
2005-03-21 Marcus Meissner <marcus@jet.franken.de>

2
camlibs/sierra/ChangeLog
View File

@@ -529,7 +529,7 @@
* sierra.c (camera_start, camera_init): Send the
initialization sequence only on init. Olympus C-860L
stops communications when receiving an initialization
sequence after some communications have already occured.
sequence after some communications have already occurred.
* library.h, library.c (sierra_ping -> sierra_init):
This function isn't really a "ping", since it can be used

4
camlibs/sierra/MC-EU1-Protocol.txt
View File

@@ -10,7 +10,7 @@ Speed is set to 19200 bauds
This protocol use 1 or 4 bytes "packets". 4 bytes packets are used to send command to the coolpix and receive information from it.
1 byte packet are used as acknowledge (0x86), not acknowledge (0x15), "attention packet" (0xFF).
Each byte in these packet is divided in two part, bit 0-6 is the value on 7 bits and bit 7 is the odd parity bit (thanks Mark Roberts !)
Returned value by the coolpix (in the two or three? last byte) have 0x1C offset, and least signifiant byte is sent first, for example
Returned value by the coolpix (in the two or three? last byte) have 0x1C offset, and least significant byte is sent first, for example
the number of picture is :
nb picture = ((byte[2] & 0x7F) - 0x1C) + 100 * ((byte[3] & 0x7F) - 0x1C)
@@ -72,7 +72,7 @@ Send Receive Informations
0x86
0x9B, 0x01, 0x7F, 0x7F Release the shutter button,
usefull in bulb mode
useful in bulb mode
0x8F

12
camlibs/sierra/library.c
View File

@@ -232,7 +232,7 @@ int sierra_list_folders (Camera *camera, const char *folder, CameraList *list,
/**
* sierra_get_picture_folder:
* @camera : camera data stucture
* @camera : camera data structure
* @folder : folder name (to be freed by the caller)
*
* Return the name of the folder that stores pictures. It is assumed that
@@ -286,7 +286,7 @@ int sierra_get_picture_folder (Camera *camera, char **folder)
/**
* sierra_check_battery_capacity:
* @camera : camera data stucture
* @camera : camera data structure
*
* Check if the battery capacity is high enough.
*
@@ -318,7 +318,7 @@ int sierra_check_battery_capacity (Camera *camera, GPContext *context)
/**
* sierra_get_memory_left:
* @camera : camera data stucture
* @camera : camera data structure
* @memory : memory left
*
* Provide the available memory left
@@ -435,7 +435,7 @@ sierra_write_packet (Camera *camera, char *packet, GPContext *context)
break;
}
/* Determing packet length */
/* Determining packet length */
if ((packet[0] == SIERRA_PACKET_COMMAND) ||
(packet[0] == SIERRA_PACKET_DATA) ||
(packet[0] == SIERRA_PACKET_DATA_END)) {
@@ -492,7 +492,7 @@ sierra_write_nak (Camera *camera, GPContext *context)
/**
* sierra_read_packet:
* @camera : camera data stucture
* @camera : camera data structure
* @packet : to return the read packet
*
* Read a data packet from the camera.
@@ -1409,7 +1409,7 @@ sierra_capture (Camera *camera, CameraCaptureType type,
}
/*
* We need to tell the frontend where the new image can be
* found. Unfortunatelly, we can only figure out the
* found. Unfortunately, we can only figure out the
* filename. Therefore, reset the CameraFilesystem and let
* it search for the filename.
*

2
camlibs/sierra/nikon-desc.c
View File

@@ -342,7 +342,7 @@ static const RegisterDescriptorType cp880_reg_33[] = {
* fix the problem.
*
* The use of next and previous should be part of a separate
* interface, such that a user can continuosly press next or previous to
* interface, such that a user can continuously press next or previous to
* cycle through the images (while the camera is in play mode).
*
* Use command 2 (via sierra_sub_action) with action

4
camlibs/sierra/olympus-desc.c
View File

@@ -587,7 +587,7 @@ static const RegisterDescriptorType oly3000z_reg_20[] = {
/*
* Olympus 750uz: Register 20: white balance. The main difference is that
* we have the flourescent 1 2 and 3:
* we have the fluorescent 1 2 and 3:
*/
static const ValueNameType oly750uz_reg_20_val_names[] = {
{ { 0x00 }, N_("Auto") },
@@ -608,7 +608,7 @@ static const RegisterDescriptorType oly750uz_reg_20[] = {
/*
* Olympus SP 500uz: Register 20: white balance. The main difference is that
* we have the flourescent 1 2 and 3:
* we have the fluorescent 1 2 and 3:
*/
static const ValueNameType olysp500uz_reg_20_val_names[] = {
{ { 0x00 }, N_("Auto") },

2
camlibs/sierra/sierra-desc.c
View File

@@ -319,7 +319,7 @@ camera_cam_desc_set_value (Camera *camera, CameraRegisterType *reg_p,
*
* Currently no need to support any subaction here.
*
* Similiar to the masking above, if we have a register
* Similar to the masking above, if we have a register
* larger than 4 bytes, put the four bytes in the int to
* into the low four bytes of the value we want to set;
* fill the rest with whatever was read from the camera.

2
camlibs/sierra/sierra-desc.h
View File

@@ -26,7 +26,7 @@
* The lowest level structs are first, followed by the higher levels.
*
* These structures can't be in one single struct, since they are variable
* length, and each level has a slightly different set of functionallity.
* length, and each level has a slightly different set of functionality.
*
* Generally, we have a CameraRegisterSetType with pointers to
* CameraRegisterType registers; each register in turn has pointers to

2
camlibs/sierra/sierra-usbwrap.c
View File

@@ -30,7 +30,7 @@
*
* IMPORTANT: In order to use this mode, the camera must be switched
* _out_ of "USB Mass Storage" mode and into "USB PC control mode".
* The images will not be accessable as a mass-storage/disk device in
* The images will not be accessible as a mass-storage/disk device in
* this mode, but you can control the camera, tell it to take pictures
* and download images using the protocol implemented in sierra.c.
*

8
camlibs/sipix/blink.txt
View File

@@ -59,7 +59,7 @@ contains:04 00 (there were 4 pics in device)
Request
-------
Gets size of specified image, odd in that request is repeated untill
Gets size of specified image, odd in that request is repeated until
first byte in returned data changes to 0
The returned size is in "blocks" these are 0x100 bytes long eithr that
@@ -74,7 +74,7 @@ Length = 8
Result:8bytes
contains:01 00 00 00 00 00 00 00
untill value changes
until value changes
Result:8bytes
contains:00 00 10 01 00 00 00 00
@@ -115,7 +115,7 @@ byte 01: size 0
request
-------
Positions bulk pipe ready to download image
Again request is repeated untill returned data byte 0 is set to 0
Again request is repeated until returned data byte 0 is set to 0
bmRequestType=c0 Vendor,device to host
bRequest = 2
@@ -126,7 +126,7 @@ Length = 6
Result:6bytes
contains:01 00 00 00 00 00
untill data changes to:
until data changes to:
contains:00 00 00 00 00 00

2
camlibs/sipix/blink2.txt
View File

@@ -81,7 +81,7 @@ Hmm (?) / Resync Routine:
control read 0x13, 0x0, 0x00 -> buf[1]
Bandwith Allocate(type):
Bandwidth Allocate(type):
320x240: control read 0x14, 0x0, 0x00 -> buf[1]
640x480: control read 0x15, 0x0, 0x00 -> buf[1]

2
camlibs/spca50x/README.spca50x
View File

@@ -113,7 +113,7 @@ Thanks from the spca504_flash README
------------------------------------
This owes everything to the work of Mark Zimmermann <mark@foresthaven.com> whose
pencamread tool I have simply ported to a gphoto2 camlib. The macam driver by
Matthias Krauß was also helpfull. All features are theirs, all bugs are mine.
Matthias Krauß was also helpful. All features are theirs, all bugs are mine.
I dont own a camera of this type, so I had to rely on Armin Janssen
<unclebenz@foni.net> to tirelessly produce usb snoops, test and give feedback.

2
camlibs/sq905/sq905.c
View File

@@ -88,7 +88,7 @@ sq_init (GPPort *port, CameraPrivateLibrary *priv)
sq_read_data(port, catalog, 0x4000); /* We need 16 bytes for each photo. */
sq_reset (port);
/* The first occurence of a zero denotes end of files entries (here clips count as 1 entry) */
/* The first occurrence of a zero denotes end of files entries (here clips count as 1 entry) */
for (i=0; i<0x4000 && catalog[i]; i+=16) ;
priv->nb_entries = i>>4;
if (i) {

2
camlibs/stv0680/bayer.c
View File

@@ -75,7 +75,7 @@ typedef struct _rgbgamma {
* Influence on the highlights is small; therefore the description
* with amplifiaction and gamma seems not very appropriate; a better
* correction function would allow to influence the slope for small
* and for large values indepentently without incurring loss of
* and for large values independently without incurring loss of
* accuracy/information. It should not be hard to construct such a
* thing. (Splines or Bézier or Triginometric/Hyperbolic functions
* could be used, e.g.)

2
camlibs/topfield/puppy.c
View File

@@ -769,7 +769,7 @@ put_file_func (CameraFilesystem *fs, const char *folder, const char *filename, C
fileSize = srcStat.st_size;
if(fileSize == 0)
{
gp_log (GP_LOG_ERROR, "topfield", "ERROR: Source file is empty - not transfering.\n");
gp_log (GP_LOG_ERROR, "topfield", "ERROR: Source file is empty - not transferring.\n");
result = -ENODATA;
goto out;
}

4
doc/api/tmpl/gphoto2-abilities-list.sgml
View File

@@ -31,7 +31,7 @@ order to set up a #Camera, you need to call #gp_camera_set_abilities. The
/* Scan the system for camera drivers */
#gp_abilities_list_load (list);
/* Retreive the abilities of a specific model */
/* Retrieve the abilities of a specific model */
n = #gp_abilities_list_lookup_model (list, "HP PhotoSmart C30");
#gp_abilities_list_get_abilities (list, n, &amp;abilities);
#gp_abilities_list_free (list);
@@ -111,7 +111,7 @@ order to set up a #Camera, you need to call #gp_camera_set_abilities. The
determine what library to load on #gp_camera_set_abilities.
For retreiving abilities of a specific model, create a
#CameraAbilitiesList and use #gp_abilities_list_load in order to scan
the system for drivers. Then, retreive the #CameraAbilities from this list.
the system for drivers. Then, retrieve the #CameraAbilities from this list.
</para>
@model:

4
doc/build_OS2.txt
View File

@@ -11,9 +11,9 @@ compile : gcc version 2.8.1
http://hobbes.nmsu.edu/cgi-bin/h-browse?sh=1&dir=/pub/os2/dev/emx/v0.9d
libraries : pthreads
unfortunatly I don't know whih version I use here but the one from netlabs should be working
unfortunately I don't know whih version I use here but the one from netlabs should be working
ftp://ftp.netlabs.org/pub/pthreads/
make sure the emx\lib directory is added to your lib environment 'SET LIB=x:\EMX\LIB'
alse the pthreads DLL's and LIB's should be in the EMX tree
else the pthreads DLL's and LIB's should be in the EMX tree

2
doc/camlib_devel.lyx
View File

@@ -644,7 +644,7 @@ Camera API
The CAPI provides the full set of functions for doing various tasks with
the camera.
All CAPI functions return either GP_OK for succesful execution , or GP_ERROR
All CAPI functions return either GP_OK for successful execution , or GP_ERROR
for a failure of execution
\layout Standard

4
doc/camlib_devel.sgml
View File

@@ -101,7 +101,7 @@ Cameras like to ping. This is the in the form of an &quot;ACK&quot;&quot;
up a camera that has gone into power-save mode. It usually starts out the communications,
as well as confirms each packet in any sort of &quot;mass&quot; transfer. The
opposite, a &quot;NAK&quot;, is sent to basically say the last packet was not
received, or an error has occured. Again, this is usually just a single byte
received, or an error has occurred. Again, this is usually just a single byte
as well.
Example:
@@ -388,7 +388,7 @@ Section 3.1 details the purpose of each of these functions, while Section
Camera API
<p>
The CAPI provides the full set of functions for doing various tasks with
the camera. All CAPI functions return either GP_OK for succesful execution
the camera. All CAPI functions return either GP_OK for successful execution
, or GP_ERROR for a failure of execution
</p>
<p>

4
doc/camlib_devel.txt
View File

@@ -89,7 +89,7 @@ should demonstrate some commonalities between most camera protocols.
mode. It usually starts out the communications, as well as confirms
each packet in any sort of "mass" transfer. The opposite, a "NAK",
is sent to basically say the last packet was not received, or an
error has occured. Again, this is usually just a single byte as
error has occurred. Again, this is usually just a single byte as
well.
Example:
@@ -337,7 +337,7 @@ Section 3.1 details the purpose of each of these functions, while Section
3.1 Camera API
The CAPI provides the full set of functions for doing various tasks
with the camera. All CAPI functions return either GP_OK for succesful
with the camera. All CAPI functions return either GP_OK for successful
execution , or GP_ERROR for a failure of execution
What follows is a listing of the functions, including prototypes and

2
examples/sample-afl.c
View File

@@ -256,7 +256,7 @@ int main(int argc, char **argv) {
gp_file_free (file);
#if 0
/* this gives endless event check loops occasionaly ... need review how to do this best */
/* this gives endless event check loops occasionally ... need review how to do this best */
ret = gp_camera_capture (camera, GP_CAPTURE_IMAGE, &path, context);
if ((ret != GP_OK) && (ret != GP_ERROR_NOT_SUPPORTED)) {
printf ("Could not capture preview.\n");

2
examples/sample-photobooth.c
View File

@@ -92,7 +92,7 @@ main(int argc, char **argv) {
GPContext *context = sample_create_context();
printf("Sample photobooth.\n");
printf("Continously stores previews in 'preview.jpg'.\n");
printf("Continuously stores previews in 'preview.jpg'.\n");
printf("kill -USR1 %d to take a capture.\n", getpid());
printf("kill -USR2 %d to read the 'config.txt'.\n", getpid());
printf("kill -TERM %d to finish.\n", getpid());

2
gphoto-m4/gp-camlibs.m4
View File

@@ -6,7 +6,7 @@ dnl ####################################################################
dnl
dnl Redundancy free definition of libgphoto2 camlibs.
dnl
dnl Removes the redundany from the camlib lists, and executes
dnl Removes the redundancy from the camlib lists, and executes
dnl additional consistency checks on the build system.
dnl
dnl Every camlib belongs to one of the following (disjunct) sets of

2
gphoto-m4/gp-documentation.m4
View File

@@ -64,7 +64,7 @@ AC_REQUIRE([GP_CHECK_DOC_DIR])
# ---------------------------------------------------------------------------
# gtk-doc: We use gtk-doc for building our documentation. However, we
# require the user to explicitely request the build.
# require the user to explicitly request the build.
# ---------------------------------------------------------------------------
try_gtkdoc=false
gtkdoc_msg="no (not requested)"

Some files were not shown because too many files have changed in this diff Show More