Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source/blender/imbuf/intern/scaling.c
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/imbuf/intern/scaling.c')
-rw-r--r--source/blender/imbuf/intern/scaling.c517
1 files changed, 427 insertions, 90 deletions
diff --git a/source/blender/imbuf/intern/scaling.c b/source/blender/imbuf/intern/scaling.c
index 7749dadb2ca..539ea0377b3 100644
--- a/source/blender/imbuf/intern/scaling.c
+++ b/source/blender/imbuf/intern/scaling.c
@@ -52,20 +52,27 @@ struct ImBuf *IMB_half_x(struct ImBuf *ibuf1)
struct ImBuf *ibuf2;
uchar *p1,*_p1,*dest;
short a,r,g,b,x,y;
+ float af,rf,gf,bf, *p1f, *_p1f, *destf;
+ int do_float = 0;
- if (ibuf1==0) return (0);
- if (ibuf1->rect == 0) return (0);
+ if (ibuf1==NULL) return (0);
+ if (ibuf1->rect==NULL) return (0);
+ if (ibuf1->rect_float) do_float = 1;
if (ibuf1->x <= 1) return(IMB_dupImBuf(ibuf1));
- ibuf2 = IMB_allocImBuf((ibuf1->x)/2 , ibuf1->y , ibuf1->depth,1,0);
- if (ibuf2==0) return (0);
+ ibuf2 = IMB_allocImBuf((ibuf1->x)/2, ibuf1->y, ibuf1->depth, ibuf1->flags, 0);
+ if (ibuf2==NULL) return (0);
_p1 = (uchar *) ibuf1->rect;
dest=(uchar *) ibuf2->rect;
+
+ _p1f = ibuf1->rect_float;
+ destf= ibuf2->rect_float;
for(y=ibuf2->y;y>0;y--){
p1 = _p1;
+ p1f = _p1f;
for(x = ibuf2->x ; x>0 ; x--){
a = *(p1++) ;
b = *(p1++) ;
@@ -79,8 +86,23 @@ struct ImBuf *IMB_half_x(struct ImBuf *ibuf1)
*(dest++) = b >> 1;
*(dest++) = g >> 1;
*(dest++) = r >> 1;
+ if (do_float) {
+ af = *(p1f++);
+ bf = *(p1f++);
+ gf = *(p1f++);
+ rf = *(p1f++);
+ af += *(p1f++);
+ bf += *(p1f++);
+ gf += *(p1f++);
+ rf += *(p1f++);
+ *(destf++) = 0.5f*af;
+ *(destf++) = 0.5f*bf;
+ *(destf++) = 0.5f*gf;
+ *(destf++) = 0.5f*rf;
+ }
}
_p1 += (ibuf1->x << 2);
+ if (do_float) _p1f += (ibuf1->x << 2);
}
return (ibuf2);
}
@@ -89,21 +111,30 @@ struct ImBuf *IMB_half_x(struct ImBuf *ibuf1)
struct ImBuf *IMB_double_fast_x(struct ImBuf *ibuf1)
{
struct ImBuf *ibuf2;
- int *p1,*dest, i, col;
+ int *p1,*dest, i, col, do_float=0;
+ float *p1f, *destf, colf;
- if (ibuf1==0) return (0);
- if (ibuf1->rect == 0) return (0);
+ if (ibuf1==NULL) return (0);
+ if (ibuf1->rect==NULL) return (0);
+ if (ibuf1->rect_float) do_float = 1;
- ibuf2 = IMB_allocImBuf(2 * ibuf1->x , ibuf1->y , ibuf1->depth,1,0);
- if (ibuf2==0) return (0);
+ ibuf2 = IMB_allocImBuf(2 * ibuf1->x , ibuf1->y , ibuf1->depth, ibuf1->flags, 0);
+ if (ibuf2==NULL) return (0);
p1 = (int *) ibuf1->rect;
dest=(int *) ibuf2->rect;
+ p1f = ibuf1->rect_float;
+ destf = ibuf2->rect_float;
for(i = ibuf1->y * ibuf1->x ; i>0 ; i--) {
col = *p1++;
*dest++ = col;
*dest++ = col;
+ if (do_float) {
+ colf = *p1f++;
+ *destf++ = col;
+ *destf++ = col;
+ }
}
return (ibuf2);
@@ -113,8 +144,8 @@ struct ImBuf *IMB_double_x(struct ImBuf *ibuf1)
{
struct ImBuf *ibuf2;
- if (ibuf1==0) return (0);
- if (ibuf1->rect == 0) return (0);
+ if (ibuf1==NULL) return (0);
+ if (ibuf1->rect==NULL) return (0);
ibuf2 = IMB_double_fast_x(ibuf1);
@@ -128,20 +159,30 @@ struct ImBuf *IMB_half_y(struct ImBuf *ibuf1)
struct ImBuf *ibuf2;
uchar *p1,*p2,*_p1,*dest;
short a,r,g,b,x,y;
+ int do_float = 0;
+ float af,rf,gf,bf,*p1f,*p2f,*_p1f,*destf;
- if (ibuf1==0) return (0);
- if (ibuf1->rect == 0) return (0);
+ p1f = NULL; p2f = NULL;
+ if (ibuf1==NULL) return (0);
+ if (ibuf1->rect==NULL) return (0);
+ if (ibuf1->rect_float) do_float = 1;
if (ibuf1->y <= 1) return(IMB_dupImBuf(ibuf1));
- ibuf2 = IMB_allocImBuf(ibuf1->x , (ibuf1->y) / 2 , ibuf1->depth,1,0);
- if (ibuf2==0) return (0);
+ ibuf2 = IMB_allocImBuf(ibuf1->x , (ibuf1->y) / 2 , ibuf1->depth, ibuf1->flags, 0);
+ if (ibuf2==NULL) return (0);
_p1 = (uchar *) ibuf1->rect;
dest=(uchar *) ibuf2->rect;
+ _p1f = ibuf1->rect_float;
+ destf= ibuf2->rect_float;
for(y=ibuf2->y ; y>0 ; y--){
p1 = _p1;
p2 = _p1 + (ibuf1->x << 2);
+ if (do_float) {
+ p1f = _p1f;
+ p2f = _p1f + (ibuf1->x << 2);
+ }
for(x = ibuf2->x ; x>0 ; x--){
a = *(p1++) ;
b = *(p1++) ;
@@ -155,8 +196,23 @@ struct ImBuf *IMB_half_y(struct ImBuf *ibuf1)
*(dest++) = b >> 1;
*(dest++) = g >> 1;
*(dest++) = r >> 1;
+ if (do_float) {
+ af = *(p1f++) ;
+ bf = *(p1f++) ;
+ gf = *(p1f++) ;
+ rf = *(p1f++);
+ af += *(p2f++) ;
+ bf += *(p2f++) ;
+ gf += *(p2f++) ;
+ rf += *(p2f++);
+ *(destf++) = 0.5f*af;
+ *(destf++) = 0.5f*bf;
+ *(destf++) = 0.5f*gf;
+ *(destf++) = 0.5f*rf;
+ }
}
_p1 += (ibuf1->x << 3);
+ if (do_float) _p1f += (ibuf1->x << 3);
}
return (ibuf2);
}
@@ -166,21 +222,31 @@ struct ImBuf *IMB_double_fast_y(struct ImBuf *ibuf1)
{
struct ImBuf *ibuf2;
int *p1, *dest1, *dest2;
+ float *p1f, *dest1f, *dest2f;
short x,y;
+ int do_float =0;
- if (ibuf1==0) return (0);
- if (ibuf1->rect == 0) return (0);
+ if (ibuf1==NULL) return (0);
+ if (ibuf1->rect==NULL) return (0);
+ if (ibuf1->rect_float) do_float =1;
- ibuf2 = IMB_allocImBuf(ibuf1->x , 2 * ibuf1->y , ibuf1->depth,1,0);
- if (ibuf2==0) return (0);
+ ibuf2 = IMB_allocImBuf(ibuf1->x , 2 * ibuf1->y , ibuf1->depth, ibuf1->flags, 0);
+ if (ibuf2==NULL) return (0);
p1 = (int *) ibuf1->rect;
dest1=(int *) ibuf2->rect;
+ p1f = ibuf1->rect_float;
+ dest1f= ibuf2->rect_float;
for(y = ibuf1->y ; y>0 ; y--){
dest2 = dest1 + ibuf2->x;
for(x = ibuf2->x ; x>0 ; x--) *dest1++ = *dest2++ = *p1++;
dest1 = dest2;
+ if (do_float) {
+ dest2f = dest1f + ibuf2->x;
+ for(x = ibuf2->x ; x>0 ; x--) *dest1f++ = *dest2f++ = *p1f++;
+ dest1f = dest2f;
+ }
}
return (ibuf2);
@@ -190,8 +256,8 @@ struct ImBuf *IMB_double_y(struct ImBuf *ibuf1)
{
struct ImBuf *ibuf2;
- if (ibuf1==0) return (0);
- if (ibuf1->rect == 0) return (0);
+ if (ibuf1==NULL) return (0);
+ if (ibuf1->rect==NULL) return (0);
ibuf2 = IMB_double_fast_y(ibuf1);
@@ -203,23 +269,29 @@ struct ImBuf *IMB_double_y(struct ImBuf *ibuf1)
struct ImBuf *IMB_onehalf(struct ImBuf *ibuf1)
{
struct ImBuf *ibuf2;
- uchar *p1,*p2,*dest;
+ uchar *p1, *p2, *dest;
+ float *p1f, *destf, *p2f = NULL;
int x,y;
+ int do_float =0;
- if (ibuf1 == 0) return (0);
- if (ibuf1->rect == 0) return (0);
+ if (ibuf1==NULL) return (0);
+ if (ibuf1->rect==NULL) return (0);
+ if (ibuf1->rect_float) do_float = 1;
if (ibuf1->x <= 1) return(IMB_half_y(ibuf1));
if (ibuf1->y <= 1) return(IMB_half_x(ibuf1));
- ibuf2=IMB_allocImBuf((ibuf1->x)/2,(ibuf1->y)/2,ibuf1->depth,1,0);
- if (ibuf2==0) return (0);
+ ibuf2=IMB_allocImBuf((ibuf1->x)/2, (ibuf1->y)/2, ibuf1->depth, ibuf1->flags, 0);
+ if (ibuf2==NULL) return (0);
+ p1f = ibuf1->rect_float;
+ destf=ibuf2->rect_float;
p1 = (uchar *) ibuf1->rect;
dest=(uchar *) ibuf2->rect;
for(y=ibuf2->y;y>0;y--){
p2 = p1 + (ibuf1->x << 2);
+ if (do_float) p2f = p1f + (ibuf1->x << 2);
for(x=ibuf2->x;x>0;x--){
dest[0] = (p1[0] + p2[0] + p1[4] + p2[4]) >> 2;
dest[1] = (p1[1] + p2[1] + p1[5] + p2[5]) >> 2;
@@ -228,10 +300,21 @@ struct ImBuf *IMB_onehalf(struct ImBuf *ibuf1)
p1 += 8;
p2 += 8;
dest += 4;
+ if (do_float){
+ destf[0] = 0.25f*(p1f[0] + p2f[0] + p1f[4] + p2f[4]);
+ destf[1] = 0.25f*(p1f[1] + p2f[1] + p1f[5] + p2f[5]);
+ destf[2] = 0.25f*(p1f[2] + p2f[2] + p1f[6] + p2f[6]);
+ destf[3] = 0.25f*(p1f[3] + p2f[3] + p1f[7] + p2f[7]);
+ p1f += 8;
+ p2f += 8;
+ destf += 4;
+ }
}
p1=p2;
+ if (do_float) p1f=p2f;
if(ibuf1->x & 1) {
p1+=4;
+ if (do_float) p1f+=4;
}
}
return (ibuf2);
@@ -243,34 +326,59 @@ struct ImBuf *IMB_onethird(struct ImBuf *ibuf1)
{
struct ImBuf *ibuf2;
uchar *p1,*p2,*p3,*dest;
+ float *p1f, *p2f, *p3f, *destf;
+ int do_float=0;
short a,r,g,b,x,y,i;
+ float af,rf,gf,bf;
- if (ibuf1 == 0) return (0);
- if (ibuf1->rect == 0) return (0);
+ p2f = NULL; p3f = NULL;
+ if (ibuf1==NULL) return (0);
+ if (ibuf1->rect==NULL) return (0);
+ if (ibuf1->rect_float) do_float = 1;
- ibuf2=IMB_allocImBuf((ibuf1->x)/3,(ibuf1->y)/3,ibuf1->depth,1,0);
- if (ibuf2==0) return (0);
+ ibuf2=IMB_allocImBuf((ibuf1->x)/3, (ibuf1->y)/3, ibuf1->depth, ibuf1->flags, 0);
+ if (ibuf2==NULL) return (0);
+ p1f = ibuf1->rect_float;
+ destf = ibuf2->rect_float;
p1 = (uchar *) ibuf1->rect;
dest=(uchar *) ibuf2->rect;
for(y=ibuf2->y;y>0;y--){
p2 = p1 + (ibuf1->x << 2);
p3 = p2 + (ibuf1->x << 2);
+ if (do_float) {
+ p2f = p1f + (ibuf1->x <<2);
+ p3f = p2f + (ibuf1->x <<2);
+ }
for(x=ibuf2->x;x>0;x--){
a=r=g=b=0;
+ af=rf=gf=bf=0;
for (i=3;i>0;i--){
a += *(p1++) + *(p2++) + *(p3++);
b += *(p1++) + *(p2++) + *(p3++);
g += *(p1++) + *(p2++) + *(p3++);
r += *(p1++) + *(p2++) + *(p3++);
+ if (do_float) {
+ af += *(p1f++) + *(p2f++) + *(p3f++);
+ bf += *(p1f++) + *(p2f++) + *(p3f++);
+ gf += *(p1f++) + *(p2f++) + *(p3f++);
+ rf += *(p1f++) + *(p2f++) + *(p3f++);
+ }
}
*(dest++) = a/9;
*(dest++) = b/9;
*(dest++) = g/9;
*(dest++) = r/9;
+ if (do_float) {
+ *(destf++) = af/9.0f;
+ *(destf++) = bf/9.0f;
+ *(destf++) = gf/9.0f;
+ *(destf++) = rf/9.0f;
+ }
}
p1=p3;
+ if (do_float) p1f = p3f;
}
return (ibuf2);
}
@@ -280,33 +388,55 @@ struct ImBuf *IMB_halflace(struct ImBuf *ibuf1)
{
struct ImBuf *ibuf2;
uchar *p1,*p2,*dest;
+ float *p1f,*p2f,*destf;
short a,r,g,b,x,y,i;
+ float af,rf,gf,bf;
+ int do_float = 0;
- if (ibuf1 == 0) return (0);
- if (ibuf1->rect == 0) return (0);
+ p2f = NULL;
+ if (ibuf1==NULL) return (0);
+ if (ibuf1->rect==NULL) return (0);
+ if (ibuf1->rect_float) do_float = 1;
- ibuf2=IMB_allocImBuf((ibuf1->x)/4,(ibuf1->y)/2,ibuf1->depth,1,0);
- if (ibuf2==0) return (0);
+ ibuf2=IMB_allocImBuf((ibuf1->x)/4, (ibuf1->y)/2, ibuf1->depth, ibuf1->flags, 0);
+ if (ibuf2==NULL) return (0);
+ p1f = ibuf1->rect_float;
+ destf= ibuf2->rect_float;
p1 = (uchar *) ibuf1->rect;
dest=(uchar *) ibuf2->rect;
for(y= ibuf2->y / 2 ; y>0;y--){
p2 = p1 + (ibuf1->x << 3);
+ if (do_float) p2f = p1f + (ibuf1->x << 3);
for(x = 2 * ibuf2->x;x>0;x--){
a=r=g=b=0;
+ af=rf=gf=bf=0;
for (i=4;i>0;i--){
a += *(p1++) + *(p2++);
b += *(p1++) + *(p2++);
g += *(p1++) + *(p2++);
r += *(p1++) + *(p2++);
+ if (do_float) {
+ af += *(p1f++) + *(p2f++);
+ bf += *(p1f++) + *(p2f++);
+ gf += *(p1f++) + *(p2f++);
+ rf += *(p1f++) + *(p2f++);
+ }
}
*(dest++) = a >> 3;
*(dest++) = b >> 3;
*(dest++) = g >> 3;
*(dest++) = r >> 3;
+ if (do_float) {
+ *(destf++) = 0.125f*af;
+ *(destf++) = 0.125f*bf;
+ *(destf++) = 0.125f*gf;
+ *(destf++) = 0.125f*rf;
+ }
}
p1 = p2;
+ if (do_float) p1f = p2f;
}
return (ibuf2);
}
@@ -315,14 +445,23 @@ struct ImBuf *IMB_halflace(struct ImBuf *ibuf1)
static struct ImBuf *scaledownx(struct ImBuf *ibuf, int newx)
{
uchar *rect,*_newrect,*newrect;
- float sample, add, val, nval;
- int x, y, i;
+ float *rectf,*_newrectf,*newrectf;
+ float sample, add, val, nval, valf, nvalf;
+ int x, y, i, do_float=0;
- if (ibuf == 0) return(0);
- if (ibuf->rect == 0) return(ibuf);
+ rectf = NULL; _newrectf= NULL; newrectf = NULL;
+ nval = 0; nvalf = 0;
+
+ if (ibuf==NULL) return(0);
+ if (ibuf->rect==NULL) return(ibuf);
+ if (ibuf->rect_float) {
+ do_float = 1;
+ _newrectf = MEM_mallocN(newx * ibuf->y * sizeof(float) * 4, "scaledownxf");
+ if (_newrectf==NULL) return(ibuf);
+ }
- _newrect = (uchar *) malloc(newx * ibuf->y * sizeof(int));
- if (_newrect == 0) return(ibuf);
+ _newrect = MEM_mallocN(newx * ibuf->y * sizeof(int), "scaledownx");
+ if (_newrect==NULL) return(ibuf);
add = (ibuf->x - 0.001) / newx;
@@ -331,22 +470,39 @@ static struct ImBuf *scaledownx(struct ImBuf *ibuf, int newx)
rect = (uchar *) ibuf->rect;
rect += i;
newrect = _newrect + i;
+ if (do_float) {
+ rectf = ibuf->rect_float;
+ rectf += i;
+ newrectf = _newrectf + i;
+ }
for (y = ibuf->y; y>0 ; y--){
- val = sample = 0.0;
+ val = sample = valf = 0.0;
for (x = newx ; x>0 ; x--){
nval = - val * sample;
+ if (do_float) nvalf = - valf * sample;
sample += add;
while (sample >= 1.0){
sample -= 1.0;
nval += *rect;
rect += 4;
+ if (do_float) {
+ nvalf += *rectf;
+ rectf += 4;
+ }
}
val = *rect;
rect += 4;
nval += sample * val;
+ if (do_float) {
+ valf = *rectf;
+ rectf += 4;
+ nvalf += sample * valf;
+ *newrectf = (nvalf/add) + 0.5;
+ newrectf += 4;
+ }
sample -= 1.0;
*newrect = (nval/add) + 0.5;
newrect += 4;
@@ -357,6 +513,13 @@ static struct ImBuf *scaledownx(struct ImBuf *ibuf, int newx)
imb_freerectImBuf(ibuf);
ibuf->mall |= IB_rect;
ibuf->rect = (unsigned int *) _newrect;
+
+ if (do_float) {
+ imb_freerectfloatImBuf(ibuf);
+ ibuf->mall |= IB_rectfloat;
+ ibuf->rect_float = _newrectf;
+ }
+
ibuf->x = newx;
return(ibuf);
}
@@ -364,15 +527,25 @@ static struct ImBuf *scaledownx(struct ImBuf *ibuf, int newx)
static struct ImBuf *scaledowny(struct ImBuf *ibuf, int newy)
{
- uchar *rect,*_newrect,*newrect;
- float sample,add,val,nval;
- int x,y,i,skipx;
+ uchar *rect, *_newrect, *newrect;
+ float *rectf, *_newrectf, *newrectf;
+ float sample, add, val, nval, valf, nvalf;
+ int x, y, i, skipx, do_float = 0;
- if (ibuf == 0) return(0);
- if (ibuf->rect == 0) return(ibuf);
+ rectf= NULL; _newrectf = NULL; newrectf = NULL;
+ nval = 0; nvalf = 0;
- _newrect = (uchar *) malloc(newy * ibuf->x * sizeof(int));
- if (_newrect == 0) return(ibuf);
+ if (ibuf==NULL) return(0);
+ if (ibuf->rect==NULL) return(ibuf);
+
+ if (ibuf->rect_float) {
+ do_float = 1;
+ _newrectf = MEM_mallocN(newy * ibuf->x * sizeof(float) * 4, "scaldownyf");
+ if (_newrectf==NULL) return(ibuf);
+ }
+
+ _newrect = MEM_mallocN(newy * ibuf->x * sizeof(int), "scaledowny");
+ if (_newrect==NULL) return(ibuf);
add = (ibuf->y - 0.001) / newy;
skipx = 4 * ibuf->x;
@@ -382,23 +555,39 @@ static struct ImBuf *scaledowny(struct ImBuf *ibuf, int newy)
for (x = skipx - 4; x>=0 ; x-= 4){
rect = ((uchar *) ibuf->rect) + i + x;
newrect = _newrect + i + x;
+ if (do_float) {
+ rectf = ((float *) ibuf->rect_float) + i + x;
+ newrectf = _newrectf + i + x;
+ }
val = sample = 0.0;
for (y = newy ; y>0 ; y--){
nval = - val * sample;
+ if (do_float) nvalf = - val * sample;
sample += add;
while (sample >= 1.0){
sample -= 1.0;
nval += *rect;
rect += skipx;
+ if (do_float) {
+ nvalf += *rectf;
+ rectf += skipx;
+ }
}
val = *rect;
rect += skipx;
nval += sample * val;
- sample -= 1.0;
*newrect = (nval/add) + 0.5;
newrect += skipx;
+ if (do_float) {
+ valf = *rectf;
+ rectf += skipx;
+ nvalf += sample * valf;
+ *newrectf = (nvalf/add) + 0.5;
+ newrectf += skipx;
+ }
+ sample -= 1.0;
}
}
}
@@ -406,6 +595,13 @@ static struct ImBuf *scaledowny(struct ImBuf *ibuf, int newy)
imb_freerectImBuf(ibuf);
ibuf->mall |= IB_rect;
ibuf->rect = (unsigned int *) _newrect;
+
+ if (do_float) {
+ imb_freerectfloatImBuf(ibuf);
+ ibuf->mall |= IB_rectfloat;
+ ibuf->rect_float = (float *) _newrectf;
+ }
+
ibuf->y = newy;
return(ibuf);
}
@@ -414,23 +610,39 @@ static struct ImBuf *scaledowny(struct ImBuf *ibuf, int newy)
static struct ImBuf *scaleupx(struct ImBuf *ibuf, int newx)
{
uchar *rect,*_newrect,*newrect;
+ float *rectf,*_newrectf,*newrectf;
float sample,add;
float val_a,nval_a,diff_a;
float val_b,nval_b,diff_b;
float val_g,nval_g,diff_g;
float val_r,nval_r,diff_r;
- int x,y;
-
- if (ibuf == 0) return(0);
- if (ibuf->rect == 0) return(ibuf);
+ float val_af,nval_af,diff_af;
+ float val_bf,nval_bf,diff_bf;
+ float val_gf,nval_gf,diff_gf;
+ float val_rf,nval_rf,diff_rf;
+ int x,y, do_float = 0;
+
+ val_af = nval_af = diff_af = val_bf = nval_bf = diff_bf = 0;
+ val_gf = nval_gf = diff_gf = val_rf = nval_rf = diff_rf = 0;
+ if (ibuf==NULL) return(0);
+ if (ibuf->rect==NULL) return(ibuf);
+
+ _newrect = MEM_mallocN(newx * ibuf->y * sizeof(int), "scaleupx");
+ if (_newrect==NULL) return(ibuf);
+
+ if (ibuf->rect_float) {
+ do_float = 1;
+ _newrectf = MEM_mallocN(newx * ibuf->y * sizeof(float) * 4, "scaleupxf");
+ if (_newrectf==NULL) return(ibuf);
+ }
- _newrect = (uchar *) malloc(newx * ibuf->y * sizeof(int));
- if (_newrect == 0) return(ibuf);
add = (ibuf->x - 1.001) / (newx - 1.0);
rect = (uchar *) ibuf->rect;
+ rectf = (float *) ibuf->rect_float;
newrect = _newrect;
+ newrectf = _newrectf = NULL;
for (y = ibuf->y; y>0 ; y--){
@@ -456,9 +668,34 @@ static struct ImBuf *scaleupx(struct ImBuf *ibuf, int newx)
val_r += 0.5;
rect += 8;
+
+ if (do_float) {
+ val_af = rectf[0] ;
+ nval_af = rectf[4];
+ diff_af = nval_af - val_af;
+ val_af += 0.5;
+
+ val_bf = rectf[1] ;
+ nval_bf = rectf[5];
+ diff_bf = nval_bf - val_bf;
+ val_bf += 0.5;
+
+ val_gf = rectf[2] ;
+ nval_gf = rectf[6];
+ diff_gf = nval_gf - val_gf;
+ val_gf += 0.5;
+
+ val_rf = rectf[3] ;
+ nval_rf = rectf[7];
+ diff_rf = nval_rf - val_rf;
+ val_rf += 0.5;
+
+ rectf += 8;
+ }
for (x = newx ; x>0 ; x--){
if (sample >= 1.0){
sample -= 1.0;
+
val_a = nval_a ;
nval_a = rect[0] ;
diff_a = nval_a - val_a ;
@@ -479,12 +716,42 @@ static struct ImBuf *scaleupx(struct ImBuf *ibuf, int newx)
diff_r = nval_r - val_r ;
val_r += 0.5;
rect += 4;
+
+ if (do_float) {
+ val_af = nval_af ;
+ nval_af = rectf[0] ;
+ diff_af = nval_af - val_af ;
+ val_af += 0.5;
+
+ val_bf = nval_bf ;
+ nval_bf = rectf[1] ;
+ diff_bf = nval_bf - val_bf ;
+ val_bf += 0.5;
+
+ val_gf = nval_gf ;
+ nval_gf = rectf[2] ;
+ diff_gf = nval_gf - val_gf ;
+ val_gf += 0.5;
+
+ val_rf = nval_rf ;
+ nval_rf = rectf[3] ;
+ diff_rf = nval_rf - val_rf;
+ val_rf += 0.5;
+ rectf += 4;
+ }
}
newrect[0] = val_a + sample * diff_a;
newrect[1] = val_b + sample * diff_b;
newrect[2] = val_g + sample * diff_g;
newrect[3] = val_r + sample * diff_r;
newrect += 4;
+ if (do_float) {
+ newrectf[0] = val_af + sample * diff_af;
+ newrectf[1] = val_bf + sample * diff_bf;
+ newrectf[2] = val_gf + sample * diff_gf;
+ newrectf[3] = val_rf + sample * diff_rf;
+ newrectf += 4;
+ }
sample += add;
}
}
@@ -492,6 +759,13 @@ static struct ImBuf *scaleupx(struct ImBuf *ibuf, int newx)
imb_freerectImBuf(ibuf);
ibuf->mall |= IB_rect;
ibuf->rect = (unsigned int *) _newrect;
+
+ if (do_float) {
+ imb_freerectfloatImBuf(ibuf);
+ ibuf->mall |= IB_rectfloat;
+ ibuf->rect_float = (float *) _newrectf;
+ }
+
ibuf->x = newx;
return(ibuf);
}
@@ -500,24 +774,44 @@ static struct ImBuf *scaleupx(struct ImBuf *ibuf, int newx)
static struct ImBuf *scaleupy(struct ImBuf *ibuf, int newy)
{
uchar *rect,*_newrect,*newrect;
- float sample,add,val,nval,diff;
- int x,y,i,skipx;
+ float *rectf = NULL, *newrectf = NULL, *_newrectf = NULL;
+ float sample,add,val,nval,diff, valf=0.0f, nvalf=0.0f, difff=0.0f;
+ int x,y,i,skipx, do_float = 0;
- if (ibuf == 0) return(0);
- if (ibuf->rect == 0) return(ibuf);
+ if (ibuf==NULL) return(0);
+ if (ibuf->rect==NULL) return(ibuf);
- _newrect = (uchar *)malloc(newy * ibuf->x * sizeof(int));
- if (_newrect == 0) return(ibuf);
+ _newrect = MEM_mallocN(newy * ibuf->x * sizeof(int), "scaleupy");
+ if (_newrect==NULL) return(ibuf);
+ if (ibuf->rect_float) {
+ do_float = 1;
+ _newrectf = MEM_mallocN(newy * ibuf->y * sizeof(float) * 4, "scaleupyf");
+ if (_newrectf==NULL) return(ibuf);
+ }
+
add = (ibuf->y - 1.001) / (newy - 1.0);
skipx = 4 * ibuf->x;
/* all four components, rgba/abgr */
for(i=3 ; i>=0 ; i--){
for (x = skipx - 4; x >= 0 ; x -= 4){
+
rect = (uchar *) ibuf->rect;
rect += i + x;
newrect = _newrect + i + x;
+
+ if (do_float) {
+ rectf = ibuf->rect_float;
+ rectf += i * x;
+ newrectf = _newrectf + i + x;
+ valf = *rectf;
+ rectf += skipx;
+ nvalf = *rectf;
+ rectf += skipx;
+ difff = nvalf - valf;
+ valf += 0.5;
+ }
sample = 0;
val = *rect ;
@@ -535,9 +829,22 @@ static struct ImBuf *scaleupy(struct ImBuf *ibuf, int newy)
rect += skipx;
diff = nval - val;
val += 0.5;
+
+ if (do_float) {
+ valf = nvalf;
+ nvalf = *rectf;
+ rectf += skipx;
+ difff = nvalf - valf;
+ valf += 0.5;
+ }
}
*newrect = val + sample * diff;
newrect += skipx;
+
+ if (do_float) {
+ *newrectf = valf + sample * difff;
+ newrectf += skipx;
+ }
sample += add;
}
}
@@ -546,20 +853,28 @@ static struct ImBuf *scaleupy(struct ImBuf *ibuf, int newy)
imb_freerectImBuf(ibuf);
ibuf->mall |= IB_rect;
ibuf->rect = (unsigned int *) _newrect;
+
+ if(do_float) {
+ imb_freerectfloatImBuf(ibuf);
+ ibuf->mall |= IB_rectfloat;
+ ibuf->rect_float = _newrectf;
+ }
+
ibuf->y = newy;
return(ibuf);
}
+/* no float buf needed here! */
static void scalefast_Z_ImBuf(ImBuf *ibuf, short newx, short newy)
{
- unsigned int *rect,*_newrect,*newrect;
- int x,y;
- int ofsx,ofsy,stepx,stepy;
+ unsigned int *rect, *_newrect, *newrect;
+ int x, y;
+ int ofsx, ofsy, stepx, stepy;
if (ibuf->zbuf) {
- _newrect = malloc(newx * newy * sizeof(int));
- if (_newrect == 0) return;
-
+ _newrect = MEM_mallocN(newx * newy * sizeof(int), "z rect");
+ if (_newrect==NULL) return;
+
stepx = (65536.0 * (ibuf->x - 1.0) / (newx - 1.0)) + 0.5;
stepy = (65536.0 * (ibuf->y - 1.0) / (newy - 1.0)) + 0.5;
ofsy = 32768;
@@ -585,8 +900,8 @@ static void scalefast_Z_ImBuf(ImBuf *ibuf, short newx, short newy)
struct ImBuf *IMB_scaleImBuf(struct ImBuf * ibuf, short newx, short newy)
{
- if (ibuf == 0) return (0);
- if (ibuf->rect == 0) return (ibuf);
+ if (ibuf==NULL) return (0);
+ if (ibuf->rect==NULL) return (ibuf);
// scaleup / scaledown functions below change ibuf->x and ibuf->y
// so we first scale the Z-buffer (if any)
@@ -604,18 +919,28 @@ struct ImBuf *IMB_scaleImBuf(struct ImBuf * ibuf, short newx, short newy)
struct ImBuf *IMB_scalefastImBuf(struct ImBuf *ibuf, short newx, short newy)
{
unsigned int *rect,*_newrect,*newrect;
- int x,y;
+ float *rectf,*_newrectf,*newrectf;
+ int x,y, do_float=0;
int ofsx,ofsy,stepx,stepy;
- if (ibuf == 0) return(0);
- if (ibuf->rect == 0) return(ibuf);
+ rectf = NULL; _newrectf = NULL; newrectf = NULL;
- if (newx == ibuf->x && newy == ibuf->y) return(ibuf);
+ if (ibuf==NULL) return(0);
+ if (ibuf->rect==NULL) return(ibuf);
+ if (ibuf->rect_float) do_float = 1;
- _newrect = malloc(newx * newy * sizeof(int));
- if (_newrect == 0) return(ibuf);
+ if (newx == ibuf->x && newy == ibuf->y) return(ibuf);
+ _newrect = MEM_mallocN(newx * newy * sizeof(int), "scalefastimbuf");
+ if (_newrect==NULL) return(ibuf);
newrect = _newrect;
+
+ if (do_float) {
+ _newrectf = MEM_mallocN(newx * newy * sizeof(float) * 4, "scalefastimbuf f");
+ if (_newrectf==NULL) return(ibuf);
+ newrectf = _newrectf;
+ }
+
stepx = (65536.0 * (ibuf->x - 1.0) / (newx - 1.0)) + 0.5;
stepy = (65536.0 * (ibuf->y - 1.0) / (newy - 1.0)) + 0.5;
ofsy = 32768;
@@ -623,10 +948,16 @@ struct ImBuf *IMB_scalefastImBuf(struct ImBuf *ibuf, short newx, short newy)
for (y = newy; y > 0 ; y--){
rect = ibuf->rect;
rect += (ofsy >> 16) * ibuf->x;
+ if (do_float) {
+ rectf = ibuf->rect_float;
+ rectf += (ofsy >> 16) * ibuf->x;
+ }
ofsy += stepy;
ofsx = 32768;
+
for (x = newx ; x>0 ; x--){
*newrect++ = rect[ofsx >> 16];
+ if (do_float) *newrectf++ = rectf[ofsx >> 16];
ofsx += stepx;
}
}
@@ -635,6 +966,12 @@ struct ImBuf *IMB_scalefastImBuf(struct ImBuf *ibuf, short newx, short newy)
ibuf->mall |= IB_rect;
ibuf->rect = _newrect;
+ if (do_float) {
+ imb_freerectfloatImBuf(ibuf);
+ ibuf->mall |= IB_rectfloat;
+ ibuf->rect_float = _newrectf;
+ }
+
scalefast_Z_ImBuf(ibuf, newx, newy);
ibuf->x = newx;
@@ -646,33 +983,34 @@ struct ImBuf *IMB_scalefastImBuf(struct ImBuf *ibuf, short newx, short newy)
static struct ImBuf *generic_fieldscale(struct ImBuf *ibuf, short newx, short newy, struct ImBuf *(*scalefunc)(ImBuf *, short, short) )
{
struct ImBuf *sbuf1, *sbuf2;
-/* extern void rectcpy(); */
- sbuf1 = IMB_allocImBuf(ibuf->x, ibuf->y / 2, ibuf->depth, IB_rect, 0);
- sbuf2 = IMB_allocImBuf(ibuf->x, ibuf->y / 2, ibuf->depth, IB_rect, 0);
+ sbuf1 = IMB_allocImBuf(ibuf->x, ibuf->y / 2, ibuf->depth, ibuf->flags, 0);
+ sbuf2 = IMB_allocImBuf(ibuf->x, ibuf->y / 2, ibuf->depth, ibuf->flags, 0);
ibuf->x *= 2;
+
/* more args needed, 0 assumed... (nzc) */
-/* rectop(sbuf1, ibuf, 0, 0, 0, 0, 32767, 32767, rectcpy); */
-/* rectop(sbuf2, ibuf, 0, 0, sbuf2->x, 0, 32767, 32767, rectcpy); */
- IMB_rectop(sbuf1, ibuf, 0, 0, 0, 0, 32767, 32767, IMB_rectcpy, 0);
- IMB_rectop(sbuf2, ibuf, 0, 0, sbuf2->x, 0, 32767, 32767, IMB_rectcpy, 0);
+ IMB_rectcpy(sbuf1, ibuf, 0, 0, 0, 0, ibuf->x, ibuf->y);
+ IMB_rectcpy(sbuf2, ibuf, 0, 0, sbuf2->x, 0, ibuf->x, ibuf->y);
imb_freerectImBuf(ibuf);
+ imb_freerectfloatImBuf(ibuf);
+
ibuf->x = newx;
ibuf->y = newy;
- imb_addrectImBuf(ibuf);
+ imb_addrectImBuf(ibuf);
+ if(ibuf->flags & IB_rectfloat)
+ imb_addrectfloatImBuf(ibuf);
+
scalefunc(sbuf1, newx, newy / 2);
scalefunc(sbuf2, newx, newy / 2);
ibuf->x *= 2;
/* more args needed, 0 assumed... (nzc) */
-/* rectop(ibuf, sbuf1, 0, 0, 0, 0, 32767, 32767, rectcpy); */
-/* rectop(ibuf, sbuf2, sbuf2->x, 0, 0, 0, 32767, 32767, rectcpy); */
- IMB_rectop(ibuf, sbuf1, 0, 0, 0, 0, 32767, 32767, IMB_rectcpy, 0);
- IMB_rectop(ibuf, sbuf2, sbuf2->x, 0, 0, 0, 32767, 32767, IMB_rectcpy, 0);
+ IMB_rectcpy(ibuf, sbuf1, 0, 0, 0, 0, sbuf1->x, sbuf1->y);
+ IMB_rectcpy(ibuf, sbuf2, sbuf2->x, 0, 0, 0, sbuf2->x, sbuf2->y);
ibuf->x /= 2;
@@ -683,9 +1021,7 @@ static struct ImBuf *generic_fieldscale(struct ImBuf *ibuf, short newx, short ne
}
-struct ImBuf *IMB_scalefastfieldImBuf(struct ImBuf *ibuf,
- short newx,
- short newy)
+struct ImBuf *IMB_scalefastfieldImBuf(struct ImBuf *ibuf, short newx, short newy)
{
return(generic_fieldscale(ibuf, newx, newy, IMB_scalefastImBuf));
}
@@ -694,3 +1030,4 @@ struct ImBuf *IMB_scalefieldImBuf(struct ImBuf *ibuf, short newx, short newy)
{
return(generic_fieldscale(ibuf, newx, newy, IMB_scaleImBuf));
}
+
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-20 22:29:46 +0300