liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cppcheck clean rtgui/thumbnail.*

Browse Source
This commit is contained in:
Ingo Weyrich
2021-05-23 14:35:59 +02:00
parent 36f1300a6b
commit c9e58fea54
2 changed files with 8 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
rtgui/thumbnail.cc
View File

@@ -194,7 +194,7 @@ void Thumbnail::_generateThumbnailImage ()
} }
} }
bool Thumbnail::isSupported () bool Thumbnail::isSupported () const
{ {
return cfs.supported; return cfs.supported;
} }
@@ -655,7 +655,7 @@ void Thumbnail::getFinalSize (const rtengine::procparams::ProcParams& pparams, i
} }
} }
void Thumbnail::getOriginalSize (int& w, int& h) void Thumbnail::getOriginalSize (int& w, int& h) const
{ {
w = tw; w = tw;
h = th; h = th;
@@ -784,7 +784,7 @@ void Thumbnail::getAutoWB (double& temp, double& green, double equal, double tem
} }
ThFileType Thumbnail::getType () ThFileType Thumbnail::getType () const
{ {
return (ThFileType) cfs.format; return (ThFileType) cfs.format;
@@ -909,20 +909,6 @@ void Thumbnail::_loadThumbnail(bool firstTrial)
} }
} }
/*
* Read all thumbnail's data from the cache; build and save them if doesn't exist - MUTEX PROTECTED
* This includes:
* - image's bitmap (*.rtti)
* - auto exposure's histogram (full thumbnail only)
* - embedded profile (full thumbnail only)
* - LiveThumbData section of the data file
*/
void Thumbnail::loadThumbnail (bool firstTrial)
{
MyMutex::MyLock lock(mutex);
_loadThumbnail(firstTrial);
}
/* /*
* Save thumbnail's data to the cache - NON PROTECTED * Save thumbnail's data to the cache - NON PROTECTED
* This includes: * This includes:
@@ -1178,7 +1164,7 @@ void Thumbnail::applyAutoExp (rtengine::procparams::ProcParams& pparams)
} }
} }
const CacheImageData* Thumbnail::getCacheImageData() const CacheImageData* Thumbnail::getCacheImageData() const
{ {
return &cfs; return &cfs;
} }

9
rtgui/thumbnail.h
View File

@@ -83,7 +83,6 @@ class Thumbnail
void _saveThumbnail (); void _saveThumbnail ();
void _generateThumbnailImage (); void _generateThumbnailImage ();
int infoFromImage (const Glib::ustring& fname, std::unique_ptr<rtengine::RawMetaDataLocation> rml = nullptr); int infoFromImage (const Glib::ustring& fname, std::unique_ptr<rtengine::RawMetaDataLocation> rml = nullptr);
void loadThumbnail (bool firstTrial = true);
void generateExifDateTimeStrings (); void generateExifDateTimeStrings ();
Glib::ustring getCacheFileName (const Glib::ustring& subdir, const Glib::ustring& fext) const; Glib::ustring getCacheFileName (const Glib::ustring& subdir, const Glib::ustring& fext) const;
@@ -121,7 +120,7 @@ public:
rtengine::IImage8* upgradeThumbImage (const rtengine::procparams::ProcParams& pparams, int h, double& scale); 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 getThumbnailSize (int &w, int &h, const rtengine::procparams::ProcParams *pparams = nullptr);
void getFinalSize (const rtengine::procparams::ProcParams& pparams, int& w, int& h); 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& getExifString () const;
const Glib::ustring& getDateTimeString () const; const Glib::ustring& getDateTimeString () const;
@@ -130,16 +129,16 @@ public:
void getSpotWB (int x, int y, int rect, double& temp, double& green); void getSpotWB (int x, int y, int rect, double& temp, double& green);
void applyAutoExp (rtengine::procparams::ProcParams& pparams); void applyAutoExp (rtengine::procparams::ProcParams& pparams);
ThFileType getType (); ThFileType getType () const;
Glib::ustring getFileName () const Glib::ustring getFileName () const
{ {
return fname; return fname;
} }
void setFileName (const Glib::ustring &fn); void setFileName (const Glib::ustring &fn);
bool isSupported (); bool isSupported () const;
const CacheImageData* getCacheImageData(); const CacheImageData* getCacheImageData() const;
std::string getMD5 () const; std::string getMD5 () const;
int getRank () const; int getRank () const;