diff --git a/ChangeLog b/ChangeLog index 7809056a9d..8c3337fa45 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,7 +7,7 @@ 2010-03-12 Hans de Goede * camlibs/st2205: New camera driver for ST2205 based picture frames. - * libgphoto2_port/usbdiskdirect: USB Disk direct acccess driver + * libgphoto2_port/usbdiskdirect: USB Disk direct access driver (for ST2205 based picture frames.) * New dependency for "libgd" for image conversion for above driver. * configure.ac, camlibs/Makefile.am: hooked up new camlib, new gd check. @@ -71,7 +71,7 @@ * Adjusted to new GPPortInfo handling. * Rewrote gphoto2-filesys.c to be directory based (in a tree - structure). Change should not be visibile outside of gphoto2-filesys.c. + structure). Change should not be visible outside of gphoto2-filesys.c. 2008-05-18 Marcus Meissner @@ -284,7 +284,7 @@ Got rid of most LRU heuristics, simplified to just store the last full datastreams. This should be fully sufficient for 99.9% of all usecases - (download images lineary). + (download images linearly). You can control this by the setting "libgphoto2" , "cached-images". @@ -1028,7 +1028,7 @@ 2002-05-19 Christophe Barbe - * frontends/command-line/main.c: replaced a missused #if with a #ifdef + * frontends/command-line/main.c: replaced a misused #if with a #ifdef * frontends/command-line/gphoto2-cmd-capture.c: same 2 times. reported by Luciano Campal Vazquez @@ -2140,7 +2140,7 @@ that broke (at least) two of the supported 'libgphoto2' camera libraries!!!" *sigh*. - * conigure.in: Add a --with-multi option and a warning that people + * configure.in: Add a --with-multi option and a warning that people who use it will run into troubles with digita and dc240 and that people who don't use it will run into troubles when using Nautilus or Konqueror for browsing their camera. @@ -2776,7 +2776,7 @@ 2001-10-26 Lutz Müller - * frontends/command-line/gphoto2-cmd-capture.c: Adjust brighness + * frontends/command-line/gphoto2-cmd-capture.c: Adjust brightness and contrast with arrow keys 2001-10-26 Dan Fandrich @@ -3192,7 +3192,7 @@ 2001-10-17 Lutz Müller - * libgphoto2/gphoto2-debug.c: Make tranition to gp_log_* + * libgphoto2/gphoto2-debug.c: Make transition to gp_log_* * camlibs/sierra: Adjust parameters of camera_capture 2001-10-17 Lutz Müller @@ -3665,7 +3665,7 @@ 2001-10-04 Lutz Müller * camlibs/konica/library.c: const - * frontents/command-line/main.c: Print out last debugging messages + * frontends/command-line/main.c: Print out last debugging messages on error * include/gphoto2-debug.h: * libgphoto2/debug.c: Remember history @@ -4606,18 +4606,18 @@ * tests/*: New * configure.in: * Makefile.am: Add tests to SUBDIRS and generate the Makefile - * frontents/command-line/test.[c,h]: Removed + * frontends/command-line/test.[c,h]: Removed * frontends/command-line/main.c: - * frontents/command-line/Makefile.am: Reflect changes + * frontends/command-line/Makefile.am: Reflect changes 2001-08-17 Lutz Müller - * frontents/gtk/macros/*: Removed. + * frontends/gtk/macros/*: Removed. 2001-08-17 Lutz Müller - * frontents/Makefile.am: Remove libpghoto2_frontend from SUBDIRS. - * frontents/gtk/*: Removed those ancient files. For GUI frontends, + * frontends/Makefile.am: Remove libpghoto2_frontend from SUBDIRS. + * frontends/gtk/*: Removed those ancient files. For GUI frontends, refer to gtkam or GnoCam. They are distributed separately. 2001-08-17 Lutz Müller @@ -4627,7 +4627,7 @@ 2001-08-17 Lutz Müller - * frontents/libgphoto2_frontend/*: Removed. Those files were mainly + * frontends/libgphoto2_frontend/*: Removed. Those files were mainly empty functions and nowhere needed. 2001-08-17 Hubert Figuiere @@ -5396,7 +5396,7 @@ 2000-07-29 04:14 simpson2 - * camlibs/digita/digita.df: bvl: digita.df, module defenition file + * camlibs/digita/digita.df: bvl: digita.df, module definition file to create DLL on OS/2 2000-07-29 04:13 simpson2 @@ -5550,7 +5550,7 @@ po/POTFILES.in, po/cat-id-tbl.c, po/project5.pot, po/stamp-cat-id, src/Makefile.am, src/callbacks.c, src/callbacks.h, src/interface.c, src/interface.h, src/main.c, src/support.c, src/support.h: added - new gtk inteface beginning code + new gtk interface beginning code 2000-07-26 14:25 scottf @@ -5630,7 +5630,7 @@ camlibs/directory/directory.def, camlibs/directory/makefile.os2, frontends/command-line/main.c, frontends/command-line/makefile.os2, include/gphoto2.h, include/gphotoos2.h, libgphoto2/library.c, - libgphoto2/makefile.os2: bvl: Made some linebreak statments, and + libgphoto2/makefile.os2: bvl: Made some linebreak statements, and ifdef correction on behalf of the OS/2 port 2000-07-22 14:47 scottf @@ -5677,7 +5677,7 @@ camlibs/konica/Makefile.in, camlibs/panasonic/dc.c, camlibs/panasonic/dc.h, camlibs/panasonic/dc1580.c, camlibs/panasonic/dc1580.h, frontends/command-line/.cvsignore, - libgphoto2/file.c, libgphoto2/library.c: added a bunch of patchs + libgphoto2/file.c, libgphoto2/library.c: added a bunch of patches from Johannes and Mariusz 2000-07-21 14:15 scottf @@ -6628,7 +6628,7 @@ * frontends/: Makefile.am, command-line/Makefile.am, libgphoto2-util/Makefile.am, libgphoto2-util/cache.c, libgphoto2-util/cache.h, libgphoto2-util/image.c, - libgphoto2-util/image.h: added beginining of gphoto2 utility + libgphoto2-util/image.h: added beginning of gphoto2 utility library for frontends 2000-06-16 14:48 scottf diff --git a/NEWS b/NEWS index 3851948368..6c107568bf 100644 --- a/NEWS +++ b/NEWS @@ -153,7 +153,7 @@ ptp2: * EOS M6 Mark 2 is actually more like a EOS DSLR and fully capable, added some work * Handle OLCINFO for M6 Mark 2 and EOS R5 and new cameras * added current list of autoexposuremode to expose also Fv and friends - * Canon Liveview size is encoded in "output" (PC / MOBILE / MOBILE2 variants are the different livesizes), try to expose seperately as "liveviewsize" + * Canon Liveview size is encoded in "output" (PC / MOBILE / MOBILE2 variants are the different livesizes), try to expose separately as "liveviewsize" * decode more options, nickname, eosmoviemode (color/bw), strobofiring, eventmode, flashcharged, oneshotrawon * bugfixes * Sony Alpha: @@ -1077,7 +1077,7 @@ libgphoto2 API: * Adjusted to new GPPortInfo handling. * Rewrote gphoto2-filesys.c to be directory based (in a tree structure). - Change should not be visibile outside of gphoto2-filesys.c. + Change should not be visible outside of gphoto2-filesys.c. libgphoto2_port API: * GPPortInfo is now abstracted and internal. @@ -1654,7 +1654,7 @@ libgphoto2: * gp-byteorder.m4 fixes for newer glibcs. Example programs: - * Addes some basic library usage example programs and helpers. + * Added some basic library usage example programs and helpers. PTP2 driver: * Merged camlib from TRUNK. @@ -1846,7 +1846,7 @@ PTP2 driver: Canon PowerShot SD1000, SD900, A450, A550, A560, A570, A420, SD40, SD750 Canon PowerShot S5 IS, SD1000 - Canon Digitial IXUS 70, 75, 900Ti, iZ + Canon Digital IXUS 70, 75, 900Ti, iZ Canon MV750i Nikon CoolPix S4, S6, P4, L10 Nikon DSC D40, @@ -1942,7 +1942,7 @@ Ricoh G3: * Added Ricoh Caplio R4 id. Disk port: - * Addes Solaris filesystem table handling. + * Added Solaris filesystem table handling. * Fixed a crasher. * Skip "fuse" filesystem. diff --git a/README.md b/README.md index 27ec86452e..e34188b810 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ Your operating system will tell you about that because it is likely to recognize the device as a SCSI disk that you can mount (for Linux 'dmesg' will tell you). Again, those cameras *cannot* be accessed through libgphoto2. Some of them can be switched to use a different communication protocol and might be in that case -useable with libgphoto2. +usable with libgphoto2. Other camera support a protocol called PTP or USB Imaging Devices that has been developed by Kodak and other. libgphoto2 does support PTP. Also working diff --git a/SECURITY.md b/SECURITY.md index d6f6b75f94..4fc9203c3c 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -30,7 +30,7 @@ Attack impacts are achieving control over this computer, or blocking its use. ## Bugs considered security issues -(Mostly for CVE assigments rules.) +(Mostly for CVE assignments rules.) In scope of a security attack are the autodetecting protocols support, like USB. diff --git a/camlibs/agfa-cl20/agfa_cl20.c b/camlibs/agfa-cl20/agfa_cl20.c index 8ed9e1990c..ad63da1f90 100644 --- a/camlibs/agfa-cl20/agfa_cl20.c +++ b/camlibs/agfa-cl20/agfa_cl20.c @@ -694,7 +694,7 @@ camera_init (Camera *camera, GPContext *context) gp_port_set_settings(camera->port, settings ); /* Camera should return either 0x00 or 0x08, depending on - * wether the PRINT button is depressed. Either way, it + * whether the PRINT button is depressed. Either way, it * should NOT stay 'X' */ diff --git a/camlibs/agfa-cl20/commands.txt b/camlibs/agfa-cl20/commands.txt index 8167f22d8f..f4a0e279b8 100644 --- a/camlibs/agfa-cl20/commands.txt +++ b/camlibs/agfa-cl20/commands.txt @@ -3,9 +3,9 @@ I don't know what they do exactly. c1 00 00 00 21 05 01 00 -c1 00 00 00 20 05 01 00 This one appeares only right after issuing any delete command +c1 00 00 00 20 05 01 00 This one appears only right after issuing any delete command 41 0a 01 00 0d 00 00 00 (for pic 01). It appears after every - delete comand. I dont't know what + delete command. I don't know what it does. The camera answers as usual with a "00" Byte. 41 02 00 00 07 00 00 00 This appears after the diff --git a/camlibs/agfa-cl20/protocol.txt b/camlibs/agfa-cl20/protocol.txt index e104d37936..e9a8bf0282 100644 --- a/camlibs/agfa-cl20/protocol.txt +++ b/camlibs/agfa-cl20/protocol.txt @@ -1,4 +1,4 @@ -Okay, let's tell something about the protocoll: +Okay, let's tell something about the protocol: Everything can be looked up in the USB 1.1 secification! http://www.usb.org/developers/data/usbspec.zip @@ -14,7 +14,7 @@ I always confuse that. Well, If I have 0x0001 then it sends 01 00, so turned aro 3. bulk transfers with direction "in" 1. These control packages are always 8 Bytes long. The first - Byte is the reqest Type. this is always 0xc1 for direction "in". + Byte is the request Type. this is always 0xc1 for direction "in". The c1 is a Bitmap: 7 1 means that the direction is device to host 6 1 Bits 6 and 5 mean that the "Type" is "Vendor" @@ -26,7 +26,7 @@ I always confuse that. Well, If I have 0x0001 then it sends 01 00, so turned aro 0 1 the last two Bytes are always 01 00 the length of the camera reply, so 0x0001 - one Byte. -The camera always replys with 0x00. +The camera always replies with 0x00. 2. Similar to 1. just the direction is "out". @@ -36,7 +36,7 @@ The camera always replys with 0x00. 3. these semm to be standard bulk transfers. you just open one, and the camera sends data. The direction of this transfer is "in". - The trnsfer buffer length is always 0x100. + The transfer buffer length is always 0x100. @@ -74,7 +74,7 @@ As answer we should get: 07 05 84 03 01 00 08 -Now it's time to choose a configuration. I believe the camera just has one, but without setting it exlicitly, the camera does nothing! +Now it's time to choose a configuration. I believe the camera just has one, but without setting it explicitly, the camera does nothing! So we choose configuration 0x01. diff --git a/camlibs/agfa-cl20/protocol2.txt b/camlibs/agfa-cl20/protocol2.txt index e5df662be7..6f10d5546a 100644 --- a/camlibs/agfa-cl20/protocol2.txt +++ b/camlibs/agfa-cl20/protocol2.txt @@ -19,7 +19,7 @@ The specs can be found here: 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: +So what basically happens in the windows driver: 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. @@ -29,21 +29,21 @@ So, if you have the Exif you automatically have the Thumbnail AND the picture. S Interesting is also, that the actual picture, the Exif File, comes in BIG ENDIAN Format. you can see this from the 4d 4d (MM) in the EXIF header. -Okay, let's tell something about the protocoll: +Okay, let's tell something about the protocol: Everything can be looked up in the USB 1.1 secification! That's where I have everything from. All the communication consists of three usb command types: It seems that all the packages have a little endian byte order (least significant byte first?) -I always cofuse that. Well, If I have 0x0001 then it sends 01 00, so turned around. +I always confuse that. Well, If I have 0x0001 then it sends 01 00, so turned around. 1. control packages with direction "in" 2. control packages with direction "out" 3. bulk transfers with direction "in" 1. These control packages are always 8 Bytes long. The first - Byte is the reqest Type. this is always 0xc1 for direction "in". + Byte is the request Type. this is always 0xc1 for direction "in". The c1 is a Bitmap: 7 1 means that the direction is device to host 6 1 Bits 6 and 5 mean that the "Type" is "Vendor" @@ -55,7 +55,7 @@ I always cofuse that. Well, If I have 0x0001 then it sends 01 00, so turned arou 0 1 the last two Bytes are always 01 00 the length of the camera reply, so 0x0001 - one Byte. -The camera always replys with 0x00. +The camera always replies with 0x00. 2. Similar to 1. just the direction is "out". @@ -65,7 +65,7 @@ The camera always replys with 0x00. 3. these semm to be standard bulk transfers. you just open one, and the camera sends data. The direction of this transfer is "in". - The trnsfer buffer length is always 0x100. + The transfer buffer length is always 0x100. @@ -103,7 +103,7 @@ As answer we should get: 07 05 84 03 01 00 08 -Now it's time to choose a configuration. I believe the camera just has one, but without setting it exlicitly, the camera does not +Now it's time to choose a configuration. I believe the camera just has one, but without setting it explicitly, the camera does not hing! So we choose configuration 0x01. @@ -149,7 +149,7 @@ These are the first rows without a flash card: 0000: 00 00 00 10 00 ff ff ff ff 31 2e 31 36 ff ff ff 0010: -ff ff ff ff 00 03 00 00 00 02 00 00 ff ff 05 09 Maybe the 03 is the nubmer of pictures, but I don't +ff ff ff ff 00 03 00 00 00 02 00 00 ff ff 05 09 Maybe the 03 is the number of pictures, but I don't 0020: think so.. 1b 00 00 00 00 00 00 50 01 e0 00 60 00 17 0f 00 0030: @@ -181,7 +181,7 @@ Each time I get back a picture information package, looing like (for pic 4 for e 0020: 1b 74 01 62 02 11 06 50 01 e0 00 60 00 17 0f 01 ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff 0030: -19 01 1a 01 1b 01 1c 01 1d 01 1e 01 1f 01 20 01 and mor ffs... +19 01 1a 01 1b 01 1c 01 1d 01 1e 01 1f 01 20 01 and more ffs... 0040: 21 01 22 01 23 01 24 01 25 01 26 01 27 01 28 01 0050: diff --git a/camlibs/ax203/README.ax203-compression b/camlibs/ax203/README.ax203-compression index 9fab136479..c4eac8c9c3 100644 --- a/camlibs/ax203/README.ax203-compression +++ b/camlibs/ax203/README.ax203-compression @@ -244,13 +244,13 @@ bit weird, but it is how it is. ┌─────────┬───────────────────────────────────────────────────────────────────┐ │ Offset │ Meaning │ ├─────────┼───────────────────────────────────────────────────────────────────┤ -│0x00-0x01│Litte Endian 16 bit word storing last DC val for the Y channel │ +│0x00-0x01│Little Endian 16 bit word storing last DC val for the Y channel │ ├─────────┼───────────────────────────────────────────────────────────────────┤ -│0x02-0x03│Litte Endian 16 bit word storing last DC val for the Cb channel │ +│0x02-0x03│Little Endian 16 bit word storing last DC val for the Cb channel │ ├─────────┼───────────────────────────────────────────────────────────────────┤ -│0x04-0x05│Litte Endian 16 bit word storing last DC val for the Cr channel │ +│0x04-0x05│Little Endian 16 bit word storing last DC val for the Cr channel │ ├─────────┼───────────────────────────────────────────────────────────────────┤ -│ │Litte Endian 16 bit word storing the offset into the image, from │ +│ │Little Endian 16 bit word storing the offset into the image, from │ │0x06-0x07│the start of this info block! Where the huffman data for this MCU │ │ │starts │ └─────────┴───────────────────────────────────────────────────────────────────┘ diff --git a/camlibs/ax203/ax203.c b/camlibs/ax203/ax203.c index 8214ee45b5..68204b6f50 100644 --- a/camlibs/ax203/ax203.c +++ b/camlibs/ax203/ax203.c @@ -1695,7 +1695,7 @@ ax203_commit(Camera *camera) int dirty_sectors; /* We first check each 64k block for dirty sectors. If the block - contains dirty sectors, decide wether to use 4k sector erase + contains dirty sectors, decide whether to use 4k sector erase commands (if the eeprom supports it), or to erase and reprogram the entire block */ for (i = 0; i < mem_sector_size; i += block_sector_size) { diff --git a/camlibs/ax203/tinyjpeg.c b/camlibs/ax203/tinyjpeg.c index 91c91f5726..9afd8f6a4b 100644 --- a/camlibs/ax203/tinyjpeg.c +++ b/camlibs/ax203/tinyjpeg.c @@ -105,7 +105,7 @@ static const unsigned char zigzag[64] = * But convert any 0xff,0x00 into 0xff * get_nbits: read nbits from the stream, and put it in result, * bits is removed from the stream and the reservoir is filled - * automaticaly. The result is signed according to the number of + * automatically. The result is signed according to the number of * bits. * look_nbits: read nbits from the stream without marking as read. * skip_nbits: read nbits from the stream but do not return the result. @@ -176,7 +176,7 @@ static void resync(struct jdec_private *priv); * Get the next (valid) huffman code in the stream. * * To speedup the procedure, we look HUFFMAN_HASH_NBITS bits and the code is - * lower than HUFFMAN_HASH_NBITS we have automaticaly the length of the code + * lower than HUFFMAN_HASH_NBITS we have automatically the length of the code * and the value by using two lookup table. * Else if the value is not found, just search (linear) into an array for each * bits is the code is present. @@ -846,7 +846,7 @@ static const convert_colorspace_fct convert_colorspace_rgb24[4] = { /** * Decode and convert the jpeg image into @pixfmt@ image * - * Note: components will be automaticaly allocated if no memory is attached. + * Note: components will be automatically allocated if no memory is attached. */ int tinyjpeg_decode(struct jdec_private *priv) { diff --git a/camlibs/canon/README.canon b/camlibs/canon/README.canon index 6d85ca551b..6c161ce542 100644 --- a/camlibs/canon/README.canon +++ b/camlibs/canon/README.canon @@ -204,7 +204,7 @@ Change history ============== For detailed changes, see the file ChangeLog. Yes, someone should -extract the user releavant information from ChangeLog and collect it +extract the user relevant information from ChangeLog and collect it here. Version 9 (17-APRIL-2001) diff --git a/camlibs/canon/canon.c b/camlibs/canon/canon.c index e1aab029fc..79450ffc39 100644 --- a/camlibs/canon/canon.c +++ b/camlibs/canon/canon.c @@ -1274,7 +1274,7 @@ canon_int_capture_preview (Camera *camera, unsigned char **data, unsigned int *l * canon_int_find_new_image: * @camera: Camera * to this camera * @initial_state: Camera directory dump before image capture - * @initial_state_len: Lengt of before dump + * @initial_state_len: Length of before dump * @final_state: Directory dump after image capture * @final_state_len: Length of after dump * @path: Will be filled in with the path and filename of the captured diff --git a/camlibs/canon/ps350/ps350proto.txt b/camlibs/canon/ps350/ps350proto.txt index 3a8c066f15..b9378015bd 100644 --- a/camlibs/canon/ps350/ps350proto.txt +++ b/camlibs/canon/ps350/ps350proto.txt @@ -460,7 +460,7 @@ After a completed file download, a "forget file" command follows. This tells the camera to turn itself off. This seems the only way of getting out of the computer-controlled mode. The M$Win driver issues this -command upon exitting it. +command upon exiting it. "turn off" reply @@ -649,7 +649,7 @@ When a picture is selected, the `Aquire' button initiates a communication just like a thumbnail download, only there may be repeated "file download" commands. And in the file name it's "AUT" instead of "THM". -When the driver is exitted, a "turn off" command is sent. +When the driver is exited, a "turn off" command is sent. DIRECTORY ENTRIES diff --git a/camlibs/canon/serial.c b/camlibs/canon/serial.c index 199428cf7a..fac3c9b698 100644 --- a/camlibs/canon/serial.c +++ b/camlibs/canon/serial.c @@ -489,7 +489,7 @@ canon_serial_wait_for_ack (Camera *camera) } } } - /* error already aknowledged, we skip the following ones */ + /* error already acknowledged, we skip the following ones */ if (camera->pl->receive_error == ERROR_RECEIVED) { if (!canon_serial_send_packet (camera, PKT_NACK, old_seq, camera->pl->psa50_eot + PKT_HDR_LEN, @@ -1189,7 +1189,7 @@ canon_serial_get_dirents (Camera *camera, unsigned char **dirent_data, */ mallocd_bytes += MAX (1024, *dirents_length); - /* check if we are reading unrealistic ammounts + /* check if we are reading unrealistic amounts * of directory entries so that we don't loop * forever. 1024 * 1024 is picked out of the blue. */ diff --git a/camlibs/casio/PROTOCOL.txt b/camlibs/casio/PROTOCOL.txt index d58cdcbc4e..0bc223324e 100644 --- a/camlibs/casio/PROTOCOL.txt +++ b/camlibs/casio/PROTOCOL.txt @@ -520,7 +520,7 @@ REPORT HARDWARE REVISION 06 XX YY ZZ WW VV Comment: - Get hardware revison number. + Get hardware revision number. XX: checksum YY: model ID1 @@ -618,7 +618,7 @@ Comment: 4th byte macro mode 01:normal 02:macro mode 5th byte unknown 01 6th byte unknown 0a,09,0c,0e,0b shutter speed? WB? - 7th byte iris(meybe) 07:(F8) 03:(F2) + 7th byte iris(maybe) 07:(F8) 03:(F2) 8th byte unknown 0d 9th byte unknown 04 10th byte unknown 0d diff --git a/camlibs/digigr8/README.905C b/camlibs/digigr8/README.905C index a773b381fe..973fd62f07 100644 --- a/camlibs/digigr8/README.905C +++ b/camlibs/digigr8/README.905C @@ -138,7 +138,7 @@ no rewind controls. The constraints which this places are obvious. It means for example that to download all the photos on the camera to display thumbnails requires the camera to be reset afterwards, because that is the only way to do the "rewind" required before any of the photos can be accessed again. It also -menas that "gphoto2 -p 2" would NOT download the second photo on the camera, +means that "gphoto2 -p 2" would NOT download the second photo on the camera, unless the support for it is so written as to download the first photo, then the second photo, and to process only the second one, having consigned the data from the first photo to /dev/null. The camera simply cannot do better. diff --git a/camlibs/dimera/Protocol.txt b/camlibs/dimera/Protocol.txt index 9ce34a71f1..c21ba28612 100644 --- a/camlibs/dimera/Protocol.txt +++ b/camlibs/dimera/Protocol.txt @@ -27,7 +27,7 @@ done with high res images, 640 x 480. // that number can exceed 255, it is not // clear what the second byte is. -61 00 // download thumbnail (first image is 0 thes +61 00 // download thumbnail (first image is 0 the // image number (starts at zero) the // second byte could be the msb of the image // number, if more than 256 images are @@ -94,7 +94,7 @@ Commands seen but not investigated 2d 65 66 // no response ( take picture? ) -The following sequnece is used to down load a full fine mode image, after +The following sequence is used to download a full fine mode image, after the baud rate is set. 41 54 0d diff --git a/camlibs/dimera/dimera3500.c b/camlibs/dimera/dimera3500.c index 039f8c0165..87660ce115 100644 --- a/camlibs/dimera/dimera3500.c +++ b/camlibs/dimera/dimera3500.c @@ -202,7 +202,7 @@ conversion_chuck (const unsigned int width, const unsigned int height, * * Use neighboring cells to generate color values for each pixel. * The neighbors are the (x-1, y-1), (x, y-1), (x-1, y), and (x, y). - * The exception is when x or y are zero then the neighors used are + * The exception is when x or y are zero then the neighbors used are * the +1 cells. */ diff --git a/camlibs/docupen/docupen.c b/camlibs/docupen/docupen.c index 15e456924e..6612cf2a0b 100644 --- a/camlibs/docupen/docupen.c +++ b/camlibs/docupen/docupen.c @@ -84,7 +84,7 @@ static bool inquiry_read(Camera *camera) return false; } /* FIXME: len is 8bit unsigned, so can be at most 255 ... sizeof(struct dp_info) is currently over 256 - * so this is alwas false ... It is harmless and likely ok, but weird. -Marcus 20200831 */ + * so this is always false ... It is harmless and likely ok, but weird. -Marcus 20200831 */ if (camera->pl->info.len > sizeof(struct dp_info)) { GP_LOG_E("camera info too long: %d bytes", camera->pl->info.len); return false; @@ -388,7 +388,7 @@ camera_manual (Camera *camera, CameraText *manual, GPContext *context) _( "Docupen scanner can't download/erase individual images, only everything\n" "at once. To work-around this, a cache file is created where a copy of the\n" - "scanner's memory is stored. The cache fill is trigerred by downloading any\n" + "scanner's memory is stored. The cache fill is triggered by downloading any\n" "image - so downloading the first image will take long time if the cache is\n" "empty or not valid. The cache is invalidated automatically when the amount\n" "of used memory reported by the scanner does not match cache size.\n" @@ -672,7 +672,7 @@ camera_init (Camera *camera, GPContext *context) camera_exit(camera, context); return GP_ERROR_CAMERA_ERROR; } - gp_port_read(camera->port, buf, sizeof(buf)); /* read and ingore */ + gp_port_read(camera->port, buf, sizeof(buf)); /* read and ignore */ if (!dp_cmd(camera->port, cmd_inquiry)) { GP_LOG_E("inquiry failed"); diff --git a/camlibs/fuji/fuji.c b/camlibs/fuji/fuji.c index 131b0b1998..b5c874575a 100644 --- a/camlibs/fuji/fuji.c +++ b/camlibs/fuji/fuji.c @@ -908,7 +908,7 @@ static int download_picture(int n,int thumb,CameraFile *file,CameraPrivateLibrar fuji_size=get_picture_info(n,name,fjd); DBG3("Info %3d %12s ", n, name); } - else fuji_size=10500; /* Probly not same for all cams, better way ? */ + else fuji_size=10500; /* Probably not same for all cams, better way ? */ DBG2("calling download for %d bytes",fuji_size); diff --git a/camlibs/gsmart300/gsmart300.c b/camlibs/gsmart300/gsmart300.c index 6e0b99dbb9..62a8f9a558 100644 --- a/camlibs/gsmart300/gsmart300.c +++ b/camlibs/gsmart300/gsmart300.c @@ -130,7 +130,7 @@ gsmart300_request_file (CameraPrivateLibrary * lib, CameraFile *file, uint8_t qIndex, value; uint8_t *mybuf; int i, ret; - /* NOTE : these varialbes are slightly renamed */ + /* NOTE : these variables are slightly renamed */ int flash_size, data_size, file_size; CHECK (gsmart300_get_file_info (lib, number, &g_file)); diff --git a/camlibs/hp215/hp215.c b/camlibs/hp215/hp215.c index 43d7407295..6bc7f0e71e 100644 --- a/camlibs/hp215/hp215.c +++ b/camlibs/hp215/hp215.c @@ -31,7 +31,7 @@ Ported to libgphoto2: Marcus Meissner in 2005. Camera commands: - Global comands + Global commands Bytes | 0 1cmd 2 3 4 5 6 7 8 9 10 11 12 13 14 15 -------------------------------+---------------------------------------------------------------------------------- init camera 8 | 0x02 0xce 0x80 0x8a 0x84 0x8d 0x83 0x03 @@ -40,8 +40,8 @@ Delete all pics 12 | 0x02 0xb1 0x84 0x8f 0x8f 0x8f 0x8f 0x86 0x80 0x8a 0x86 0x03 - Single picture comands: - Allways 12 bytes long + Single picture commands: + Always 12 bytes long | 0 1cmd 2 3 4 5 6 7 8 9 10 11 -------------------------------+--------------------------------------------------------------- Request for a preview | 0x02 0xb3 0x84 0x80 ... 0x03 diff --git a/camlibs/iclick/README.iclick b/camlibs/iclick/README.iclick index af51123076..3f76b99150 100644 --- a/camlibs/iclick/README.iclick +++ b/camlibs/iclick/README.iclick @@ -1,5 +1,5 @@ /* This is a supplemental README file for libgphoto2/camlibs/iclick, - * another camera fro S&Q Technologies. + * another camera from S&Q Technologies. * Integral part of the libgphoto2/camlibs/iclick library source and is * distributed with that source under the LGPL license. a copy of which * license may be seen in any of the source files in libgphoto2/camlibs/iclick, diff --git a/camlibs/jd11/jd11.html b/camlibs/jd11/jd11.html index 00e0f6a391..0df06a88df 100644 --- a/camlibs/jd11/jd11.html +++ b/camlibs/jd11/jd11.html @@ -14,7 +14,7 @@

