merge with dev

This commit is contained in:
Desmis
2018-05-05 09:37:58 +02:00
115 changed files with 1924 additions and 3142 deletions

View File

@@ -46,7 +46,6 @@ protected:
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
SHMap* cshmap; // per line allocation
float * shbuf_real; // "one chunk" allocation
// --- automatically allocated and deleted when necessary, and only renewed on size changes