From 4dd60d9d1e6912769294cb2ad77d9826aa8356e9 Mon Sep 17 00:00:00 2001 From: James McClure Date: Wed, 21 Nov 2018 14:31:43 -0500 Subject: [PATCH] change morph_delta adapt - fix bug --- models/ColorModel.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/ColorModel.cpp b/models/ColorModel.cpp index 017b7928..8410b0d0 100644 --- a/models/ColorModel.cpp +++ b/models/ColorModel.cpp @@ -636,7 +636,7 @@ void ScaLBL_ColorModel::Run(){ volA += delta_volume; volB -= delta_volume; if (delta_volume_target / delta_volume > 0.f){ - morph_delta *= 1.01*min((delta_volume_target - delta_volume) / delta_volume, 2.f); + morph_delta *= 1.01*min((delta_volume_target - delta_volume) / delta_volume, 2.0); if (morph_delta > 1.f) morph_delta = 1.f; if (morph_delta < -1.f) morph_delta = -1.f; if (fabs(morph_delta) < 0.05 ) morph_delta = 0.05*(morph_delta)/fabs(morph_delta); // set minimum