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
diff options
context:
space:
mode:
authorTon Roosendaal <ton@blender.org>2006-01-09 03:40:35 +0300
committerTon Roosendaal <ton@blender.org>2006-01-09 03:40:35 +0300
commit014aa7261e29810b35b3d65c759f9d255bf8a277 (patch)
tree360325f8db9431bdd187c0f0e7f7c40dcaa3a073 /source/blender/imbuf/intern/rotate.c
parent104ab9b103ab30ca87ccb9e739a58863fc29d3bf (diff)
Orange branch: OpenEXR finally in Blender!
Credits go to Gernot Ziegler, who originally coded EXR support, and to Austin Benesh for bringing it further. Kent Mein provided a lot of code for integrating float buffers in Blender imbuf and ImBuf API cleanup, and provided Make and Scons and static linking. At this moment; the EXR libraries are a *dependency*, so you cannot get the Orange branch compiled without having OpenEXR installed. Get the (precompiled or sources) stuff from www.openexr.com. Current default is that the headers and lib resides in /user/local/ Several changes/additions/fixes were added: - EXR code only supported 'half' format (16 bits per channel). I've added float writing, but for reading it I need tomorrow. :) - Quite some clumsy copying of data happened in EXR code. - cleaned up the api calls already a bit, preparing for more advanced support - Zbuffers were saved 16 bits, now 32 bits - automatic adding of .exr extensions went wrong Imbuf: - added proper imbuf->flags and imbuf->mall support for float buffers, it was created for *each* imbuf. :) - found bugs for float buffers in scaling and flipping. Code there will need more checks still - imbuf also needs to be verified to behave properly when no 32 bits rect exists (for saving for example) TODO: - support internal float images for textures, backbuf, AO probes, and display in Image window Hope this commit won't screwup syncing with bf-blender... :/
Diffstat (limited to 'source/blender/imbuf/intern/rotate.c')
-rw-r--r--source/blender/imbuf/intern/rotate.c42
1 files changed, 31 insertions, 11 deletions
diff --git a/source/blender/imbuf/intern/rotate.c b/source/blender/imbuf/intern/rotate.c
index f8d01789cdc..13edfbf0a33 100644
--- a/source/blender/imbuf/intern/rotate.c
+++ b/source/blender/imbuf/intern/rotate.c
@@ -43,26 +43,46 @@
void IMB_flipy(struct ImBuf * ibuf)
{
- short x,y,backx;
- unsigned int *top,*bottom,temp;
+ short x, y;
+ unsigned int *top, *bottom, do_float=0, *line;
+ float *topf=NULL, *bottomf=NULL, *linef=NULL;
- if (ibuf == 0) return;
- if (ibuf->rect == 0) return;
+ if (ibuf == NULL) return;
+ if (ibuf->rect == NULL) return;
+
+ if (ibuf->rect_float) do_float =1;
x = ibuf->x;
y = ibuf->y;
- backx = x<<1;
top = ibuf->rect;
bottom = top + ((y-1) * x);
+ line= MEM_mallocN(x*sizeof(int), "linebuf");
+
+ if (do_float) {
+ topf= ibuf->rect_float;
+ bottomf = topf + 4*((y-1) * x);
+ linef= MEM_mallocN(4*x*sizeof(float), "linebuff");
+ }
y >>= 1;
- for(;y>0;y--){
- for(x = ibuf->x; x > 0; x--){
- temp = *top;
- *(top++) = *bottom;
- *(bottom++) = temp;
+ for(;y>0;y--) {
+
+ memcpy(line, top, x*sizeof(int));
+ memcpy(top, bottom, x*sizeof(int));
+ memcpy(bottom, line, x*sizeof(int));
+ bottom -= x;
+ top+= x;
+
+ if(do_float) {
+ memcpy(linef, topf, 4*x*sizeof(float));
+ memcpy(topf, bottomf, 4*x*sizeof(float));
+ memcpy(bottomf, linef, 4*x*sizeof(float));
+ bottomf -= 4*x;
+ topf+= 4*x;
}
- bottom -= backx;
}
+
+ MEM_freeN(line);
+ if(linef) MEM_freeN(linef);
}