summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYuri Chornoivan <yurchor@ukr.net>2020-05-25 12:32:37 +0300
committerYuri Chornoivan <yurchor@ukr.net>2020-05-25 12:32:37 +0300
commitd385c3265343b0ef6e70ee3d5bcbd66c0ab23542 (patch)
treeb8da5a4c7ddb697b247595cfb4fb20b1f8548517
parentc720f6871b74385dbbfaf3c78f2ba0ad9c8e4bce (diff)
downloadlibgphoto2-d385c3265343b0ef6e70ee3d5bcbd66c0ab23542.tar.gz
Fix minor typos
-rw-r--r--INSTALL2
-rw-r--r--camlibs/canon/doc/Protocol.xml2
-rw-r--r--camlibs/canon/usb.c6
-rw-r--r--camlibs/dimera/dimera3500.c2
-rw-r--r--camlibs/jd11/jd11.html2
-rw-r--r--camlibs/jl2005c/README.jl2005c2
-rw-r--r--camlibs/ptp2/chdk_live_view.h2
-rw-r--r--camlibs/ptp2/config.c8
-rw-r--r--camlibs/sierra/sierra.c2
-rw-r--r--camlibs/sonydscf55/sony.c2
-rw-r--r--camlibs/st2205/st2205.c2
-rw-r--r--camlibs/template/Makefile-files2
-rw-r--r--configure.ac2
-rw-r--r--tests/ddb/check-ddb.sh.in2
14 files changed, 19 insertions, 19 deletions
diff --git a/INSTALL b/INSTALL
index bfe1aa0a1..5e0f755d9 100644
--- a/INSTALL
+++ b/INSTALL
@@ -147,7 +147,7 @@ Appendix A: Platform specific compilation hints
libgphoto2 has been successfully used on many system. Some systems
where it has been reported to successfully compile are listed
below. Not all, or even any, camera libraries have been tested on
-these systems, so there may be endian other other issues that prevent
+these systems, so there may be endian other issues that prevent
some camera libraries from working.
Please report any changes to this list to the gphoto developer mailing
diff --git a/camlibs/canon/doc/Protocol.xml b/camlibs/canon/doc/Protocol.xml
index 52f4bf52f..8a2acff51 100644
--- a/camlibs/canon/doc/Protocol.xml
+++ b/camlibs/canon/doc/Protocol.xml
@@ -2528,7 +2528,7 @@ do {
</listitem>
<listitem>
<para>The sequence of messages 0x0a/0x1c; 0x0a/0x1d may be
- repeated once or twice if the the image captured is the
+ repeated once or twice if the image captured is the
last one that will fit on the camera's storage
device.</para>
</listitem>
diff --git a/camlibs/canon/usb.c b/camlibs/canon/usb.c
index 689b9f7bc..baaf3ea1f 100644
--- a/camlibs/canon/usb.c
+++ b/camlibs/canon/usb.c
@@ -1005,7 +1005,7 @@ canon_usb_wait_for_event (Camera *camera, int timeout,
* command, then handle the interrupt pipe here.
*
* Returns: a char * that points to the data read from the camera (or
- * NULL on failure), and sets what @return_length points to to the number
+ * NULL on failure), and sets what @return_length points to the number
* of bytes read. If this function returns NULL, return any photographic
* failure error codes in what @photo_status points to.
*
@@ -1334,7 +1334,7 @@ static char *canon_usb_decode_status ( int code ) {
*
* Returns: a char * that points to all of the packet data read from
* the camera (or NULL on failure), and sets what @return_length
- * points to to the number of bytes read. Note that, unlike this
+ * points to the number of bytes read. Note that, unlike this
* function, canon_usb_dialogue() chops off the first 0x50 bytes to
* generate its output.
*
@@ -1630,7 +1630,7 @@ canon_usb_dialogue_full (Camera *camera, canonCommandIndex canon_funct, unsigned
* returned with GP_OK or some error code.
*
* Returns: a char * that points to the data read from the camera (or
- * NULL on failure), and sets what @return_length points to to the number
+ * NULL on failure), and sets what @return_length points to the number
* of bytes read.
*
*/
diff --git a/camlibs/dimera/dimera3500.c b/camlibs/dimera/dimera3500.c
index 4e99813c5..ccf2b5c70 100644
--- a/camlibs/dimera/dimera3500.c
+++ b/camlibs/dimera/dimera3500.c
@@ -811,7 +811,7 @@ Dimera_Preview( long *size, Camera *camera, GPContext *context )
/* Automatic exposure control */
- /* Current picture brightness, where 0 is is dark and 255 is bright */
+ /* Current picture brightness, where 0 is dark and 255 is bright */
brightness = exposure_total / (VIEWFIND_SZ / 16);
GP_DEBUG(
diff --git a/camlibs/jd11/jd11.html b/camlibs/jd11/jd11.html
index 2b1d0cc2b..116c5189b 100644
--- a/camlibs/jd11/jd11.html
+++ b/camlibs/jd11/jd11.html
@@ -226,7 +226,7 @@ Judging from other cameras it is easy to suspect the camera uses the JPEG
format. It does not unfortunately.
<h3>Chapter 3.1: The format of the index picture</h3>
-Casting a closer look at the raw data of the index picture shows a a stream
+Casting a closer look at the raw data of the index picture shows a stream
of 8 bit values. Some experimentation later it turns out to a stream of
64x48 grayscale pictures, upside down.
Using:<pre>
diff --git a/camlibs/jl2005c/README.jl2005c b/camlibs/jl2005c/README.jl2005c
index a3410b4ea..5641c71ed 100644
--- a/camlibs/jl2005c/README.jl2005c
+++ b/camlibs/jl2005c/README.jl2005c
@@ -126,7 +126,7 @@ to work.
One known functionality of the camera is not completely supported, though. The
cameras all support a "continuous shooting" mode, in which the camera shoots
-frames until it it is stopped by a button press or runs out of memory. The OEM
+frames until it is stopped by a button press or runs out of memory. The OEM
driver software saves the result as an AVI file. Here, the individual frames
are merely downloaded and saved as individual photos. The intention is to
support this feature completely, in the future.
diff --git a/camlibs/ptp2/chdk_live_view.h b/camlibs/ptp2/chdk_live_view.h
index b41126c80..8bf8f8372 100644
--- a/camlibs/ptp2/chdk_live_view.h
+++ b/camlibs/ptp2/chdk_live_view.h
@@ -74,7 +74,7 @@ typedef struct {
visible size in pixels
describes data within the buffer which contains image data to be displayed
any offsets within buffer data are added before sending, so the top left
- pixel is always the first first byte of data.
+ pixel is always the first byte of data.
width must always be <= buffer_width
if buffer_width is > width, the additional data should be skipped
visible_height also defines the number of data rows
diff --git a/camlibs/ptp2/config.c b/camlibs/ptp2/config.c
index 4d29dd1d2..213f572a8 100644
--- a/camlibs/ptp2/config.c
+++ b/camlibs/ptp2/config.c
@@ -2477,8 +2477,8 @@ static struct deviceproptableu16 canon_eos_drive_mode[] = {
{ N_("Super high speed continuous shooting"), 0x0012, 0 },
{ N_("Single silent"), 0x0013, 0 },
{ N_("Continuous silent"), 0x0014, 0 },
- { N_("Silent HS continous"), 0x0015, 0 },
- { N_("Silent LS continous"), 0x0016, 0 },
+ { N_("Silent HS continuous"), 0x0015, 0 },
+ { N_("Silent LS continuous"), 0x0016, 0 },
};
GENERIC16TABLE(Canon_EOS_DriveMode,canon_eos_drive_mode)
@@ -4555,7 +4555,7 @@ GENERICI8TABLE(Nikon_LiveViewAFI,nikon_liveviewafi)
static struct deviceproptableu8 nikon_liveviewaffocus[] = {
{ N_("Single-servo AF"), 0, 0 },
- { N_("Continous-servo AF"), 1, 0 },
+ { N_("Continuous-servo AF"), 1, 0 },
{ N_("Full-time-servo AF"), 2, 0 },
{ N_("Manual Focus (fixed)"), 3, 0 },
{ N_("Manual Focus (selection)"), 4, 0 },
@@ -7104,7 +7104,7 @@ _put_Nikon_Movie(CONFIG_PUT_ARGS)
if (value.u32) {
if (value.u32 & (1<<14)) { gp_context_error (context, _("Movie recording cannot start: Camera is not in application mode.")); return GP_ERROR; }
if (value.u32 & (1<<13)) { gp_context_error (context, _("Movie recording cannot start: Set liveview selector is enabled.")); return GP_ERROR; }
- if (value.u32 & (1<<12)) { gp_context_error (context, _("Movie recording cannot start: In enlarged liewview.")); return GP_ERROR; }
+ if (value.u32 & (1<<12)) { gp_context_error (context, _("Movie recording cannot start: In enlarged liveview.")); return GP_ERROR; }
if (value.u32 & (1<<11)) { gp_context_error (context, _("Movie recording cannot start: Card protected.")); return GP_ERROR; }
if (value.u32 & (1<<10)) { gp_context_error (context, _("Movie recording cannot start: Already in movie recording.")); return GP_ERROR; }
if (value.u32 & (1<< 9)) { gp_context_error (context, _("Movie recording cannot start: Images / movies not yet record in buffer.")); return GP_ERROR; }
diff --git a/camlibs/sierra/sierra.c b/camlibs/sierra/sierra.c
index 79a93eeae..5db776bef 100644
--- a/camlibs/sierra/sierra.c
+++ b/camlibs/sierra/sierra.c
@@ -2128,7 +2128,7 @@ camera_about (Camera *camera, CameraText *about, GPContext *context)
* @data: input data table
* @data_size: table size
* @jpeg_data: return JPEG data table (NULL if no valid data is found).
- * To be free by the the caller.
+ * To be free by the caller.
* @jpeg_size: return size of the jpeg_data table.
*
* Extract JPEG data form the provided input data (looking for the SOI
diff --git a/camlibs/sonydscf55/sony.c b/camlibs/sonydscf55/sony.c
index ec0160326..f74ad234a 100644
--- a/camlibs/sonydscf55/sony.c
+++ b/camlibs/sonydscf55/sony.c
@@ -97,7 +97,7 @@ static unsigned char X13Camera[] = { 0, 2, 18 };
/*
- * This array contains the expected packet sequence code to to be applied/
+ * This array contains the expected packet sequence code to be applied/
* checked for.
*/
static const unsigned char sony_sequence[] =
diff --git a/camlibs/st2205/st2205.c b/camlibs/st2205/st2205.c
index fce1344b6..5f441d82c 100644
--- a/camlibs/st2205/st2205.c
+++ b/camlibs/st2205/st2205.c
@@ -870,7 +870,7 @@ st2205_init(Camera *camera)
* -lookup tables directly followed by shuffle tables at 0x8477
* -pictures starting at 0x10000
* -64k of firmware at the end of memory
- * Version 2 devices show up as 2 disks, with the second second disk
+ * Version 2 devices show up as 2 disks, with the second disk
* containing a msdos filesystem with the windows software. These have:
* -1 copy of the "FAT"
* -lookup tables as part of the firmware at memory-end - 0x27b89 bytes
diff --git a/camlibs/template/Makefile-files b/camlibs/template/Makefile-files
index 3ba9028d3..cfb698824 100644
--- a/camlibs/template/Makefile-files
+++ b/camlibs/template/Makefile-files
@@ -6,7 +6,7 @@
# * "noinst_DATA" into "camlibdoc_DATA"
# * "noinst_LTLIBRARIES" into "EXTRA_LTLIBRARIES"
#
-# Additionally, you must add add an include line to the Makefile-files
+# Additionally, you must add an include line to the Makefile-files
# of the new camlib to camlibs/Makefile.am:
# * "include my-new-camlib/Makefile-files"
#
diff --git a/configure.ac b/configure.ac
index 94ab802bf..4879cee8a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -97,7 +97,7 @@ AM_CONDITIONAL([HAVE_CXX], [test "x$CXX" != "x" && test "x$CXX" != "xno"])
dnl --------------------------------------------------------------------
-dnl Determine the most pedantic compiler flags we can can find for both
+dnl Determine the most pedantic compiler flags we can find for both
dnl C and C++, so that we can test that the libgphoto2 headers compile
dnl with those flags.
dnl --------------------------------------------------------------------
diff --git a/tests/ddb/check-ddb.sh.in b/tests/ddb/check-ddb.sh.in
index 3b67a89ad..ba0ba260e 100644
--- a/tests/ddb/check-ddb.sh.in
+++ b/tests/ddb/check-ddb.sh.in
@@ -1,6 +1,6 @@
#!/bin/sh
# "make installcheck" testcase:
-# Compares camera list printed by by print-camera-list and parsed by
+# Compares camera list printed by print-camera-list and parsed by
#test-ddb with the camera list from gp_abilities_list_load().
# Fails if differences are found.