summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLode Vandevenne <lvandeve@users.noreply.github.com>2015-10-24 17:16:15 +0200
committerLode Vandevenne <lvandeve@users.noreply.github.com>2015-10-24 17:16:15 +0200
commit3b04aa3394b756157b8c67fa71955fe277e8defe (patch)
treeb37b6065f35aba8a6bfbdb0848a00103ec8e37f1
parent6f432b32a78026358111ba56581fe97383d5aad0 (diff)
parent3f1a7980a8d48eb21caa4bc7da74848121df64de (diff)
Merge pull request #21 from BenWiederhake/master
fix typos
-rw-r--r--examples/example_optimize_png.cpp2
-rw-r--r--lodepng.cpp4
-rw-r--r--lodepng.h4
-rw-r--r--pngdetail.cpp2
4 files changed, 6 insertions, 6 deletions
diff --git a/examples/example_optimize_png.cpp b/examples/example_optimize_png.cpp
index ecf25cf..d64c7f2 100644
--- a/examples/example_optimize_png.cpp
+++ b/examples/example_optimize_png.cpp
@@ -25,7 +25,7 @@ freely, subject to the following restrictions:
/*
This example saves the PNG with the best compression LodePNG can do, and with
-unnecesary chunks removed. It tries out several combinations of settings and
+unnecessary chunks removed. It tries out several combinations of settings and
keeps the smallest one.
NOTE: This is not as good as a true PNG optimizer like optipng or pngcrush.
diff --git a/lodepng.cpp b/lodepng.cpp
index fbcecb5..643bfd5 100644
--- a/lodepng.cpp
+++ b/lodepng.cpp
@@ -4097,7 +4097,7 @@ static unsigned postProcessScanlines(unsigned char* out, unsigned char* in,
CERROR_TRY_RETURN(unfilter(in, in, w, h, bpp));
removePaddingBits(out, in, w * bpp, ((w * bpp + 7) / 8) * 8, h);
}
- /*we can immediatly filter into the out buffer, no other steps needed*/
+ /*we can immediately filter into the out buffer, no other steps needed*/
else CERROR_TRY_RETURN(unfilter(out, in, w, h, bpp));
}
else /*interlace_method is 1 (Adam7)*/
@@ -5456,7 +5456,7 @@ static unsigned preProcessScanlines(unsigned char** out, size_t* outsize, const
}
else
{
- /*we can immediatly filter into the out buffer, no other steps needed*/
+ /*we can immediately filter into the out buffer, no other steps needed*/
error = filter(*out, in, w, h, &info_png->color, settings);
}
}
diff --git a/lodepng.h b/lodepng.h
index b37c279..86e56a3 100644
--- a/lodepng.h
+++ b/lodepng.h
@@ -540,7 +540,7 @@ typedef enum LodePNGFilterStrategy
{
/*every filter at zero*/
LFS_ZERO,
- /*Use filter that gives minumum sum, as described in the official PNG filter heuristic.*/
+ /*Use filter that gives minimum sum, as described in the official PNG filter heuristic.*/
LFS_MINSUM,
/*Use the filter type that gives smallest Shannon entropy for this scanline. Depending
on the image, this is better or worse than minsum.*/
@@ -1589,7 +1589,7 @@ symbol.
*) 22 apr 2012 (!): Made interface more consistent, renaming a lot. Removed
redundant C++ codec classes. Reduced amount of structs. Everything changed,
but it is cleaner now imho and functionality remains the same. Also fixed
- several bugs and shrinked the implementation code. Made new samples.
+ several bugs and shrunk the implementation code. Made new samples.
*) 6 nov 2011 (!): By default, the encoder now automatically chooses the best
PNG color model and bit depth, based on the amount and type of colors of the
raw image. For this, autoLeaveOutAlphaChannel replaced by auto_choose_color.
diff --git a/pngdetail.cpp b/pngdetail.cpp
index e812a42..af958f7 100644
--- a/pngdetail.cpp
+++ b/pngdetail.cpp
@@ -63,7 +63,7 @@ struct Options
bool show_filters; //show the PNG filter of each scanline (not supported for interlaced PNGs currently)
bool zlib_info; //show basic zlib info
bool zlib_blocks; //show type, tree info, code length summaries and sizes for each zlib block
- bool zlib_counts; //in addition to the zlib_blocks info, show counts of occurances all symbols
+ bool zlib_counts; //in addition to the zlib_blocks info, show counts of occurrences all symbols
bool zlib_full; //in addition to the zlib_blocks info, show all symbols, one per line (huge output)
bool use_hex; //show some sizes or positions in hexadecimal