From 56ba19313d723be9332c680ae73689c61ac637a0 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Thu, 27 Oct 2016 23:11:43 +0200 Subject: [PATCH] cc_item_picture: fix wrong operator in width calculation Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/874f54af4b58db012097d909899872c06b32ea6e Author: vanhofen Date: 2016-10-27 (Thu, 27 Oct 2016) Origin message was: ------------------ - cc_item_picture: fix wrong operator in width calculation ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/components/cc_item_picture.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/components/cc_item_picture.cpp b/src/gui/components/cc_item_picture.cpp index 1fd538ac5..89ffaed86 100644 --- a/src/gui/components/cc_item_picture.cpp +++ b/src/gui/components/cc_item_picture.cpp @@ -224,7 +224,7 @@ void CComponentsPicture::initCCItem() width = GetWidth4FB_HW_ACC(x+fr_thickness, width-2*fr_thickness)+2*fr_thickness; #endif } - if (keep_dy_aspect & dx){ + if (keep_dy_aspect && dx){ float w_ratio = float(width)*100/(float)dx; height = int(w_ratio*(float)dy/100); }