Restored color profile in canvas preview
This commit is contained in:
parent
9c2d545e6a
commit
c9fa33984b
3 changed files with 7 additions and 2 deletions
|
@ -3,6 +3,7 @@
|
||||||
#include "Color.h"
|
#include "Color.h"
|
||||||
#include "CanvasLiveClient.h"
|
#include "CanvasLiveClient.h"
|
||||||
#include "Mutex.h"
|
#include "Mutex.h"
|
||||||
|
#include "ColorProfile.h"
|
||||||
|
|
||||||
#include <cassert>
|
#include <cassert>
|
||||||
|
|
||||||
|
@ -18,12 +19,14 @@ CanvasPreview::CanvasPreview()
|
||||||
dirty_up = -1;
|
dirty_up = -1;
|
||||||
|
|
||||||
lock = new Mutex();
|
lock = new Mutex();
|
||||||
|
profile = new ColorProfile();
|
||||||
}
|
}
|
||||||
|
|
||||||
CanvasPreview::~CanvasPreview()
|
CanvasPreview::~CanvasPreview()
|
||||||
{
|
{
|
||||||
delete [] pixels;
|
delete [] pixels;
|
||||||
delete lock;
|
delete lock;
|
||||||
|
delete profile;
|
||||||
}
|
}
|
||||||
|
|
||||||
void CanvasPreview::setSize(int real_width, int real_height, int preview_width, int preview_height)
|
void CanvasPreview::setSize(int real_width, int real_height, int preview_width, int preview_height)
|
||||||
|
@ -77,7 +80,7 @@ void CanvasPreview::updateLive(CanvasLiveClient *client)
|
||||||
{
|
{
|
||||||
for (x = dirty_left; x <= dirty_right; x++)
|
for (x = dirty_left; x <= dirty_right; x++)
|
||||||
{
|
{
|
||||||
client->canvasPainted(x, y, pixels[y * width + x]);
|
client->canvasPainted(x, y, profile->apply(pixels[y * width + x]));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -36,6 +36,8 @@ private:
|
||||||
int width;
|
int width;
|
||||||
int height;
|
int height;
|
||||||
|
|
||||||
|
ColorProfile *profile;
|
||||||
|
|
||||||
int dirty_left;
|
int dirty_left;
|
||||||
int dirty_right;
|
int dirty_right;
|
||||||
int dirty_down;
|
int dirty_down;
|
||||||
|
|
|
@ -339,7 +339,7 @@ void Rasterizer::renderScanLines(CanvasPortion *canvas, RenderScanlines* scanlin
|
||||||
Color frag_color = *color;
|
Color frag_color = *color;
|
||||||
if (cury == starty || cury == endy)
|
if (cury == starty || cury == endy)
|
||||||
{
|
{
|
||||||
frag_color.mask(Color(0.0, 0.0, 0.0, 0.1));
|
frag_color.mask(Color(0.0, 0.0, 0.0, 0.3));
|
||||||
}
|
}
|
||||||
fragment.setColor(frag_color);
|
fragment.setColor(frag_color);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue