Formatted all .cc and .h code in rtengine, rtexif and rtgui using astyle
This commit is contained in:
DrSlony
156
rtengine/lcp.h
156
rtengine/lcp.h
@@ -7,7 +7,7 @@
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
*
|
||||
* RawTherapee is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
@@ -28,105 +28,111 @@
|
||||
#include <string>
|
||||
#include <expat.h>
|
||||
|
||||
namespace rtengine {
|
||||
// Perspective model common data, also used for Vignette and Fisheye
|
||||
class LCPModelCommon {
|
||||
public:
|
||||
float focLenX, focLenY, imgXCenter, imgYCenter;
|
||||
float param[5]; // k1..k5, resp. alpha1..5
|
||||
float scaleFac; // alpha0
|
||||
double meanErr;
|
||||
bool badErr;
|
||||
namespace rtengine
|
||||
{
|
||||
// Perspective model common data, also used for Vignette and Fisheye
|
||||
class LCPModelCommon
|
||||
{
|
||||
public:
|
||||
float focLenX, focLenY, imgXCenter, imgYCenter;
|
||||
float param[5]; // k1..k5, resp. alpha1..5
|
||||
float scaleFac; // alpha0
|
||||
double meanErr;
|
||||
bool badErr;
|
||||
|
||||
double x0,y0,fx,fy; // prepared params
|
||||
double x0, y0, fx, fy; // prepared params
|
||||
|
||||
LCPModelCommon();
|
||||
bool empty() const; // is it empty
|
||||
void print() const; // printf all values
|
||||
void merge(const LCPModelCommon& a, const LCPModelCommon& b, float facA);
|
||||
void prepareParams(int fullWidth, int fullHeight, float focalLength, float focalLength35mm, float sensorFormatFactor, bool swapXY, bool mirrorX, bool mirrorY);
|
||||
};
|
||||
LCPModelCommon();
|
||||
bool empty() const; // is it empty
|
||||
void print() const; // printf all values
|
||||
void merge(const LCPModelCommon& a, const LCPModelCommon& b, float facA);
|
||||
void prepareParams(int fullWidth, int fullHeight, float focalLength, float focalLength35mm, float sensorFormatFactor, bool swapXY, bool mirrorX, bool mirrorY);
|
||||
};
|
||||
|
||||
class LCPPersModel {
|
||||
public:
|
||||
float focLen, focDist, aperture; // this is what it refers to
|
||||
class LCPPersModel
|
||||
{
|
||||
public:
|
||||
float focLen, focDist, aperture; // this is what it refers to
|
||||
|
||||
LCPModelCommon base; // base perspective correction
|
||||
LCPModelCommon chromRG, chromG, chromBG; // red/green, green, blue/green (may be empty)
|
||||
LCPModelCommon vignette; // vignette (may be empty)
|
||||
LCPModelCommon base; // base perspective correction
|
||||
LCPModelCommon chromRG, chromG, chromBG; // red/green, green, blue/green (may be empty)
|
||||
LCPModelCommon vignette; // vignette (may be empty)
|
||||
|
||||
LCPPersModel();
|
||||
bool hasModeData(int mode) const;
|
||||
void print() const;
|
||||
};
|
||||
LCPPersModel();
|
||||
bool hasModeData(int mode) const;
|
||||
void print() const;
|
||||
};
|
||||
|
||||
|
||||
class LCPProfile {
|
||||
// Temporary data for parsing
|
||||
bool inCamProfiles,firstLIDone,inPerspect,inAlternateLensID,inAlternateLensNames;
|
||||
char lastTag[256],inInvalidTag[256];
|
||||
LCPPersModel* pCurPersModel;
|
||||
LCPModelCommon* pCurCommon;
|
||||
class LCPProfile
|
||||
{
|
||||
// Temporary data for parsing
|
||||
bool inCamProfiles, firstLIDone, inPerspect, inAlternateLensID, inAlternateLensNames;
|
||||
char lastTag[256], inInvalidTag[256];
|
||||
LCPPersModel* pCurPersModel;
|
||||
LCPModelCommon* pCurCommon;
|
||||
|
||||
static void XMLCALL XmlStartHandler(void *pLCPProfile, const char *el, const char **attr);
|
||||
static void XMLCALL XmlTextHandler (void *pLCPProfile, const XML_Char *s, int len);
|
||||
static void XMLCALL XmlEndHandler (void *pLCPProfile, const char *el);
|
||||
static void XMLCALL XmlStartHandler(void *pLCPProfile, const char *el, const char **attr);
|
||||
static void XMLCALL XmlTextHandler (void *pLCPProfile, const XML_Char *s, int len);
|
||||
static void XMLCALL XmlEndHandler (void *pLCPProfile, const char *el);
|
||||
|
||||
int filterBadFrames(double maxAvgDevFac, int minFramesLeft);
|
||||
int filterBadFrames(double maxAvgDevFac, int minFramesLeft);
|
||||
|
||||
public:
|
||||
// Common data
|
||||
Glib::ustring profileName, lensPrettyName, cameraPrettyName, lens, camera; // lens/camera(=model) can be auto-matched with DNG
|
||||
bool isRaw,isFisheye;
|
||||
float sensorFormatFactor;
|
||||
int persModelCount;
|
||||
public:
|
||||
// Common data
|
||||
Glib::ustring profileName, lensPrettyName, cameraPrettyName, lens, camera; // lens/camera(=model) can be auto-matched with DNG
|
||||
bool isRaw, isFisheye;
|
||||
float sensorFormatFactor;
|
||||
int persModelCount;
|
||||
|
||||
// The correction frames
|
||||
static const int MaxPersModelCount=3000;
|
||||
LCPPersModel* aPersModel[MaxPersModelCount]; // Do NOT use std::list or something, it's buggy in GCC!
|
||||
// The correction frames
|
||||
static const int MaxPersModelCount = 3000;
|
||||
LCPPersModel* aPersModel[MaxPersModelCount]; // Do NOT use std::list or something, it's buggy in GCC!
|
||||
|
||||
LCPProfile(Glib::ustring fname);
|
||||
LCPProfile(Glib::ustring fname);
|
||||
|
||||
void calcParams(int mode, float focalLength, float focusDist, float aperture, LCPModelCommon *pCorr1, LCPModelCommon *pCorr2, LCPModelCommon *pCorr3) const; // Interpolates between the persModels frames
|
||||
void calcParams(int mode, float focalLength, float focusDist, float aperture, LCPModelCommon *pCorr1, LCPModelCommon *pCorr2, LCPModelCommon *pCorr3) const; // Interpolates between the persModels frames
|
||||
|
||||
void print() const;
|
||||
};
|
||||
void print() const;
|
||||
};
|
||||
|
||||
class LCPStore {
|
||||
MyMutex mtx;
|
||||
class LCPStore
|
||||
{
|
||||
MyMutex mtx;
|
||||
|
||||
// Maps file name to profile as cache
|
||||
std::map<Glib::ustring, LCPProfile*> profileCache;
|
||||
// Maps file name to profile as cache
|
||||
std::map<Glib::ustring, LCPProfile*> profileCache;
|
||||
|
||||
public:
|
||||
Glib::ustring getDefaultCommonDirectory() const;
|
||||
bool isValidLCPFileName(Glib::ustring filename) const;
|
||||
LCPProfile* getProfile(Glib::ustring filename);
|
||||
public:
|
||||
Glib::ustring getDefaultCommonDirectory() const;
|
||||
bool isValidLCPFileName(Glib::ustring filename) const;
|
||||
LCPProfile* getProfile(Glib::ustring filename);
|
||||
|
||||
static LCPStore* getInstance();
|
||||
};
|
||||
static LCPStore* getInstance();
|
||||
};
|
||||
|
||||
#define lcpStore LCPStore::getInstance()
|
||||
|
||||
|
||||
// Once precalculated class to correct a point
|
||||
class LCPMapper {
|
||||
// Once precalculated class to correct a point
|
||||
class LCPMapper
|
||||
{
|
||||
|
||||
bool useCADist; // should the distortion in the CA info be used?
|
||||
bool swapXY;
|
||||
LCPModelCommon mc;
|
||||
LCPModelCommon chrom[3]; // in order RedGreen/Green/BlueGreen
|
||||
bool useCADist; // should the distortion in the CA info be used?
|
||||
bool swapXY;
|
||||
LCPModelCommon mc;
|
||||
LCPModelCommon chrom[3]; // in order RedGreen/Green/BlueGreen
|
||||
|
||||
public:
|
||||
bool enableCA; // is the mapper capable if CA correction?
|
||||
public:
|
||||
bool enableCA; // is the mapper capable if CA correction?
|
||||
|
||||
// precalculates the mapper.
|
||||
LCPMapper(LCPProfile* pProf, float focalLength, float focalLength35mm, float focusDist, float aperture, bool vignette, bool useCADistP, int fullWidth, int fullHeight,
|
||||
const CoarseTransformParams& coarse, int rawRotationDeg);
|
||||
// precalculates the mapper.
|
||||
LCPMapper(LCPProfile* pProf, float focalLength, float focalLength35mm, float focusDist, float aperture, bool vignette, bool useCADistP, int fullWidth, int fullHeight,
|
||||
const CoarseTransformParams& coarse, int rawRotationDeg);
|
||||
|
||||
void correctDistortion(double& x, double& y) const; // MUST be the first stage
|
||||
void correctCA(double& x, double& y, int channel) const;
|
||||
float calcVignetteFac (int x, int y) const; // MUST be in RAW
|
||||
};
|
||||
void correctDistortion(double& x, double& y) const; // MUST be the first stage
|
||||
void correctCA(double& x, double& y, int channel) const;
|
||||
float calcVignetteFac (int x, int y) const; // MUST be in RAW
|
||||
};
|
||||
}
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user