diff --git a/rtexif/pentaxattribs.cc b/rtexif/pentaxattribs.cc index f41090c82..ab15b73c3 100644 --- a/rtexif/pentaxattribs.cc +++ b/rtexif/pentaxattribs.cc @@ -964,7 +964,9 @@ public: case 2: return "Depth"; case 3: return "MTF"; } + return"Normal"; } + }; PAAFModeInterpreter paAFModeInterpreter; diff --git a/rtgui/shcselector.cc b/rtgui/shcselector.cc index c11b67b10..7dec130d6 100644 --- a/rtgui/shcselector.cc +++ b/rtgui/shcselector.cc @@ -120,6 +120,7 @@ bool SHCSelector::on_expose_event(GdkEventExpose* event) { cr->fill_preserve (); cr->stroke (); } + return true; } bool SHCSelector::on_button_press_event (GdkEventButton* event) { @@ -135,6 +136,7 @@ bool SHCSelector::on_button_press_event (GdkEventButton* event) { break; } queue_draw (); + return true; } bool SHCSelector::on_button_release_event (GdkEventButton* event) { @@ -143,6 +145,7 @@ bool SHCSelector::on_button_release_event (GdkEventButton* event) { movingPosition = -1; queue_draw (); } + return true; } bool SHCSelector::on_motion_notify_event (GdkEventMotion* event) { @@ -163,6 +166,7 @@ bool SHCSelector::on_motion_notify_event (GdkEventMotion* event) { cl->shcChanged (); queue_draw (); } + return true; } void SHCSelector::styleChanged (const Glib::RefPtr& style) { diff --git a/rtgui/thumbimageupdater.cc b/rtgui/thumbimageupdater.cc index cbe7a9121..cbdc6313b 100644 --- a/rtgui/thumbimageupdater.cc +++ b/rtgui/thumbimageupdater.cc @@ -19,7 +19,7 @@ #include #include -#define threadNum 8 +#define threadNum 1 ThumbImageUpdater thumbImageUpdater; ThumbImageUpdater::ThumbImageUpdater () @@ -68,7 +68,7 @@ void ThumbImageUpdater::process () { stopped = false; if(!threadPool) - threadPool = new Glib::ThreadPool(threadNum,0); + threadPool = new Glib::ThreadPool(threadNum,1); //thread = Glib::Thread::create (sigc::mem_fun(*this, &ThumbImageUpdater::process_), (unsigned long int)0, true, true, Glib::THREAD_PRIORITY_NORMAL); process_();