Index: core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp |
diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp |
index 101a1979680b95e37b24fb12c5eb428f140854b4..1e9c4063ffbf96eaaedad5d3ea4d6aa0d6b32c42 100644 |
--- a/core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp |
+++ b/core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp |
@@ -40,7 +40,7 @@ CPDF_DeviceCS::CPDF_DeviceCS(CPDF_Document* pDoc, int family) |
: CPDF_ColorSpace(pDoc, family, ComponentsForFamily(family)) { |
} |
-FX_BOOL CPDF_DeviceCS::GetRGB(FX_FLOAT* pBuf, FX_FLOAT& R, FX_FLOAT& G, FX_FLOAT& B) const |
+bool CPDF_DeviceCS::GetRGB(FX_FLOAT* pBuf, FX_FLOAT& R, FX_FLOAT& G, FX_FLOAT& B) const |
{ |
if (m_Family == PDFCS_DEVICERGB) { |
R = pBuf[0]; |
@@ -81,56 +81,56 @@ FX_BOOL CPDF_DeviceCS::GetRGB(FX_FLOAT* pBuf, FX_FLOAT& R, FX_FLOAT& G, FX_FLOAT |
} else { |
ASSERT(m_Family == PDFCS_PATTERN); |
R = G = B = 0; |
- return FALSE; |
+ return false; |
} |
- return TRUE; |
+ return true; |
} |
-FX_BOOL CPDF_DeviceCS::v_GetCMYK(FX_FLOAT* pBuf, FX_FLOAT& c, FX_FLOAT& m, FX_FLOAT& y, FX_FLOAT& k) const |
+bool CPDF_DeviceCS::v_GetCMYK(FX_FLOAT* pBuf, FX_FLOAT& c, FX_FLOAT& m, FX_FLOAT& y, FX_FLOAT& k) const |
{ |
if (m_Family != PDFCS_DEVICECMYK) { |
- return FALSE; |
+ return false; |
} |
c = pBuf[0]; |
m = pBuf[1]; |
y = pBuf[2]; |
k = pBuf[3]; |
- return TRUE; |
+ return true; |
} |
-FX_BOOL CPDF_DeviceCS::SetRGB(FX_FLOAT* pBuf, FX_FLOAT R, FX_FLOAT G, FX_FLOAT B) const |
+bool CPDF_DeviceCS::SetRGB(FX_FLOAT* pBuf, FX_FLOAT R, FX_FLOAT G, FX_FLOAT B) const |
{ |
if (m_Family == PDFCS_DEVICERGB) { |
pBuf[0] = R; |
pBuf[1] = G; |
pBuf[2] = B; |
- return TRUE; |
+ return true; |
} else if (m_Family == PDFCS_DEVICEGRAY) { |
if (R == G && R == B) { |
*pBuf = R; |
- return TRUE; |
+ return true; |
} else { |
- return FALSE; |
+ return false; |
} |
} else if (m_Family == PDFCS_DEVICECMYK) { |
sRGB_to_AdobeCMYK(R, G, B, pBuf[0], pBuf[1], pBuf[2], pBuf[3]); |
- return TRUE; |
+ return true; |
} |
- return FALSE; |
+ return false; |
} |
-FX_BOOL CPDF_DeviceCS::v_SetCMYK(FX_FLOAT* pBuf, FX_FLOAT c, FX_FLOAT m, FX_FLOAT y, FX_FLOAT k) const |
+bool CPDF_DeviceCS::v_SetCMYK(FX_FLOAT* pBuf, FX_FLOAT c, FX_FLOAT m, FX_FLOAT y, FX_FLOAT k) const |
{ |
if (m_Family == PDFCS_DEVICERGB) { |
AdobeCMYK_to_sRGB(c, m, y, k, pBuf[0], pBuf[1], pBuf[2]); |
- return TRUE; |
+ return true; |
} else if (m_Family == PDFCS_DEVICEGRAY) { |
- return FALSE; |
+ return false; |
} else if (m_Family == PDFCS_DEVICECMYK) { |
pBuf[0] = c; |
pBuf[1] = m; |
pBuf[2] = y; |
pBuf[3] = k; |
- return TRUE; |
+ return true; |
} |
- return FALSE; |
+ return false; |
} |
static void ReverseRGB(uint8_t* pDestBuf, const uint8_t* pSrcBuf, int pixels) |
{ |
@@ -149,7 +149,7 @@ static void ReverseRGB(uint8_t* pDestBuf, const uint8_t* pSrcBuf, int pixels) |
pSrcBuf += 3; |
} |
} |
-void CPDF_DeviceCS::TranslateImageLine(uint8_t* pDestBuf, const uint8_t* pSrcBuf, int pixels, int image_width, int image_height, FX_BOOL bTransMask) const |
+void CPDF_DeviceCS::TranslateImageLine(uint8_t* pDestBuf, const uint8_t* pSrcBuf, int pixels, int image_width, int image_height, bool bTransMask) const |
{ |
if (bTransMask && m_Family == PDFCS_DEVICECMYK) { |
for (int i = 0; i < pixels; i ++) { |
@@ -274,11 +274,11 @@ public: |
explicit CPDF_CalGray(CPDF_Document* pDoc) |
: CPDF_ColorSpace(pDoc, PDFCS_CALGRAY, 1) { |
} |
- FX_BOOL v_Load(CPDF_Document* pDoc, CPDF_Array* pArray) override; |
- FX_BOOL GetRGB(FX_FLOAT* pBuf, FX_FLOAT& R, FX_FLOAT& G, FX_FLOAT& B) const override; |
- FX_BOOL SetRGB(FX_FLOAT* pBuf, FX_FLOAT R, FX_FLOAT G, FX_FLOAT B) const override; |
+ bool v_Load(CPDF_Document* pDoc, CPDF_Array* pArray) override; |
+ bool GetRGB(FX_FLOAT* pBuf, FX_FLOAT& R, FX_FLOAT& G, FX_FLOAT& B) const override; |
+ bool SetRGB(FX_FLOAT* pBuf, FX_FLOAT R, FX_FLOAT G, FX_FLOAT B) const override; |
void TranslateImageLine(uint8_t* pDestBuf, const uint8_t* pSrcBuf, int pixels, int image_width, |
- int image_height, FX_BOOL bTransMask = FALSE) const override; |
+ int image_height, bool bTransMask = false) const override; |
private: |
FX_FLOAT m_WhitePoint[3]; |
@@ -286,7 +286,7 @@ private: |
FX_FLOAT m_Gamma; |
}; |
-FX_BOOL CPDF_CalGray::v_Load(CPDF_Document* pDoc, CPDF_Array* pArray) |
+bool CPDF_CalGray::v_Load(CPDF_Document* pDoc, CPDF_Array* pArray) |
{ |
CPDF_Dictionary* pDict = pArray->GetDict(1); |
CPDF_Array* pParam = pDict->GetArray(FX_BSTRC("WhitePoint")); |
@@ -302,23 +302,23 @@ FX_BOOL CPDF_CalGray::v_Load(CPDF_Document* pDoc, CPDF_Array* pArray) |
if (m_Gamma == 0) { |
m_Gamma = 1.0f; |
} |
- return TRUE; |
+ return true; |
} |
-FX_BOOL CPDF_CalGray::GetRGB(FX_FLOAT* pBuf, FX_FLOAT& R, FX_FLOAT& G, FX_FLOAT& B) const |
+bool CPDF_CalGray::GetRGB(FX_FLOAT* pBuf, FX_FLOAT& R, FX_FLOAT& G, FX_FLOAT& B) const |
{ |
R = G = B = *pBuf; |
- return TRUE; |
+ return true; |
} |
-FX_BOOL CPDF_CalGray::SetRGB(FX_FLOAT* pBuf, FX_FLOAT R, FX_FLOAT G, FX_FLOAT B) const |
+bool CPDF_CalGray::SetRGB(FX_FLOAT* pBuf, FX_FLOAT R, FX_FLOAT G, FX_FLOAT B) const |
{ |
if (R == G && R == B) { |
*pBuf = R; |
- return TRUE; |
+ return true; |
} else { |
- return FALSE; |
+ return false; |
} |
} |
-void CPDF_CalGray::TranslateImageLine(uint8_t* pDestBuf, const uint8_t* pSrcBuf, int pixels, int image_width, int image_height, FX_BOOL bTransMask) const |
+void CPDF_CalGray::TranslateImageLine(uint8_t* pDestBuf, const uint8_t* pSrcBuf, int pixels, int image_width, int image_height, bool bTransMask) const |
{ |
for (int i = 0; i < pixels; i ++) { |
*pDestBuf ++ = pSrcBuf[i]; |
@@ -332,24 +332,24 @@ public: |
explicit CPDF_CalRGB(CPDF_Document* pDoc) |
: CPDF_ColorSpace(pDoc, PDFCS_CALRGB, 3) { |
} |
- FX_BOOL v_Load(CPDF_Document* pDoc, CPDF_Array* pArray) override; |
- FX_BOOL GetRGB(FX_FLOAT* pBuf, FX_FLOAT& R, FX_FLOAT& G, FX_FLOAT& B) const override; |
- FX_BOOL SetRGB(FX_FLOAT* pBuf, FX_FLOAT R, FX_FLOAT G, FX_FLOAT B) const override; |
+ bool v_Load(CPDF_Document* pDoc, CPDF_Array* pArray) override; |
+ bool GetRGB(FX_FLOAT* pBuf, FX_FLOAT& R, FX_FLOAT& G, FX_FLOAT& B) const override; |
+ bool SetRGB(FX_FLOAT* pBuf, FX_FLOAT R, FX_FLOAT G, FX_FLOAT B) const override; |
void TranslateImageLine(uint8_t* pDestBuf, const uint8_t* pSrcBuf, int pixels, int image_width, |
- int image_height, FX_BOOL bTransMask = FALSE) const override; |
+ int image_height, bool bTransMask = false) const override; |
FX_FLOAT m_WhitePoint[3]; |
FX_FLOAT m_BlackPoint[3]; |
FX_FLOAT m_Gamma[3]; |
FX_FLOAT m_Matrix[9]; |
- FX_BOOL m_bGamma; |
- FX_BOOL m_bMatrix; |
+ bool m_bGamma; |
+ bool m_bMatrix; |
}; |
-FX_BOOL CPDF_CalRGB::v_Load(CPDF_Document* pDoc, CPDF_Array* pArray) |
+bool CPDF_CalRGB::v_Load(CPDF_Document* pDoc, CPDF_Array* pArray) |
{ |
CPDF_Dictionary* pDict = pArray->GetDict(1); |
if (!pDict) |
- return FALSE; |
+ return false; |
CPDF_Array* pParam = pDict->GetArray(FX_BSTRC("WhitePoint")); |
int i; |
@@ -362,25 +362,25 @@ FX_BOOL CPDF_CalRGB::v_Load(CPDF_Document* pDoc, CPDF_Array* pArray) |
} |
pParam = pDict->GetArray(FX_BSTRC("Gamma")); |
if (pParam) { |
- m_bGamma = TRUE; |
+ m_bGamma = true; |
for (i = 0; i < 3; i ++) { |
m_Gamma[i] = pParam->GetNumber(i); |
} |
} else { |
- m_bGamma = FALSE; |
+ m_bGamma = false; |
} |
pParam = pDict->GetArray(FX_BSTRC("Matrix")); |
if (pParam) { |
- m_bMatrix = TRUE; |
+ m_bMatrix = true; |
for (i = 0; i < 9; i ++) { |
m_Matrix[i] = pParam->GetNumber(i); |
} |
} else { |
- m_bMatrix = FALSE; |
+ m_bMatrix = false; |
} |
- return TRUE; |
+ return true; |
} |
-FX_BOOL CPDF_CalRGB::GetRGB(FX_FLOAT* pBuf, FX_FLOAT& R, FX_FLOAT& G, FX_FLOAT& B) const |
+bool CPDF_CalRGB::GetRGB(FX_FLOAT* pBuf, FX_FLOAT& R, FX_FLOAT& G, FX_FLOAT& B) const |
{ |
FX_FLOAT A_ = pBuf[0]; |
FX_FLOAT B_ = pBuf[1]; |
@@ -401,16 +401,16 @@ FX_BOOL CPDF_CalRGB::GetRGB(FX_FLOAT* pBuf, FX_FLOAT& R, FX_FLOAT& G, FX_FLOAT& |
Z = C_; |
} |
XYZ_to_sRGB_WhitePoint(X, Y, Z, R, G, B, m_WhitePoint[0], m_WhitePoint[1], m_WhitePoint[2]); |
- return TRUE; |
+ return true; |
} |
-FX_BOOL CPDF_CalRGB::SetRGB(FX_FLOAT* pBuf, FX_FLOAT R, FX_FLOAT G, FX_FLOAT B) const |
+bool CPDF_CalRGB::SetRGB(FX_FLOAT* pBuf, FX_FLOAT R, FX_FLOAT G, FX_FLOAT B) const |
{ |
pBuf[0] = R; |
pBuf[1] = G; |
pBuf[2] = B; |
- return TRUE; |
+ return true; |
} |
-void CPDF_CalRGB::TranslateImageLine(uint8_t* pDestBuf, const uint8_t* pSrcBuf, int pixels, int image_width, int image_height, FX_BOOL bTransMask) const |
+void CPDF_CalRGB::TranslateImageLine(uint8_t* pDestBuf, const uint8_t* pSrcBuf, int pixels, int image_width, int image_height, bool bTransMask) const |
{ |
if (bTransMask) { |
FX_FLOAT Cal[3]; |
@@ -436,21 +436,21 @@ public: |
: CPDF_ColorSpace(pDoc, PDFCS_LAB, 3) { |
} |
void GetDefaultValue(int iComponent, FX_FLOAT& value, FX_FLOAT& min, FX_FLOAT& max) const override; |
- FX_BOOL v_Load(CPDF_Document* pDoc, CPDF_Array* pArray) override; |
- FX_BOOL GetRGB(FX_FLOAT* pBuf, FX_FLOAT& R, FX_FLOAT& G, FX_FLOAT& B) const override; |
- FX_BOOL SetRGB(FX_FLOAT* pBuf, FX_FLOAT R, FX_FLOAT G, FX_FLOAT B) const override; |
+ bool v_Load(CPDF_Document* pDoc, CPDF_Array* pArray) override; |
+ bool GetRGB(FX_FLOAT* pBuf, FX_FLOAT& R, FX_FLOAT& G, FX_FLOAT& B) const override; |
+ bool SetRGB(FX_FLOAT* pBuf, FX_FLOAT R, FX_FLOAT G, FX_FLOAT B) const override; |
void TranslateImageLine(uint8_t* pDestBuf, const uint8_t* pSrcBuf, int pixels, int image_width, |
- int image_height, FX_BOOL bTransMask = FALSE) const; |
+ int image_height, bool bTransMask = false) const; |
FX_FLOAT m_WhitePoint[3]; |
FX_FLOAT m_BlackPoint[3]; |
FX_FLOAT m_Ranges[4]; |
}; |
-FX_BOOL CPDF_LabCS::v_Load(CPDF_Document* pDoc, CPDF_Array* pArray) |
+bool CPDF_LabCS::v_Load(CPDF_Document* pDoc, CPDF_Array* pArray) |
{ |
CPDF_Dictionary* pDict = pArray->GetDict(1); |
if (!pDict) { |
- return FALSE; |
+ return false; |
} |
CPDF_Array* pParam = pDict->GetArray(FX_BSTRC("WhitePoint")); |
int i; |
@@ -466,7 +466,7 @@ FX_BOOL CPDF_LabCS::v_Load(CPDF_Document* pDoc, CPDF_Array* pArray) |
for (i = 0; i < 4; i ++) { |
m_Ranges[i] = pParam ? pParam->GetNumber(i) : def_ranges[i]; |
} |
- return TRUE; |
+ return true; |
} |
void CPDF_LabCS::GetDefaultValue(int iComponent, FX_FLOAT& value, FX_FLOAT& min, FX_FLOAT& max) const |
{ |
@@ -485,7 +485,7 @@ void CPDF_LabCS::GetDefaultValue(int iComponent, FX_FLOAT& value, FX_FLOAT& min, |
} |
} |
} |
-FX_BOOL CPDF_LabCS::GetRGB(FX_FLOAT* pBuf, FX_FLOAT& R, FX_FLOAT& G, FX_FLOAT& B) const |
+bool CPDF_LabCS::GetRGB(FX_FLOAT* pBuf, FX_FLOAT& R, FX_FLOAT& G, FX_FLOAT& B) const |
{ |
FX_FLOAT Lstar = pBuf[0]; |
FX_FLOAT astar = pBuf[1]; |
@@ -510,13 +510,13 @@ FX_BOOL CPDF_LabCS::GetRGB(FX_FLOAT* pBuf, FX_FLOAT& R, FX_FLOAT& G, FX_FLOAT& B |
Z = 1.0889f * N * N * N; |
} |
XYZ_to_sRGB(X, Y, Z, R, G, B); |
- return TRUE; |
+ return true; |
} |
-FX_BOOL CPDF_LabCS::SetRGB(FX_FLOAT* pBuf, FX_FLOAT R, FX_FLOAT G, FX_FLOAT B) const |
+bool CPDF_LabCS::SetRGB(FX_FLOAT* pBuf, FX_FLOAT R, FX_FLOAT G, FX_FLOAT B) const |
{ |
- return FALSE; |
+ return false; |
} |
-void CPDF_LabCS::TranslateImageLine(uint8_t* pDestBuf, const uint8_t* pSrcBuf, int pixels, int image_width, int image_height, FX_BOOL bTransMask) const |
+void CPDF_LabCS::TranslateImageLine(uint8_t* pDestBuf, const uint8_t* pSrcBuf, int pixels, int image_width, int image_height, bool bTransMask) const |
{ |
for (int i = 0; i < pixels; i ++) { |
FX_FLOAT lab[3]; |
@@ -533,12 +533,12 @@ void CPDF_LabCS::TranslateImageLine(uint8_t* pDestBuf, const uint8_t* pSrcBuf, i |
} |
} |
CPDF_IccProfile::CPDF_IccProfile(const uint8_t* pData, FX_DWORD dwSize): |
- m_bsRGB(FALSE), |
+ m_bsRGB(false), |
m_pTransform(NULL), |
m_nSrcComponents(0) |
{ |
if (dwSize == 3144 && FXSYS_memcmp(pData + 0x190, "sRGB IEC61966-2.1", 17) == 0) { |
- m_bsRGB = TRUE; |
+ m_bsRGB = true; |
m_nSrcComponents = 3; |
} |
else if (CPDF_ModuleMgr::Get()->GetIccModule()) { |
@@ -560,23 +560,23 @@ public: |
m_pProfile(nullptr), |
m_pCache(nullptr), |
m_pRanges(nullptr), |
- m_bOwn(FALSE) { |
+ m_bOwn(false) { |
} |
~CPDF_ICCBasedCS() override; |
- FX_BOOL v_Load(CPDF_Document* pDoc, CPDF_Array* pArray) override; |
- FX_BOOL GetRGB(FX_FLOAT* pBuf, FX_FLOAT& R, FX_FLOAT& G, FX_FLOAT& B) const override; |
- FX_BOOL SetRGB(FX_FLOAT* pBuf, FX_FLOAT R, FX_FLOAT G, FX_FLOAT B) const override; |
- FX_BOOL v_GetCMYK(FX_FLOAT* pBuf, FX_FLOAT& c, FX_FLOAT& m, FX_FLOAT& y, FX_FLOAT& k) const override; |
- void EnableStdConversion(FX_BOOL bEnabled) override; |
+ bool v_Load(CPDF_Document* pDoc, CPDF_Array* pArray) override; |
+ bool GetRGB(FX_FLOAT* pBuf, FX_FLOAT& R, FX_FLOAT& G, FX_FLOAT& B) const override; |
+ bool SetRGB(FX_FLOAT* pBuf, FX_FLOAT R, FX_FLOAT G, FX_FLOAT B) const override; |
+ bool v_GetCMYK(FX_FLOAT* pBuf, FX_FLOAT& c, FX_FLOAT& m, FX_FLOAT& y, FX_FLOAT& k) const override; |
+ void EnableStdConversion(bool bEnabled) override; |
void TranslateImageLine(uint8_t* pDestBuf, const uint8_t* pSrcBuf, int pixels, int image_width, |
- int image_height, FX_BOOL bTransMask = FALSE) const override; |
+ int image_height, bool bTransMask = false) const override; |
CPDF_ColorSpace* m_pAlterCS; |
CPDF_IccProfile* m_pProfile; |
uint8_t* m_pCache; |
FX_FLOAT* m_pRanges; |
- FX_BOOL m_bOwn; |
+ bool m_bOwn; |
}; |
CPDF_ICCBasedCS::~CPDF_ICCBasedCS() |
@@ -595,15 +595,15 @@ CPDF_ICCBasedCS::~CPDF_ICCBasedCS() |
} |
} |
-FX_BOOL CPDF_ICCBasedCS::v_Load(CPDF_Document* pDoc, CPDF_Array* pArray) |
+bool CPDF_ICCBasedCS::v_Load(CPDF_Document* pDoc, CPDF_Array* pArray) |
{ |
CPDF_Stream* pStream = pArray->GetStream(1); |
if (pStream == NULL) { |
- return FALSE; |
+ return false; |
} |
m_pProfile = pDoc->LoadIccProfile(pStream); |
if (!m_pProfile) { |
- return FALSE; |
+ return false; |
} |
m_nComponents = m_pProfile->GetComponents(); //Try using the nComponents from ICC profile |
CPDF_Dictionary* pDict = pStream->GetDict(); |
@@ -616,13 +616,13 @@ FX_BOOL CPDF_ICCBasedCS::v_Load(CPDF_Document* pDoc, CPDF_Array* pArray) |
if (pAlterCS->CountComponents() > 0) { // Use Alternative colorspace |
m_nComponents = pAlterCS->CountComponents(); |
m_pAlterCS = pAlterCS; |
- m_bOwn = TRUE; |
+ m_bOwn = true; |
} |
else { // No valid alternative colorspace |
pAlterCS->ReleaseCS(); |
int32_t nDictComponents = pDict ? pDict->GetInteger(FX_BSTRC("N")) : 0; |
if (nDictComponents != 1 && nDictComponents != 3 && nDictComponents != 4) { |
- return FALSE; |
+ return false; |
} |
m_nComponents = nDictComponents; |
} |
@@ -634,7 +634,7 @@ FX_BOOL CPDF_ICCBasedCS::v_Load(CPDF_Document* pDoc, CPDF_Array* pArray) |
} |
else { |
m_pAlterCS = pAlterCS; |
- m_bOwn = TRUE; |
+ m_bOwn = true; |
} |
} |
} |
@@ -662,15 +662,15 @@ FX_BOOL CPDF_ICCBasedCS::v_Load(CPDF_Document* pDoc, CPDF_Array* pArray) |
m_pRanges[i] = 0; |
} |
} |
- return TRUE; |
+ return true; |
} |
-FX_BOOL CPDF_ICCBasedCS::GetRGB(FX_FLOAT* pBuf, FX_FLOAT& R, FX_FLOAT& G, FX_FLOAT& B) const |
+bool CPDF_ICCBasedCS::GetRGB(FX_FLOAT* pBuf, FX_FLOAT& R, FX_FLOAT& G, FX_FLOAT& B) const |
{ |
if (m_pProfile && m_pProfile->m_bsRGB) { |
R = pBuf[0]; |
G = pBuf[1]; |
B = pBuf[2]; |
- return TRUE; |
+ return true; |
} |
ICodec_IccModule *pIccModule = CPDF_ModuleMgr::Get()->GetIccModule(); |
if (m_pProfile->m_pTransform == NULL || pIccModule == NULL) { |
@@ -679,7 +679,7 @@ FX_BOOL CPDF_ICCBasedCS::GetRGB(FX_FLOAT* pBuf, FX_FLOAT& R, FX_FLOAT& G, FX_FLO |
} else { |
R = G = B = 0.0f; |
} |
- return TRUE; |
+ return true; |
} |
FX_FLOAT rgb[3]; |
pIccModule->SetComponents(m_nComponents); |
@@ -687,31 +687,31 @@ FX_BOOL CPDF_ICCBasedCS::GetRGB(FX_FLOAT* pBuf, FX_FLOAT& R, FX_FLOAT& G, FX_FLO |
R = rgb[0]; |
G = rgb[1]; |
B = rgb[2]; |
- return TRUE; |
+ return true; |
} |
-FX_BOOL CPDF_ICCBasedCS::v_GetCMYK(FX_FLOAT* pBuf, FX_FLOAT& c, FX_FLOAT& m, FX_FLOAT& y, FX_FLOAT& k) const |
+bool CPDF_ICCBasedCS::v_GetCMYK(FX_FLOAT* pBuf, FX_FLOAT& c, FX_FLOAT& m, FX_FLOAT& y, FX_FLOAT& k) const |
{ |
if (m_nComponents != 4) { |
- return FALSE; |
+ return false; |
} |
c = pBuf[0]; |
m = pBuf[1]; |
y = pBuf[2]; |
k = pBuf[3]; |
- return TRUE; |
+ return true; |
} |
-FX_BOOL CPDF_ICCBasedCS::SetRGB(FX_FLOAT* pBuf, FX_FLOAT R, FX_FLOAT G, FX_FLOAT B) const |
+bool CPDF_ICCBasedCS::SetRGB(FX_FLOAT* pBuf, FX_FLOAT R, FX_FLOAT G, FX_FLOAT B) const |
{ |
- return FALSE; |
+ return false; |
} |
-void CPDF_ICCBasedCS::EnableStdConversion(FX_BOOL bEnabled) |
+void CPDF_ICCBasedCS::EnableStdConversion(bool bEnabled) |
{ |
CPDF_ColorSpace::EnableStdConversion(bEnabled); |
if (m_pAlterCS) { |
m_pAlterCS->EnableStdConversion(bEnabled); |
} |
} |
-void CPDF_ICCBasedCS::TranslateImageLine(uint8_t* pDestBuf, const uint8_t* pSrcBuf, int pixels, int image_width, int image_height, FX_BOOL bTransMask) const |
+void CPDF_ICCBasedCS::TranslateImageLine(uint8_t* pDestBuf, const uint8_t* pSrcBuf, int pixels, int image_width, int image_height, bool bTransMask) const |
{ |
if (m_pProfile->m_bsRGB) { |
ReverseRGB(pDestBuf, pSrcBuf, pixels); |
@@ -766,10 +766,10 @@ public: |
} |
~CPDF_IndexedCS() override; |
- FX_BOOL v_Load(CPDF_Document* pDoc, CPDF_Array* pArray) override; |
- FX_BOOL GetRGB(FX_FLOAT* pBuf, FX_FLOAT& R, FX_FLOAT& G, FX_FLOAT& B) const override; |
+ bool v_Load(CPDF_Document* pDoc, CPDF_Array* pArray) override; |
+ bool GetRGB(FX_FLOAT* pBuf, FX_FLOAT& R, FX_FLOAT& G, FX_FLOAT& B) const override; |
CPDF_ColorSpace* GetBaseCS() const override; |
- void EnableStdConversion(FX_BOOL bEnabled) override; |
+ void EnableStdConversion(bool bEnabled) override; |
CPDF_ColorSpace* m_pBaseCS; |
CPDF_CountedColorSpace* m_pCountedBaseCS; |
@@ -788,19 +788,19 @@ CPDF_IndexedCS::~CPDF_IndexedCS() |
m_pDocument->GetPageData()->ReleaseColorSpace(pCS->GetArray()); |
} |
} |
-FX_BOOL CPDF_IndexedCS::v_Load(CPDF_Document* pDoc, CPDF_Array* pArray) |
+bool CPDF_IndexedCS::v_Load(CPDF_Document* pDoc, CPDF_Array* pArray) |
{ |
if (pArray->GetCount() < 4) { |
- return FALSE; |
+ return false; |
} |
CPDF_Object* pBaseObj = pArray->GetElementValue(1); |
if (pBaseObj == m_pArray) { |
- return FALSE; |
+ return false; |
} |
CPDF_DocPageData* pDocPageData = pDoc->GetPageData(); |
m_pBaseCS = pDocPageData->GetColorSpace(pBaseObj, NULL); |
if (m_pBaseCS == NULL) { |
- return FALSE; |
+ return false; |
} |
m_pCountedBaseCS = pDocPageData->FindColorSpacePtr(m_pBaseCS->GetArray()); |
m_nBaseComponents = m_pBaseCS->CountComponents(); |
@@ -813,29 +813,29 @@ FX_BOOL CPDF_IndexedCS::v_Load(CPDF_Document* pDoc, CPDF_Array* pArray) |
m_MaxIndex = pArray->GetInteger(2); |
CPDF_Object* pTableObj = pArray->GetElementValue(3); |
if (pTableObj == NULL) { |
- return FALSE; |
+ return false; |
} |
if (pTableObj->GetType() == PDFOBJ_STRING) { |
m_Table = ((CPDF_String*)pTableObj)->GetString(); |
} else if (pTableObj->GetType() == PDFOBJ_STREAM) { |
CPDF_StreamAcc acc; |
- acc.LoadAllData((CPDF_Stream*)pTableObj, FALSE); |
+ acc.LoadAllData((CPDF_Stream*)pTableObj, false); |
m_Table = CFX_ByteStringC(acc.GetData(), acc.GetSize()); |
} |
- return TRUE; |
+ return true; |
} |
-FX_BOOL CPDF_IndexedCS::GetRGB(FX_FLOAT* pBuf, FX_FLOAT& R, FX_FLOAT& G, FX_FLOAT& B) const |
+bool CPDF_IndexedCS::GetRGB(FX_FLOAT* pBuf, FX_FLOAT& R, FX_FLOAT& G, FX_FLOAT& B) const |
{ |
int index = (int32_t)(*pBuf); |
if (index < 0 || index > m_MaxIndex) { |
- return FALSE; |
+ return false; |
} |
if (m_nBaseComponents) { |
if (index == INT_MAX || (index + 1) > INT_MAX / m_nBaseComponents || |
(index + 1)*m_nBaseComponents > (int)m_Table.GetLength()) { |
R = G = B = 0; |
- return FALSE; |
+ return false; |
} |
} |
CFX_FixedBufGrow<FX_FLOAT, 16> Comps(m_nBaseComponents); |
@@ -845,13 +845,13 @@ FX_BOOL CPDF_IndexedCS::GetRGB(FX_FLOAT* pBuf, FX_FLOAT& R, FX_FLOAT& G, FX_FLOA |
comps[i] = m_pCompMinMax[i * 2] + m_pCompMinMax[i * 2 + 1] * pTable[index * m_nBaseComponents + i] / 255; |
} |
m_pBaseCS->GetRGB(comps, R, G, B); |
- return TRUE; |
+ return true; |
} |
CPDF_ColorSpace*CPDF_IndexedCS::GetBaseCS() const |
{ |
return m_pBaseCS; |
} |
-void CPDF_IndexedCS::EnableStdConversion(FX_BOOL bEnabled) |
+void CPDF_IndexedCS::EnableStdConversion(bool bEnabled) |
{ |
CPDF_ColorSpace::EnableStdConversion(bEnabled); |
if (m_pBaseCS) { |
@@ -872,39 +872,39 @@ CPDF_PatternCS::~CPDF_PatternCS() |
m_pDocument->GetPageData()->ReleaseColorSpace(pCS->GetArray()); |
} |
} |
-FX_BOOL CPDF_PatternCS::v_Load(CPDF_Document* pDoc, CPDF_Array* pArray) |
+bool CPDF_PatternCS::v_Load(CPDF_Document* pDoc, CPDF_Array* pArray) |
{ |
CPDF_Object* pBaseCS = pArray->GetElementValue(1); |
if (pBaseCS == m_pArray) { |
- return FALSE; |
+ return false; |
} |
CPDF_DocPageData* pDocPageData = pDoc->GetPageData(); |
m_pBaseCS = pDocPageData->GetColorSpace(pBaseCS, NULL); |
if (m_pBaseCS) { |
if (m_pBaseCS->GetFamily() == PDFCS_PATTERN) { |
- return FALSE; |
+ return false; |
} |
m_pCountedBaseCS = pDocPageData->FindColorSpacePtr(m_pBaseCS->GetArray()); |
m_nComponents = m_pBaseCS->CountComponents() + 1; |
if (m_pBaseCS->CountComponents() > MAX_PATTERN_COLORCOMPS) { |
- return FALSE; |
+ return false; |
} |
} else { |
m_nComponents = 1; |
} |
- return TRUE; |
+ return true; |
} |
-FX_BOOL CPDF_PatternCS::GetRGB(FX_FLOAT* pBuf, FX_FLOAT& R, FX_FLOAT& G, FX_FLOAT& B) const |
+bool CPDF_PatternCS::GetRGB(FX_FLOAT* pBuf, FX_FLOAT& R, FX_FLOAT& G, FX_FLOAT& B) const |
{ |
if (m_pBaseCS) { |
ASSERT(m_pBaseCS->GetFamily() != PDFCS_PATTERN); |
PatternValue* pvalue = (PatternValue*)pBuf; |
if (m_pBaseCS->GetRGB(pvalue->m_Comps, R, G, B)) { |
- return TRUE; |
+ return true; |
} |
} |
R = G = B = 0.75f; |
- return FALSE; |
+ return false; |
} |
CPDF_ColorSpace* CPDF_PatternCS::GetBaseCS() const |
{ |
@@ -920,9 +920,9 @@ public: |
} |
~CPDF_SeparationCS() override; |
void GetDefaultValue(int iComponent, FX_FLOAT& value, FX_FLOAT& min, FX_FLOAT& max) const override; |
- FX_BOOL v_Load(CPDF_Document* pDoc, CPDF_Array* pArray) override; |
- FX_BOOL GetRGB(FX_FLOAT* pBuf, FX_FLOAT& R, FX_FLOAT& G, FX_FLOAT& B) const override; |
- void EnableStdConversion(FX_BOOL bEnabled) override; |
+ bool v_Load(CPDF_Document* pDoc, CPDF_Array* pArray) override; |
+ bool GetRGB(FX_FLOAT* pBuf, FX_FLOAT& R, FX_FLOAT& G, FX_FLOAT& B) const override; |
+ void EnableStdConversion(bool bEnabled) override; |
CPDF_ColorSpace* m_pAltCS; |
CPDF_Function* m_pFunc; |
@@ -941,7 +941,7 @@ void CPDF_SeparationCS::GetDefaultValue(int iComponent, FX_FLOAT& value, FX_FLOA |
min = 0; |
max = 1.0f; |
} |
-FX_BOOL CPDF_SeparationCS::v_Load(CPDF_Document* pDoc, CPDF_Array* pArray) |
+bool CPDF_SeparationCS::v_Load(CPDF_Document* pDoc, CPDF_Array* pArray) |
{ |
CFX_ByteString name = pArray->GetString(1); |
if (name == FX_BSTRC("None")) { |
@@ -950,11 +950,11 @@ FX_BOOL CPDF_SeparationCS::v_Load(CPDF_Document* pDoc, CPDF_Array* pArray) |
m_Type = Colorant; |
CPDF_Object* pAltCS = pArray->GetElementValue(2); |
if (pAltCS == m_pArray) { |
- return FALSE; |
+ return false; |
} |
m_pAltCS = Load(pDoc, pAltCS); |
if (!m_pAltCS) { |
- return FALSE; |
+ return false; |
} |
CPDF_Object* pFuncObj = pArray->GetElementValue(3); |
if (pFuncObj && pFuncObj->GetType() != PDFOBJ_NAME) { |
@@ -965,16 +965,16 @@ FX_BOOL CPDF_SeparationCS::v_Load(CPDF_Document* pDoc, CPDF_Array* pArray) |
m_pFunc = NULL; |
} |
} |
- return TRUE; |
+ return true; |
} |
-FX_BOOL CPDF_SeparationCS::GetRGB(FX_FLOAT* pBuf, FX_FLOAT& R, FX_FLOAT& G, FX_FLOAT& B) const |
+bool CPDF_SeparationCS::GetRGB(FX_FLOAT* pBuf, FX_FLOAT& R, FX_FLOAT& G, FX_FLOAT& B) const |
{ |
if (m_Type == None) { |
- return FALSE; |
+ return false; |
} |
if (m_pFunc == NULL) { |
if (m_pAltCS == NULL) { |
- return FALSE; |
+ return false; |
} |
int nComps = m_pAltCS->CountComponents(); |
CFX_FixedBufGrow<FX_FLOAT, 16> results(nComps); |
@@ -982,23 +982,23 @@ FX_BOOL CPDF_SeparationCS::GetRGB(FX_FLOAT* pBuf, FX_FLOAT& R, FX_FLOAT& G, FX_F |
results[i] = *pBuf; |
} |
m_pAltCS->GetRGB(results, R, G, B); |
- return TRUE; |
+ return true; |
} |
CFX_FixedBufGrow<FX_FLOAT, 16> results(m_pFunc->CountOutputs()); |
int nresults = 0; |
m_pFunc->Call(pBuf, 1, results, nresults); |
if (nresults == 0) { |
- return FALSE; |
+ return false; |
} |
if (m_pAltCS) { |
m_pAltCS->GetRGB(results, R, G, B); |
- return TRUE; |
+ return true; |
} else { |
R = G = B = 0; |
- return FALSE; |
+ return false; |
} |
} |
-void CPDF_SeparationCS::EnableStdConversion(FX_BOOL bEnabled) |
+void CPDF_SeparationCS::EnableStdConversion(bool bEnabled) |
{ |
CPDF_ColorSpace::EnableStdConversion(bEnabled); |
if (m_pAltCS) { |
@@ -1015,9 +1015,9 @@ public: |
} |
~CPDF_DeviceNCS() override; |
void GetDefaultValue(int iComponent, FX_FLOAT& value, FX_FLOAT& min, FX_FLOAT& max) const override; |
- FX_BOOL v_Load(CPDF_Document* pDoc, CPDF_Array* pArray) override; |
- FX_BOOL GetRGB(FX_FLOAT* pBuf, FX_FLOAT& R, FX_FLOAT& G, FX_FLOAT& B) const override; |
- void EnableStdConversion(FX_BOOL bEnabled) override; |
+ bool v_Load(CPDF_Document* pDoc, CPDF_Array* pArray) override; |
+ bool GetRGB(FX_FLOAT* pBuf, FX_FLOAT& R, FX_FLOAT& G, FX_FLOAT& B) const override; |
+ void EnableStdConversion(bool bEnabled) override; |
CPDF_ColorSpace* m_pAltCS; |
CPDF_Function* m_pFunc; |
@@ -1035,45 +1035,45 @@ void CPDF_DeviceNCS::GetDefaultValue(int iComponent, FX_FLOAT& value, FX_FLOAT& |
min = 0; |
max = 1.0f; |
} |
-FX_BOOL CPDF_DeviceNCS::v_Load(CPDF_Document* pDoc, CPDF_Array* pArray) |
+bool CPDF_DeviceNCS::v_Load(CPDF_Document* pDoc, CPDF_Array* pArray) |
{ |
CPDF_Object* pObj = pArray->GetElementValue(1); |
if (!pObj) { |
- return FALSE; |
+ return false; |
} |
if (pObj->GetType() != PDFOBJ_ARRAY) { |
- return FALSE; |
+ return false; |
} |
m_nComponents = ((CPDF_Array*)pObj)->GetCount(); |
CPDF_Object* pAltCS = pArray->GetElementValue(2); |
if (!pAltCS || pAltCS == m_pArray) { |
- return FALSE; |
+ return false; |
} |
m_pAltCS = Load(pDoc, pAltCS); |
m_pFunc = CPDF_Function::Load(pArray->GetElementValue(3)); |
if (m_pAltCS == NULL || m_pFunc == NULL) { |
- return FALSE; |
+ return false; |
} |
if (m_pFunc->CountOutputs() < m_pAltCS->CountComponents()) { |
- return FALSE; |
+ return false; |
} |
- return TRUE; |
+ return true; |
} |
-FX_BOOL CPDF_DeviceNCS::GetRGB(FX_FLOAT* pBuf, FX_FLOAT& R, FX_FLOAT& G, FX_FLOAT& B) const |
+bool CPDF_DeviceNCS::GetRGB(FX_FLOAT* pBuf, FX_FLOAT& R, FX_FLOAT& G, FX_FLOAT& B) const |
{ |
if (m_pFunc == NULL) { |
- return FALSE; |
+ return false; |
} |
CFX_FixedBufGrow<FX_FLOAT, 16> results(m_pFunc->CountOutputs()); |
int nresults = 0; |
m_pFunc->Call(pBuf, m_nComponents, results, nresults); |
if (nresults == 0) { |
- return FALSE; |
+ return false; |
} |
m_pAltCS->GetRGB(results, R, G, B); |
- return TRUE; |
+ return true; |
} |
-void CPDF_DeviceNCS::EnableStdConversion(FX_BOOL bEnabled) |
+void CPDF_DeviceNCS::EnableStdConversion(bool bEnabled) |
{ |
CPDF_ColorSpace::EnableStdConversion(bEnabled); |
if (m_pAltCS) { |
@@ -1199,33 +1199,33 @@ FX_FLOAT* CPDF_ColorSpace::CreateBuf() |
uint8_t* pBuf = FX_Alloc(uint8_t, size); |
return (FX_FLOAT*)pBuf; |
} |
-FX_BOOL CPDF_ColorSpace::sRGB() const |
+bool CPDF_ColorSpace::sRGB() const |
{ |
if (m_Family == PDFCS_DEVICERGB) { |
- return TRUE; |
+ return true; |
} |
if (m_Family != PDFCS_ICCBASED) { |
- return FALSE; |
+ return false; |
} |
CPDF_ICCBasedCS* pCS = (CPDF_ICCBasedCS*)this; |
return pCS->m_pProfile->m_bsRGB; |
} |
-FX_BOOL CPDF_ColorSpace::GetCMYK(FX_FLOAT* pBuf, FX_FLOAT& c, FX_FLOAT& m, FX_FLOAT& y, FX_FLOAT& k) const |
+bool CPDF_ColorSpace::GetCMYK(FX_FLOAT* pBuf, FX_FLOAT& c, FX_FLOAT& m, FX_FLOAT& y, FX_FLOAT& k) const |
{ |
if (v_GetCMYK(pBuf, c, m, y, k)) { |
- return TRUE; |
+ return true; |
} |
FX_FLOAT R, G, B; |
if (!GetRGB(pBuf, R, G, B)) { |
- return FALSE; |
+ return false; |
} |
sRGB_to_AdobeCMYK(R, G, B, c, m, y, k); |
- return TRUE; |
+ return true; |
} |
-FX_BOOL CPDF_ColorSpace::SetCMYK(FX_FLOAT* pBuf, FX_FLOAT c, FX_FLOAT m, FX_FLOAT y, FX_FLOAT k) const |
+bool CPDF_ColorSpace::SetCMYK(FX_FLOAT* pBuf, FX_FLOAT c, FX_FLOAT m, FX_FLOAT y, FX_FLOAT k) const |
{ |
if (v_SetCMYK(pBuf, c, m, y, k)) { |
- return TRUE; |
+ return true; |
} |
FX_FLOAT R, G, B; |
AdobeCMYK_to_sRGB(c, m, y, k, R, G, B); |
@@ -1249,7 +1249,7 @@ int CPDF_ColorSpace::GetMaxIndex() const |
CPDF_IndexedCS* pCS = (CPDF_IndexedCS*)this; |
return pCS->m_MaxIndex; |
} |
-void CPDF_ColorSpace::TranslateImageLine(uint8_t* dest_buf, const uint8_t* src_buf, int pixels, int image_width, int image_height, FX_BOOL bTransMask) const |
+void CPDF_ColorSpace::TranslateImageLine(uint8_t* dest_buf, const uint8_t* src_buf, int pixels, int image_width, int image_height, bool bTransMask) const |
{ |
CFX_FixedBufGrow<FX_FLOAT, 16> srcbuf(m_nComponents); |
FX_FLOAT* src = srcbuf; |
@@ -1267,7 +1267,7 @@ void CPDF_ColorSpace::TranslateImageLine(uint8_t* dest_buf, const uint8_t* src_b |
*dest_buf ++ = (int32_t)(R * 255); |
} |
} |
-void CPDF_ColorSpace::EnableStdConversion(FX_BOOL bEnabled) |
+void CPDF_ColorSpace::EnableStdConversion(bool bEnabled) |
{ |
if (bEnabled) { |
m_dwStdConversion ++; |
@@ -1399,23 +1399,23 @@ void CPDF_Color::Copy(const CPDF_Color* pSrc) |
if (m_pCS->GetFamily() == PDFCS_PATTERN) { |
PatternValue* pvalue = (PatternValue*)m_pBuffer; |
if (pvalue->m_pPattern && pvalue->m_pPattern->m_pDocument) { |
- pvalue->m_pPattern = pvalue->m_pPattern->m_pDocument->GetPageData()->GetPattern(pvalue->m_pPattern->m_pPatternObj, FALSE, &pvalue->m_pPattern->m_ParentMatrix); |
+ pvalue->m_pPattern = pvalue->m_pPattern->m_pDocument->GetPageData()->GetPattern(pvalue->m_pPattern->m_pPatternObj, false, &pvalue->m_pPattern->m_ParentMatrix); |
} |
} |
} |
-FX_BOOL CPDF_Color::GetRGB(int& R, int& G, int& B) const |
+bool CPDF_Color::GetRGB(int& R, int& G, int& B) const |
{ |
if (m_pCS == NULL || m_pBuffer == NULL) { |
- return FALSE; |
+ return false; |
} |
FX_FLOAT r=0.0f, g=0.0f, b=0.0f; |
if (!m_pCS->GetRGB(m_pBuffer, r, g, b)) { |
- return FALSE; |
+ return false; |
} |
R = (int32_t)(r * 255 + 0.5f); |
G = (int32_t)(g * 255 + 0.5f); |
B = (int32_t)(b * 255 + 0.5f); |
- return TRUE; |
+ return true; |
} |
CPDF_Pattern* CPDF_Color::GetPattern() const |
{ |
@@ -1440,10 +1440,10 @@ FX_FLOAT* CPDF_Color::GetPatternColor() const |
PatternValue* pvalue = (PatternValue*)m_pBuffer; |
return pvalue->m_nComps ? pvalue->m_Comps : NULL; |
} |
-FX_BOOL CPDF_Color::IsEqual(const CPDF_Color& other) const |
+bool CPDF_Color::IsEqual(const CPDF_Color& other) const |
{ |
if (m_pCS != other.m_pCS || m_pCS == NULL) { |
- return FALSE; |
+ return false; |
} |
return FXSYS_memcmp(m_pBuffer, other.m_pBuffer, m_pCS->GetBufSize()) == 0; |
} |