CComponentsPicture: Align pictures at 4 byte boundary...

...for hw blit on apollo/kronos hardware

src/gui/components/cc_item_picture.cpp

@@ -33,6 +33,7 @@
 #include "cc_item_picture.h"
 #include <unistd.h>
 #include <system/debug.h>
+#include <system/helpers.h>
 
 extern CPictureViewer * g_PicViewer;
 
@@ -196,6 +197,10 @@ void CComponentsPicture::initCCItem()
 	if (keep_dx_aspect){
 		float h_ratio = float(height)*100/(float)dy;
 		width = int(h_ratio*(float)dx/100);
+#ifdef BOXMODEL_APOLLO
+		if (do_scale && (width > 10 || height > 10))
+			width = GetWidth4FB_HW_ACC(x+fr_thickness, width-2*fr_thickness)+2*fr_thickness;
+#endif
 	}
 	if (keep_dy_aspect){
 		float w_ratio = float(width)*100/(float)dx;

src/gui/moviebrowser.cpp

@@ -1347,10 +1347,6 @@ void CMovieBrowser::refreshMovieInfo(void)
 	if (logo_ok) {
 		flogo_w = (int)(((float)16 / (float)9) * (float)m_cBoxFrameInfo.iHeight);
 		flogo_h = m_cBoxFrameInfo.iHeight;
-#ifdef BOXMODEL_APOLLO
-		/* align for hw blit */
-		flogo_w = ((flogo_w + 3) / 4) * 4;
-#endif
 	}
 
 	static int logo_w = 0;