Merge branch 'dev' into testoutputprofile

This commit is contained in:
Morgan Hardwood
2018-05-17 12:00:05 +02:00
67 changed files with 831 additions and 633 deletions

View File

@@ -76,7 +76,7 @@ void Image16::getScanline(int row, unsigned char* buffer, int bps)
/*
* void Image16::setScanline (int row, unsigned char* buffer, int bps, int minValue[3], int maxValue[3]);
* has not been implemented yet, because as of now, this method is called for IIOSF_FLOAT sample format only
* has not been implemented yet, because as of now, this method is called for IIOSF_FLOATxx sample format only
*/
void Image16::setScanline(int row, unsigned char* buffer, int bps, unsigned int numSamples, float *minValue, float *maxValue)
{