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

Merge branch 'dev' into rtsurface-cleanup

Browse Source
This commit is contained in:
Flössie
2019-03-25 19:09:15 +01:00
parent 363385a838 14020ed356
commit fc10dc5f77
105 changed files with 5860 additions and 2805 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
rtengine/pipettebuffer.cc
View File

@@ -19,7 +19,9 @@
#include "pipettebuffer.h"
#include "../rtgui/edit.h"
#include "imagefloat.h"
#include "../rtgui/editcallbacks.h"
namespace rtengine
{
@@ -134,13 +136,17 @@ bool PipetteBuffer::bufferCreated()
return false;
}
void PipetteBuffer::getPipetteData(float* v, int x, int y, int squareSize)
void PipetteBuffer::getPipetteData(int x, int y, const int squareSize)
{
if (ready && dataProvider && dataProvider->getCurrSubscriber()) {
switch (dataProvider->getCurrSubscriber()->getPipetteBufferType()) {
case (BT_IMAGEFLOAT):
if (imgFloatBuffer) {
float v[3];
imgFloatBuffer->getPipetteData(v[0], v[1], v[2], x, y, squareSize, 0);
dataProvider->setPipetteVal1(v[0]);
dataProvider->setPipetteVal2(v[1]);
dataProvider->setPipetteVal3(v[2]);
return;
}
@@ -148,7 +154,11 @@ void PipetteBuffer::getPipetteData(float* v, int x, int y, int squareSize)
case (BT_LABIMAGE):
if (LabBuffer) {
float v[3];
LabBuffer->getPipetteData(v[0], v[1], v[2], x, y, squareSize);
dataProvider->setPipetteVal1(v[0]);
dataProvider->setPipetteVal2(v[1]);
dataProvider->setPipetteVal3(v[2]);
return;
}
@@ -156,14 +166,19 @@ void PipetteBuffer::getPipetteData(float* v, int x, int y, int squareSize)
case (BT_SINGLEPLANE_FLOAT):
if (singlePlaneBuffer.data != nullptr) {
singlePlaneBuffer.getPipetteData(v[0], x, y, squareSize, 0);
v[1] = v[2] = -1.f;
float v;
singlePlaneBuffer.getPipetteData(v, x, y, squareSize, 0);
dataProvider->setPipetteVal1(v);
dataProvider->setPipetteVal2(-1.f);
dataProvider->setPipetteVal3(-1.f);
return;
}
}
}
v[0] = v[1] = v[2] = -1.f;
dataProvider->setPipetteVal1(-1.f);
dataProvider->setPipetteVal2(-1.f);
dataProvider->setPipetteVal3(-1.f);
}
}