Skip to content

Fix various typos in code and documentation #2438

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 25, 2019
Merged

Fix various typos in code and documentation #2438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1146,8 +1146,8 @@ Fixes and feature enhancements:
hash collisions. #1819 (1.9.2)
* IC/TS performance improvements by changing the underlying hash table
implementation. #1823,1824,1825,1826,1830 (1.9.2)
* texture()/texture3d(): when requesting a nonexistant "subimage",
return the fill color, like we do when requesting nonexistant channels
* texture()/texture3d(): when requesting a nonexistent "subimage",
return the fill color, like we do when requesting nonexistent channels
(rather than nondeterministically simply not filling in the result).
#1917 (1.9.2)
* Relying on some changes to the ImageInput API, there is now much less
Expand Down
4 changes: 2 additions & 2 deletions src/doc/CHANGES-1.x.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2283,7 +2283,7 @@ Fixes, minor enhancements, and performance improvements:
* oiiotool --stats of "deep" files prints a histogram of samples/pixel
(1.5.6).
* oiiotool -subimage has better error detection and reporting for
requests for nonexistant subimages. #1005 (1.5.7)
requests for nonexistent subimages. #1005 (1.5.7)
* oiiotool --ch is a bit more flexible in its channel-shuffling syntax:
you are now able to say newchannel=oldchannel, both shuffling and
renaming channels simultaneously, thus removing a frequent necessity
Expand Down Expand Up @@ -3310,7 +3310,7 @@ Fixes, minor enhancements, and performance improvements:
* ImageBufAlgo improvements:
* Internal overhaul of IBA::resize to greatly speed it up.
* Improve IBA::resize to handle the image edge better -- instead of
clamping, just don't consider nonexistant pixels.
clamping, just don't consider nonexistent pixels.
* More careful selection of filter when resizing (IBA::resize, oiiotool
--resize and --fit, and maketx).
* Fix IBA::paste() error when the foreground image runs off the end of
Expand Down
2 changes: 1 addition & 1 deletion src/doc/iinfo.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ prints all metadata about each image::
Exif:ApertureValue: 6.91887 (f/11)
Exif:ExposureBiasValue: 0
Exif:MeteringMode: 5 (pattern)
Exif:Flash: 16 (no flash, flash supression)
Exif:Flash: 16 (no flash, flash suppression)
Exif:FocalLength: 27 (27 mm)
Exif:ColorSpace: 1
Exif:PixelXDimension: 2496
Expand Down
2 changes: 1 addition & 1 deletion src/doc/iinfo.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ \section{Using {\cf iinfo}}
Exif:ApertureValue: 6.91887 (f/11)
Exif:ExposureBiasValue: 0
Exif:MeteringMode: 5 (pattern)
Exif:Flash: 16 (no flash, flash supression)
Exif:Flash: 16 (no flash, flash suppression)
Exif:FocalLength: 27 (27 mm)
Exif:ColorSpace: 1
Exif:PixelXDimension: 2496
Expand Down
2 changes: 1 addition & 1 deletion src/doc/stdmetadata.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,7 @@ A sum of:
4 strobe return light was not detected
6 strobe return light was detected
8 compulsary flash firing
16 compulsary flash supression
16 compulsary flash suppression
24 auto-flash mode
32 no flash function (0 if flash function present)
64 red-eye reduction supported (0 if no red-eye reduction mode)
Expand Down
2 changes: 1 addition & 1 deletion src/doc/stdmetadata.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,7 +491,7 @@ \section{Exif metadata}
6 & strobe return light was detected \\
\hline
8 & compulsary flash firing \\
16 & compulsary flash supression \\
16 & compulsary flash suppression \\
24 & auto-flash mode \\
\hline
32 & no flash function (0 if flash function present) \\
Expand Down
4 changes: 2 additions & 2 deletions src/include/OpenImageIO/imageio.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -990,7 +990,7 @@ class OIIO_API ImageInput {
/// expensive, due to the work that needs to be done to fully copy an
/// ImageSpec if there is lots of named metadata to allocate and copy.
/// See also the less expensive `spec_dimensions()`. Errors (such as
/// having requested a nonexistant subimage) are indicated by returning
/// having requested a nonexistent subimage) are indicated by returning
/// an ImageSpec with `format==TypeUnknown`.
virtual ImageSpec spec (int subimage, int miplevel=0);

Expand All @@ -1000,7 +1000,7 @@ class OIIO_API ImageInput {
/// nor any of the arbitrary named metadata will be copied, thus this is
/// a relatively inexpensive operation if you don't need that
/// information. It is guaranteed to be thread-safe. Errors (such as
/// having requested a nonexistant subimage) are indicated by returning
/// having requested a nonexistent subimage) are indicated by returning
/// an ImageSpec with `format==TypeUnknown`.
virtual ImageSpec spec_dimensions (int subimage, int miplevel=0);

Expand Down
4 changes: 2 additions & 2 deletions src/iv/ivgl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ IvGL::create_shaders(void)
// extension-based shaders won't work.
m_shader_program = glCreateProgram();

GLERRPRINT("create progam");
GLERRPRINT("create program");

// This holds the compilation status
GLint status;
Expand Down Expand Up @@ -938,7 +938,7 @@ IvGL::useshader(int tex_width, int tex_height, bool pixelview)

loc = glGetUniformLocation(m_shader_program, "height");
glUniform1i(loc, tex_height);
GLERRPRINT("After settting uniforms");
GLERRPRINT("After setting uniforms");
}


Expand Down
2 changes: 1 addition & 1 deletion src/libOpenImageIO/formatspec.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -629,7 +629,7 @@ explain_ExifFlash(const ParamValue& p, const void* extradata)
(val & 6) == 4 ? ", no strobe return" : "",
(val & 6) == 6 ? ", strobe return" : "",
(val & 24) == 8 ? ", compulsary flash" : "",
(val & 24) == 16 ? ", flash supression" : "",
(val & 24) == 16 ? ", flash suppression" : "",
(val & 24) == 24 ? ", auto flash" : "",
(val & 32) ? ", no flash available" : "",
(val & 64) ? ", red-eye reduction" : "");
Expand Down
4 changes: 2 additions & 2 deletions src/libOpenImageIO/imageinout_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ test_read_proxy(string_view formatname, string_view extension,


// Test writer's ability to detect and recover from errors when asked to
// write an unwriteable file (such as in a nonexistant directory).
// write an unwriteable file (such as in a nonexistent directory).
static bool
test_write_unwriteable(string_view formatname, string_view extension,
const ImageBuf& buf)
Expand Down Expand Up @@ -277,7 +277,7 @@ test_all_formats()
test_read_proxy(formatname, extensions[0], filename, buf);

//
// Test what happens when we write to an unwriteable or nonexistant
// Test what happens when we write to an unwriteable or nonexistent
// directory. It should not crash! But appropriately return some
// error.
//
Expand Down
2 changes: 1 addition & 1 deletion src/libOpenImageIO/maketexture.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,7 @@ bump_to_bumpslopes(ImageBuf& dst, const ImageBuf& src,
&& !ImageBufAlgo::isMonochrome(src)) // maybe it's a normal map?
bump_filter = &normal_gradient;
} else {
outstream << "maketx ERROR: Unknow input bump format " << bumpformat
outstream << "maketx ERROR: Unknown input bump format " << bumpformat
<< ". Valid formats are height, normal or auto\n";
return false;
}
Expand Down
14 changes: 7 additions & 7 deletions src/libtexture/imagecache.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2545,7 +2545,7 @@ ImageCacheImpl::get_image_info(ImageCacheFile* file,
if (dataname == s_exists && datatype == TypeInt) {
// Just check for existence. Need to do this before the invalid
// file error below, since in this one case, it's not an error
// for the file to be nonexistant or broken!
// for the file to be nonexistent or broken!
if ((*(int*)data = (file && !file->broken())) == 0) {
// eat any error generated by find_file
std::string* errptr = m_errormessage.get();
Expand Down Expand Up @@ -2590,7 +2590,7 @@ ImageCacheImpl::get_image_info(ImageCacheFile* file,
if (dataname == s_UDIM && datatype == TypeInt) {
// Just check for existence. Need to do this before the invalid
// file error below, since in this one case, it's not an error
// for the file to be nonexistant or broken!
// for the file to be nonexistent or broken!
*(int*)data = file->is_udim();
return true;
}
Expand Down Expand Up @@ -2953,13 +2953,13 @@ ImageCacheImpl::get_pixels(ImageCacheFile* file,
}
if (subimage < 0 || subimage >= file->subimages()) {
if (file->errors_should_issue())
errorf("get_pixels asked for nonexistant subimage %d of \"%s\"",
errorf("get_pixels asked for nonexistent subimage %d of \"%s\"",
subimage, file->filename());
return false;
}
if (miplevel < 0 || miplevel >= file->miplevels(subimage)) {
if (file->errors_should_issue())
errorf("get_pixels asked for nonexistant MIP level %d of \"%s\"",
errorf("get_pixels asked for nonexistent MIP level %d of \"%s\"",
miplevel, file->filename());
return false;
}
Expand Down Expand Up @@ -3003,7 +3003,7 @@ ImageCacheImpl::get_pixels(ImageCacheFile* file,
char* zptr = (char*)result;
for (int z = zbegin; z < zend; ++z, zptr += zstride) {
if (z < spec.z || z >= (spec.z + spec.depth)) {
// nonexistant planes
// nonexistent planes
if (xstride == result_pixelsize && ystride == scanlinesize) {
// Can zero out the plane in one shot
memset(zptr, 0, zplanesize);
Expand All @@ -3029,7 +3029,7 @@ ImageCacheImpl::get_pixels(ImageCacheFile* file,
tyend += spec.tile_height;
}
if (y < spec.y || y >= (spec.y + spec.height)) {
// nonexistant scanlines
// nonexistent scanlines
if (xstride == result_pixelsize) {
// Can zero out the scanline in one shot
memset(yptr, 0, scanlinesize);
Expand All @@ -3047,7 +3047,7 @@ ImageCacheImpl::get_pixels(ImageCacheFile* file,
for (int x = xbegin; x < xend;
++x, xptr += xstride, ++npixelsread) {
if (x < spec.x || x >= (spec.x + spec.width)) {
// nonexistant columns
// nonexistent columns
memset(xptr, 0, result_pixelsize);
continue;
}
Expand Down
10 changes: 5 additions & 5 deletions src/libtexture/texturesys.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -677,13 +677,13 @@ TextureSystemImpl::get_texels(TextureHandle* texture_handle_,
}
int subimage = options.subimage;
if (subimage < 0 || subimage >= texfile->subimages()) {
errorf("get_texel asked for nonexistant subimage %d of \"%s\"",
errorf("get_texel asked for nonexistent subimage %d of \"%s\"",
subimage, texfile->filename());
return false;
}
if (miplevel < 0 || miplevel >= texfile->miplevels(subimage)) {
if (texfile->errors_should_issue())
errorf("get_texel asked for nonexistant MIP level %d of \"%s\"",
errorf("get_texel asked for nonexistent MIP level %d of \"%s\"",
miplevel, texfile->filename());
return false;
}
Expand Down Expand Up @@ -712,23 +712,23 @@ TextureSystemImpl::get_texels(TextureHandle* texture_handle_,
bool ok = true;
for (int z = zbegin; z < zend; ++z) {
if (z < spec.z || z >= (spec.z + std::max(spec.depth, 1))) {
// nonexistant planes
// nonexistent planes
memset(result, 0, zplanesize);
result = (void*)((char*)result + zplanesize);
continue;
}
tileid.z(z - ((z - spec.z) % std::max(1, spec.tile_depth)));
for (int y = ybegin; y < yend; ++y) {
if (y < spec.y || y >= (spec.y + spec.height)) {
// nonexistant scanlines
// nonexistent scanlines
memset(result, 0, scanlinesize);
result = (void*)((char*)result + scanlinesize);
continue;
}
tileid.y(y - ((y - spec.y) % spec.tile_height));
for (int x = xbegin; x < xend; ++x, ++npixelsread) {
if (x < spec.x || x >= (spec.x + spec.width)) {
// nonexistant columns
// nonexistent columns
memset(result, 0, formatpixelsize);
result = (void*)((char*)result + formatpixelsize);
continue;
Expand Down
10 changes: 5 additions & 5 deletions testsuite/psd/ref/out-alt.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ Reading ../../../../../oiio-images/psd_bitmap.psd
Exif:ExifVersion: "0220"
Exif:ExposureBiasValue: 0
Exif:ExposureMode: 0 (auto)
Exif:Flash: 16 (no flash, flash supression)
Exif:Flash: 16 (no flash, flash suppression)
Exif:FlashPixVersion: "0100"
Exif:FocalLength: 7.3 (7.3 mm)
Exif:FocalPlaneResolutionUnit: 2 (inches)
Expand Down Expand Up @@ -357,7 +357,7 @@ Reading ../../../../../oiio-images/psd_indexed_trans.psd
Exif:ExifVersion: "0220"
Exif:ExposureBiasValue: 0
Exif:ExposureMode: 0 (auto)
Exif:Flash: 16 (no flash, flash supression)
Exif:Flash: 16 (no flash, flash suppression)
Exif:FlashPixVersion: "0100"
Exif:FocalLength: 7.3 (7.3 mm)
Exif:FocalPlaneResolutionUnit: 2 (inches)
Expand Down Expand Up @@ -428,7 +428,7 @@ Reading ../../../../../oiio-images/psd_rgb_8.psd
Exif:ExifVersion: "0220"
Exif:ExposureBiasValue: 0
Exif:ExposureMode: 0 (auto)
Exif:Flash: 16 (no flash, flash supression)
Exif:Flash: 16 (no flash, flash suppression)
Exif:FlashPixVersion: "0100"
Exif:FocalLength: 7.3 (7.3 mm)
Exif:FocalPlaneResolutionUnit: 2 (inches)
Expand Down Expand Up @@ -499,7 +499,7 @@ Reading ../../../../../oiio-images/psd_rgb_16.psd
Exif:ExifVersion: "0220"
Exif:ExposureBiasValue: 0
Exif:ExposureMode: 0 (auto)
Exif:Flash: 16 (no flash, flash supression)
Exif:Flash: 16 (no flash, flash suppression)
Exif:FlashPixVersion: "0100"
Exif:FocalLength: 7.3 (7.3 mm)
Exif:FocalPlaneResolutionUnit: 2 (inches)
Expand Down Expand Up @@ -570,7 +570,7 @@ Reading ../../../../../oiio-images/psd_rgb_32.psd
Exif:ExifVersion: "0220"
Exif:ExposureBiasValue: 0
Exif:ExposureMode: 0 (auto)
Exif:Flash: 16 (no flash, flash supression)
Exif:Flash: 16 (no flash, flash suppression)
Exif:FlashPixVersion: "0100"
Exif:FocalLength: 7.3 (7.3 mm)
Exif:FocalPlaneResolutionUnit: 2 (inches)
Expand Down
10 changes: 5 additions & 5 deletions testsuite/psd/ref/out.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ Reading ../../../../../oiio-images/psd_bitmap.psd
Exif:ExifVersion: "0220"
Exif:ExposureBiasValue: 0
Exif:ExposureMode: 0 (auto)
Exif:Flash: 16 (no flash, flash supression)
Exif:Flash: 16 (no flash, flash suppression)
Exif:FlashPixVersion: "0100"
Exif:FocalLength: 7.3 (7.3 mm)
Exif:FocalPlaneResolutionUnit: 2 (inches)
Expand Down Expand Up @@ -357,7 +357,7 @@ Reading ../../../../../oiio-images/psd_indexed_trans.psd
Exif:ExifVersion: "0220"
Exif:ExposureBiasValue: 0
Exif:ExposureMode: 0 (auto)
Exif:Flash: 16 (no flash, flash supression)
Exif:Flash: 16 (no flash, flash suppression)
Exif:FlashPixVersion: "0100"
Exif:FocalLength: 7.3 (7.3 mm)
Exif:FocalPlaneResolutionUnit: 2 (inches)
Expand Down Expand Up @@ -428,7 +428,7 @@ Reading ../../../../../oiio-images/psd_rgb_8.psd
Exif:ExifVersion: "0220"
Exif:ExposureBiasValue: 0
Exif:ExposureMode: 0 (auto)
Exif:Flash: 16 (no flash, flash supression)
Exif:Flash: 16 (no flash, flash suppression)
Exif:FlashPixVersion: "0100"
Exif:FocalLength: 7.3 (7.3 mm)
Exif:FocalPlaneResolutionUnit: 2 (inches)
Expand Down Expand Up @@ -499,7 +499,7 @@ Reading ../../../../../oiio-images/psd_rgb_16.psd
Exif:ExifVersion: "0220"
Exif:ExposureBiasValue: 0
Exif:ExposureMode: 0 (auto)
Exif:Flash: 16 (no flash, flash supression)
Exif:Flash: 16 (no flash, flash suppression)
Exif:FlashPixVersion: "0100"
Exif:FocalLength: 7.3 (7.3 mm)
Exif:FocalPlaneResolutionUnit: 2 (inches)
Expand Down Expand Up @@ -570,7 +570,7 @@ Reading ../../../../../oiio-images/psd_rgb_32.psd
Exif:ExifVersion: "0220"
Exif:ExposureBiasValue: 0
Exif:ExposureMode: 0 (auto)
Exif:Flash: 16 (no flash, flash supression)
Exif:Flash: 16 (no flash, flash suppression)
Exif:FlashPixVersion: "0100"
Exif:FocalLength: 7.3 (7.3 mm)
Exif:FocalPlaneResolutionUnit: 2 (inches)
Expand Down
4 changes: 2 additions & 2 deletions testsuite/raw/ref/out-libraw0.17.1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
Exif:ExposureBiasValue: 0/1 (0)
Exif:ExposureMode: 0 (auto)
Exif:ExposureProgram: 3 (aperture priority)
Exif:Flash: 16 (no flash, flash supression)
Exif:Flash: 16 (no flash, flash suppression)
Exif:FlashPixVersion: ""
Exif:FocalLength: 200 (200 mm)
Exif:FocalPlaneResolutionUnit: 2 (inches)
Expand Down Expand Up @@ -332,7 +332,7 @@
Exif:ExposureBiasValue: 0/167772160 (0)
Exif:ExposureMode: 0 (auto)
Exif:ExposureProgram: 2 (normal program)
Exif:Flash: 16 (no flash, flash supression)
Exif:Flash: 16 (no flash, flash suppression)
Exif:FocalLength: 42.5 (42.5 mm)
Exif:FocalLengthIn35mmFilm: 64
Exif:ISOSpeedRatings: 100
Expand Down
6 changes: 3 additions & 3 deletions testsuite/raw/ref/out-libraw0.18.11.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@
Exif:ExposureBiasValue: 0/1 (0)
Exif:ExposureMode: 0 (auto)
Exif:ExposureProgram: 3 (aperture priority)
Exif:Flash: 16 (no flash, flash supression)
Exif:Flash: 16 (no flash, flash suppression)
Exif:FlashPixVersion: ""
Exif:FocalLength: 200 (200 mm)
Exif:FocalPlaneResolutionUnit: 2 (inches)
Expand Down Expand Up @@ -444,7 +444,7 @@
Exif:ExifVersion: ""
Exif:ExposureBiasValue: -33/100 (-0.33)
Exif:ExposureProgram: 3 (aperture priority)
Exif:Flash: 16 (no flash, flash supression)
Exif:Flash: 16 (no flash, flash suppression)
Exif:FocalLength: 14 (14 mm)
Exif:ISOSpeedRatings: 100
Exif:MaxApertureValue: 925/256 (3.61328)
Expand Down Expand Up @@ -478,7 +478,7 @@
Exif:ExposureBiasValue: 0/167772160 (0)
Exif:ExposureMode: 0 (auto)
Exif:ExposureProgram: 2 (normal program)
Exif:Flash: 16 (no flash, flash supression)
Exif:Flash: 16 (no flash, flash suppression)
Exif:FocalLength: 42.5 (42.5 mm)
Exif:FocalLengthIn35mmFilm: 64
Exif:ISOSpeedRatings: 100
Expand Down
4 changes: 2 additions & 2 deletions testsuite/raw/ref/out-libraw0.18.8-gh.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@
Exif:ExposureBiasValue: 0/1 (0)
Exif:ExposureMode: 0 (auto)
Exif:ExposureProgram: 3 (aperture priority)
Exif:Flash: 16 (no flash, flash supression)
Exif:Flash: 16 (no flash, flash suppression)
Exif:FlashPixVersion: ""
Exif:FocalLength: 200 (200 mm)
Exif:FocalPlaneResolutionUnit: 2 (inches)
Expand Down Expand Up @@ -449,7 +449,7 @@
Exif:ExposureBiasValue: 0/167772160 (0)
Exif:ExposureMode: 0 (auto)
Exif:ExposureProgram: 2 (normal program)
Exif:Flash: 16 (no flash, flash supression)
Exif:Flash: 16 (no flash, flash suppression)
Exif:FocalLength: 42.5 (42.5 mm)
Exif:FocalLengthIn35mmFilm: 64
Exif:ISOSpeedRatings: 100
Expand Down
Loading