diff options
Diffstat (limited to 'fpdfsdk/src')
| -rw-r--r-- | fpdfsdk/src/fpdf_dataavail.cpp | 15 | ||||
| -rw-r--r-- | fpdfsdk/src/fpdfview.cpp | 38 |
2 files changed, 29 insertions, 24 deletions
diff --git a/fpdfsdk/src/fpdf_dataavail.cpp b/fpdfsdk/src/fpdf_dataavail.cpp index f4e235ccf5..baf8f9c924 100644 --- a/fpdfsdk/src/fpdf_dataavail.cpp +++ b/fpdfsdk/src/fpdf_dataavail.cpp @@ -122,19 +122,20 @@ FPDFAvail_IsDocAvail(FPDF_AVAIL avail, FX_DOWNLOADHINTS* hints) { DLLEXPORT FPDF_DOCUMENT STDCALL FPDFAvail_GetDocument(FPDF_AVAIL avail, FPDF_BYTESTRING password) { - if (!avail) + CFPDF_DataAvail* pDataAvail = static_cast<CFPDF_DataAvail*>(avail); + if (!pDataAvail) return NULL; + CPDF_Parser* pParser = new CPDF_Parser; pParser->SetPassword(password); - - FX_DWORD err_code = pParser->StartAsynParse( - ((CFPDF_DataAvail*)avail)->m_pDataAvail->GetFileRead()); - if (err_code) { + CPDF_Parser::Error error = + pParser->StartAsynParse(pDataAvail->m_pDataAvail->GetFileRead()); + if (error != CPDF_Parser::SUCCESS) { delete pParser; - ProcessParseError(err_code); + ProcessParseError(error); return NULL; } - ((CFPDF_DataAvail*)avail)->m_pDataAvail->SetDocument(pParser->GetDocument()); + pDataAvail->m_pDataAvail->SetDocument(pParser->GetDocument()); CheckUnSupportError(pParser->GetDocument(), FPDF_ERR_SUCCESS); return FPDFDocumentFromCPDFDocument(pParser->GetDocument()); } diff --git a/fpdfsdk/src/fpdfview.cpp b/fpdfsdk/src/fpdfview.cpp index 3bffa91a8b..b61f574c8b 100644 --- a/fpdfsdk/src/fpdfview.cpp +++ b/fpdfsdk/src/fpdfview.cpp @@ -132,19 +132,23 @@ int GetLastError() { } #endif -void ProcessParseError(FX_DWORD err_code) { +void ProcessParseError(CPDF_Parser::Error err) { + FX_DWORD err_code; // Translate FPDFAPI error code to FPDFVIEW error code - switch (err_code) { - case PDFPARSE_ERROR_FILE: + switch (err) { + case CPDF_Parser::SUCCESS: + err_code = FPDF_ERR_SUCCESS; + break; + case CPDF_Parser::FILE_ERROR: err_code = FPDF_ERR_FILE; break; - case PDFPARSE_ERROR_FORMAT: + case CPDF_Parser::FORMAT_ERROR: err_code = FPDF_ERR_FORMAT; break; - case PDFPARSE_ERROR_PASSWORD: + case CPDF_Parser::PASSWORD_ERROR: err_code = FPDF_ERR_PASSWORD; break; - case PDFPARSE_ERROR_HANDLER: + case CPDF_Parser::HANDLER_ERROR: err_code = FPDF_ERR_SECURITY; break; } @@ -168,10 +172,10 @@ DLLEXPORT FPDF_DOCUMENT STDCALL FPDF_LoadDocument(FPDF_STRING file_path, CPDF_Parser* pParser = new CPDF_Parser; pParser->SetPassword(password); - FX_DWORD err_code = pParser->StartParse(pFileAccess); - if (err_code) { + CPDF_Parser::Error error = pParser->StartParse(pFileAccess); + if (error != CPDF_Parser::SUCCESS) { delete pParser; - ProcessParseError(err_code); + ProcessParseError(error); return NULL; } return pParser->GetDocument(); @@ -210,15 +214,15 @@ DLLEXPORT FPDF_DOCUMENT STDCALL FPDF_LoadMemDocument(const void* data_buf, CPDF_Parser* pParser = new CPDF_Parser; pParser->SetPassword(password); CMemFile* pMemFile = new CMemFile((uint8_t*)data_buf, size); - FX_DWORD err_code = pParser->StartParse(pMemFile); - if (err_code) { + CPDF_Parser::Error error = pParser->StartParse(pMemFile); + if (error != CPDF_Parser::SUCCESS) { delete pParser; - ProcessParseError(err_code); + ProcessParseError(error); return NULL; } CPDF_Document* pDoc = NULL; pDoc = pParser ? pParser->GetDocument() : NULL; - CheckUnSupportError(pDoc, err_code); + CheckUnSupportError(pDoc, error); return FPDFDocumentFromCPDFDocument(pParser->GetDocument()); } @@ -228,15 +232,15 @@ FPDF_LoadCustomDocument(FPDF_FILEACCESS* pFileAccess, CPDF_Parser* pParser = new CPDF_Parser; pParser->SetPassword(password); CPDF_CustomAccess* pFile = new CPDF_CustomAccess(pFileAccess); - FX_DWORD err_code = pParser->StartParse(pFile); - if (err_code) { + CPDF_Parser::Error error = pParser->StartParse(pFile); + if (error != CPDF_Parser::SUCCESS) { delete pParser; - ProcessParseError(err_code); + ProcessParseError(error); return NULL; } CPDF_Document* pDoc = NULL; pDoc = pParser ? pParser->GetDocument() : NULL; - CheckUnSupportError(pDoc, err_code); + CheckUnSupportError(pDoc, error); return FPDFDocumentFromCPDFDocument(pParser->GetDocument()); } |