| Index: fpdfsdk/fpdf_flatten.cpp
|
| diff --git a/fpdfsdk/fpdf_flatten.cpp b/fpdfsdk/fpdf_flatten.cpp
|
| index bbd5ad3dd3dd6be02d3c9ba87a73b1baa2b9f3cd..99f97d7ca2c572e4fde9b9bdc2f8af318a570d3d 100644
|
| --- a/fpdfsdk/fpdf_flatten.cpp
|
| +++ b/fpdfsdk/fpdf_flatten.cpp
|
| @@ -395,7 +395,7 @@ DLLEXPORT int STDCALL FPDFPage_Flatten(FPDF_PAGE page, int nFlag) {
|
| char sExtend[5] = {};
|
| FXSYS_itoa(iKey, sExtend, 10);
|
| key = CFX_ByteString("FFT") + CFX_ByteString(sExtend);
|
| - if (!pPageXObject->KeyExist(key.AsByteStringC()))
|
| + if (!pPageXObject->KeyExist(key.AsStringC()))
|
| break;
|
| }
|
| }
|
| @@ -405,7 +405,7 @@ DLLEXPORT int STDCALL FPDFPage_Flatten(FPDF_PAGE page, int nFlag) {
|
| CPDF_Dictionary* pNewXORes = NULL;
|
|
|
| if (!key.IsEmpty()) {
|
| - pPageXObject->SetAtReference(key.AsByteStringC(), pDocument, dwObjNum);
|
| + pPageXObject->SetAtReference(key.AsStringC(), pDocument, dwObjNum);
|
| CPDF_Dictionary* pNewOXbjectDic = pNewXObject->GetDict();
|
| pNewXORes = new CPDF_Dictionary;
|
| pNewOXbjectDic->SetAt("Resources", pNewXORes);
|
| @@ -437,7 +437,7 @@ DLLEXPORT int STDCALL FPDFPage_Flatten(FPDF_PAGE page, int nFlag) {
|
| continue;
|
|
|
| if (!sAnnotState.IsEmpty()) {
|
| - pAPStream = pAPDic->GetStreamBy(sAnnotState.AsByteStringC());
|
| + pAPStream = pAPDic->GetStreamBy(sAnnotState.AsStringC());
|
| } else {
|
| auto it = pAPDic->begin();
|
| if (it != pAPDic->end()) {
|
| @@ -486,7 +486,7 @@ DLLEXPORT int STDCALL FPDFPage_Flatten(FPDF_PAGE page, int nFlag) {
|
| CFX_ByteString sFormName;
|
| sFormName.Format("F%d", i);
|
| uint32_t dwObjNum = pDocument->AddIndirectObject(pObj);
|
| - pXObject->SetAtReference(sFormName.AsByteStringC(), pDocument, dwObjNum);
|
| + pXObject->SetAtReference(sFormName.AsStringC(), pDocument, dwObjNum);
|
|
|
| CPDF_StreamAcc acc;
|
| acc.LoadAllData(pNewXObject);
|
|
|