Merge branch 'master' into adding_some_documentation

aous72 · Jun 20, 2024 · 088ad76 · 088ad76
2 parents 6f413ff + ceb6a79
commit 088ad76
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/docs/status.md b/docs/status.md
@@ -6,4 +6,4 @@ The encoder supports lossless and quantization-based lossy encoding.  There is c
 
 As it stands, the OpenJPH library needs documentation. The provided encoder ojph\_compress only generates HTJ2K codestreams, with the extension j2c; the generated files lack the .jph header.  Adding the .jph header is of little urgency, as the codestream contains all needed information to properly decode an image.  The .jph header will be added at a future point in time.  The provided decoder ojph\_expand decodes .jph files, by ignoring the .jph header if it is present.
 
-The provided command line tools ojph\_compress and ojph\_expand accepts and generated .pgm, .ppm, .yuv, .raw, and .dpx. See the usage examples below.
+The provided command line tools ojph\_compress and ojph\_expand accepts and generates .pgm, .ppm, .yuv, .raw, and .dpx. See the usage examples below.
diff --git a/src/apps/ojph_compress/ojph_compress.cpp b/src/apps/ojph_compress/ojph_compress.cpp
@@ -558,7 +558,7 @@ int main(int argc, char * argv[]) {
     "               LRCP, RLCP, RPCL, PCRL, CPRL\n"
     " -block_size   {x,y} (64,64) where x and y are the height and width of\n"
     "               a codeblock. In unix-like environment, { and } must be\n"
-    "               proceeded by a ""\\""\n"
+    "               preceded by a ""\\""\n"
     " -precincts    {x,y},{x,y},...,{x,y} where {x,y} is the precinct size\n"
     "               starting from the coarsest resolution; the last precinct\n"
     "               is repeated for all finer resolutions\n"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,4 +6,4 @@ The encoder supports lossless and quantization-based lossy encoding. There is c

		As it stands, the OpenJPH library needs documentation. The provided encoder ojph\_compress only generates HTJ2K codestreams, with the extension j2c; the generated files lack the .jph header. Adding the .jph header is of little urgency, as the codestream contains all needed information to properly decode an image. The .jph header will be added at a future point in time. The provided decoder ojph\_expand decodes .jph files, by ignoring the .jph header if it is present.

		The provided command line tools ojph\_compress and ojph\_expand accepts and generated .pgm, .ppm, .yuv, .raw, and .dpx. See the usage examples below.
		The provided command line tools ojph\_compress and ojph\_expand accepts and generates .pgm, .ppm, .yuv, .raw, and .dpx. See the usage examples below.