liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' into std-mutex

Browse Source
This commit is contained in:
Hombre
2019-12-24 00:24:28 +01:00
parent 55cc71608b 898527732b
commit 808da1b8a3
581 changed files with 18869 additions and 11002 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
rtgui/guiutils.cc
View File

@@ -13,7 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with RawTherapee. If not, see <http://www.gnu.org/licenses/>.
* along with RawTherapee. If not, see <https://www.gnu.org/licenses/>.
*/
#include <cairomm/cairomm.h>
#include "../rtengine/rt_math.h"
@@ -164,16 +164,6 @@ bool removeIfThere (Gtk::Container* cont, Gtk::Widget* w, bool increference)
}
}
void thumbInterp (const unsigned char* src, int sw, int sh, unsigned char* dst, int dw, int dh)
{
if (options.thumbInterp == 0) {
rtengine::nearestInterp (src, sw, sh, dst, dw, dh);
} else if (options.thumbInterp == 1) {
rtengine::bilinearInterp (src, sw, sh, dst, dw, dh);
}
}
bool confirmOverwrite (Gtk::Window& parent, const std::string& filename)
{
bool safe = true;
@@ -903,24 +893,22 @@ bool MyScrolledWindow::on_scroll_event (GdkEventScroll* event)
const double lowerBound = adjust->get_lower();
double value = adjust->get_value();
double step = adjust->get_step_increment();
double value2 = 0.;
if (event->direction == GDK_SCROLL_DOWN) {
value2 = rtengine::min<double>(value + step, upperBound);
const double value2 = rtengine::min<double>(value + step, upperBound);
if (value2 != value) {
scroll->set_value(value2);
}
} else if (event->direction == GDK_SCROLL_UP) {
value2 = rtengine::max<double>(value - step, lowerBound);
const double value2 = rtengine::max<double>(value - step, lowerBound);
if (value2 != value) {
scroll->set_value(value2);
}
} else if (event->direction == GDK_SCROLL_SMOOTH) {
if (abs(event->delta_y) > 0.1) {
value2 = rtengine::LIM<double>(value + (event->delta_y > 0 ? step : -step), lowerBound, upperBound);
}
const double value2 = rtengine::LIM<double>(value + event->delta_y * step, lowerBound, upperBound);
if (value2 != value) {
scroll->set_value(value2);
}