CComponentsPicture: simplify item init, adapt getHeight/getWidth members

Members getHeight/getWidth returns now image related values dependent of
scale mode


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8227638c06
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-10-12 (Sun, 12 Oct 2014)



------------------
This commit was generated by Migit

src/gui/components/cc_item_picture.h

@@ -111,12 +111,18 @@ class CComponentsPicture : public CComponentsItem
 		///sets an image name (unscaled icons only), full image path or url to an image file
 		virtual void setPicture(const char* picture_name);
 
+		///handle image size
+		virtual void getSize(int* width_image, int *height_image);
+		///return width of component
+		virtual int getWidth();
+		///return height of component
+		virtual int getHeight();
+
+		virtual void doScale(bool scale = true){do_scale = scale;}
+
 		///return paint mode of internal image, true=image was painted, please do not to confuse with isPainted()! isPainted() is related to item itself.
 		virtual inline bool isPicPainted(){return is_image_painted;};
 
-		///handle image size
-		void getImageSize(int* width_image, int *height_image);
-
 		///paint item
 		virtual void paint(bool do_save_bg = CC_SAVE_SCREEN_YES);
 		///hide item
@@ -137,6 +143,8 @@ class CComponentsChannelLogo : public CComponentsPicture
 		///indicates that logo is available, after paint or new instance, value = false
 		bool has_logo;
 
+		void init(const uint64_t& channelId, const std::string& channelName, bool allow_scale);
+
 	public:
 		CComponentsChannelLogo( const int &x_pos, const int &y_pos, const int &w, const int &h,
 					const std::string& channelName = "",