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

35
rtgui/cacheimagedata.h
View File

@@ -21,9 +21,10 @@
#include <glibmm.h>
#include "options.h"
#include "../rtengine/rtengine.h"
#include "../rtengine/imageformat.h"
class CacheImageData
class CacheImageData: public rtengine::FramesMetaData
{
public:
@@ -47,6 +48,7 @@ public:
char sec;
// exif info
bool exifValid;
unsigned short frameCount;
double fnumber;
double shutter;
double focalLen, focalLen35mm;
@@ -80,9 +82,32 @@ public:
int load (const Glib::ustring& fname);
int save (const Glib::ustring& fname);
Glib::ustring getCamera() const
{
return Glib::ustring(camMake + " " + camModel);
}
//-------------------------------------------------------------------------
// FramesMetaData interface
//-------------------------------------------------------------------------
unsigned int getRootCount () const { return -1; }
unsigned int getFrameCount () const { return frameCount; }
bool hasExif (unsigned int frame = 0) const { return false; }
rtexif::TagDirectory* getRootExifData (unsigned int root = 0) const { return nullptr; }
rtexif::TagDirectory* getFrameExifData (unsigned int frame = 0) const { return nullptr; }
bool hasIPTC (unsigned int frame = 0) const { return false; }
rtengine::procparams::IPTCPairs getIPTCData (unsigned int frame = 0) const { return rtengine::procparams::IPTCPairs(); }
tm getDateTime (unsigned int frame = 0) const { return tm{}; }
time_t getDateTimeAsTS(unsigned int frame = 0) const { return time_t(-1); }
int getISOSpeed (unsigned int frame = 0) const { return iso; }
double getFNumber (unsigned int frame = 0) const { return fnumber; }
double getFocalLen (unsigned int frame = 0) const { return focalLen; }
double getFocalLen35mm (unsigned int frame = 0) const { return focalLen35mm; }
float getFocusDist (unsigned int frame = 0) const { return focusDist; }
double getShutterSpeed (unsigned int frame = 0) const { return shutter; }
double getExpComp (unsigned int frame = 0) const { return atof(expcomp.c_str()); }
std::string getMake (unsigned int frame = 0) const { return camMake; }
std::string getModel (unsigned int frame = 0) const { return camModel; }
std::string getLens (unsigned int frame = 0) const { return lens; }
std::string getOrientation (unsigned int frame = 0) const { return ""; } // TODO
bool getPixelShift (unsigned int frame = 0) const { return isPixelShift; }
bool getHDR (unsigned int frame = 0) const { return isHDR; }
rtengine::IIOSampleFormat getSampleFormat (unsigned int frame = 0) const { return sampleFormat; }
};
#endif