Merge branch 'dev' into metadata-exiv2
This commit is contained in:
@@ -22,6 +22,7 @@
|
||||
#include <string>
|
||||
|
||||
#include <glibmm/ustring.h>
|
||||
#include <glibmm/datetime.h>
|
||||
|
||||
#include "cacheimagedata.h"
|
||||
#include "threadutils.h"
|
||||
@@ -73,6 +74,7 @@ class Thumbnail
|
||||
// exif & date/time strings
|
||||
Glib::ustring exifString;
|
||||
Glib::ustring dateTimeString;
|
||||
Glib::DateTime dateTime;
|
||||
|
||||
bool initial_;
|
||||
|
||||
@@ -83,7 +85,6 @@ class Thumbnail
|
||||
void _saveThumbnail ();
|
||||
void _generateThumbnailImage ();
|
||||
int infoFromImage (const Glib::ustring& fname);
|
||||
void loadThumbnail (bool firstTrial = true);
|
||||
void generateExifDateTimeStrings ();
|
||||
|
||||
Glib::ustring getCacheFileName (const Glib::ustring& subdir, const Glib::ustring& fext) const;
|
||||
@@ -123,25 +124,26 @@ public:
|
||||
rtengine::IImage8* upgradeThumbImage (const rtengine::procparams::ProcParams& pparams, int h, double& scale);
|
||||
void getThumbnailSize (int &w, int &h, const rtengine::procparams::ProcParams *pparams = nullptr);
|
||||
void getFinalSize (const rtengine::procparams::ProcParams& pparams, int& w, int& h);
|
||||
void getOriginalSize (int& w, int& h);
|
||||
void getOriginalSize (int& w, int& h) const;
|
||||
|
||||
const Glib::ustring& getExifString () const;
|
||||
const Glib::ustring& getDateTimeString () const;
|
||||
const Glib::DateTime& getDateTime () const;
|
||||
void getCamWB (double& temp, double& green) const;
|
||||
void getAutoWB (double& temp, double& green, double equal, double tempBias);
|
||||
void getSpotWB (int x, int y, int rect, double& temp, double& green);
|
||||
void applyAutoExp (rtengine::procparams::ProcParams& pparams);
|
||||
|
||||
ThFileType getType ();
|
||||
ThFileType getType () const;
|
||||
Glib::ustring getFileName () const
|
||||
{
|
||||
return fname;
|
||||
}
|
||||
void setFileName (const Glib::ustring &fn);
|
||||
|
||||
bool isSupported ();
|
||||
bool isSupported () const;
|
||||
|
||||
const CacheImageData* getCacheImageData();
|
||||
const CacheImageData* getCacheImageData() const;
|
||||
std::string getMD5 () const;
|
||||
|
||||
int getRank () const;
|
||||
|
Reference in New Issue
Block a user