projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add bound test to dragchkbox
[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 ca0c879f91b332603b4a91faea18594281a500da..351da2a3acd4dacf4da3c5f591fe2fc89c610d58 100644
(file)
--- a/
cinelerra-5.1/cinelerra/fileexr.C
+++ b/
cinelerra-5.1/cinelerra/fileexr.C
@@
-244,10
+244,8
@@
int FileEXR::check_sig(Asset *asset, char *test)
}
void FileEXR::get_parameters(BC_WindowBase *parent_window,
}
void FileEXR::get_parameters(BC_WindowBase *parent_window,
- Asset *asset,
- BC_WindowBase* &format_window,
- int audio_options,
- int video_options)
+ Asset *asset, BC_WindowBase* &format_window,
+ int audio_options, int video_options, EDL *edl)
{
if(video_options)
{
{
if(video_options)
{
@@
-468,12
+466,8
@@
int FileEXR::write_frame(VFrame *frame, VFrame *data, FrameWriterUnit *unit)
if(frame->get_color_model() != native_cmodel)
{
if(frame->get_color_model() != native_cmodel)
{
- if(!exr_unit->temp_frame) exr_unit->temp_frame = new VFrame(0,
- -1,
- asset->width,
- asset->height,
- native_cmodel,
- -1);
+ if(!exr_unit->temp_frame) exr_unit->temp_frame =
+ new VFrame(asset->width, asset->height, native_cmodel, 0);
BC_CModels::transfer(exr_unit->temp_frame->get_rows(), /* Leave NULL if non existent */
frame->get_rows(),
exr_unit->temp_frame->get_y(), /* Leave NULL if non existent */
BC_CModels::transfer(exr_unit->temp_frame->get_rows(), /* Leave NULL if non existent */
frame->get_rows(),
exr_unit->temp_frame->get_y(), /* Leave NULL if non existent */