Merge branch 'dev' into spot-removal-tool

This commit is contained in:
Hombre
2019-03-25 22:35:17 +01:00
100 changed files with 5863 additions and 2811 deletions

View File

@@ -1149,7 +1149,7 @@ public:
}
}
void getPipetteData (T &valueR, T &valueG, T &valueB, int posX, int posY, int squareSize, int tran) const
void getPipetteData (T &valueR, T &valueG, T &valueB, int posX, int posY, const int squareSize, int tran) const
{
int x;
int y;