summaryrefslogtreecommitdiff
path: root/camlibs/canon
diff options
context:
space:
mode:
authorSijawusz Pur Rahnama <sija@sija.pl>2020-05-25 17:49:22 +0200
committerSijawusz Pur Rahnama <sija@sija.pl>2020-05-25 17:55:09 +0200
commitfd0be84db57825472483432390fc4b87d29b4fbe (patch)
tree24b6a09976a57c208369ab75246cf75356f8c5bb /camlibs/canon
parentacafc3324695b6f51ada104af461fdf8905b03cd (diff)
downloadlibgphoto2-fd0be84db57825472483432390fc4b87d29b4fbe.tar.gz
Fix typos throughout the codebase
Diffstat (limited to 'camlibs/canon')
-rw-r--r--camlibs/canon/ChangeLog8
-rw-r--r--camlibs/canon/canon.c10
-rw-r--r--camlibs/canon/doc/Protocol.xml2
-rw-r--r--camlibs/canon/ps350/ps350proto.txt2
4 files changed, 11 insertions, 11 deletions
diff --git a/camlibs/canon/ChangeLog b/camlibs/canon/ChangeLog
index fc43c28f2..ee0124826 100644
--- a/camlibs/canon/ChangeLog
+++ b/camlibs/canon/ChangeLog
@@ -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
diff --git a/camlibs/canon/canon.c b/camlibs/canon/canon.c
index 87f3ef5aa..d222ef49d 100644
--- a/camlibs/canon/canon.c
+++ b/camlibs/canon/canon.c
@@ -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;
diff --git a/camlibs/canon/doc/Protocol.xml b/camlibs/canon/doc/Protocol.xml
index 8a2acff51..222130aab 100644
--- a/camlibs/canon/doc/Protocol.xml
+++ b/camlibs/canon/doc/Protocol.xml
@@ -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>
diff --git a/camlibs/canon/ps350/ps350proto.txt b/camlibs/canon/ps350/ps350proto.txt
index ed1e1d974..73c571a56 100644
--- a/camlibs/canon/ps350/ps350proto.txt
+++ b/camlibs/canon/ps350/ps350proto.txt
@@ -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).