diff options
author | Ton Roosendaal <ton@blender.org> | 2006-03-14 20:48:40 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2006-03-14 20:48:40 +0300 |
commit | fe3506f6d409c39f6e9fddcdf4dc94f454cbae1a (patch) | |
tree | 96759c74c170c87cd96df6c6fb2602e1224c850a /source/blender/imbuf | |
parent | e3fb99ad70e1f184953724bc376bad17894f7fa8 (diff) |
WIP commit on getting the 'render result layers' saved in a single
file. Previous fix accidentally committed parts of that... :)
Note: it is currently disabled still... will commit the real version
soon.
Diffstat (limited to 'source/blender/imbuf')
-rw-r--r-- | source/blender/imbuf/intern/openexr/openexr_api.cpp | 6 | ||||
-rw-r--r-- | source/blender/imbuf/intern/scaling.c | 14 |
2 files changed, 11 insertions, 9 deletions
diff --git a/source/blender/imbuf/intern/openexr/openexr_api.cpp b/source/blender/imbuf/intern/openexr/openexr_api.cpp index 6252caa2918..4b5cf64cd49 100644 --- a/source/blender/imbuf/intern/openexr/openexr_api.cpp +++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp @@ -381,7 +381,7 @@ void IMB_exr_add_channel(void *handle, const char *layname, const char *channame } else strncpy(echan->name, channame, 2*CHANMAXNAME); - printf("added channel %s\n", echan->name); + // printf("added channel %s\n", echan->name); BLI_addtail(&data->channels, echan); } @@ -491,7 +491,7 @@ void IMB_exrtile_write_channels(void *handle, int partx, int party) } data->tofile->setFrameBuffer (frameBuffer); - printf("write tile %d %d\n", partx/data->tilex, party/data->tiley); + // printf("write tile %d %d\n", partx/data->tilex, party/data->tiley); data->tofile->writeTile (partx/data->tilex, party/data->tiley); } @@ -522,6 +522,8 @@ void IMB_exr_read_channels(void *handle) if(echan->rect) frameBuffer.insert (echan->name, Slice (FLOAT, (char *)echan->rect, echan->xstride*sizeof(float), echan->ystride*sizeof(float))); + else + printf("warning, channel with no rect set %s\n", echan->name); } data->ifile->setFrameBuffer (frameBuffer); diff --git a/source/blender/imbuf/intern/scaling.c b/source/blender/imbuf/intern/scaling.c index c461381ba10..a21e5c7b592 100644 --- a/source/blender/imbuf/intern/scaling.c +++ b/source/blender/imbuf/intern/scaling.c @@ -466,13 +466,13 @@ static struct ImBuf *scaledownx(struct ImBuf *ibuf, int newx) add = (ibuf->x - 0.001) / newx; - rect = (uchar *) ibuf->rect; - newrect = _newrect; - - if (do_float) { - rectf = ibuf->rect_float; - newrectf = _newrectf; - } + rect = (uchar *) ibuf->rect; + newrect = _newrect; + + if (do_float) { + rectf = ibuf->rect_float; + newrectf = _newrectf; + } for (y = ibuf->y; y>0 ; y--) { sample = 0.0f; |