diff options
author | Clément Foucault <foucault.clem@gmail.com> | 2020-07-15 15:23:59 +0300 |
---|---|---|
committer | Clément Foucault <foucault.clem@gmail.com> | 2020-07-15 15:23:59 +0300 |
commit | 9034351b8def3c3fd3b8d001a559dd91e2f28c14 (patch) | |
tree | d0228d217bd9f1eafbeeba973bd5e61ab782c840 /source/blender/imbuf/intern/iris.c | |
parent | b5c67c2ec146c86e362d030781c48066e8502fe8 (diff) | |
parent | 44bb73e765a6f79bc14a46449368f83e572d8bad (diff) |
Merge branch 'master' into tmp-eevee-glsl-cleanuptmp-eevee-glsl-cleanup
Diffstat (limited to 'source/blender/imbuf/intern/iris.c')
-rw-r--r-- | source/blender/imbuf/intern/iris.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/imbuf/intern/iris.c b/source/blender/imbuf/intern/iris.c index bfcd1ec2cee..2516df22151 100644 --- a/source/blender/imbuf/intern/iris.c +++ b/source/blender/imbuf/intern/iris.c @@ -122,7 +122,7 @@ static int expandrow2( static void interleaverow(uchar *lptr, const uchar *cptr, int z, int n); static void interleaverow2(float *lptr, const uchar *cptr, int z, int n); static int compressrow(uchar *lbuf, uchar *rlebuf, int z, int cnt); -static void lumrow(uchar *rgbptr, uchar *lumptr, int n); +static void lumrow(const uchar *rgbptr, uchar *lumptr, int n); /* * byte order independent read/write of shorts and ints. @@ -900,7 +900,7 @@ static int output_iris(uint *lptr, int xsize, int ysize, int zsize, const char * /* static utility functions for output_iris */ -static void lumrow(uchar *rgbptr, uchar *lumptr, int n) +static void lumrow(const uchar *rgbptr, uchar *lumptr, int n) { lumptr += CHANOFFSET(0); while (n--) { |