Skip to content

Commit 610229f

Browse files
committed
docs: Update/correct explanation of "openexr:core" attribute, and typo fixes (#4943)
Signed-off-by: Larry Gritz <[email protected]>
1 parent 8361b5b commit 610229f

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

src/include/OpenImageIO/imagebufalgo.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ bool OIIO_API render_line (ImageBuf &dst, int x1, int y1, int x2, int y2,
307307
/// as many values as `roi.chend-1`. The ROI can be used to limit the pixel
308308
/// area or channels that are modified, and default to the entirety of
309309
/// `dst`. If `fill` is `true`, the box will be completely filled in,
310-
/// otherwise only its outlien will be drawn.
310+
/// otherwise only its outline will be drawn.
311311
bool OIIO_API render_box (ImageBuf &dst, int x1, int y1, int x2, int y2,
312312
cspan<float> color=1.0f, bool fill = false,
313313
ROI roi={}, int nthreads=0);
@@ -542,7 +542,7 @@ bool OIIO_API transpose (ImageBuf &dst, const ImageBuf &src,
542542
/// @}
543543

544544

545-
/// Return (or store into `dst`) a copy of `src`, but with whatever seties
545+
/// Return (or store into `dst`) a copy of `src`, but with whatever series
546546
/// of rotations, flips, or flops are necessary to transform the pixels into
547547
/// the configuration suggested by the "Orientation" metadata of the image
548548
/// (and the "Orientation" metadata is then set to 1, ordinary orientation).
@@ -1246,7 +1246,7 @@ OIIO_API bool contrast_remap (ImageBuf &dst, const ImageBuf &src,
12461246
/// `src` within the ROI, and in the process adjusts the color saturation of
12471247
/// the three consecutive channels starting with `firstchannel` based on the
12481248
/// `scale` parameter: 0.0 fully desaturates to a greyscale image of
1249-
/// percaptually equivalent luminance, 1.0 leaves the colors unchanged,
1249+
/// perceptually equivalent luminance, 1.0 leaves the colors unchanged,
12501250
/// `scale` values inside this range interpolate between them, and `scale` > 1
12511251
/// would increase apparent color saturation.
12521252
///
@@ -2117,14 +2117,14 @@ bool OIIO_API ocionamedtransform (ImageBuf &dst, const ImageBuf &src,
21172117
/// `src` within the ROI, and in the process divides all color channels
21182118
/// (those not alpha or z) by the alpha value, to "un-premultiply" them.
21192119
/// This presumes that the image starts of as "associated alpha" a.k.a.
2120-
/// "premultipled," and you are converting to "unassociated alpha." For
2120+
/// "premultiplied," and you are converting to "unassociated alpha." For
21212121
/// pixels with alpha == 0, the color values are not modified.
21222122
///
21232123
/// The `premult` operation returns (or copies into `dst`) the pixels of
21242124
/// `src` within the ROI, and in the process multiplies all color channels
21252125
/// (those not alpha or z) by the alpha value, to "premultiply" them. This
21262126
/// presumes that the image starts of as "unassociated alpha" a.k.a.
2127-
/// "non-premultipled" and converts it to "associated alpha / premultipled."
2127+
/// "non-premultiplied" and converts it to "associated alpha / premultiplied."
21282128
///
21292129
/// The `repremult` operation is like `premult`, but preserves the color
21302130
/// values of pixels whose alpha is 0. This is intended for cases where you
@@ -2531,7 +2531,7 @@ bool OIIO_API deep_merge (ImageBuf &dst, const ImageBuf &A,
25312531
/// Return the samples of deep image `src` that are closer than the opaque
25322532
/// frontier of deep image holdout, returning true upon success and false
25332533
/// for any failures. Samples of `src` that are farther than the first
2534-
/// opaque sample of holdout (for the corresponding pixel)will not be copied
2534+
/// opaque sample of holdout (for the corresponding pixel) will not be copied
25352535
/// to `dst`. Image holdout is only used as the depth threshold; no sample
25362536
/// values from holdout are themselves copied to `dst`.
25372537
ImageBuf OIIO_API deep_holdout (const ImageBuf &src, const ImageBuf &holdout,

src/include/OpenImageIO/imageio.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3812,8 +3812,8 @@ OIIO_API std::string geterror(bool clear = true);
38123812
///
38133813
/// - `int openexr:core`
38143814
///
3815-
/// When nonzero, use the new "OpenEXR core C library" when available,
3816-
/// for OpenEXR >= 3.1. This is experimental, and currently defaults to 0.
3815+
/// When nonzero, use the new "OpenEXR core C library" when available.
3816+
/// The default is 1 for OpenEXR >= 3.1.10, 0 for older OpenEXR releases.
38173817
///
38183818
/// - `int jpeg:com_attributes`
38193819
///

0 commit comments

Comments
 (0)