Skip to content

WIP: deserializeValue: try to fix IPLPoint/IPLColor loading #110

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
drzraf wants to merge 1 commit into
base: master
Choose a base branch
from
Open

WIP: deserializeValue: try to fix IPLPoint/IPLColor loading #110

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
44 changes: 13 additions & 31 deletions IPL/src/IPLProcessProperty.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,45 +183,27 @@ inline void deserializeValue(const std::string &data, std::vector<double> &value

inline void deserializeValue(const std::string &data, IPLColor &value)
{
std::array<float,3> color;

int i = 0;
std::smatch match;
auto pos = data.begin();
while(i < (int) color.size() && std::regex_search(pos,data.end(),match,std::regex("[-0-9.]")))
{
pos += match.position();

int charsParsed = 0;
float element = 0;
if (sscanf(&(*pos),"%f%n",&element,&charsParsed) > 0)
color[i++] = element;

pos += charsParsed;
std::regex e ("\\[([-0-9.eE]+),([-0-9.eE]+),([-0-9.eE]+)\\]");
if (!std::regex_search(data, match, e) || match.size() - 1 != 3) {
value = IPLColor(0, 0, 0);
return;
}
value = IPLColor(color[0], color[1], color[2]);
value = IPLColor(std::stof(match.str(1)),
std::stof(match.str(2)),
std::stof(match.str(3)));
}

inline void deserializeValue(const std::string &data, IPLPoint &value)
{
std::array<double,2> point;

int i = 0;
std::smatch match;
auto pos = data.begin();
while(i < (int) point.size() && std::regex_search(pos,data.end(),match,std::regex("[-0-9.]")))
{
pos += match.position();

int charsParsed = 0;
float element = 0;
if (sscanf(&(*pos),"%f%n",&element,&charsParsed) > 0)
point[i++] = element;

pos += charsParsed;
std::regex e ("\\[([-0-9.eE]+),([-0-9.eE]+)\\]");
if (!std::regex_search(data, match, e) || match.size() - 1 != 2) {
value = IPLPoint(0, 0, 0);
return;
}

value = IPLPoint(point[0], point[1]);
value = IPLPoint(std::stod(match.str(1)),
std::stod(match.str(2)));
}

inline void deserializeValue(const std::string &data, std::string &value)
Expand Down