From 0ca753dbcaf32899a02b24e4e4e57cffa9989ac0 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Tue, 30 Jun 2015 21:02:41 +0200 Subject: [PATCH] CComponentsPicture: fix internal value for dimension vars The values contained not values from the scaled image file. Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/5e380fa4f8f2f3fe5aa60ce7bafac8d264db2463 Author: Thilo Graf Date: 2015-06-30 (Tue, 30 Jun 2015) ------------------ This commit was generated by Migit --- src/gui/components/cc_item_picture.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/gui/components/cc_item_picture.cpp b/src/gui/components/cc_item_picture.cpp index bca05b38d..8255b671b 100644 --- a/src/gui/components/cc_item_picture.cpp +++ b/src/gui/components/cc_item_picture.cpp @@ -130,6 +130,8 @@ void CComponentsPicture::initCCItem() //if initialized dimension values = 0, set current object dimension values to real image size otherwise use defined size g_PicViewer->getSize(pic_name.c_str(), (width == 0 ? &width : &w_pic), (height == 0 ? &height : &h_pic)); g_PicViewer->rescaleImageDimensions(&w_pic, &h_pic, width, height); + width = w_pic; + height = h_pic; } }