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.

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

Make it work #5

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
313 changes: 296 additions & 17 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -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
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -53,3 +53,4 @@ Comments, suggestions and, why not, donations to:
* [Cristóbal Carnero Liñán](mailto:[email protected]), first author
* [Stefan Gachter](http://gachter.name)
* Kouichi Nishino
* [xfgryujk](https://github.com/xfgryujk)
2 changes: 1 addition & 1 deletion cvBlob/cvb_aux.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (C) 2007 by Cristóbal Carnero Liñán
// Copyright (C) 2007 by Cristóbal Carnero Liñán
// [email protected]
//
// Copyright (C) 2013 by Fabrice de Gans-Riberi for ProViSys Engineering
Expand Down
2 changes: 1 addition & 1 deletion cvBlob/cvb_aux.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (C) 2007 by Crist�bal Carnero Li��n
// Copyright (C) 2007 by Cristóbal Carnero Liñán
// [email protected]
//
// Copyright (C) 2013 by Fabrice de Gans-Riberi for ProViSys Engineering
Expand Down
5 changes: 3 additions & 2 deletions cvBlob/cvb_blob.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (C) 2007 by Cristóbal Carnero Liñán
// Copyright (C) 2007 by Cristóbal Carnero Liñán
// [email protected]
//
// Copyright (C) 2013 by Fabrice de Gans-Riberi for ProViSys Engineering
Expand All @@ -22,6 +22,7 @@

#include <cmath>
#include <iostream>
#include <opencv2/imgproc.hpp>
#include <opencv2/highgui/highgui.hpp>

#include "cvb_blob.h"
Expand Down Expand Up @@ -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;
}
6 changes: 4 additions & 2 deletions cvBlob/cvb_blob.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (C) 2007 by Cristóbal Carnero Liñán
// Copyright (C) 2007 by Cristóbal Carnero Liñán
// [email protected]
//
// Copyright (C) 2013 by Fabrice de Gans-Riberi for ProViSys Engineering
Expand Down Expand Up @@ -59,6 +59,8 @@ const Label MaxLabel = std::numeric_limits<Label>::max(); ///< Max Label value

/// \brief Class that contains information about one blob.
class CVBLOB_EXPORT Blob {
friend class Track;
friend class TrackList;
public:
/// \brief Constructor, with one dot.
/// \param point The blob first point.
Expand Down Expand Up @@ -190,7 +192,7 @@ const Label MaxLabel = std::numeric_limits<Label>::max(); ///< Max Label value

/// \brief Overload operator "<<" for printing blob structure.
/// \return Stream.
CVBLOB_EXPORT std::ostream &operator<< (std::ostream &output, const Blob &b);
CVBLOB_EXPORT std::ostream& operator<< (std::ostream &output, const Blob &b);

} // Namespace

Expand Down
Loading