mirror of
https://github.com/amyinspace/MagicSetEditor2.git
synced 2026-06-11 05:07:00 -04:00
Fixed compilation errors for gcc@linux (not all yet).
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@181 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
@@ -15,6 +15,7 @@
|
||||
#include <queue>
|
||||
|
||||
DECLARE_POINTER_TYPE(ThumbnailRequest);
|
||||
class ThumbnailThreadWorker;
|
||||
|
||||
// ----------------------------------------------------------------------------- : ThumbnailRequest
|
||||
|
||||
@@ -24,6 +25,8 @@ class ThumbnailRequest {
|
||||
ThumbnailRequest(void* owner, const String& cache_name, const wxDateTime& modified)
|
||||
: owner(owner), cache_name(cache_name), modified(modified) {}
|
||||
|
||||
virtual ~ThumbnailRequest() {}
|
||||
|
||||
/// Generate the thumbnail, called in another thread
|
||||
virtual Image generate() = 0;
|
||||
/// Store the thumbnail, called from the main thread
|
||||
@@ -66,7 +69,7 @@ class ThumbnailThread {
|
||||
|
||||
deque<ThumbnailRequestP> open_requests; ///< Requests on which work hasn't finished
|
||||
vector<pair<ThumbnailRequestP,Image> > closed_requests; ///< Requests for which work is completed
|
||||
set<ThumbnailRequestP> request_names; ///< Requests that haven't been stored yet, to prevent duplicates
|
||||
set<ThumbnailRequestP> request_names; ///< Requests that haven't been stored yet, to prevent duplicates
|
||||
friend class ThumbnailThreadWorker;
|
||||
ThumbnailThreadWorker* worker; ///< The worker thread. invariant: no requests ==> worker==nullptr
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user