Merge branch 'dev' into browser-preview-applied-pparams
This commit is contained in:
@@ -24,7 +24,6 @@
|
||||
#include "image8.h"
|
||||
#include "imagefloat.h"
|
||||
#include "LUT.h"
|
||||
#include "rawmetadatalocation.h"
|
||||
|
||||
#include "../rtgui/threadutils.h"
|
||||
|
||||
@@ -86,6 +85,8 @@ class Thumbnail
|
||||
public:
|
||||
|
||||
bool isRaw;
|
||||
int full_width;
|
||||
int full_height;
|
||||
|
||||
~Thumbnail ();
|
||||
Thumbnail ();
|
||||
@@ -97,10 +98,9 @@ public:
|
||||
int getImageWidth (const procparams::ProcParams& pparams, int rheight, float &ratio);
|
||||
void getDimensions (int& w, int& h, double& scaleFac);
|
||||
|
||||
static Thumbnail* loadQuickFromRaw (const Glib::ustring& fname, rtengine::RawMetaDataLocation& rml, eSensorType &sensorType, int &w, int &h, int fixwh, bool rotate, bool inspectorMode = false, bool forHistogramMatching = false);
|
||||
static Thumbnail* loadFromRaw (const Glib::ustring& fname, RawMetaDataLocation& rml, eSensorType &sensorType, int &w, int &h, int fixwh, double wbEq, StandardObserver wbObserver, bool rotate, const RAWParams *rawParams, bool forHistogramMatching = false);
|
||||
static Thumbnail* loadQuickFromRaw (const Glib::ustring& fname, eSensorType &sensorType, int &w, int &h, int fixwh, bool rotate, bool inspectorMode = false, bool forHistogramMatching = false);
|
||||
static Thumbnail* loadFromRaw (const Glib::ustring& fname, eSensorType &sensorType, int &w, int &h, int fixwh, double wbEq, StandardObserver wbObserver, bool rotate, const RAWParams *rawParams, bool forHistogramMatching=false);
|
||||
static Thumbnail* loadFromImage (const Glib::ustring& fname, int &w, int &h, int fixwh, double wbEq, StandardObserver wbObserver, bool inspectorMode = false);
|
||||
static RawMetaDataLocation loadMetaDataFromRaw (const Glib::ustring& fname);
|
||||
|
||||
void getCamWB (double& temp, double& green, StandardObserver observer);
|
||||
void getAutoWB (double& temp, double& green, double equal, double tempBias, StandardObserver observer);
|
||||
|
Reference in New Issue
Block a user