diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2015-06-29 18:10:42 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2015-06-29 18:10:42 +0300 |
| commit | 58d6cbba6da31db8dc8a2b42d528b9a353081904 (patch) | |
| tree | 04b57a2f809c6f08d84a082edf061f3ece631860 /source/blender/imbuf/intern/rectop.c | |
| parent | 94549adec4b6857fb6ec4cf77606da51ff7c26b7 (diff) | |
| parent | 295d0c52a26730edc6d4ed1276e4051cce006be5 (diff) | |
Merge branch 'master' into temp-ghash-setopstemp-ghash-setops
Diffstat (limited to 'source/blender/imbuf/intern/rectop.c')
| -rw-r--r-- | source/blender/imbuf/intern/rectop.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/imbuf/intern/rectop.c b/source/blender/imbuf/intern/rectop.c index 4001b681ad9..c7b347cb20c 100644 --- a/source/blender/imbuf/intern/rectop.c +++ b/source/blender/imbuf/intern/rectop.c @@ -322,30 +322,30 @@ void IMB_rectblend(ImBuf *dbuf, ImBuf *obuf, ImBuf *sbuf, unsigned short *dmask, do_float = (sbuf && sbuf->rect_float && dbuf->rect_float && obuf->rect_float); if (do_char) { - drect = dbuf->rect + desty * dbuf->x + destx; - orect = obuf->rect + origy * obuf->x + origx; + drect = dbuf->rect + ((size_t)desty) * dbuf->x + destx; + orect = obuf->rect + ((size_t)origy) * obuf->x + origx; } if (do_float) { - drectf = dbuf->rect_float + (desty * dbuf->x + destx) * 4; - orectf = obuf->rect_float + (origy * obuf->x + origx) * 4; + drectf = dbuf->rect_float + (((size_t)desty) * dbuf->x + destx) * 4; + orectf = obuf->rect_float + (((size_t)origy) * obuf->x + origx) * 4; } if (dmaskrect) - dmaskrect += origy * obuf->x + origx; + dmaskrect += ((size_t)origy) * obuf->x + origx; destskip = dbuf->x; origskip = obuf->x; if (sbuf) { - if (do_char) srect = sbuf->rect + srcy * sbuf->x + srcx; - if (do_float) srectf = sbuf->rect_float + (srcy * sbuf->x + srcx) * 4; + if (do_char) srect = sbuf->rect + ((size_t)srcy) * sbuf->x + srcx; + if (do_float) srectf = sbuf->rect_float + (((size_t)srcy) * sbuf->x + srcx) * 4; srcskip = sbuf->x; if (cmaskrect) - cmaskrect += srcy * sbuf->x + srcx; + cmaskrect += ((size_t)srcy) * sbuf->x + srcx; if (texmaskrect) - texmaskrect += srcy * sbuf->x + srcx; + texmaskrect += ((size_t)srcy) * sbuf->x + srcx; } else { srect = drect; |