diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-06-01 19:26:42 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-01 19:26:42 +0300 |
commit | bfe1d0e0dc6281d33448c3d4ddfa2e231bbc5566 (patch) | |
tree | 14e9db1c58d7ffc33becc3ff5d74f4feb4c2d75e /source/blender/imbuf/intern/tiff.c | |
parent | 297bf7235bc4b2384b99f41676a8c217f2ee3249 (diff) | |
parent | 75fc1c35070e0cf247f2d2e4cffe8a6e711522ff (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/imbuf/intern/tiff.c')
-rw-r--r-- | source/blender/imbuf/intern/tiff.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/imbuf/intern/tiff.c b/source/blender/imbuf/intern/tiff.c index a68b2aa966b..914fcc4e847 100644 --- a/source/blender/imbuf/intern/tiff.c +++ b/source/blender/imbuf/intern/tiff.c @@ -32,10 +32,10 @@ * already loaded the file into a memory buffer. libtiff is not well * configured to handle files in memory, so a client wrapper is written to * surround the memory and turn it into a virtual file. Currently, reading - * of TIFF files is done using libtiff's RGBAImage support. This is a + * of TIFF files is done using libtiff's RGBAImage support. This is a * high-level routine that loads all images as 32-bit RGBA, handling all the * required conversions between many different TIFF types internally. - * + * * Saving supports RGB, RGBA and BW (grayscale) images correctly, with * 8 bits per channel in all cases. The "deflate" compression algorithm is * used to compress images. @@ -371,7 +371,7 @@ static void imb_read_tiff_resolution(ImBuf *ibuf, TIFF *image) /* * Use the libTIFF scanline API to read a TIFF image. - * This method is most flexible and can handle multiple different bit depths + * This method is most flexible and can handle multiple different bit depths * and RGB channel orderings. */ static int imb_read_tiff_pixels(ImBuf *ibuf, TIFF *image) @@ -694,7 +694,7 @@ void imb_loadtiletiff(ImBuf *ibuf, const unsigned char *mem, size_t size, int tx /** * Saves a TIFF file. * - * ImBuf structures with 1, 3 or 4 bytes per pixel (GRAY, RGB, RGBA + * ImBuf structures with 1, 3 or 4 bytes per pixel (GRAY, RGB, RGBA * respectively) are accepted, and interpreted correctly. Note that the TIFF * convention is to use pre-multiplied alpha, which can be achieved within * Blender by setting "Premul" alpha handling. Other alpha conventions are |