X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ffileexr.C;h=351da2a3acd4dacf4da3c5f591fe2fc89c610d58;hb=17061ff8d289bfa96bef2da5bac789762f631d4a;hp=a62b1b3c6dbc2f6ef4530080cc3324f11b3620b6;hpb=49f85559268fc040fe7ba5611cc0520793cf728b;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/cinelerra/fileexr.C b/cinelerra-5.1/cinelerra/fileexr.C index a62b1b3c..351da2a3 100644 --- a/cinelerra-5.1/cinelerra/fileexr.C +++ b/cinelerra-5.1/cinelerra/fileexr.C @@ -19,6 +19,8 @@ * */ +#ifdef HAVE_OPENEXR + #include "asset.h" #include "bcsignals.h" #include "clip.h" @@ -242,10 +244,8 @@ int FileEXR::check_sig(Asset *asset, char *test) } 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) { @@ -466,12 +466,8 @@ int FileEXR::write_frame(VFrame *frame, VFrame *data, FrameWriterUnit *unit) 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 */ @@ -662,3 +658,4 @@ int EXRCompressionItem::handle_event() return 0; } +#endif