From: Good Guy Date: Mon, 5 Nov 2018 01:10:53 +0000 (-0700) Subject: make kfrm operator= illegal, use copy_from instead X-Git-Tag: 2019-08~187 X-Git-Url: https://cinelerra-gg.org/git/?a=commitdiff_plain;h=5cdeee0e01761c9d53c45ab7d8983f7fb376a487;p=goodguy%2Fcinelerra.git make kfrm operator= illegal, use copy_from instead --- diff --git a/cinelerra-5.1/cinelerra/keyframe.h b/cinelerra-5.1/cinelerra/keyframe.h index 0d2f4804..89edf1f9 100644 --- a/cinelerra-5.1/cinelerra/keyframe.h +++ b/cinelerra-5.1/cinelerra/keyframe.h @@ -34,6 +34,7 @@ class KeyFrame : public Auto { + KeyFrame &operator =(KeyFrame &k) { return k; } //illegal public: KeyFrame(); KeyFrame(EDL *edl, KeyFrames *autos); diff --git a/cinelerra-5.1/cinelerra/pluginset.C b/cinelerra-5.1/cinelerra/pluginset.C index e46fbd32..6805d8ae 100644 --- a/cinelerra-5.1/cinelerra/pluginset.C +++ b/cinelerra-5.1/cinelerra/pluginset.C @@ -517,7 +517,7 @@ int PluginSet::optimize() source; source = (KeyFrame*)source->next) { KeyFrame *dest = new KeyFrame(edl, current_edit->keyframes); - *dest = *source; + dest->copy_from(source); current_edit->keyframes->append(dest); } remove(next_edit);