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

Merge branch 'dev' into multiframe-handling, with some merge bugfix

Browse Source
This commit is contained in:
Hombre57
2017-09-17 01:15:51 +02:00
parent ee0bff4124 10a4c5f1de
commit 0905294bda
197 changed files with 11535 additions and 5495 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
rtengine/rtthumbnail.h
View File

@@ -71,8 +71,7 @@ public:
void init ();
IImage8* processImage (const procparams::ProcParams& pparams, int rheight, TypeInterpolation interp, std::string camName,
double focalLen, double focalLen35mm, float focusDist, float shutter, float fnumber, float iso, std::string expcomp_, double& scale);
IImage8* processImage (const procparams::ProcParams& pparams, int rheight, TypeInterpolation interp, const FramesMetaData *metadata, double& scale);
IImage8* quickProcessImage (const procparams::ProcParams& pparams, int rheight, TypeInterpolation interp, double& scale);
int getImageWidth (const procparams::ProcParams& pparams, int rheight, float &ratio);
void getDimensions (int& w, int& h, double& scaleFac);