What is the JD11?

-The JD11 is a cheap digital camera produced by JenOptik (apparenly a subsidiary +The JD11 is a cheap digital camera produced by JenOptik (apparently a subsidiary of Zeiss Jena). It was at the time of writing this available for around 250 DM.

There is software available, a windows program called FotoBee @@ -218,7 +218,7 @@

  • READ PACKET until packets exhausted. -Thats all we needed to know about the serial commands. +That's all we needed to know about the serial commands.

    Chapter 3: The image compression, stage 1

    diff --git a/camlibs/kodak/dc210/ChangeLog b/camlibs/kodak/dc210/ChangeLog index 724e17ffec..82086e2c13 100644 --- a/camlibs/kodak/dc210/ChangeLog +++ b/camlibs/kodak/dc210/ChangeLog @@ -67,7 +67,7 @@ 2002-09-06 Michael Koltan - * Implemeted the named commands for displaying, + * Implemented the named commands for displaying, downloading and deleting of files * Added conversion for cfa bayer thumnails * Minor cleanups diff --git a/camlibs/kodak/dc210/library.c b/camlibs/kodak/dc210/library.c index a5f29c8ff7..636916d629 100644 --- a/camlibs/kodak/dc210/library.c +++ b/camlibs/kodak/dc210/library.c @@ -737,7 +737,7 @@ int dc210_init_port (Camera *camera){ /* ok, run a dummy command; if the camera was off, this will activate it and set the speed to 9600; but the command will return an error; - It makes no sense to shorten the timout time, + It makes no sense to shorten the timeout time, because the camera may need up to 10 seconds (information of the manual) to startup */ if (dc210_check_battery(camera) == GP_OK) return GP_OK; diff --git a/camlibs/largan/lmini/lmini.c b/camlibs/largan/lmini/lmini.c index 6a1791e08f..a5dc4745d8 100644 --- a/camlibs/largan/lmini/lmini.c +++ b/camlibs/largan/lmini/lmini.c @@ -335,7 +335,7 @@ int largan_capture (Camera *camera) return ret; } if (reply != LARGAN_CAPTURE_CMD) { - GP_DEBUG ("largan_capture(): inconsisten reply code\n"); + GP_DEBUG ("largan_capture(): inconsistent reply code\n"); return GP_ERROR; } if (code != code2) { diff --git a/camlibs/mars/README.mars b/camlibs/mars/README.mars index 5f87cedc6a..6f4eaf1cf7 100644 --- a/camlibs/mars/README.mars +++ b/camlibs/mars/README.mars @@ -43,7 +43,7 @@ here the information can be used to run options such as gphoto2 -p 3 and gphoto2 -p 3-5. The OEM software provided with the various cameras does not take advantage even of the mentioned abilities. With the OEM driver, one has the choice either to download all photos, or none. If all are downloaded, then -thumbnails are created from temporry image files in C:\TEMP. Thereby, the user +thumbnails are created from temporary image files in C:\TEMP. Thereby, the user can decide what to "save" in some more permanent place. diff --git a/camlibs/mars/protocol.txt b/camlibs/mars/protocol.txt index e7dc417f02..c5befbf348 100644 --- a/camlibs/mars/protocol.txt +++ b/camlibs/mars/protocol.txt @@ -156,7 +156,7 @@ listed as location 0x400. The entries in columns 4 through 6 indicate, again in little endian form, the data size for the given photo, in bytes. The actual data size to be requested -and downloaded from the camera needs to be tne next integer multiple of 0x2000. +and downloaded from the camera needs to be the next integer multiple of 0x2000. Finally, for the seventh column there is at this time no obvious diff --git a/camlibs/minolta/NEWER_MINOLTAS b/camlibs/minolta/NEWER_MINOLTAS index 2fc91343c7..4f10cb3f1f 100644 --- a/camlibs/minolta/NEWER_MINOLTAS +++ b/camlibs/minolta/NEWER_MINOLTAS @@ -3,7 +3,7 @@ UPDATE: Here is an update about what is written below. Most recent Minolta digital camera now use USB Mass Storage device protocol for USB connectivity. That means that they can be mounted as a disk device -within the OS without additionnal support (Linux 2.4.x, *BSD, +within the OS without additional support (Linux 2.4.x, *BSD, etc.). This is a great step forward to having these camera universally supported without requiring complex and non-standard device driver support. diff --git a/camlibs/minolta/dimagev/dimagev.c b/camlibs/minolta/dimagev/dimagev.c index 3db09f9c9a..cbe1c6c0c2 100644 --- a/camlibs/minolta/dimagev/dimagev.c +++ b/camlibs/minolta/dimagev/dimagev.c @@ -467,7 +467,7 @@ int camera_init (Camera *camera, GPContext *context) } /* Apparently, trying to set the clock now leaves the camera in an - unstable state. Skiping it for now. */ + unstable state. Skipping it for now. */ /* if ( dimagev_set_date(camera->pl) < GP_OK ) { GP_DEBUG( "camera_init::unable to set camera to system time"); } */ diff --git a/camlibs/minolta/dimagev/status.c b/camlibs/minolta/dimagev/status.c index 17a704ce3f..85f12e162f 100644 --- a/camlibs/minolta/dimagev/status.c +++ b/camlibs/minolta/dimagev/status.c @@ -153,7 +153,7 @@ dimagev_status_t *dimagev_import_camera_status(unsigned char *raw_data) { return processed_data; } -/* This is a fairly simple dump function, using the GPIO debug funtions. It +/* This is a fairly simple dump function, using the GPIO debug functions. It just prints the current status to stderr in a reasonably readable format. */ void dimagev_dump_camera_status(dimagev_status_t *status) { diff --git a/camlibs/mustek/README.mustek b/camlibs/mustek/README.mustek index 5eb57281f4..84f7ad5a94 100644 --- a/camlibs/mustek/README.mustek +++ b/camlibs/mustek/README.mustek @@ -13,11 +13,11 @@ Baudrate is selectable in the GUI. History : 10.01.2000 The Library was ported to the ne iolib. It uses also - the USB Interfave from Johannes Erdfeld. This makes it + the USB Interface from Johannes Erdfeld. This makes it 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 + whether you want to use USB or rs232. This is needed because the iolib does not support autodetection for this. 19.11.1999 Autoprobe of the Baudrate when starting (opening) this diff --git a/camlibs/mustek/core.c b/camlibs/mustek/core.c index 52bf8d4d04..d4f98c0ccd 100644 --- a/camlibs/mustek/core.c +++ b/camlibs/mustek/core.c @@ -33,7 +33,7 @@ #include "print.h" -/*---------------------- Funktion for Communication ------------------------ */ +/*---------------------- Function for Communication ------------------------ */ /* * Send the Initial Command. If the device is rs232 this @@ -148,7 +148,7 @@ int mdc800_changespeed (Camera *camera,int new) if (oldrate == sizeof(baud_rate)/sizeof(baud_rate[0])) return GP_ERROR_IO; - /* Setting comunication speed */ + /* Setting communication speed */ ret = mdc800_io_sendCommand(camera->port,COMMAND_CHANGE_RS232_BAUD_RATE,new,oldrate,0,0,0); if (ret != GP_OK) { @@ -397,7 +397,7 @@ int mdc800_setStorageSource (Camera *camera,int flag) if (flag == camera->pl->memory_source) return GP_OK; - /* Check wether FlashCard is present */ + /* Check whether FlashCard is present */ if ((flag == 0) && mdc800_isCFCardPresent (camera)) { printCoreNote ("There's is no FlashCard in the Camera !\n"); @@ -632,7 +632,7 @@ int mdc800_playbackImage (Camera *camera,int nr ) } /* - * With ths function you can get information about, how many + * With this function you can get information about, how many * pictures can be stored in the free memory of the camera. * * h: High Quality, s: Standard Quality, e: Economy Quality @@ -705,7 +705,7 @@ int mdc800_getWBandExposure (Camera *camera,int* exp, int* wb) unsigned char retval[2]; int ret; - /* What's that here is a real diffenrence between USB and RS232 */ + /* What's that here is a real difference between USB and RS232 */ int toggle= (camera->port->type == GP_PORT_USB); ret = mdc800_io_sendCommand(camera->port,COMMAND_GET_WB_AND_EXPOSURE,0,0,0,retval,2); diff --git a/camlibs/mustek/io.c b/camlibs/mustek/io.c index 8732e4e444..385ea29514 100644 --- a/camlibs/mustek/io.c +++ b/camlibs/mustek/io.c @@ -41,7 +41,7 @@ #include "mdc800_spec.h" /* - * Send a Command to the Camera. It is unimportant wether this + * Send a Command to the Camera. It is unimportant whether this * is a USB or a RS232 Command. The Function implements an automatic * retry of a failed command. * @@ -76,7 +76,7 @@ int mdc800_io_sendCommand_with_retry (GPPort *port,unsigned char* command, unsig /* * sends a command and receives the answer to this - * buffer: Strores the answer + * buffer: Stores the answer * length: length of answer or null */ int mdc800_io_sendCommand (GPPort*port,unsigned char commandid,unsigned char par1,unsigned char par2,unsigned char par3, unsigned char* buffer, int length) diff --git a/camlibs/mustek/print.h b/camlibs/mustek/print.h index ac5b9ec3ab..cda39e62f4 100644 --- a/camlibs/mustek/print.h +++ b/camlibs/mustek/print.h @@ -27,11 +27,11 @@ #include /* Message or Errors from the gphoto API */ -#define printAPINote if (1) printf +#define printAPINote if (1) printf #define printAPIError if (1) printf /* only for debugging : The FunktionCall */ -#define printFnkCall if (0) printf +#define printFnkCall if (0) printf /* Message or Errors from the Core Layer */ #define printCoreNote if (1) printf diff --git a/camlibs/mustek/rs232.c b/camlibs/mustek/rs232.c index 9f020b80f3..887a9226c7 100644 --- a/camlibs/mustek/rs232.c +++ b/camlibs/mustek/rs232.c @@ -35,7 +35,7 @@ /* * sends a command and receives the answer to this - * buffer: Strores the answer + * buffer: Stores the answer * length: length of answer or null */ int mdc800_rs232_sendCommand(GPPort *port,unsigned char* command, unsigned char* buffer, int length) diff --git a/camlibs/mustek/usb.c b/camlibs/mustek/usb.c index 85ed9ea7ba..a9661873f8 100644 --- a/camlibs/mustek/usb.c +++ b/camlibs/mustek/usb.c @@ -41,7 +41,7 @@ /* - * Checks wether the camera responds busy + * Checks whether the camera responds busy */ static int mdc800_usb_isBusy (unsigned char* ch) { @@ -54,7 +54,7 @@ static int mdc800_usb_isBusy (unsigned char* ch) /* - * Checks wether the Camera is ready + * Checks whether the Camera is ready */ static int mdc800_usb_isReady (unsigned char *ch) { diff --git a/camlibs/pccam600/library.c b/camlibs/pccam600/library.c index e9e04ff8a0..0fa41c55f9 100644 --- a/camlibs/pccam600/library.c +++ b/camlibs/pccam600/library.c @@ -18,7 +18,7 @@ /* */ /* Please notice that camera commands was sniffed by use of a */ /* usbsniffer under windows. This is an experimental driver and */ -/* a work in progess(I hope :)) */ +/* a work in progress(I hope :)) */ /* */ /* You should have received a copy of the GNU Library General */ /* Public License along with this library; if not, write to the */ diff --git a/camlibs/pccam600/pccam600.c b/camlibs/pccam600/pccam600.c index 39170472ae..58aaa3f9c4 100644 --- a/camlibs/pccam600/pccam600.c +++ b/camlibs/pccam600/pccam600.c @@ -18,7 +18,7 @@ /* */ /* Please notice that camera commands was sniffed by use of a */ /* usbsniffer under windows. This is an experimental driver and */ -/* a work in progess(I hope :)) */ +/* a work in progress(I hope :)) */ /* */ /* You should have received a copy of the GNU Library General */ /* Public License along with this library; if not, write to the */ diff --git a/camlibs/pentax/pslr_enum.c b/camlibs/pentax/pslr_enum.c index 46d4b1de74..543efde622 100644 --- a/camlibs/pentax/pslr_enum.c +++ b/camlibs/pentax/pslr_enum.c @@ -193,7 +193,7 @@ const char* pslr_scene_mode_str[PSLR_SCENE_MODE_MAX] = { }; -/* case insenstive comparison - strnicmp */ +/* case insensitive comparison - strnicmp */ int str_comparison_i (const char *s1, const char *s2, int n) { if ( s1 == NULL ) { return s2 == NULL ? 0 : -(*s2); diff --git a/camlibs/polaroid/jpeg.txt b/camlibs/polaroid/jpeg.txt index c7feeaeca6..f36173ffc4 100644 --- a/camlibs/polaroid/jpeg.txt +++ b/camlibs/polaroid/jpeg.txt @@ -4,7 +4,7 @@ Oh well, I will try to explain here anyway. Jpeg markers in general: ------------ -0xFF marker# lenth(2 bytes) data +0xFF marker# length(2 bytes) data length is the size of the information after the 0xFF XX Quantization tables: diff --git a/camlibs/polaroid/pdc700.c b/camlibs/polaroid/pdc700.c index 27cddca684..5707686ee7 100644 --- a/camlibs/polaroid/pdc700.c +++ b/camlibs/polaroid/pdc700.c @@ -1083,7 +1083,7 @@ camera_set_config (Camera *camera, CameraWidget *window, GPContext *context) if (i != -1) pdc700_set_date(camera, (time_t) i, context); else - GP_DEBUG ("date widget returned -1, not setting datee/time"); + GP_DEBUG ("date widget returned -1, not setting date/time"); /* GP_DEBUG ("Implement setting of date & time!"); */ } diff --git a/camlibs/ptp2/ChangeLog b/camlibs/ptp2/ChangeLog index 6138086431..cc1bf75658 100644 --- a/camlibs/ptp2/ChangeLog +++ b/camlibs/ptp2/ChangeLog @@ -441,7 +441,7 @@ 2007-10-26 Marcus Meissner * library.c, config.c: Set GPContext consistently - in the Params struct, otherwise we might resuse + in the Params struct, otherwise we might reuse already free contexts. 2007-10-25 Marcus Meissner @@ -2080,7 +2080,7 @@ structures 2003-04-03 Mariusz Woloszyn * library.c: enabled getting config support; - curently only getting batery level is supported; + curently only getting battery level is supported; * ptp-pack.c: "finished" Device Property Describing Dataset unpacking function ptp_unpack_DPD(); * ptp.h: changed PTP_DC_* to PTP_DTC_* (DTC stands for DataType Code); diff --git a/camlibs/ptp2/cameras/canon-powershot-a95.txt b/camlibs/ptp2/cameras/canon-powershot-a95.txt index 33e4b5b5ad..b5be2bd912 100644 --- a/camlibs/ptp2/cameras/canon-powershot-a95.txt +++ b/camlibs/ptp2/cameras/canon-powershot-a95.txt @@ -251,7 +251,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 +Flash Quantity 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 diff --git a/camlibs/ptp2/cameras/canon-s5.txt b/camlibs/ptp2/cameras/canon-s5.txt index 4dd97413d9..a0fe325b8f 100644 --- a/camlibs/ptp2/cameras/canon-s5.txt +++ b/camlibs/ptp2/cameras/canon-s5.txt @@ -211,7 +211,7 @@ ISO Speed(0xd01c):(readwrite) (type=0x4) Enumeration [0,69,72,80,88,96,104] valu Exposure Compensation(0xd01f):(readwrite) (type=0x2) Enumeration [8,11,13,16,19,21,24,27,29,32,35,37,40] value: 24 Flash Compensation(0xd020):(readwrite) (type=0x2) Enumeration [8,11,13,16,19,21,24,27,29,32,35,37,40] value: 24 Assist Light(0xd041):(readwrite) (type=0x4) Enumeration [1,0] value: 1 -Flash Quanity Count(0xd042):(read only) (type=0x4) Enumeration [] value: 2 +Flash Quantity Count(0xd042):(read only) (type=0x4) Enumeration [] value: 2 Rotation Scene(0xd044):(readwrite) (type=0x4) Enumeration [0,1] value: 0 Flash Mode(0xd00a):(read only) (type=0x2) Enumeration [] value: 0 Shooting Mode(0xd00c):(readwrite) (type=0x2) Enumeration [1,2,3,4] value: 1 diff --git a/camlibs/ptp2/cameras/nikon-coolpix-s6800.txt b/camlibs/ptp2/cameras/nikon-coolpix-s6800.txt index bb24bfb3c6..343f3c9b03 100644 --- a/camlibs/ptp2/cameras/nikon-coolpix-s6800.txt +++ b/camlibs/ptp2/cameras/nikon-coolpix-s6800.txt @@ -210,7 +210,7 @@ Hi I have been able to connect a Nikon Coolpix s6800 successfully and the relevant information is below/attached. -I discovered the PTP propert 0xd002 is image mode with values and output as +I discovered the PTP property 0xd002 is image mode with values and output as follows; 7 - Scene mode - AUTO, Quality - FINE, Compression 1/4, Size - 4608x3456 - diff --git a/camlibs/ptp2/config.c b/camlibs/ptp2/config.c index edeb6b1e07..cd410a3185 100644 --- a/camlibs/ptp2/config.c +++ b/camlibs/ptp2/config.c @@ -2919,7 +2919,7 @@ static struct deviceproptableu16 fuji_action[] = { * 0x600 SDK_1PushAF * 0x4 SDK_CancelS1 * 0x300 SDK_ShootS2 - * 0x8000 migh be autowhitebalance + * 0x8000 might be autowhitebalance * working bulb transition (with autofocus): * 0x200 -> wait for d209 turn from 1 to 2 -> 0x500 -> wait BULBTIME seconds -> 0xc * seen in fuji webcam traces: @@ -8224,7 +8224,7 @@ _put_Canon_EOS_TestOLC(CONFIG_PUT_ARGS) { CR (gp_widget_get_value(widget, &val)); if (val) { - /* idea is to request all OLCs seperately to see the sizes in the logfile */ + /* idea is to request all OLCs separately to see the sizes in the logfile */ for (i=0;i<13;i++) { /* 0x1 -> 0x1000 */ C_PTP (ptp_canon_eos_setrequestolcinfogroup(params, (1<name[0]='\0'; path->folder[0]='\0'; - if (newobject != 0) /* FIXME: does not handle assocation adds I think */ + if (newobject != 0) /* FIXME: does not handle association adds I think */ return add_object_to_fs_and_path (camera, newobject, path, context); return GP_ERROR; } @@ -5659,7 +5659,7 @@ camera_capture (Camera *camera, CameraCaptureType type, CameraFilePath *path, SET_CONTEXT_P(params, context); camera->pl->checkevents = TRUE; - /* first, draing existing events if the caller did not do it. */ + /* first, draining existing events if the caller did not do it. */ while (ptp_get_one_event(params, &event)) { GP_LOG_D ("draining unhandled event Code %04x, Param 1 %08x", event.Code, event.Param1); } @@ -5784,7 +5784,7 @@ camera_capture (Camera *camera, CameraCaptureType type, CameraFilePath *path, * all newly created objects. However there might be more than one * newly created object. There a two scenarios here, which may occur * both at the time. - * 1) InitiateCapture trigers capture of more than one object if the + * 1) InitiateCapture triggers capture of more than one object if the * camera is in burst mode for example. * 2) InitiateCapture creates a number of objects, but not all * objects represents images. This happens when the camera creates a diff --git a/camlibs/ptp2/music-players.h b/camlibs/ptp2/music-players.h index 6ab4398f39..7d7c2162b7 100644 --- a/camlibs/ptp2/music-players.h +++ b/camlibs/ptp2/music-players.h @@ -662,7 +662,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. @@ -2513,7 +2513,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 @@ -2766,7 +2766,7 @@ // Reported by jaile { "Asus", 0x0b05, "TF300 Transformer (MTP+ADB)", 0x4c81, DEVICE_FLAGS_ANDROID_BUGS }, - // Repored by Florian Apolloner + // Reported by Florian Apolloner { "Asus", 0x0b05, "TF700 Transformer (MTP)", 0x4c90, DEVICE_FLAGS_ANDROID_BUGS }, { "Asus", 0x0b05, "TF700 Transformer (MTP+ADB)", 0x4c91, @@ -3329,7 +3329,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 @@ -3424,7 +3424,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 @@ -3870,7 +3870,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 }, diff --git a/camlibs/ptp2/ptp-pack.c b/camlibs/ptp2/ptp-pack.c index 95cd38d47a..17895d4fb6 100644 --- a/camlibs/ptp2/ptp-pack.c +++ b/camlibs/ptp2/ptp-pack.c @@ -129,7 +129,7 @@ dtoh64ap (PTPParams *params, const unsigned char *a) /* * PTP strings ... if the size field is: * size 0 : "empty string" ... we interpret that as string with just \0 terminator, return 1 - * (the whole PTP standard is not that clear, it occasionaly refers to strings as optional in such cases, but no clear guidance). + * (the whole PTP standard is not that clear, it occasionally refers to strings as optional in such cases, but no clear guidance). * size > 0: all other strings have a terminating \0, included in the length (not sure how conforming everyone is here) * * len - in ptp string characters currently @@ -801,7 +801,7 @@ ptp_unpack_OI (PTPParams *params, unsigned char* data, PTPObjectInfo *oi, unsign free(capture_date); } -/* Custom Type Value Assignement (without Length) macro frequently used below */ +/* Custom Type Value Assignment (without Length) macro frequently used below */ #define CTVAL(target,func) { \ if (total - *offset < sizeof(target)) \ return 0; \ @@ -1677,7 +1677,7 @@ ptp_unpack_EOS_ImageFormat (PTPParams* params, unsigned char** data ) /* EOS ImageFormat entries (of at least the 5DM2 and the 400D) look like this: uint32: number of entries / generated files (1 or 2) - uint32: size of this entry in bytes (most likely allways 0x10) + uint32: size of this entry in bytes (most likely always 0x10) uint32: image type (1 == JPG, 6 == RAW) uint32: image size (0 == Large, 1 == Medium, 2 == Small, 0xe == S1, 0xf == S2, 0x10 == S3) uint32: image compression (2 == Standard/JPG, 3 == Fine/JPG, 4 == Lossles/RAW) @@ -2532,7 +2532,7 @@ static unsigned int olcsizes[0x15][13] = { {0,0,0,0,0, 0,0,0,0,0, 0,0,0 }, /* 0x5 */ {0,0,0,0,0, 0,0,0,0,0, 0,0,0 }, /* 0x6 */ {2,6,5,4,4, 6,7,4,6,5, 5,8,1 }, /* 0x7 */ /* CONFIRMED: EOS 100D, 5D Mark 3 */ - {2,6,5,4,4, 6,7,4,6,7, 7,8,1 }, /* 0x8 */ /* CONFIRMED: EOS M10, PowerShot SX720HS: only report 0x1, 0x2, 0x4 and 0x8 masks, seperately */ + {2,6,5,4,4, 6,7,4,6,7, 7,8,1 }, /* 0x8 */ /* CONFIRMED: EOS M10, PowerShot SX720HS: only report 0x1, 0x2, 0x4 and 0x8 masks, separately */ {2,6,5,4,4, 6,7,4,6,7, 7,8,1 }, /* 0x9 */ /* guessed */ {2,6,5,4,4, 6,7,4,6,7, 7,8,1 }, /* 0xa */ /* guessed */ {2,6,5,4,4, 6,8,4,6,5, 5,9,8 }, /* 0xb */ /* CONFIRMED */ diff --git a/camlibs/ptp2/ptp.c b/camlibs/ptp2/ptp.c index 8652d72b88..851fbe4836 100644 --- a/camlibs/ptp2/ptp.c +++ b/camlibs/ptp2/ptp.c @@ -190,7 +190,7 @@ ptp_error (PTPParams *params, const char *format, ...) * Performs PTP transaction. ptp is a PTPContainer with appropriate fields * filled in (i.e. operation code and parameters). It's up to caller to do * so. - * The flags decide thether the transaction has a data phase and what is its + * The flags decide whether the transaction has a data phase and what is its * direction (send or receive). * If transaction is sending data the sendlen should contain its length in * bytes, otherwise it's ignored. @@ -199,7 +199,7 @@ ptp_error (PTPParams *params, const char *format, ...) * 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 - * being retreived the appropriate amount of memory is being allocated + * being retrieved the appropriate amount of memory is being allocated * (the caller should handle that!). * * Return values: Some PTP_RC_* code. @@ -3427,7 +3427,7 @@ ptp_list_folder (PTPParams *params, uint32_t storage, uint32_t handle) { /*debug_objectinfo(params, handle, &ob->oi);*/ } -#if 0 /* apple devices report it, but the conrtent they have does not match the standard somehow. Neesd further debugging */ +#if 0 /* apple devices report it, but the conrtent they have does not match the standard somehow. Needs further debugging */ if (ptp_operation_issupported(params, PTP_OC_GetFilesystemManifest)) { uint64_t numoifs = 0; PTPObjectFilesystemInfo *oifs = NULL; diff --git a/camlibs/ptp2/ptp.h b/camlibs/ptp2/ptp.h index 5c650599a4..5f1c2685ac 100644 --- a/camlibs/ptp2/ptp.h +++ b/camlibs/ptp2/ptp.h @@ -60,7 +60,7 @@ struct _PTPContainer { /* events can only have three parameters */ uint32_t Param4; uint32_t Param5; - /* the number of meaningfull parameters */ + /* the number of meaningful parameters */ uint8_t Nparam; }; typedef struct _PTPContainer PTPContainer; @@ -570,7 +570,7 @@ typedef struct _PTPIPHeader PTPIPHeader; #define PTP_OC_NIKON_GetDevicePTPIPInfo 0x90E0 -#define PTP_OC_NIKON_GetPartialObjectHiSpeed 0x9400 /* 3 params, p1: object handle, p2: 32bit transfer size, p3: terminate after transfer. DATA in, Reuslt: r1: 32bit number sent, r2: before offset low 32bit , r3: before offset high 32bit */ +#define PTP_OC_NIKON_GetPartialObjectHiSpeed 0x9400 /* 3 params, p1: object handle, p2: 32bit transfer size, p3: terminate after transfer. DATA in, Result: r1: 32bit number sent, r2: before offset low 32bit , r3: before offset high 32bit */ #define PTP_OC_NIKON_StartSpotWb 0x9402 #define PTP_OC_NIKON_EndSpotWb 0x9403 #define PTP_OC_NIKON_ChangeSpotWbArea 0x9404 @@ -2863,7 +2863,7 @@ typedef struct _PTPCanonEOSDeviceInfo { * 0x600 SDK_1PushAF * 0x4 SDK_CancelS1 * 0x300 SDK_ShootS2 - * 0x8000 migh be autowhitebalance + * 0x8000 might be autowhitebalance */ #define PTP_DPC_FUJI_AFStatus 0xD209 #define PTP_DPC_FUJI_DeviceName 0xD20B diff --git a/camlibs/sierra/ChangeLog b/camlibs/sierra/ChangeLog index ff2bdf9255..ace7b1cbb5 100644 --- a/camlibs/sierra/ChangeLog +++ b/camlibs/sierra/ChangeLog @@ -310,7 +310,7 @@ 2002-09-21 Lutz Müller * library.c - * sierra.c: Make the check for the precence of a memory card + * sierra.c: Make the check for the presence of a memory card non-fatal. 2002-09-19 Lutz Müller @@ -345,7 +345,7 @@ 2002-07-09 Selmeczi David - * olympus-desc.c: Patch aperature to use menu rather than radio. + * olympus-desc.c: Patch aperture to use menu rather than radio. 2002-07-08 Patrick Mansfield diff --git a/camlibs/sierra/nikon-desc.c b/camlibs/sierra/nikon-desc.c index 6769857a04..40cde36253 100644 --- a/camlibs/sierra/nikon-desc.c +++ b/camlibs/sierra/nikon-desc.c @@ -412,7 +412,7 @@ static const ValueNameType cp880_reg_53_val_names[] = { /* { { 0xnn }, "Japanese" }, * * weird, can set to japanese, but can't see any change in any - * registers; reg 53 is 3 wether it is english or japanese. + * registers; reg 53 is 3 whether it is english or japanese. */ }; static const RegisterDescriptorType cp880_reg_53[] = { @@ -519,7 +519,7 @@ static const RegisterDescriptorType cp880_reg_71[] = { * camera goes to a digital zoom). * * The low portion (mask 0x00ff) seems to have three values, none verified - * on the cp880 - mabye should probably be split further. + * on the cp880 - maybe should probably be split further. */ #ifdef OLD_WAY static const ValueNameType cp880_reg_72_mask_hi_val_names[] = { diff --git a/camlibs/sierra/olympus-desc.c b/camlibs/sierra/olympus-desc.c index 2e8d0e0d3d..b380d9a837 100644 --- a/camlibs/sierra/olympus-desc.c +++ b/camlibs/sierra/olympus-desc.c @@ -642,7 +642,7 @@ static const RegisterDescriptorType oly3040_reg_33[] = { /* * Register 34: LCD mode / write-only through SIERRA_SUBACTION / ACTION_LCD_MODE * This register always contains 1 (OFF). - * Note: Always swicth off LCD before disconnecting the camera. Otherwise the camera + * Note: Always switch off LCD before disconnecting the camera. Otherwise the camera * controls won't work, and you will need to replug the cable and switch off the LCD. * (This _is_ a documented "feature".) */ diff --git a/camlibs/spca50x/ChangeLog.gsmart b/camlibs/spca50x/ChangeLog.gsmart index 556d335322..d71b5fd000 100644 --- a/camlibs/spca50x/ChangeLog.gsmart +++ b/camlibs/spca50x/ChangeLog.gsmart @@ -7,7 +7,7 @@ Sam Dez 07 21:04:46 2002 Till Adam Tue Nov 05 12:17:30 2002 Till Adam - * return unssuported for avi downloading and small and large image + * return unssupported for avi downloading and small and large image resolutions if the bridge is a SPCA500 (gsmart mini). Sat Oct 19 22:52:34 2002 Till Adam @@ -25,7 +25,7 @@ Mon Oct 14 20:32:08 2002 Till Adam * driver status for the spca504a based is now TESTING * patch from Piotr Pawlow adding an index to downloaded avi's and fixing a few bugs. - * endianess fixes + * endianness fixes Wed Oct 09 19:58:01 2002 Till Adam @@ -43,7 +43,7 @@ Tue Oct 08 22:14:04 2002 Till Adam Sam Aug 31 20:15:03 2002 Till Adam * return name in the file_info as well. Fixes kamera kio-slave - * endianess fix reported by Carl Lunde + * endianness fix reported by Carl Lunde * spelling fix Thu Aug 22 20:46:02 2002 Till Adam diff --git a/camlibs/spca50x/README.spca50x b/camlibs/spca50x/README.spca50x index a4de50965d..e9d0e0d924 100644 --- a/camlibs/spca50x/README.spca50x +++ b/camlibs/spca50x/README.spca50x @@ -36,7 +36,7 @@ Webcam mode The cameras of this series are based on the spca504a and spca500 chip manufactured by Sunplus. Both chips are capable of streaming, so there's a project working on video4linux support for them. spca50x.sourceforge.net -We have been succesfull in getting some of the cameras supported by this +We have been successful in getting some of the cameras supported by this camlib working as part of that project. :) Authors diff --git a/camlibs/stv0680/demosaic_sharpen.c b/camlibs/stv0680/demosaic_sharpen.c index 30848f23a7..cfe7f78ac2 100644 --- a/camlibs/stv0680/demosaic_sharpen.c +++ b/camlibs/stv0680/demosaic_sharpen.c @@ -90,7 +90,7 @@ typedef enum { * branching. (KG) */ -/* relative postition */ +/* relative positition */ typedef struct _off { signed char dx, dy; } off; diff --git a/camlibs/topfield/puppy.c b/camlibs/topfield/puppy.c index 28bfe47835..14815bd9e5 100644 --- a/camlibs/topfield/puppy.c +++ b/camlibs/topfield/puppy.c @@ -801,7 +801,7 @@ put_file_func (CameraFilesystem *fs, const char *folder, const char *filename, C int payloadSize = sizeof(packet.data) - 9; ssize_t w = read(src, &packet.data[8], payloadSize); - /* Detect a Topfield protcol bug and prevent the sending of packets + /* Detect a Topfield protocol bug and prevent the sending of packets that are a multiple of 512 bytes. */ if((w > 4) && (((((PACKET_HEAD_SIZE + 8 + w) + 1) & ~1) % 0x200) == 0)) { lseek(src, -4, SEEK_CUR); diff --git a/doc/api/tmpl/gphoto2-abilities-list.sgml b/doc/api/tmpl/gphoto2-abilities-list.sgml index e09c749476..82f1ba99b5 100644 --- a/doc/api/tmpl/gphoto2-abilities-list.sgml +++ b/doc/api/tmpl/gphoto2-abilities-list.sgml @@ -16,7 +16,7 @@ Camera drivers will get in contact with a #CameraAbilitiesList when the #CameraL Frontends will use the #CameraAbilitiesList as an entry point to gphoto2. In order to set up a #Camera, you need to call #gp_camera_set_abilities. The -#CameraAbilities you pass to that function can be retreived from a +#CameraAbilities you pass to that function can be retrieved from a #CameraAbilitiesList. Using the #CameraAbilitiesList @@ -109,7 +109,7 @@ order to set up a #Camera, you need to call #gp_camera_set_abilities. The This structure is used to inform frontends about what abilities a specific camera model has. In addition, it is used by gphoto2 to determine what library to load on #gp_camera_set_abilities. - For retreiving abilities of a specific model, create a + For retrieving abilities of a specific model, create a #CameraAbilitiesList and use #gp_abilities_list_load in order to scan the system for drivers. Then, retrieve the #CameraAbilities from this list. diff --git a/doc/api/tmpl/gphoto2-filesys.sgml b/doc/api/tmpl/gphoto2-filesys.sgml index ff4bd4a65b..09dfa762d4 100644 --- a/doc/api/tmpl/gphoto2-filesys.sgml +++ b/doc/api/tmpl/gphoto2-filesys.sgml @@ -14,7 +14,7 @@ prevent synchronization errors. Camera drivers need to set up the #CameraFilesystem on #camera_init in order to make the #CameraFilesystem capable of getting file or folder listings, -retreiving information about a file, etc. +retrieving information about a file, etc. Setting up the #CameraFilesystem diff --git a/examples/sample-afl.c b/examples/sample-afl.c index 26f7ae0441..9750b814ae 100644 --- a/examples/sample-afl.c +++ b/examples/sample-afl.c @@ -255,7 +255,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"); diff --git a/examples/sample-libfuzz.c b/examples/sample-libfuzz.c index 2cc4146f62..177bcbe028 100644 --- a/examples/sample-libfuzz.c +++ b/examples/sample-libfuzz.c @@ -294,7 +294,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) { 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"); diff --git a/gphoto2/gphoto2-filesys.h b/gphoto2/gphoto2-filesys.h index f37378edc7..3ee8cca24e 100644 --- a/gphoto2/gphoto2-filesys.h +++ b/gphoto2/gphoto2-filesys.h @@ -206,7 +206,7 @@ typedef enum { } CameraStorageFilesystemType; /** - * \brief Storage information structue. + * \brief Storage information structure. * * This structure contains the information of a specific camera storage. * Only the members as specified by the \a fields member are valid. diff --git a/libgphoto2/gphoto2-camera.c b/libgphoto2/gphoto2-camera.c index 745d7f9881..bd50da5f65 100644 --- a/libgphoto2/gphoto2-camera.c +++ b/libgphoto2/gphoto2-camera.c @@ -92,7 +92,7 @@ * to a 'Reset' signal on the camera. I quote from the Digita 'Host * Interface Specification' document: * - * "The Reset signal is a pulse on the Reset/Att line (which cooresponds + * "The Reset signal is a pulse on the Reset/Att line (which corresponds * [sic] to pin 2 at the camera side) sent from the host computer to the * camera. This pulse must be at least 50us." */ diff --git a/libgphoto2/gphoto2-file.c b/libgphoto2/gphoto2-file.c index 0f933f591b..1f3f5209c3 100644 --- a/libgphoto2/gphoto2-file.c +++ b/libgphoto2/gphoto2-file.c @@ -46,7 +46,7 @@ #define CHECK_RESULT(result) {int r = (result); if (r < 0) return (r);} -/* lengt of one path component */ +/* length of one path component */ #ifndef MAX_PATH # define MAX_PATH 256 #endif diff --git a/libgphoto2/gphoto2-filesys.c b/libgphoto2/gphoto2-filesys.c index eabb489317..746d91446a 100644 --- a/libgphoto2/gphoto2-filesys.c +++ b/libgphoto2/gphoto2-filesys.c @@ -1126,7 +1126,7 @@ gp_filesystem_delete_file (CameraFilesystem *fs, const char *folder, } /** - * \brief Delete a virtal file from a folder in the filesystem + * \brief Delete a virtual file from a folder in the filesystem * \param fs a #CameraFilesystem * \param folder a folder in which to delete the file * \param filename the name of the file to delete @@ -1474,7 +1474,7 @@ recursive_folder_scan ( } f = f->next; } - /* thorugh all subfoilders */ + /* through all subfolders */ return GP_ERROR_FILE_NOT_FOUND; } /** diff --git a/libgphoto2_port/ChangeLog b/libgphoto2_port/ChangeLog index 477909fc0a..81fed0f770 100644 --- a/libgphoto2_port/ChangeLog +++ b/libgphoto2_port/ChangeLog @@ -483,11 +483,11 @@ http://sourceforge.net/tracker/download.php?group_id=8874&atid=108874&file_id=17 2002-03-12 Mariusz Woloszyn * changed all _event, eventep to _int and intep as it describes usb - inerrupt endpoint + interrupt endpoint 2002-03-11 Lutz Müller - * configure.in: Fix versionning. + * configure.in: Fix versioning. 2002-03-11 Mariusz Woloszyn @@ -847,7 +847,7 @@ http://sourceforge.net/tracker/download.php?group_id=8874&atid=108874&file_id=17 2001-10-20 Lutz Müller - * libgphoto2_port/gp_port.c: Forot to set default speed to 0 + * libgphoto2_port/gp_port.c: Forgot to set default speed to 0 2001-10-20 Lutz Müller diff --git a/libgphoto2_port/gphoto-m4/gp-camlibs.m4 b/libgphoto2_port/gphoto-m4/gp-camlibs.m4 index eb71211c03..428c6312c2 100644 --- a/libgphoto2_port/gphoto-m4/gp-camlibs.m4 +++ b/libgphoto2_port/gphoto-m4/gp-camlibs.m4 @@ -466,7 +466,7 @@ GP_SET_EQUAL_IFELSE([camlib-set], [camlib-set-standard], [dnl ]) m4_pattern_allow([GP_CAMLIB_SET_IS_NONSTANDARD])dnl AC_DEFINE_UNQUOTED([GP_CAMLIB_SET_IS_NONSTANDARD], [1], - [define when the camlib set to buidl is non-standard]) + [define when the camlib set to build is non-standard]) ])dnl m4_pattern_allow([GP_CAMLIB_SET])dnl diff --git a/libgphoto2_port/gphoto-m4/gp-driverdir.m4 b/libgphoto2_port/gphoto-m4/gp-driverdir.m4 index 930e2faedb..264f2a9fe3 100644 --- a/libgphoto2_port/gphoto-m4/gp-driverdir.m4 +++ b/libgphoto2_port/gphoto-m4/gp-driverdir.m4 @@ -22,7 +22,7 @@ AS_VAR_IF([$1], [], [dnl $1="\${libdir}/${PACKAGE_TARNAME}/${PACKAGE_VERSION}" AC_MSG_RESULT([${$1} (default)]) ], [dnl - AC_MSG_RESULT([${$1} (set explictly)]) + AC_MSG_RESULT([${$1} (set explicitly)]) ]) dnl If you see this after 2022-12-31, please remove the following diff --git a/libgphoto2_port/gphoto-m4/gp-libjpeg.m4 b/libgphoto2_port/gphoto-m4/gp-libjpeg.m4 index 774de024ac..ce9e816fdb 100644 --- a/libgphoto2_port/gphoto-m4/gp-libjpeg.m4 +++ b/libgphoto2_port/gphoto-m4/gp-libjpeg.m4 @@ -54,7 +54,7 @@ AC_MSG_RESULT([$with_jpeg]) dnl AS_CASE([$with_jpeg], [no], [ - # libjpeg explictly disabled from command line + # libjpeg explicitly disabled from command line GP_CONFIG_MSG([JPEG mangling support], [no (disabled by --without-jpeg)]) ], diff --git a/libgphoto2_port/gphoto-m4/gp-libltdl.m4 b/libgphoto2_port/gphoto-m4/gp-libltdl.m4 index 9680318d82..2966135581 100644 --- a/libgphoto2_port/gphoto-m4/gp-libltdl.m4 +++ b/libgphoto2_port/gphoto-m4/gp-libltdl.m4 @@ -26,7 +26,7 @@ AS_IF([test "x${LTDLINCL}${LIBLTDL}" != x], [dnl AC_MSG_CHECKING([LTDLINCL (given explicitly)]) AC_MSG_RESULT([${LTDLINCL}]) - AC_MSG_CHECKING([LIBLTDL (given explictly)]) + AC_MSG_CHECKING([LIBLTDL (given explicitly)]) AC_MSG_RESULT([${LIBLTDL}]) GP_LINK_LIBLTDL_IFELSE([dnl diff --git a/libgphoto2_port/gphoto2/gphoto2-port-library.h b/libgphoto2_port/gphoto2/gphoto2-port-library.h index be92ba3050..146c8d76b3 100644 --- a/libgphoto2_port/gphoto2/gphoto2-port-library.h +++ b/libgphoto2_port/gphoto2/gphoto2-port-library.h @@ -33,7 +33,7 @@ * These operations are to be implemented and set by the port library, * which drives the lowlevel protocol (serial, usb, etc.). * - * They are acessed using the accessor functions, like gp_port_open(), + * They are accessed using the accessor functions, like gp_port_open(), * gp_port_read() and gp_port_write(). */ typedef struct _GPPortOperations { diff --git a/libgphoto2_port/libgphoto2_port/gphoto2-port-info-list.c b/libgphoto2_port/libgphoto2_port/gphoto2-port-info-list.c index 9a3ea40a92..4f547770ea 100644 --- a/libgphoto2_port/libgphoto2_port/gphoto2-port-info-list.c +++ b/libgphoto2_port/libgphoto2_port/gphoto2-port-info-list.c @@ -522,7 +522,7 @@ gp_port_info_list_get_info (GPPortInfoList *list, int n, GPPortInfo *info) * \param info a #GPPortInfo * \param name a pointer to a char* which will receive the name * - * Retreives the name of the passed in GPPortInfo, by reference. + * Retrieves the name of the passed in GPPortInfo, by reference. * * \return a gphoto2 error code **/ @@ -553,7 +553,7 @@ gp_port_info_set_name (GPPortInfo info, const char *name) { * \param info a #GPPortInfo * \param path a pointer to a char* which will receive the path * - * Retreives the path of the passed in GPPortInfo, by reference. + * Retrieves the path of the passed in GPPortInfo, by reference. * * \return a gphoto2 error code **/ @@ -584,7 +584,7 @@ gp_port_info_set_path (GPPortInfo info, const char *path) { * \param info a #GPPortInfo * \param type a pointer to a GPPortType variable which will receive the type * - * Retreives the type of the passed in GPPortInfo + * Retrieves the type of the passed in GPPortInfo * * \return a gphoto2 error code **/ diff --git a/libgphoto2_port/libgphoto2_port/gphoto2-port.c b/libgphoto2_port/libgphoto2_port/gphoto2-port.c index f481dff83f..dc8871b587 100644 --- a/libgphoto2_port/libgphoto2_port/gphoto2-port.c +++ b/libgphoto2_port/libgphoto2_port/gphoto2-port.c @@ -241,7 +241,7 @@ gp_port_set_info (GPPort *port, GPPortInfo info) } /** - * \brief Retreives information about the port. + * \brief Retrieves information about the port. * * Retrieves the informations set by gp_port_set_info(). * @@ -447,7 +447,7 @@ gp_port_read (GPPort *port, char *data, int size) } /** - * \brief Check for intterupt. + * \brief Check for interrupt. * * \param port a GPPort * \param data a pointer to an allocated buffer @@ -486,7 +486,7 @@ gp_port_check_int (GPPort *port, char *data, int size) * \param data a pointer to an allocated buffer * \param size the number of bytes that should be read * - * Reads a specified number of bytes from the inerrupt endpoint + * Reads a specified number of bytes from the interrupt endpoint * into the supplied buffer. * Function waits 50 miliseconds for data on interrupt endpoint. * @@ -560,7 +560,7 @@ int gp_port_timeout_get (GPPort *port, int *timeout) * \param port a #GPPort * \param timeout pointer to timeout * - * Retreives the current timeout of the port. + * Retrieves the current timeout of the port. * * \return a gphoto2 error code **/ @@ -624,7 +624,7 @@ int gp_port_settings_set (GPPort *port, GPPortSettings settings) * \param port a #GPPort * \param settings pointer to the retrieved settings * - * Retreives the current settings of a port. + * Retrieves the current settings of a port. * * \return a gphoto2 error code **/ @@ -1145,7 +1145,7 @@ int gp_port_send_scsi_cmd (GPPort *port, int to_dev, } GP_LOG_D ("\tCurrent command read filemark: %s",(sense[2]&0x80)?"yes":"no"); GP_LOG_D ("\tEarly warning passed: %s",(sense[2]&0x40)?"yes":"no"); - GP_LOG_D ("\tIncorrect blocklengt: %s",(sense[2]&0x20)?"yes":"no"); + GP_LOG_D ("\tIncorrect block length: %s",(sense[2]&0x20)?"yes":"no"); GP_LOG_D ("\tSense Key: %d",sense[2]&0xf); if (sense[0]&0x80) GP_LOG_D ("\tResidual Length: %d",sense[3]*0x1000000+sense[4]*0x10000+sense[5]*0x100+sense[6]); diff --git a/libgphoto2_port/libusb1/libusb1.c b/libgphoto2_port/libusb1/libusb1.c index 0ba60de65d..c3a5fe5cbc 100644 --- a/libgphoto2_port/libusb1/libusb1.c +++ b/libgphoto2_port/libusb1/libusb1.c @@ -243,7 +243,7 @@ gp_port_library_list (GPPortInfoList *list) if (!unknownint) continue; /* Note: We do not skip USB storage. Some devices can support both, - * and the Ricoh erronously reports it. + * and the Ricoh erroneously reports it. */ nrofdevices++; } @@ -296,7 +296,7 @@ gp_port_library_list (GPPortInfoList *list) if (!unknownint) continue; /* Note: We do not skip USB storage. Some devices can support both, - * and the Ricoh erronously reports it. + * and the Ricoh erroneously reports it. */ C_GP (gp_port_info_new (&info)); gp_port_info_set_type (info, GP_PORT_USB); @@ -881,7 +881,7 @@ gp_libusb1_msg_class_read_lib(GPPort *port, int request, } /* - * This function applys changes to the device. + * This function applies changes to the device. * * New settings are in port->settings_pending and the old ones * are in port->settings. Compare them first and only call diff --git a/libgphoto2_port/usb/libusb.c b/libgphoto2_port/usb/libusb.c index 3cd91fa674..ab0a854f41 100644 --- a/libgphoto2_port/usb/libusb.c +++ b/libgphoto2_port/usb/libusb.c @@ -122,7 +122,7 @@ gp_port_library_list (GPPortInfoList *list) if (!unknownint) continue; /* Note: We do not skip USB storage. Some devices can support both, - * and the Ricoh erronously reports it. + * and the Ricoh erroneously reports it. */ nrofdevices++; } @@ -176,7 +176,7 @@ gp_port_library_list (GPPortInfoList *list) if (!unknownint) continue; /* Note: We do not skip USB storage. Some devices can support both, - * and the Ricoh erronously reports it. + * and the Ricoh erroneously reports it. */ gp_port_info_new (&info); gp_port_info_set_type (info, GP_PORT_USB); @@ -426,7 +426,7 @@ gp_port_usb_reset(GPPort *port) { int ret; - GP_LOG_D ("Reseting port"); + GP_LOG_D ("Resetting port"); C_PARAMS (port && port->pl->dh); ret = usb_reset(port->pl->dh); @@ -533,7 +533,7 @@ gp_port_usb_msg_class_read_lib(GPPort *port, int request, } /* - * This function applys changes to the device. + * This function applies changes to the device. * * New settings are in port->settings_pending and the old ones * are in port->settings. Compare them first and only call diff --git a/libgphoto2_port/vusb/README.txt b/libgphoto2_port/vusb/README.txt index c5abb23cd5..f5f012471d 100644 --- a/libgphoto2_port/vusb/README.txt +++ b/libgphoto2_port/vusb/README.txt @@ -19,7 +19,7 @@ being captured. Doing a deletion is virtual and does not affect the filesystem content. PTP Opcode 0x9999 can be used to emit PTP Events -First argment is the type, second argument is the delay of the interrupt in 1/1000 seconds +First argument is the type, second argument is the delay of the interrupt in 1/1000 seconds 0x0 objectadded - will use a random existing jpg and virtually duplicate it 0x1 objectremoved - will virtually delete the first existing jpg it finds