| Index: xfa/fde/fde_object.h
|
| diff --git a/xfa/fde/fde_object.h b/xfa/fde/fde_object.h
|
| index e222b1a56262d26f4f4ddd66fd845a62601153f1..e7497787947578ef361b4481bb1b73929bdd7519 100644
|
| --- a/xfa/fde/fde_object.h
|
| +++ b/xfa/fde/fde_object.h
|
| @@ -90,6 +90,7 @@ class CFDE_Pen : public IFDE_Pen, public CFX_Target {
|
| CFX_FloatArray m_DashArray;
|
| CFDE_CompoundPatterns m_CompoundPatterns;
|
| };
|
| +
|
| class CFDE_SolidBrush : public IFDE_SolidBrush, public CFX_Target {
|
| public:
|
| CFDE_SolidBrush() : m_Color(0xFF000000) { m_Matrix.SetIdentity(); }
|
| @@ -113,134 +114,5 @@ class CFDE_SolidBrush : public IFDE_SolidBrush, public CFX_Target {
|
| FX_ARGB m_Color;
|
| CFX_Matrix m_Matrix;
|
| };
|
| -class CFDE_HatchBrush : public IFDE_HatchBrush, public CFX_Target {
|
| - public:
|
| - CFDE_HatchBrush() : m_iStyle(-1), m_BackColor(0), m_ForeColor(0) {
|
| - m_Matrix.SetIdentity();
|
| - }
|
| -
|
| - virtual void Release() { delete this; }
|
| - virtual int32_t GetType() const { return FDE_BRUSHTYPE_Hatch; }
|
| - virtual const CFX_Matrix& GetMatrix() const { return m_Matrix; }
|
| - virtual void ResetMatrix() { m_Matrix.SetIdentity(); }
|
| - virtual void TranslateMatrix(FX_FLOAT dx, FX_FLOAT dy) {
|
| - m_Matrix.Translate(dx, dy);
|
| - }
|
| - virtual void RotateMatrix(FX_FLOAT fRadian) { m_Matrix.Rotate(fRadian); }
|
| - virtual void ScaleMatrix(FX_FLOAT sx, FX_FLOAT sy) { m_Matrix.Scale(sx, sy); }
|
| - virtual void ConcatMatrix(const CFX_Matrix& matrix) {
|
| - m_Matrix.Concat(matrix);
|
| - }
|
| - virtual void SetMatrix(const CFX_Matrix& matrix) { m_Matrix = matrix; }
|
| - virtual FX_ARGB GetColor(FX_BOOL bForegroundColor) const {
|
| - return bForegroundColor ? m_ForeColor : m_BackColor;
|
| - }
|
| - virtual void SetColor(FX_ARGB color, FX_BOOL bForegroundColor) {
|
| - if (bForegroundColor) {
|
| - m_ForeColor = color;
|
| - } else {
|
| - m_BackColor = color;
|
| - }
|
| - }
|
| -
|
| - virtual int32_t GetHatchStyle() const { return m_iStyle; }
|
| - virtual FX_BOOL SetHatchStyle(int32_t iHatchStyle) {
|
| - m_iStyle = iHatchStyle;
|
| - return m_iStyle >= FDE_HATCHSTYLE_Min && m_iStyle <= FDE_HATCHSTYLE_Max;
|
| - }
|
| - int32_t m_iStyle;
|
| - FX_ARGB m_BackColor;
|
| - FX_ARGB m_ForeColor;
|
| - CFX_Matrix m_Matrix;
|
| -};
|
| -class CFDE_TextureBrush : public IFDE_TextureBrush, public CFX_Target {
|
| - public:
|
| - CFDE_TextureBrush() : m_iWrap(0), m_pImage(NULL), m_bAutoRelease(FALSE) {
|
| - m_Matrix.SetIdentity();
|
| - }
|
| -
|
| - virtual void Release() { delete this; }
|
| - virtual int32_t GetType() const { return FDE_BRUSHTYPE_Texture; }
|
| - virtual const CFX_Matrix& GetMatrix() const { return m_Matrix; }
|
| - virtual void ResetMatrix() { m_Matrix.SetIdentity(); }
|
| - virtual void TranslateMatrix(FX_FLOAT dx, FX_FLOAT dy) {
|
| - m_Matrix.Translate(dx, dy);
|
| - }
|
| - virtual void RotateMatrix(FX_FLOAT fRadian) { m_Matrix.Rotate(fRadian); }
|
| - virtual void ScaleMatrix(FX_FLOAT sx, FX_FLOAT sy) { m_Matrix.Scale(sx, sy); }
|
| - virtual void ConcatMatrix(const CFX_Matrix& matrix) {
|
| - m_Matrix.Concat(matrix);
|
| - }
|
| - virtual void SetMatrix(const CFX_Matrix& matrix) { m_Matrix = matrix; }
|
| - virtual IFDE_Image* GetImage() const { return m_pImage; }
|
| - virtual void SetImage(IFDE_Image* pImage, FX_BOOL bAutoRelease) {
|
| - m_pImage = pImage;
|
| - m_bAutoRelease = bAutoRelease;
|
| - }
|
| - virtual int32_t GetWrapMode() const { return m_iWrap; }
|
| - virtual void SetWrapMode(int32_t iWrapMode) { m_iWrap = iWrapMode; }
|
| - int32_t m_iWrap;
|
| - IFDE_Image* m_pImage;
|
| - FX_BOOL m_bAutoRelease;
|
| - CFX_Matrix m_Matrix;
|
| -};
|
| -class CFDE_LinearBrush : public IFDE_LinearGradientBrush, public CFX_Target {
|
| - public:
|
| - CFDE_LinearBrush() : m_EndColor(0), m_StartColor(0), m_iWrapMode(0) {
|
| - m_StartPoint.x = m_StartPoint.y = m_EndPoint.x = m_EndPoint.y = 0;
|
| - m_Matrix.SetIdentity();
|
| - }
|
| -
|
| - virtual void Release() { delete this; }
|
| - virtual int32_t GetType() const { return FDE_BRUSHTYPE_LinearGradient; }
|
| - virtual const CFX_Matrix& GetMatrix() const { return m_Matrix; }
|
| - virtual void ResetMatrix() { m_Matrix.SetIdentity(); }
|
| - virtual void TranslateMatrix(FX_FLOAT dx, FX_FLOAT dy) {
|
| - m_Matrix.Translate(dx, dy);
|
| - }
|
| - virtual void RotateMatrix(FX_FLOAT fRadian) { m_Matrix.Rotate(fRadian); }
|
| - virtual void ScaleMatrix(FX_FLOAT sx, FX_FLOAT sy) { m_Matrix.Scale(sx, sy); }
|
| - virtual void ConcatMatrix(const CFX_Matrix& matrix) {
|
| - m_Matrix.Concat(matrix);
|
| - }
|
| - virtual void SetMatrix(const CFX_Matrix& matrix) { m_Matrix = matrix; }
|
| - virtual void GetLinearPoints(CFX_PointF& startingPoint,
|
| - CFX_PointF& endingPoint) const {
|
| - startingPoint = m_StartPoint;
|
| - endingPoint = m_EndPoint;
|
| - }
|
| - virtual void SetLinearPoints(const CFX_PointF& startingPoint,
|
| - const CFX_PointF& endingPoint) {
|
| - m_StartPoint = startingPoint;
|
| - m_EndPoint = endingPoint;
|
| - }
|
| - virtual void GetLinearColors(FX_ARGB& startingColor,
|
| - FX_ARGB& endingColor) const {
|
| - startingColor = m_StartColor;
|
| - endingColor = m_EndColor;
|
| - }
|
| - virtual void SetLinearColors(const FX_ARGB& startingColor,
|
| - const FX_ARGB& endingColor) {
|
| - m_StartColor = startingColor;
|
| - m_EndColor = endingColor;
|
| - }
|
| - virtual int32_t CountGradientColors() const { return m_GradColors.GetSize(); }
|
| - virtual FX_BOOL GetGradientColors(CFDE_GradientColors& colors) const {
|
| - return colors.Copy(m_GradColors), TRUE;
|
| - }
|
| - virtual FX_BOOL SetGradientColors(const CFDE_GradientColors& colors) {
|
| - return m_GradColors.Copy(colors), TRUE;
|
| - }
|
| -
|
| - virtual int32_t GetWrapMode() const { return m_iWrapMode; }
|
| - virtual void SetWrapMode(int32_t iWrapMode) { m_iWrapMode = iWrapMode; }
|
| - CFX_PointF m_EndPoint;
|
| - CFX_PointF m_StartPoint;
|
| - FX_ARGB m_EndColor;
|
| - FX_ARGB m_StartColor;
|
| - CFDE_GradientColors m_GradColors;
|
| - int32_t m_iWrapMode;
|
| - CFX_Matrix m_Matrix;
|
| -};
|
|
|
| #endif // XFA_FDE_FDE_OBJECT_H_
|
|
|