From 7dd598d9b7acc3b52a867351aa36e3d9d077a956 Mon Sep 17 00:00:00 2001
From: Alberto Griggio <agriggio@users.noreply.github.com>
Date: Wed, 31 Jan 2018 21:24:56 +0100
Subject: [PATCH] bug fixes by heckflosse

---
 rtengine/histmatching.cc | 2 +-
 rtengine/rtthumbnail.cc  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/rtengine/histmatching.cc b/rtengine/histmatching.cc
index e326a3f7d..aaeada81a 100644
--- a/rtengine/histmatching.cc
+++ b/rtengine/histmatching.cc
@@ -213,7 +213,7 @@ void RawImageSource::getAutoMatchedToneCurve(std::vector<double> &outCurve)
             histMatchingCache = outCurve;
             return;
         }
-        skip = LIM(5, skip * fh / h, 10); // adjust the skip factor -- the larger the thumbnail, the less we should skip to get a good match
+        skip = LIM(skip * fh / h, 6, 10); // adjust the skip factor -- the larger the thumbnail, the less we should skip to get a good match
         source.reset(thumb->quickProcessImage(neutral, fh / skip, TI_Nearest));
 
         if (settings->verbose) {
diff --git a/rtengine/rtthumbnail.cc b/rtengine/rtthumbnail.cc
index 2dcb6b9e0..5318c5eaa 100644
--- a/rtengine/rtthumbnail.cc
+++ b/rtengine/rtthumbnail.cc
@@ -466,8 +466,8 @@ Thumbnail* Thumbnail::loadFromRaw (const Glib::ustring& fname, RawMetaDataLocati
         skip--;
     }
 
-    if (skip < 1) {
-        skip = 1;
+    if (skip < 2) {
+        skip = 2;
     }
 
     int hskip = skip, vskip = skip;