"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "rtengine/pipettebuffer.cc" between
rawtherapee-5.6.tar.xz and rawtherapee-5.7.tar.xz

About: RawTherapee is a powerful cross-platform raw image processing program.

pipettebuffer.cc  (rawtherapee-5.6.tar.xz):pipettebuffer.cc  (rawtherapee-5.7.tar.xz)
skipping to change at line 17 skipping to change at line 17
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* RawTherapee is distributed in the hope that it will be useful, * RawTherapee is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with RawTherapee. If not, see <http://www.gnu.org/licenses/>. * along with RawTherapee. If not, see <https://www.gnu.org/licenses/>.
*/ */
#include "pipettebuffer.h" #include "pipettebuffer.h"
#include "../rtgui/editcallbacks.h"
#include "imagefloat.h" #include "imagefloat.h"
#include "../rtgui/editcallbacks.h"
namespace rtengine namespace rtengine
{ {
PipetteBuffer::PipetteBuffer(::EditDataProvider *dataProvider) : PipetteBuffer::PipetteBuffer(::EditDataProvider *dataProvider) :
dataProvider(dataProvider), imgFloatBuffer(nullptr), LabBuffer(nullptr), sin glePlaneBuffer(), ready(false) {} dataProvider(dataProvider), imgFloatBuffer(nullptr), LabBuffer(nullptr), sin glePlaneBuffer(), ready(false) {}
PipetteBuffer::~PipetteBuffer() PipetteBuffer::~PipetteBuffer()
{ {
flush(); flush();
} }
skipping to change at line 177 skipping to change at line 179
float v; float v;
singlePlaneBuffer.getPipetteData(v, x, y, squareSize, 0); singlePlaneBuffer.getPipetteData(v, x, y, squareSize, 0);
dataProvider->setPipetteVal1(v); dataProvider->setPipetteVal1(v);
dataProvider->setPipetteVal2(-1.f); dataProvider->setPipetteVal2(-1.f);
dataProvider->setPipetteVal3(-1.f); dataProvider->setPipetteVal3(-1.f);
return; return;
} }
} }
} }
dataProvider->setPipetteVal1(-1.f); if (dataProvider) {
dataProvider->setPipetteVal2(-1.f); dataProvider->setPipetteVal1(-1.f);
dataProvider->setPipetteVal3(-1.f); dataProvider->setPipetteVal2(-1.f);
dataProvider->setPipetteVal3(-1.f);
}
} }
} }
 End of changes. 4 change blocks. 
5 lines changed or deleted 9 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)