Skip to content

Color matrix requires more than 1 component #17

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
TimSC wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Color matrix requires more than 1 component #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
db107c5
Read xml with blank values
TimSC Apr 1, 2013
1955f5d
Read blank xml entry
TimSC Apr 1, 2013
bf5c788
Allocate more memory space for color
TimSC Apr 1, 2013
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
8 changes: 7 additions & 1 deletion src/FileStorageModel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
*/

#include <sstream>
#include <iostream>
#include <opencv2/core/core.hpp>
#include "FileStorageModel.hpp"

Expand Down Expand Up @@ -145,7 +146,12 @@ bool FileStorageModel::deserialize(const std::string& filename) {
part["parentid"] >> parentid_[c][p];
part["filterid"] >> filterid_[c][p];
part["biasid"] >> biasid_[c][p];
part["defid"] >> defid_[c][p];

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

Expand Down
2 changes: 1 addition & 1 deletion src/Visualize.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ void Visualize::candidates(const Mat& im, const vectorCandidate& candidates, uns
const unsigned int ncolors = candidates[0].parts().size();
vector<Scalar> colors;
for (unsigned int n = 0; n < ncolors; ++n) {
Mat color(Size(1,1), CV_32FC3);
Mat color(Size(1,3), CV_32FC3);
// Hue is in degrees, not radians (because consistency is over-rated)
color.at<float>(0) = (360) / ncolors * n;
color.at<float>(1) = 1.0;
Expand Down