From f6809f3e5e30eab87b32a9593892866bc29e7359 Mon Sep 17 00:00:00 2001 From: Konstantin Dmitriev Date: Nov 14 2019 07:38:52 +0000 Subject: Remove try/catch statements, not needed after 0589a7d --- diff --git a/synfig-studio/src/gui/workarearenderer/renderer_timecode.cpp b/synfig-studio/src/gui/workarearenderer/renderer_timecode.cpp index 2489d53..88b1883 100644 --- a/synfig-studio/src/gui/workarearenderer/renderer_timecode.cpp +++ b/synfig-studio/src/gui/workarearenderer/renderer_timecode.cpp @@ -99,29 +99,18 @@ Renderer_Timecode::render_vfunc( { Glib::RefPtr layout(Pango::Layout::create(get_work_area()->get_pango_context())); - try - { - int w, h; - KeyframeList::iterator iter; - //layout->set_text(canvas->keyframe_list().find(cur_time)->get_description()); - if (canvas->keyframe_list().find(cur_time, iter)) { - layout->set_text(iter->get_description()); - } else { - get_work_area()->timecode_width = get_work_area()->timecode_height = 0; - return; - } - layout->get_size(w, h); - get_work_area()->timecode_width = int(w*1.0/Pango::SCALE); - get_work_area()->timecode_height = int(h*1.0/Pango::SCALE); - } - catch (const synfig::Exception::NotFound&) - { + int w, h; + KeyframeList::iterator iter; + //layout->set_text(canvas->keyframe_list().find(cur_time)->get_description()); + if (canvas->keyframe_list().find(cur_time, iter)) { + layout->set_text(iter->get_description()); + } else { get_work_area()->timecode_width = get_work_area()->timecode_height = 0; return; } - catch (...) { - assert(0); - } + layout->get_size(w, h); + get_work_area()->timecode_width = int(w*1.0/Pango::SCALE); + get_work_area()->timecode_height = int(h*1.0/Pango::SCALE); cr->save(); diff --git a/synfig-studio/src/synfigapp/canvasinterface.cpp b/synfig-studio/src/synfigapp/canvasinterface.cpp index 372f8d0..07e19b5 100644 --- a/synfig-studio/src/synfigapp/canvasinterface.cpp +++ b/synfig-studio/src/synfigapp/canvasinterface.cpp @@ -657,20 +657,15 @@ void CanvasInterface::jump_to_next_keyframe() { synfig::info("Current time: %s",get_time().get_string().c_str()); - try - { - KeyframeList::iterator iter; - if (get_canvas()->keyframe_list().find_next(get_time(), iter)) { - synfig::Keyframe keyframe(*iter); - synfig::info("Jumping to keyframe \"%s\" at %s",keyframe.get_description().c_str(),keyframe.get_time().get_string().c_str()); - set_time(keyframe.get_time()); - } - else { - synfig::warning("Unable to find next keyframe"); - } - //synfig::Keyframe keyframe(*get_canvas()->keyframe_list().find_next(get_time())); + KeyframeList::iterator iter; + if (get_canvas()->keyframe_list().find_next(get_time(), iter)) { + synfig::Keyframe keyframe(*iter); + synfig::info("Jumping to keyframe \"%s\" at %s",keyframe.get_description().c_str(),keyframe.get_time().get_string().c_str()); + set_time(keyframe.get_time()); + } + else { + synfig::warning("Unable to find next keyframe"); } - catch(...) { synfig::warning("Unable to find next keyframe"); } } void