Skip to content

Commit 08a48cb

Browse files
authored
Merge pull request #143 from githubdoe/DOE/crashfixzernikeprocess
Fix crash in Zernike process
2 parents 91f406a + eb8d642 commit 08a48cb

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

mainwindow.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -971,7 +971,7 @@ void MainWindow::on_actionAbout_triggered()
971971
"<li> QWT " + QWT_VERSION_STR + ", armadillo " + QString::fromStdString(arma::arma_version::as_string()) + ", Lapack, BLAS</li></ul></p>"
972972
"<h3>Credits</h3>"
973973
"<ul><li>Mike Peck for<ul><li>Researching and explaining FFT algorithm.</li>"
974-
"<li>Researching and explaining Unwrap algorithms.</li></li>"
974+
"<li>Researching and explaining Unwrap and annular algorithms.</li></li>"
975975
"<li>Steve Koehler for much help with Vortex implementation.</li>"
976976
"<li>Dave Rowe for starting the Interferometry group and publishig the initial program.</li>"
977977
"<li>Kieran Larken for deriving and publishing the Vortex Transform.</li>"

zernikeprocess.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1099,7 +1099,7 @@ cv::Mat zernikeProcess::makeSurfaceFromZerns(int border, bool doColor){
10991099
cv::Mat result = cv::Mat::ones(wx,wx, (doColor)? CV_8UC4: numType);
11001100

11011101

1102-
1102+
m_needsInit = true;
11031103
initGrid(wx, rad, (wx-1)/2, (wx-1)/2, m_maxOrder, 0);
11041104
double spacing = 1.;
11051105
mirrorDlg *md = mirrorDlg::get_Instance();
@@ -1116,7 +1116,7 @@ cv::Mat zernikeProcess::makeSurfaceFromZerns(int border, bool doColor){
11161116
dlg_arbitrary->prepare(dlg.size);
11171117

11181118

1119-
for (std::size_t i = 0; i < m_zerns.n_rows; ++i)
1119+
for (std::size_t i = 0; i < m_rhoTheta.n_cols; ++i)
11201120
{
11211121

11221122
double rho = m_rhoTheta.row(0)(i);

0 commit comments

Comments
 (0)