projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge hv v6, rework trace methods
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
fileexr.C
diff --git
a/cinelerra-5.1/cinelerra/fileexr.C
b/cinelerra-5.1/cinelerra/fileexr.C
index 1beb3a7c6b9b7293da1c7ba283a480c533366f1a..a62b1b3c6dbc2f6ef4530080cc3324f11b3620b6 100644
(file)
--- a/
cinelerra-5.1/cinelerra/fileexr.C
+++ b/
cinelerra-5.1/cinelerra/fileexr.C
@@
-305,7
+305,7
@@
int FileEXR::read_frame_header(char *path)
asset->width = dw.max.x - dw.min.x + 1;
asset->height = dw.max.y - dw.min.y + 1;
asset->width = dw.max.x - dw.min.x + 1;
asset->height = dw.max.y - dw.min.y + 1;
- asset->interlace_mode =
BC_
ILACE_MODE_NOTINTERLACED;
+ asset->interlace_mode = ILACE_MODE_NOTINTERLACED;
const Imf::ChannelList &channels = file.header().channels();
const Imf::ChannelList &channels = file.header().channels();
@@
-313,6
+313,7
@@
int FileEXR::read_frame_header(char *path)
native_cmodel = BC_RGBA_FLOAT;
else
native_cmodel = BC_RGB_FLOAT;
native_cmodel = BC_RGBA_FLOAT;
else
native_cmodel = BC_RGB_FLOAT;
+ asset->exr_use_alpha = BC_CModels::has_alpha(native_cmodel) ? 1 : 0;
if(channels.findChannel("Y"))
is_yuv = 1;
if(channels.findChannel("Y"))
is_yuv = 1;