removed: FRECT struct - use CRect instead.

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@23127 568bbfeb-2a22-0410-94d2-cc84cf5bfa90

1 files changed, 9 insertions, 10 deletions

diff --git a/guilib/VisibleEffect.cpp b/guilib/VisibleEffect.cpp
index df48066142..1f05fb9340 100644
--- a/guilib/VisibleEffect.cpp
+++ b/guilib/VisibleEffect.cpp
@@ -24,7 +24,6 @@
 #include "utils/log.h"
 #include "SkinInfo.h" // for the effect time adjustments
 #include "StringUtils.h"
-#include "GUIImage.h" // for FRECT
 #include "Tween.h"
 #include "tinyXML/tinyxml.h"
 
@@ -248,7 +247,7 @@ void CRotateEffect::ApplyEffect(float offset, const CPoint &center)
     m_matrix.SetZRotation(((m_endAngle - m_startAngle)*offset + m_startAngle) * degree_to_radian, m_center.x, m_center.y, g_graphicsContext.GetScalingPixelRatio());
 }
 
-CZoomEffect::CZoomEffect(const TiXmlElement *node, const FRECT &rect) : CAnimEffect(node, EFFECT_TYPE_ZOOM)
+CZoomEffect::CZoomEffect(const TiXmlElement *node, const CRect &rect) : CAnimEffect(node, EFFECT_TYPE_ZOOM)
 {
   // effect defaults
   m_startX = m_startY = 100;
@@ -256,13 +255,13 @@ CZoomEffect::CZoomEffect(const TiXmlElement *node, const FRECT &rect) : CAnimEff
   m_center = CPoint(0,0);
   m_autoCenter = false;
 
-  float startPosX = rect.left;
-  float startPosY = rect.top;
-  float endPosX = rect.left;
-  float endPosY = rect.top;
+  float startPosX = rect.x1;
+  float startPosY = rect.y1;
+  float endPosX = rect.x1;
+  float endPosY = rect.y1;
 
-  float width = (rect.right) ? rect.right : 0.001f;
-  float height = (rect.bottom) ? rect.bottom : 0.001f;
+  float width = max(rect.Width(), 0.001f);
+  float height = max(rect.Height(),0.001f);
 
   const char *start = node->Attribute("start");
   if (start)
@@ -608,7 +607,7 @@ void CAnimation::SetInitialCondition(int contextWindow)
     ResetAnimation();
 }
 
-void CAnimation::Create(const TiXmlElement *node, const FRECT &rect)
+void CAnimation::Create(const TiXmlElement *node, const CRect &rect)
 {
   if (!node || !node->FirstChild())
     return;
@@ -671,7 +670,7 @@ void CAnimation::Create(const TiXmlElement *node, const FRECT &rect)
   }
 }
 
-void CAnimation::AddEffect(const CStdString &type, const TiXmlElement *node, const FRECT &rect)
+void CAnimation::AddEffect(const CStdString &type, const TiXmlElement *node, const CRect &rect)
 {
   CAnimEffect *effect = NULL;
   if (type.Equals("fade"))