From aa4cd0bed17605fefd7254e723af6b3fb8d7159b Mon Sep 17 00:00:00 2001 From: John Smith Date: Wed, 16 May 2018 16:50:34 +0800 Subject: [PATCH 1/2] Make it work --- .gitignore | 313 +++++++++++++++++++++++++++-- README.md | 3 +- cvBlob/cvb_aux.cpp | 2 +- cvBlob/cvb_aux.h | 2 +- cvBlob/cvb_blob.cpp | 5 +- cvBlob/cvb_blob.h | 6 +- cvBlob/cvb_blob_list.cpp | 42 ++-- cvBlob/cvb_blob_list.h | 10 +- cvBlob/cvb_contour.cpp | 2 +- cvBlob/cvb_contour.h | 4 +- cvBlob/cvb_defines.h | 2 +- cvBlob/cvb_track.cpp | 137 +++++++------ cvBlob/cvb_track.h | 31 ++- vc/README | 5 +- vc/TestDLL/TestDLL.cpp | 10 +- vc/TestDLL/TestDLL.vcxproj | 48 +++-- vc/TestDLL/TestDLL.vcxproj.filters | 3 + vc/TestDLL/packages.config | 5 + vc/cvBlob/cvBlob.vcxproj | 45 +++-- vc/cvBlob/cvBlob.vcxproj.filters | 9 + vc/cvBlob/packages.config | 5 + 21 files changed, 522 insertions(+), 167 deletions(-) create mode 100644 vc/TestDLL/packages.config create mode 100644 vc/cvBlob/packages.config diff --git a/.gitignore b/.gitignore index 180d3cd..49f18f2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,24 +1,303 @@ -Specify filepatterns you want git to ignore. +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. -Example: -#ignore thumbnails created by windows -Thumbs.db -#Ignore files build by Visual Studio +# User-specific files +*.suo *.user -*.aps -*.pch -*.vspscc +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ + +# Visual Studio 2015 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUNIT +*.VisualState.xml +TestResult.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# DNX +project.lock.json +artifacts/ + *_i.c *_p.c -*.ncb -*.suo -*.bak -*.cache +*_i.h *.ilk -*.log -[Bb]in -[Dd]ebug*/ +*.meta +*.obj +*.pch +*.pdb +*.pgc +*.pgd +*.rsp *.sbr -obj/ -[Rr]elease*/ +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in _ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# JustCode is a .NET coding add-in +.JustCode + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# TODO: Comment the next line if you want to checkin your web deploy settings +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# The packages folder can be ignored because of Package Restore +**/packages/* +# except build/, which is used as an MSBuild target. +!**/packages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/packages/repositories.config +# NuGet v3's project.json files produces more ignoreable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.pfx +*.publishsettings +node_modules/ +orleans.codegen.cs + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm + +# SQL Server files +*.mdf +*.ldf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# JetBrains Rider +.idea/ +*.sln.iml + +# ========================= +# Operating System Files +# ========================= + +# OSX +# ========================= + +.DS_Store +.AppleDouble +.LSOverride + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + +# Windows +# ========================= + +# Windows image file caches +Thumbs.db +ehthumbs.db + +# Folder config file +Desktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msm +*.msp + +# Windows shortcuts +*.lnk diff --git a/README.md b/README.md index 7816f6f..6ed5732 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ In Linux, if you have unpacked the source in $CVBLOB, enter in a console: If you are encountering issues, please read [this](http://www.cmake.org/HTML/RunningCMake.html). -For Windows, a Visual Studio 2012 solution is provided in the vc subdirectory. +For Windows, a Visual Studio 2017 solution is provided in the vc subdirectory. ### OpenCV path @@ -53,3 +53,4 @@ Comments, suggestions and, why not, donations to: * [Cristóbal Carnero Liñán](mailto:grendel.ccl@gmail.com), first author * [Stefan Gachter](http://gachter.name) * Kouichi Nishino +* [xfgryujk](https://github.com/xfgryujk) diff --git a/cvBlob/cvb_aux.cpp b/cvBlob/cvb_aux.cpp index c66866d..6144395 100644 --- a/cvBlob/cvb_aux.cpp +++ b/cvBlob/cvb_aux.cpp @@ -1,4 +1,4 @@ -// Copyright (C) 2007 by Cristóbal Carnero Liñán +// Copyright (C) 2007 by Cristóbal Carnero Liñán // grendel.ccl@gmail.com // // Copyright (C) 2013 by Fabrice de Gans-Riberi for ProViSys Engineering diff --git a/cvBlob/cvb_aux.h b/cvBlob/cvb_aux.h index 4c6ec53..8975330 100644 --- a/cvBlob/cvb_aux.h +++ b/cvBlob/cvb_aux.h @@ -1,4 +1,4 @@ -// Copyright (C) 2007 by Cristbal Carnero Lin +// Copyright (C) 2007 by Cristóbal Carnero Liñán // grendel.ccl@gmail.com // // Copyright (C) 2013 by Fabrice de Gans-Riberi for ProViSys Engineering diff --git a/cvBlob/cvb_blob.cpp b/cvBlob/cvb_blob.cpp index b696d3a..1de8f9b 100644 --- a/cvBlob/cvb_blob.cpp +++ b/cvBlob/cvb_blob.cpp @@ -1,4 +1,4 @@ -// Copyright (C) 2007 by Cristóbal Carnero Liñán +// Copyright (C) 2007 by Cristóbal Carnero Liñán // grendel.ccl@gmail.com // // Copyright (C) 2013 by Fabrice de Gans-Riberi for ProViSys Engineering @@ -22,6 +22,7 @@ #include #include +#include #include #include "cvb_blob.h" @@ -314,7 +315,7 @@ void Blob::Merge(Blob &a_blob) { m02 += a_blob.m02; } -std::ostream &operator<< (std::ostream &output, const Blob &b) { +CVBLOB_EXPORT std::ostream& cvb::operator<< (std::ostream &output, const Blob &b) { b.Print(output); return output; } diff --git a/cvBlob/cvb_blob.h b/cvBlob/cvb_blob.h index 69b306a..8fd6c9b 100644 --- a/cvBlob/cvb_blob.h +++ b/cvBlob/cvb_blob.h @@ -1,4 +1,4 @@ -// Copyright (C) 2007 by Cristóbal Carnero Liñán +// Copyright (C) 2007 by Cristóbal Carnero Liñán // grendel.ccl@gmail.com // // Copyright (C) 2013 by Fabrice de Gans-Riberi for ProViSys Engineering @@ -59,6 +59,8 @@ const Label MaxLabel = std::numeric_limits