3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-26 09:31:08 +08:00
Code Issues Projects Releases Wiki Activity

[cctag] update to v1.0.4 (#39467)

Browse Source
This commit is contained in:
Simone Gasparini 2024-06-27 05:22:06 +02:00 committed by GitHub
parent c79b293665
commit d723b88bd6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 8 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
ports/cctag/fix-compatibility-with-boost-1.85.patch
View File

@ -1,47 +0,0 @@
src/applications/detection/main.cpp | 3 +--
src/cctag/Fitting.cpp | 4 ++--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/applications/detection/main.cpp b/src/applications/detection/main.cpp
index da8243b..6807ada 100644
--- a/src/applications/detection/main.cpp
+++ b/src/applications/detection/main.cpp
@@ -21,7 +21,6 @@
#include <boost/archive/xml_oarchive.hpp>
#include <boost/exception/all.hpp>
#include <boost/filesystem.hpp>
-#include <boost/filesystem/convenience.hpp>
#include <boost/ptr_container/ptr_list.hpp>
#include <boost/timer/timer.hpp>
#include <opencv2/core/core.hpp>
@@ -501,7 +500,7 @@ int main(int argc, char** argv)
tbb::parallel_for(0, 2, [&](size_t fileListIdx) {
for(const auto& fileInFolder : files[fileListIdx])
{
- const std::string subExt(bfs::extension(fileInFolder.second));
+ const std::string subExt(fileInFolder.second.extension().string());
if((subExt == ".png") || (subExt == ".jpg") || (subExt == ".PNG") || (subExt == ".JPG"))
{
diff --git a/src/cctag/Fitting.cpp b/src/cctag/Fitting.cpp
index 931922e..59b3a3a 100644
--- a/src/cctag/Fitting.cpp
+++ b/src/cctag/Fitting.cpp
@@ -226,7 +226,7 @@ template void fitEllipse(std::vector<cctag::Point2d<Eigen::Vector3f>>::const_ite
} // geometry
float innerProdMin(const std::vector<cctag::EdgePoint*>& filteredChildren, float thrCosDiffMax, Point2d<Vector3s> & p1, Point2d<Vector3s> & p2) {
- using namespace boost::numeric;
+ //using namespace boost::numeric;
//using namespace cctag::numerical;
EdgePoint* pAngle1 = nullptr;
@@ -335,7 +335,7 @@ void ellipseFitting( cctag::numerical::geometry::Ellipse& e, const std::vector<c
}
void circleFitting(cctag::numerical::geometry::Ellipse& e, const std::vector<cctag::EdgePoint*>& points) {
- using namespace boost::numeric;
+ //using namespace boost::numeric;
std::size_t nPoints = points.size();

6
ports/cctag/portfile.cmake
View File

@ -2,14 +2,10 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO alicevision/cctag
REF "v${VERSION}"
SHA512 ccae0829480eca2a25cae70a5bf2cb3fde5ae1f71a08a9b614c05a1bb746ad66d6ac70f590ac8096635ea4fe75590d0ecb1c8c9f1b77189e5eae6f5e59c78cfe
SHA512 65f8260213faab1965ff97e38b890d85f5599c5db5f50f09ab1ed2d73d7008d2e93693145d66a4d9af6342666817204736c3b0384885fa50402850f1dc5dceae
HEAD_REF develop
PATCHES
fix-compatibility-with-boost-1.85.patch
)
file(REMOVE "${SOURCE_PATH}/cmake/FindTBB.cmake" "${SOURCE_PATH}/src/applications/cmake/FindTBB.cmake")
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
cuda CCTAG_WITH_CUDA

2
ports/cctag/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "cctag",
"version-semver": "1.0.3",
"version-semver": "1.0.4",
"maintainers": "alicevision-team@googlegroups.com",
"description": "Computer vision library for detecting CCTag markers made up of concentric circles",
"homepage": "https://github.com/alicevision/CCTag",

2
versions/baseline.json
View File

@ -1529,7 +1529,7 @@
"port-version": 13
},
"cctag": {
"baseline": "1.0.3",
"baseline": "1.0.4",
"port-version": 0
},
"cctz": {

5
versions/c-/cctag.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "ce8749684cd638c95c3e2ff15ea713ae11cd991d",
"version-semver": "1.0.4",
"port-version": 0
},
{
"git-tree": "43157f8be9e5020e0e2ab708ec931f4cb3266b31",
"version-semver": "1.0.3",