From 4f1f2dcff03cf1a534f6f0f979dea6580ea9ef83 Mon Sep 17 00:00:00 2001 From: "Jerry (Xinyu Hou)" Date: Mon, 19 Oct 2015 12:34:29 -0700 Subject: [PATCH] Use condition instead of assertion #5030 --- src/lib/synergy/DpiHelper.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/lib/synergy/DpiHelper.cpp b/src/lib/synergy/DpiHelper.cpp index 6507979e..67423cc5 100644 --- a/src/lib/synergy/DpiHelper.cpp +++ b/src/lib/synergy/DpiHelper.cpp @@ -39,14 +39,14 @@ void DpiHelper::calculateDpi(size_t width, size_t height) size_t dpiTest1 = s_resolutionWidth * 100 / width; size_t dpiTest2 = s_resolutionHeight * 100 / height; - assert(dpiTest1 == dpiTest2); + if (dpiTest1 == dpiTest2) { + s_dpi = dpiTest1; - s_dpi = dpiTest1; + if (s_dpi != kDefaultDpi) { + s_dpiScaled = true; - if (s_dpi != kDefaultDpi) { - s_dpiScaled = true; - - LOG((CLOG_DEBUG "DPI: %d%%", s_dpi)); - LOG((CLOG_DEBUG "physical resolution: %d, %d scaled resolution: %d, %d", s_resolutionWidth, s_resolutionHeight, width, height)); - } + LOG((CLOG_DEBUG "DPI: %d%%", s_dpi)); + LOG((CLOG_DEBUG "physical resolution: %d, %d scaled resolution: %d, %d", s_resolutionWidth, s_resolutionHeight, width, height)); + } + } }