Skip to content

Commit 27c08ed

Browse files
authored
Merge pull request #114 from githubdoe/issue112
Fixes issue #112 (smoothing wavefront crashes if obstruction)
2 parents cd52669 + bf7c06e commit 27c08ed

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

RevisionHistory.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@
369369
</ul></ul>
370370
</ul>
371371

372-
<ul><li>Version 7.1.0</li>
372+
<ul><li>Version 7.1.1</li>
373373
<ul>
374374
<li>Added logging to assist with debugging, particularly if there is a crash. To view log file go to exe folder then DFTFringeLogs/log.txt</li>
375375
<li>Updated project dependencies</li>
@@ -387,7 +387,8 @@
387387
<li>Fixed issue where Foucault view display "TextLabel" instead of number</li>
388388
<li>Fixed regression introduced in 7.0.0 not displaying effects of central obstruction in most displays</li>
389389
<li>Removed unused interpolation drop down from rotate wavefront dialog</li>
390-
<li>Linux is not sensitive to jpg or other extension case anymore for selecting files</li>
390+
<li>Linux is not case sensitive to jpg (or other extension) anymore for selecting files</li>
391391
<li>Fixed regression introduced in 7.0.0 where regions might not be updated correctly when processing several igram</li>
392+
<li>Fixed crash if you smooth a wavefront that has an inner outline (perforated mirror). Bug existed staring ver 6.3.1.</li>
392393
</ul></ul>
393394
</ul>

zernikeprocess.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1410,7 +1410,7 @@ void zernikeProcess::initGrid(int width, double radius, double cx, double cy, in
14101410
m_obsPercent = obsPercent;
14111411
m_rhoTheta = rhotheta(width, radius, cx, cy);
14121412

1413-
if (obsPercent <= 0.) {
1413+
if (obsPercent >= 0.) { // was "<=" but this can cause a crash see github issue #112
14141414
m_zerns = zpmC(m_rhoTheta.row(0), m_rhoTheta.row(1), maxOrder);
14151415
// for (int i = 0; i < m_zerns.n_rows; ++i){
14161416
// if (m_row[i] == 300){

0 commit comments

Comments
 (0)