[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35586] trunk/blender/source/blender/imbuf /intern: changed short's to int's image scale and flip functions ( images can be bigger then short range)

[Campbell Barton]

Revision: 35586
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35586
Author:   campbellbarton
Date:     2011-03-17 05:15:54 +0000 (Thu, 17 Mar 2011)
Log Message:
-----------
changed short's to int's image scale and flip functions (images can be bigger then short range)

Modified Paths:
--------------
    trunk/blender/source/blender/imbuf/intern/rotate.c
    trunk/blender/source/blender/imbuf/intern/scaling.c

Modified: trunk/blender/source/blender/imbuf/intern/rotate.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/rotate.c	2011-03-17 04:43:58 UTC (rev 35585)
+++ trunk/blender/source/blender/imbuf/intern/rotate.c	2011-03-17 05:15:54 UTC (rev 35586)
@@ -101,7 +101,7 @@
 
 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;

Modified: trunk/blender/source/blender/imbuf/intern/scaling.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/scaling.c	2011-03-17 04:43:58 UTC (rev 35585)
+++ trunk/blender/source/blender/imbuf/intern/scaling.c	2011-03-17 05:15:54 UTC (rev 35586)
@@ -55,7 +55,8 @@
 {
 	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 *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 *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 @@
 
 
 /* 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;