aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio
diff options
context:
space:
mode:
authorVictoria Plitt <Victoria.Plitt@twine-s.com>2022-12-01 11:03:19 +0200
committerVictoria Plitt <Victoria.Plitt@twine-s.com>2022-12-01 11:03:19 +0200
commitca8e9ce5fefeafa6da4476435361d64c8b8fe600 (patch)
tree11d89a80f6aa91de730d7bcfee3c46bf6c006567 /Software/Visual_Studio
parentacf59049bd08d74cd6fb6eb25679b07b7d8f3b15 (diff)
downloadTango-ca8e9ce5fefeafa6da4476435361d64c8b8fe600.tar.gz
Tango-ca8e9ce5fefeafa6da4476435361d64c8b8fe600.zip
PPC. FT Check bounds argument of arc cosine.
Diffstat (limited to 'Software/Visual_Studio')
-rw-r--r--Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/VisualOffsetModel.cs10
-rw-r--r--Software/Visual_Studio/Tango.ColorConversion/DefaultColorConverter.cs2
2 files changed, 10 insertions, 2 deletions
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/VisualOffsetModel.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/VisualOffsetModel.cs
index 0ba23f352..042350cb0 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/VisualOffsetModel.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/VisualOffsetModel.cs
@@ -382,8 +382,14 @@ namespace Tango.PPC.Jobs.Models
double refX_SH = refX_SC * (refX_T * refX_F + 1 - refX_F);
if(C1 != 0)
{
- double tmp = (180 / Math.PI) * Math.Acos(1 - (refX_SH * refX_SH * hueOffset * hueOffset / (2 * C1 * C1)));
- if (hueOffset < 0)//??????
+ var argum = 1 - (refX_SH * refX_SH * hueOffset * hueOffset / (2 * C1 * C1));
+ if(argum < -1)
+ argum = -1;
+ if (argum > 1)
+ argum = 1;
+
+ double tmp = (180 / Math.PI) * Math.Acos(argum);
+ if (hueOffset < 0)//?
tmp *= -1;
H1 += tmp;
}
diff --git a/Software/Visual_Studio/Tango.ColorConversion/DefaultColorConverter.cs b/Software/Visual_Studio/Tango.ColorConversion/DefaultColorConverter.cs
index 1afe168c6..e4d2ae0c0 100644
--- a/Software/Visual_Studio/Tango.ColorConversion/DefaultColorConverter.cs
+++ b/Software/Visual_Studio/Tango.ColorConversion/DefaultColorConverter.cs
@@ -99,6 +99,8 @@ namespace Tango.ColorConversion
conversionInput.InputCoordinates = new InputCoordinates();
+ conversionInput.ForFineTuning = forFineTuning;
+
if (stop.BrushColorSpace == ColorSpaces.RGB)
{
conversionInput.InputCoordinates.Red = Math.Max(stop.Red, 0);