Merge branch 'dev' into browser-preview-applied-pparams

This commit is contained in:
Lawrence Lee
2023-08-29 22:58:51 -07:00
188 changed files with 12449 additions and 21671 deletions

View File

@@ -84,16 +84,21 @@ class Thumbnail
void _loadThumbnail (bool firstTrial = true);
void _saveThumbnail ();
void _generateThumbnailImage ();
int infoFromImage (const Glib::ustring& fname, std::unique_ptr<rtengine::RawMetaDataLocation> rml = nullptr);
int infoFromImage (const Glib::ustring& fname);
void generateExifDateTimeStrings ();
Glib::ustring getCacheFileName (const Glib::ustring& subdir, const Glib::ustring& fext) const;
void saveMetadata();
public:
Thumbnail (CacheManager* cm, const Glib::ustring& fname, CacheImageData* cf);
Thumbnail (CacheManager* cm, const Glib::ustring& fname, const std::string& md5);
Thumbnail (CacheManager* cm, const Glib::ustring& fname, const std::string& md5, const std::string &xmpSidecarMd5);
~Thumbnail ();
static int infoFromImage(const Glib::ustring &fname, CacheImageData &cfs);
static Glib::ustring xmpSidecarPath(const Glib::ustring &imagePath);
bool hasProcParams () const;
const rtengine::procparams::ProcParams& getProcParams ();
const rtengine::procparams::ProcParams& getProcParamsU (); // Unprotected version