merge with dev - I hope no error

2018-11-24 14:18:37 +01:00
parent bdc888423b d1571658f8
commit 86c03e61d4
208 changed files with 2982 additions and 2150 deletions
--- a/rtgui/thumbnail.cc
+++ b/rtgui/thumbnail.cc
@@ -619,6 +619,11 @@ void Thumbnail::getFinalSize (const rtengine::procparams::ProcParams& pparams, i
    }
 }

+void Thumbnail::getOriginalSize (int& w, int& h)
+{
+    w = tw;
+    h = th;
+}

 rtengine::IImage8* Thumbnail::processThumbImage (const rtengine::procparams::ProcParams& pparams, int h, double& scale)
 {