summaryrefslogtreecommitdiff
path: root/xfa/fxgraphics
diff options
context:
space:
mode:
Diffstat (limited to 'xfa/fxgraphics')
-rw-r--r--xfa/fxgraphics/cfx_graphics.cpp6
-rw-r--r--xfa/fxgraphics/cfx_graphics.h10
-rw-r--r--xfa/fxgraphics/cxfa_color.cpp (renamed from xfa/fxgraphics/cfx_color.cpp)18
-rw-r--r--xfa/fxgraphics/cxfa_color.h (renamed from xfa/fxgraphics/cfx_color.h)18
4 files changed, 26 insertions, 26 deletions
diff --git a/xfa/fxgraphics/cfx_graphics.cpp b/xfa/fxgraphics/cfx_graphics.cpp
index a67932f052..0865221aa9 100644
--- a/xfa/fxgraphics/cfx_graphics.cpp
+++ b/xfa/fxgraphics/cfx_graphics.cpp
@@ -12,10 +12,10 @@
#include "core/fxge/cfx_renderdevice.h"
#include "core/fxge/cfx_unicodeencoding.h"
#include "third_party/base/ptr_util.h"
-#include "xfa/fxgraphics/cfx_color.h"
#include "xfa/fxgraphics/cfx_path.h"
#include "xfa/fxgraphics/cfx_pattern.h"
#include "xfa/fxgraphics/cfx_shading.h"
+#include "xfa/fxgraphics/cxfa_color.h"
namespace {
@@ -165,7 +165,7 @@ void CFX_Graphics::SetLineWidth(float lineWidth, bool isActOnDash) {
}
}
-void CFX_Graphics::SetStrokeColor(CFX_Color* color) {
+void CFX_Graphics::SetStrokeColor(CXFA_Color* color) {
if (!color)
return;
if (m_type == FX_CONTEXT_Device && m_renderDevice) {
@@ -173,7 +173,7 @@ void CFX_Graphics::SetStrokeColor(CFX_Color* color) {
}
}
-void CFX_Graphics::SetFillColor(CFX_Color* color) {
+void CFX_Graphics::SetFillColor(CXFA_Color* color) {
if (!color)
return;
if (m_type == FX_CONTEXT_Device && m_renderDevice) {
diff --git a/xfa/fxgraphics/cfx_graphics.h b/xfa/fxgraphics/cfx_graphics.h
index 8785a387d6..0ce9bf4b32 100644
--- a/xfa/fxgraphics/cfx_graphics.h
+++ b/xfa/fxgraphics/cfx_graphics.h
@@ -17,7 +17,7 @@
#include "core/fxge/fx_dib.h"
#include "core/fxge/fx_font.h"
-class CFX_Color;
+class CXFA_Color;
class CFX_Path;
using FX_FillMode = int32_t;
@@ -57,8 +57,8 @@ class CFX_Graphics {
void SetLineDash(float dashPhase, float* dashArray, int32_t dashCount);
void SetLineDash(FX_DashStyle dashStyle);
void SetLineWidth(float lineWidth, bool isActOnDash = false);
- void SetStrokeColor(CFX_Color* color);
- void SetFillColor(CFX_Color* color);
+ void SetStrokeColor(CXFA_Color* color);
+ void SetFillColor(CXFA_Color* color);
void SetClipRect(const CFX_RectF& rect);
void StrokePath(CFX_Path* path, CFX_Matrix* matrix = nullptr);
void FillPath(CFX_Path* path,
@@ -81,8 +81,8 @@ class CFX_Graphics {
CFX_GraphStateData graphState;
CFX_Matrix CTM;
bool isActOnDash;
- CFX_Color* strokeColor;
- CFX_Color* fillColor;
+ CXFA_Color* strokeColor;
+ CXFA_Color* fillColor;
} m_info;
void RenderDeviceSetLineDash(FX_DashStyle dashStyle);
diff --git a/xfa/fxgraphics/cfx_color.cpp b/xfa/fxgraphics/cxfa_color.cpp
index 36025a82c8..27a0cbe569 100644
--- a/xfa/fxgraphics/cfx_color.cpp
+++ b/xfa/fxgraphics/cxfa_color.cpp
@@ -4,33 +4,33 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/fxgraphics/cfx_color.h"
+#include "xfa/fxgraphics/cxfa_color.h"
-CFX_Color::CFX_Color() : m_type(FX_COLOR_None) {}
+CXFA_Color::CXFA_Color() : m_type(FX_COLOR_None) {}
-CFX_Color::CFX_Color(const FX_ARGB argb) {
+CXFA_Color::CXFA_Color(const FX_ARGB argb) {
Set(argb);
}
-CFX_Color::CFX_Color(CFX_Pattern* pattern, const FX_ARGB argb) {
+CXFA_Color::CXFA_Color(CFX_Pattern* pattern, const FX_ARGB argb) {
Set(pattern, argb);
}
-CFX_Color::CFX_Color(CFX_Shading* shading) {
+CXFA_Color::CXFA_Color(CFX_Shading* shading) {
Set(shading);
}
-CFX_Color::~CFX_Color() {
+CXFA_Color::~CXFA_Color() {
m_type = FX_COLOR_None;
}
-void CFX_Color::Set(const FX_ARGB argb) {
+void CXFA_Color::Set(const FX_ARGB argb) {
m_type = FX_COLOR_Solid;
m_info.argb = argb;
m_info.pattern = nullptr;
}
-void CFX_Color::Set(CFX_Pattern* pattern, const FX_ARGB argb) {
+void CXFA_Color::Set(CFX_Pattern* pattern, const FX_ARGB argb) {
if (!pattern)
return;
m_type = FX_COLOR_Pattern;
@@ -38,7 +38,7 @@ void CFX_Color::Set(CFX_Pattern* pattern, const FX_ARGB argb) {
m_info.pattern = pattern;
}
-void CFX_Color::Set(CFX_Shading* shading) {
+void CXFA_Color::Set(CFX_Shading* shading) {
if (!shading)
return;
m_type = FX_COLOR_Shading;
diff --git a/xfa/fxgraphics/cfx_color.h b/xfa/fxgraphics/cxfa_color.h
index 75f7fe2010..16ef1d7d4d 100644
--- a/xfa/fxgraphics/cfx_color.h
+++ b/xfa/fxgraphics/cxfa_color.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef XFA_FXGRAPHICS_CFX_COLOR_H_
-#define XFA_FXGRAPHICS_CFX_COLOR_H_
+#ifndef XFA_FXGRAPHICS_CXFA_COLOR_H_
+#define XFA_FXGRAPHICS_CXFA_COLOR_H_
#include "core/fxge/fx_dib.h"
#include "xfa/fxgraphics/cfx_graphics.h"
@@ -15,13 +15,13 @@ class CFX_Shading;
enum { FX_COLOR_None = 0, FX_COLOR_Solid, FX_COLOR_Pattern, FX_COLOR_Shading };
-class CFX_Color {
+class CXFA_Color {
public:
- CFX_Color();
- explicit CFX_Color(const FX_ARGB argb);
- explicit CFX_Color(CFX_Shading* shading);
- CFX_Color(CFX_Pattern* pattern, const FX_ARGB argb);
- virtual ~CFX_Color();
+ CXFA_Color();
+ explicit CXFA_Color(const FX_ARGB argb);
+ explicit CXFA_Color(CFX_Shading* shading);
+ CXFA_Color(CFX_Pattern* pattern, const FX_ARGB argb);
+ virtual ~CXFA_Color();
void Set(const FX_ARGB argb);
void Set(CFX_Pattern* pattern, const FX_ARGB argb);
@@ -40,4 +40,4 @@ class CFX_Color {
};
};
-#endif // XFA_FXGRAPHICS_CFX_COLOR_H_
+#endif // XFA_FXGRAPHICS_CXFA_COLOR_H_