remove hardware specific code from gui

Use the framebuffer's getWidth4FB_HW_ACC() instead of system/helpers.
The use in cc_item_picture was guarded by a hardware #ifdef, use
needAlign4Blit() instead.

This needs testing on the affected hardware, which I do not have :-)
This commit is contained in:
Stefan Seyfried
2017-02-14 00:14:30 +01:00
committed by M. Liebmann
parent b6909fb815
commit c9e1072b94
2 changed files with 4 additions and 6 deletions

View File

@@ -33,7 +33,6 @@
#include "cc_item_picture.h"
#include <unistd.h>
#include <system/debug.h>
#include <system/helpers.h>
#include <driver/pictureviewer/pictureviewer.h>
extern CPictureViewer * g_PicViewer;
@@ -222,10 +221,9 @@ void CComponentsPicture::initCCItem()
{
float h_ratio = float(height)*100/(float)dy;
width = int(h_ratio*(float)dx/100);
#ifdef BOXMODEL_CS_HD2
if (do_scale && (width > 10 || height > 10))
width = GetWidth4FB_HW_ACC(x+fr_thickness, width-2*fr_thickness)+2*fr_thickness;
#endif
if (frameBuffer->needAlign4Blit() &&
do_scale && (width > 10 || height > 10))
width = frameBuffer->getWidth4FB_HW_ACC(x+fr_thickness, width-2*fr_thickness)+2*fr_thickness;
keep_dx_aspect = false;
}
if (keep_dy_aspect && dx)