diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-03-17 08:15:54 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-03-17 08:15:54 +0300 |
commit | 719afd2622d4025bc463fbc9d6f8ec50b20f5ed3 (patch) | |
tree | e9253045e025efc7e0dafdaadb3c11ae72900a65 /source | |
parent | 197e903efc9825fc4c2f5c01a124fc7fd9934bec (diff) |
changed short's to int's image scale and flip functions (images can be bigger then short range)
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/imbuf/intern/rotate.c | 2 | ||||
-rw-r--r-- | source/blender/imbuf/intern/scaling.c | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/source/blender/imbuf/intern/rotate.c b/source/blender/imbuf/intern/rotate.c index 741806f6215..2f9d5d60baa 100644 --- a/source/blender/imbuf/intern/rotate.c +++ b/source/blender/imbuf/intern/rotate.c @@ -101,7 +101,7 @@ void IMB_flipy(struct ImBuf * ibuf) void IMB_flipx(struct ImBuf * ibuf) { - short x, y, xr, xl, yi; + int x, y, xr, xl, yi; float px_f[4]; if (ibuf == NULL) return; diff --git a/source/blender/imbuf/intern/scaling.c b/source/blender/imbuf/intern/scaling.c index 64a9603610b..06f0d43bbd7 100644 --- a/source/blender/imbuf/intern/scaling.c +++ b/source/blender/imbuf/intern/scaling.c @@ -55,7 +55,8 @@ struct ImBuf *IMB_half_x(struct ImBuf *ibuf1) { struct ImBuf *ibuf2; uchar *p1,*_p1,*dest; - short a,r,g,b,x,y; + short a,r,g,b; + int x,y; float af,rf,gf,bf, *p1f, *_p1f, *destf; int do_rect, do_float; @@ -173,7 +174,8 @@ struct ImBuf *IMB_half_y(struct ImBuf *ibuf1) { struct ImBuf *ibuf2; uchar *p1,*p2,*_p1,*dest; - short a,r,g,b,x,y; + short a,r,g,b; + int x,y; int do_rect, do_float; float af,rf,gf,bf,*p1f,*p2f,*_p1f,*destf; @@ -245,7 +247,7 @@ struct ImBuf *IMB_double_fast_y(struct ImBuf *ibuf1) struct ImBuf *ibuf2; int *p1, *dest1, *dest2; float *p1f, *dest1f, *dest2f; - short x,y; + int x,y; int do_rect, do_float; if (ibuf1==NULL) return (NULL); @@ -1418,7 +1420,7 @@ static struct ImBuf *scaleupy(struct ImBuf *ibuf, int newy) /* no float buf needed here! */ -static void scalefast_Z_ImBuf(ImBuf *ibuf, short newx, short newy) +static void scalefast_Z_ImBuf(ImBuf *ibuf, int newx, int newy) { unsigned int *rect, *_newrect, *newrect; int x, y; |