diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-11-14 09:12:52 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-11-14 09:21:34 +0300 |
| commit | 55e719ec35a10c3f9e7231dee13d4b05aad7d965 (patch) | |
| tree | 563ed5b1b27e9613de8384da90197ce2c3e1924b /source/blender/imbuf/intern/iris.c | |
| parent | c279f879ab86e03dff0dbfd3a36b14bebb4956f9 (diff) | |
| parent | d7f55c4ff58f87b80f0ce2fa43ce2f7cd2b72675 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/imbuf/intern/iris.c')
| -rw-r--r-- | source/blender/imbuf/intern/iris.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/imbuf/intern/iris.c b/source/blender/imbuf/intern/iris.c index 50690cfa047..11f799a33d2 100644 --- a/source/blender/imbuf/intern/iris.c +++ b/source/blender/imbuf/intern/iris.c @@ -124,7 +124,7 @@ static int compressrow(uchar *lbuf, uchar *rlebuf, int z, int cnt); static void lumrow(uchar *rgbptr, uchar *lumptr, int n); /* - * byte order independent read/write of shorts and ints. + * byte order independent read/write of shorts and ints. * */ @@ -245,9 +245,9 @@ int imb_is_a_iris(const uchar *mem) } /* - * longimagedata - - * read in a B/W RGB or RGBA iris image file and return a - * pointer to an array of ints. + * longimagedata - + * read in a B/W RGB or RGBA iris image file and return a + * pointer to an array of ints. * */ |