Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Conflicts:
	src/gui/moviebrowser/mb.cpp


Origin commit data
------------------
Commit: 1ddcc0c7ce
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-02 (Wed, 02 Nov 2016)

src/gui/components/.gitignore

@@ -0,0 +1 @@
+/doc/html

src/gui/components/cc_frm_scrollbar.cpp

@@ -136,6 +136,8 @@ void CComponentsScrollBar::initSegments()
 
 	//calculate height of segment container
 	int h_seg_obj = height - 2*sb_up_obj->getHeight() - 3*append_y_offset;
+	if(h_seg_obj < 0)
+		h_seg_obj = 0;
 
 	//init segment container
 	if (sb_segments_obj == NULL){
@@ -154,6 +156,8 @@ void CComponentsScrollBar::initSegments()
 	//set y position of 1st segment and set height of segments
 	int y_seg = 1+ append_y_offset;
 	int h_seg = sb_segments_obj->getHeight()/sb_segments_count - append_y_offset;
+	if(h_seg < 0)
+		h_seg = 0;
 
 	//create and add segments to segment container
 	for(u_int8_t i=0; i<sb_segments_count; i++){

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);
 	}