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

Porting following changsets to Default for the merge :

Browse Source 
- 7faf00bc5cbe
- 6f9407b451af
This commit is contained in:
Hombre
2011-06-28 23:40:37 +02:00
parent 58efd5c861
commit 49b7100e4a
6 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
rtgui/thumbnail.cc
View File

@@ -35,7 +35,7 @@ using namespace rtengine::procparams;
Thumbnail::Thumbnail (CacheManager* cm, const Glib::ustring& fname, CacheImageData* cf)
: fname(fname), cfs(*cf), cachemgr(cm), ref(1), enqueueNumber(0), tpp(NULL),
pparamsValid(false), needsReProcessing(true), lastImg(NULL),
pparamsValid(false), needsReProcessing(true),imageLoading(false), lastImg(NULL),
initial_(false) {
cfs.load (getCacheFileName ("data")+".txt");
@@ -61,7 +61,7 @@ Thumbnail::Thumbnail (CacheManager* cm, const Glib::ustring& fname, CacheImageDa
Thumbnail::Thumbnail (CacheManager* cm, const Glib::ustring& fname, const std::string& md5)
: fname(fname), cachemgr(cm), ref(1), enqueueNumber(0), tpp(NULL), pparamsValid(false),
needsReProcessing(true), lastImg(NULL),
needsReProcessing(true),imageLoading(false), lastImg(NULL),
initial_(true) {
@@ -728,3 +728,15 @@ bool Thumbnail::openDefaultViewer(int destination) {
#endif
}
bool Thumbnail::imageLoad(bool loading)
{
Glib::Mutex::Lock lock(mutex);
bool previous = imageLoading;
if( loading && !previous ){
imageLoading = true;
return true;
}else if( !loading )
imageLoading = false;
return false;
}