Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pull fixes from python_wrapper branch #1232

Merged
merged 4 commits into from
Sep 15, 2023
Merged

Pull fixes from python_wrapper branch #1232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
00b8050
Pull fixes from python_wrapper branch
SamFlt Sep 13, 2023
c104eb1
fix tuple assertion error, document install script
SamFlt Sep 14, 2023
6c9a74e
migrate deprecated functions into include guards
SamFlt Sep 14, 2023
a15411f
fix java build that had an error with deprecated vpMatrix::euclideanNorm
SamFlt Sep 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions modules/core/include/visp3/core/vpColVector.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,6 @@ class VISP_EXPORT vpColVector : public vpArray2D<double>
return (*this);
}

vp_deprecated double euclideanNorm() const;
/*!
Extract a sub-column vector from a column vector.
\param r : Index of the row corresponding to the first element of the
Expand All @@ -263,9 +262,9 @@ class VISP_EXPORT vpColVector : public vpArray2D<double>
{
if (r >= rowNum || r + colsize > rowNum) {
throw(vpException(vpException::fatalError,
"Cannot extract a (%dx1) column vector from a (%dx1) "
"column vector starting at index %d",
colsize, rowNum, r));
"Cannot extract a (%dx1) column vector from a (%dx1) "
"column vector starting at index %d",
colsize, rowNum, r));
}

return vpColVector(*this, r, colsize);
Expand Down Expand Up @@ -368,9 +367,9 @@ class VISP_EXPORT vpColVector : public vpArray2D<double>
{
if (ncols != 1) {
throw(vpException(vpException::fatalError,
"Cannot resize a column vector to a (%dx%d) "
"dimension vector that has more than one column",
nrows, ncols));
"Cannot resize a column vector to a (%dx%d) "
"dimension vector that has more than one column",
nrows, ncols));
}
vpArray2D<double>::resize(nrows, ncols, flagNullify);
}
Expand Down Expand Up @@ -455,6 +454,7 @@ class VISP_EXPORT vpColVector : public vpArray2D<double>
}

vp_deprecated void insert(const vpColVector &v, unsigned int r, unsigned int c = 0);
vp_deprecated double euclideanNorm() const;
//@}
#endif
};
Expand Down
1 change: 1 addition & 0 deletions modules/core/include/visp3/core/vpHomogeneousMatrix.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,7 @@ class VISP_EXPORT vpHomogeneousMatrix : public vpArray2D<double>
// Conversion helper function to avoid circular dependencies and MSVC errors that are not exported in the DLL
void parse_json(const nlohmann::json &j);
void convert_to_json(nlohmann::json &j) const;
public:

#endif

Expand Down
Loading