Merge branch 'dev' into capture_sharpening

This commit is contained in:
Ingo Weyrich
2019-09-01 20:27:04 +02:00
4 changed files with 49 additions and 6 deletions

View File

@@ -729,7 +729,7 @@ void BayerProcess::FrameCountChanged(int n, int frameNum)
imageNumber->remove_all();
imageNumber->append("1");
for (int i = 2; i <= std::min(n, 4); ++i) {
for (int i = 2; i <= std::min(n, 6); ++i) {
std::ostringstream entry;
entry << i;
imageNumber->append(entry.str());