Skip to content

run fail with vs2010 #34

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

Open
wky555 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

run fail with vs2010 #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
499cf98
Update FileStorageModel.cpp
wky555 Apr 1, 2015
024e8a7
Update Parts.hpp
wky555 Apr 1, 2015
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
2 changes: 1 addition & 1 deletion include/Parts.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ class ComponentPart {
//! the part's bias
vectorf bias(size_t mixture = 0) const {
const int offset = (*biasid_)[self_][mixture];
return vectorf(&((*biasw_)[offset]), &((*biasw_)[offset+nmixtures()]));
return vectorf((*biasw_).begin()+offset, (*biasw_).begin()+offset+nmixtures());
}
//! the part's bias index
int biasi(size_t mixture = 0) const { return (*biasi_)[(*biasid_)[self_][mixture]]; }
Expand Down
2 changes: 1 addition & 1 deletion src/FileStorageModel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ bool FileStorageModel::deserialize(const std::string& filename) {
part["biasid"] >> biasid_[c][p];

cv::FileNode defid = part["defid"];
if(defid.isInt())
if(!defid.isNone())
defid >> defid_[c][p];
else
defid_[c][p].push_back(0);
Expand Down