merge with dev

This commit is contained in:
Desmis
2018-06-05 10:48:26 +02:00
82 changed files with 2764 additions and 2338 deletions

View File

@@ -45,14 +45,12 @@ protected:
LabImage* labnCrop; // "one chunk" allocation
LabImage* reservCrop; // "one chunk" allocation
Image8* cropImg; // "one chunk" allocation ; displayed image in monitor color space, showing the output profile as well (soft-proofing enabled, which then correspond to workimg) or not
float * cbuf_real; // "one chunk" allocation
float * shbuf_real; // "one chunk" allocation
// --- automatically allocated and deleted when necessary, and only renewed on size changes
Imagefloat* transCrop; // "one chunk" allocation, allocated if necessary
CieImage* cieCrop; // allocating 6 images, each in "one chunk" allocation
// -----------------------------------------------------------------
float** cbuffer;
float** shbuffer;
bool updating; /// Flag telling if an updater thread is currently processing