Skip to content

Commit

Permalink
Merge pull request #1390 from stweil/typos
Browse files Browse the repository at this point in the history
Fix some typos (found by codespell)
  • Loading branch information
rouault authored Dec 5, 2021
2 parents 9048120 + 6ec9871 commit 22eb737
Show file tree
Hide file tree
Showing 26 changed files with 1,042 additions and 975 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ if(BUILD_DOC)
endif()

#-----------------------------------------------------------------------------
# Buld Testing
# Build Testing
option(BUILD_TESTING "Build the tests." OFF)
if(BUILD_TESTING)
if(BUILD_CODEC)
Expand Down
2 changes: 1 addition & 1 deletion src/bin/jp2/convertpng.c
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ static opj_image_t * pngtoimage_internal(opj_cparameters_t * params,
if (png_get_valid(png, info, PNG_INFO_tRNS)) {
png_set_expand(png);
}
/* We might wan't to expand background */
/* We might want to expand background */
/*
if(png_get_valid(png, info, PNG_INFO_bKGD)) {
png_color_16p bgnd;
Expand Down
4 changes: 2 additions & 2 deletions src/bin/jp2/opj_decompress.c
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ static void decode_help_display(void)
" OPTIONAL\n"
" Force the precision (bit depth) of components.\n");
fprintf(stdout,
" There shall be at least 1 value. Theres no limit on the number of values (comma separated, last values ignored if too much values).\n"
" There shall be at least 1 value. There is no limit on the number of values (comma separated, last values ignored if too much values).\n"
" If there are less values than components, the last value is used for remaining components.\n"
" If 'C' is specified (default), values are clipped.\n"
" If 'S' is specified, values are scaled.\n"
Expand Down Expand Up @@ -802,7 +802,7 @@ int parse_cmdline_decoder(int argc, char **argv,
break;

/* ----------------------------------------------------- */
case 'c': { /* Componenets */
case 'c': { /* Components */
const char* iter = opj_optarg;
while (1) {
parameters->numcomps ++;
Expand Down
10 changes: 5 additions & 5 deletions src/bin/jp2/windirent.h
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
* handle inclusion of sys/dir.h in a part that is compiled only in Apollo
* operating system. To fix the problem you need to insert DIR.H into
* SYSINCL.DAT located in MSVC\BIN directory and restart visual C++.
* Consult manuals for more informaton about the problem.
* Consult manuals for more information about the problem.
*
* Since many UNIX systems have dirent.h we assume to have one also.
* However, if your UNIX system does not have dirent.h you can download one
Expand Down Expand Up @@ -102,7 +102,7 @@

/*
* See what kind of dirent interface we have unless autoconf has already
* determinated that.
* determined that.
*/
#if !defined(HAVE_DIRENT_H) && !defined(HAVE_DIRECT_H) && !defined(HAVE_SYS_DIR_H) && !defined(HAVE_NDIR_H) && !defined(HAVE_SYS_NDIR_H) && !defined(HAVE_DIR_H)
# if defined(_MSC_VER) /* Microsoft C/C++ */
Expand Down Expand Up @@ -172,7 +172,7 @@

#elif defined(MSDOS) || defined(WIN32)

/* figure out type of underlaying directory interface to be used */
/* figure out type of underlying directory interface to be used */
# if defined(WIN32)
# define DIRENT_WIN32_INTERFACE
# elif defined(MSDOS)
Expand Down Expand Up @@ -254,7 +254,7 @@ typedef struct dirent {
/*** Operating system specific part ***/
# if defined(DIRENT_WIN32_INTERFACE) /*WIN32*/
WIN32_FIND_DATA data;
# elif defined(DIRENT_MSDOS_INTERFACE) /*MSDOS*/
# elif defined(DIRENT_MSDOS_INTERFACE) /*MS-DOS*/
# if defined(DIRENT_USE_FFBLK)
struct ffblk data;
# else
Expand Down Expand Up @@ -592,7 +592,7 @@ rewinddir(DIR *dirp)
/* re-open previous stream */
if (_initdir(dirp) == 0) {
/* initialization failed but we cannot deal with error. User will notice
* error later when she tries to retrieve first directory enty. */
* error later when she tries to retrieve first directory entry. */
/*EMPTY*/;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/bin/jpip/README
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ Server:
For shutting down JPIP server:
%GET http://hostname/myFCGI?quitJPIP
Notice, http://hostname/myFCGI is the HTTP server URI (myFCGI refers to opj_server by the server setting)
Requst message "quitJPIP" can be changed in Makfile, modify -DQUIT_SIGNAL=\"quitJPIP\"
Request message "quitJPIP" can be changed in Makefile, modify -DQUIT_SIGNAL=\"quitJPIP\"

Client:
1. Launch image decoding server, and keep it alive as long as image viewers are open
Expand Down
2 changes: 1 addition & 1 deletion src/bin/jpip/opj_jpip_addxml.c
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ int main(int argc, char *argv[])
long fsize, boxsize;

if (argc < 3) {
fprintf(stderr, "USAGE: %s modifing.jp2 adding.xml\n", argv[0]);
fprintf(stderr, "USAGE: %s modifying.jp2 adding.xml\n", argv[0]);
return -1;
}

Expand Down
Loading

0 comments on commit 22eb737

Please sign in to comment.