Mirrors/ebsynth
1
0
Fork 0
mirror of https://github.com/jamriska/ebsynth.git synced 2025-12-16 16:37:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

remove NANs altogether

Browse Source
This commit is contained in:
Ondrej Jamriska
2018-10-31 12:29:38 +01:00
parent f0777625e3
commit 8d8fcc5cee
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/ebsynth.cpp
View File

@@ -265,7 +265,7 @@ int main(int argc,char** argv)
} }
std::string styleFileName; std::string styleFileName;
float styleWeight = NAN; float styleWeight = -1;
std::string outputFileName = "output.png"; std::string outputFileName = "output.png";
struct Guide struct Guide
@@ -312,7 +312,7 @@ int main(int argc,char** argv)
if (tryToParseStringArg(args,&argi,"-style",&styleFileName,&fail)) if (tryToParseStringArg(args,&argi,"-style",&styleFileName,&fail))
{ {
styleWeight = NAN; styleWeight = -1;
precedingStyleOrGuideWeight = &styleWeight; precedingStyleOrGuideWeight = &styleWeight;
argi++; argi++;
} }
@@ -321,7 +321,7 @@ int main(int argc,char** argv)
Guide guide; Guide guide;
guide.sourceFileName = guidePair.first; guide.sourceFileName = guidePair.first;
guide.targetFileName = guidePair.second; guide.targetFileName = guidePair.second;
guide.weight = NAN; guide.weight = -1;
guides.push_back(guide); guides.push_back(guide);
precedingStyleOrGuideWeight = &guides[guides.size()-1].weight; precedingStyleOrGuideWeight = &guides[guides.size()-1].weight;
argi++; argi++;
@@ -332,7 +332,11 @@ int main(int argc,char** argv)
} }
else if (tryToParseFloatArg(args,&argi,"-weight",&weight,&fail)) else if (tryToParseFloatArg(args,&argi,"-weight",&weight,&fail))
{ {
if (precedingStyleOrGuideWeight!=0) { *precedingStyleOrGuideWeight = weight; } if (precedingStyleOrGuideWeight!=0)
{
if (weight>=0) { *precedingStyleOrGuideWeight = weight; }
else { printf("error: weights must be non-negaitve!\n"); return 1; }
}
else { printf("error: at least one -style or -guide option must precede the -weight option!\n"); return 1; } else { printf("error: at least one -style or -guide option must precede the -weight option!\n"); return 1; }
argi++; argi++;
} }
@@ -467,10 +471,10 @@ int main(int argc,char** argv)
} }
std::vector<float> styleWeights(numStyleChannelsTotal); std::vector<float> styleWeights(numStyleChannelsTotal);
if (std::isnan(styleWeight)) { styleWeight = 1.0f; } if (styleWeight<0) { styleWeight = 1.0f; }
for(int i=0;i<numStyleChannelsTotal;i++) { styleWeights[i] = styleWeight / float(numStyleChannelsTotal); } for(int i=0;i<numStyleChannelsTotal;i++) { styleWeights[i] = styleWeight / float(numStyleChannelsTotal); }
for(int i=0;i<numGuides;i++) { if (std::isnan(guides[i].weight)) { guides[i].weight = 1.0f/float(numGuides); } } for(int i=0;i<numGuides;i++) { if (guides[i].weight<0) { guides[i].weight = 1.0f/float(numGuides); } }
std::vector<float> guideWeights(numGuideChannelsTotal); std::vector<float> guideWeights(numGuideChannelsTotal);
{ {