diff options
| author | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2021-05-24 00:40:17 +0300 |
|---|---|---|
| committer | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2021-05-24 00:40:17 +0300 |
| commit | 68d24848ab873df64ee4511d6c6bbb9298a8b1a1 (patch) | |
| tree | 1cadb2308434a578c3428bd0956c490939a6512b /Software | |
| parent | 2d88402a5ae5116f3d389662c5184956a890059a (diff) | |
| parent | 73c58af360f611fb64360436826b9ed3a0c12719 (diff) | |
| download | Tango-68d24848ab873df64ee4511d6c6bbb9298a8b1a1.tar.gz Tango-68d24848ab873df64ee4511d6c6bbb9298a8b1a1.zip | |
Merge branch 'software' of https://twinetfs.visualstudio.com/Tango/_git/Tango into software
Diffstat (limited to 'Software')
| -rw-r--r-- | Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/ColorConverter.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/ColorConverter.cpp b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/ColorConverter.cpp index 294a94dca..f9cbadc93 100644 --- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/ColorConverter.cpp +++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/ColorConverter.cpp @@ -700,7 +700,7 @@ void Tango::ColorLib::ColorConverter::SetCalibFactorization() m_CalibGain[i] = (m_ProcessRangesMaxP[m_nProcessRanges - 1] - m_maxNlPerCM(i)) / denom; m_CalibOffset[i] = (m_GamutRegionMaxLim[m_nProcessRanges - 1] * m_maxNlPerCM(i) - - (m_GamutRegionMaxLim[m_nProcessRanges - 1] * m_CTmaxNlPerCM(i))) / denom; + (m_ProcessRangesMaxP[m_nProcessRanges - 1] * m_CTmaxNlPerCM(i))) / denom; } } } @@ -4574,7 +4574,13 @@ void Tango::ColorLib::ColorConverter::SplitVolume(VectorXd Volume, VectorXd &Vol } //Set Limits DefineSplitLimits(low, high, InitTotalVolume); - + //Verify there are no inks below the split limits + //This might happen because of a previous rounding step that changes the low limit by a small amount + for (int i = 0; i < m_nInks; ++i) + { + if ((Vol_nlcm(i) < low) & (Vol_nlcm(i) > 0)) + Vol_nlcm(i) = low; + } //Apply 1st Split for (int i = 0; i < m_nInks - 1; ++i) { |