diff options
author | Lei Zhang <thestig@chromium.org> | 2016-02-19 14:57:07 -0800 |
---|---|---|
committer | Lei Zhang <thestig@chromium.org> | 2016-02-19 14:57:07 -0800 |
commit | ae85f87266abee649fe8f202515bba4590196711 (patch) | |
tree | a2d1cb3fabc33921a9e11c1b99f87ae7a2f04ef8 /fpdfsdk/src/fpdfview.cpp | |
parent | 052a8d963af8bb186b956057763021624332c7a8 (diff) | |
download | pdfium-ae85f87266abee649fe8f202515bba4590196711.tar.xz |
Define _DEBUG for debug builds.
Otherwise ASSERT() is useless.
BUG=pdfium:136
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1712053003 .
Diffstat (limited to 'fpdfsdk/src/fpdfview.cpp')
-rw-r--r-- | fpdfsdk/src/fpdfview.cpp | 64 |
1 files changed, 3 insertions, 61 deletions
diff --git a/fpdfsdk/src/fpdfview.cpp b/fpdfsdk/src/fpdfview.cpp index 418d35d720..a535866889 100644 --- a/fpdfsdk/src/fpdfview.cpp +++ b/fpdfsdk/src/fpdfview.cpp @@ -519,10 +519,6 @@ void DropContext(void* data) { delete (CRenderContext*)data; } -#if defined(_DEBUG) || defined(DEBUG) -#define DEBUG_TRACE -#endif - #if defined(_WIN32) DLLEXPORT void STDCALL FPDF_RenderPage(HDC dc, FPDF_PAGE page, @@ -539,7 +535,7 @@ DLLEXPORT void STDCALL FPDF_RenderPage(HDC dc, CRenderContext* pContext = new CRenderContext; pPage->SetPrivateData((void*)1, pContext, DropContext); -#ifndef _WIN32_WCE +#if !defined(_WIN32_WCE) CFX_DIBitmap* pBitmap = nullptr; FX_BOOL bBackgroundAlphaNeeded = pPage->BackgroundAlphaNeeded(); FX_BOOL bHasImageMask = pPage->HasImageMask(); @@ -591,16 +587,6 @@ DLLEXPORT void STDCALL FPDF_RenderPage(HDC dc, int width = rect.right - rect.left; int height = rect.bottom - rect.top; -#ifdef DEBUG_TRACE - { - char str[128]; - memset(str, 0, sizeof(str)); - FXSYS_snprintf(str, sizeof(str) - 1, "Rendering DIB %d x %d", width, - height); - CPDF_ModuleMgr::Get()->ReportError(999, str); - } -#endif - // Create a DIB section LPVOID pBuffer; BITMAPINFOHEADER bmih; @@ -612,78 +598,34 @@ DLLEXPORT void STDCALL FPDF_RenderPage(HDC dc, bmih.biWidth = width; pContext->m_hBitmap = CreateDIBSection(dc, (BITMAPINFO*)&bmih, DIB_RGB_COLORS, &pBuffer, NULL, 0); - if (!pContext->m_hBitmap) { -#if defined(DEBUG) || defined(_DEBUG) - char str[128]; - memset(str, 0, sizeof(str)); - FXSYS_snprintf(str, sizeof(str) - 1, - "Error CreateDIBSection: %d x %d, error code = %d", width, - height, GetLastError()); - CPDF_ModuleMgr::Get()->ReportError(FPDFERR_OUT_OF_MEMORY, str); -#else - CPDF_ModuleMgr::Get()->ReportError(FPDFERR_OUT_OF_MEMORY, NULL); -#endif - } FXSYS_memset(pBuffer, 0xff, height * ((width * 3 + 3) / 4 * 4)); -#ifdef DEBUG_TRACE - { CPDF_ModuleMgr::Get()->ReportError(999, "DIBSection created"); } -#endif - // Create a device with this external buffer pContext->m_pBitmap = new CFX_DIBitmap; pContext->m_pBitmap->Create(width, height, FXDIB_Rgb, (uint8_t*)pBuffer); pContext->m_pDevice = new CPDF_FxgeDevice; ((CPDF_FxgeDevice*)pContext->m_pDevice)->Attach(pContext->m_pBitmap); -#ifdef DEBUG_TRACE - CPDF_ModuleMgr::Get()->ReportError(999, "Ready for PDF rendering"); -#endif - // output to bitmap device FPDF_RenderPage_Retail(pContext, page, start_x - rect.left, start_y - rect.top, size_x, size_y, rotate, flags); -#ifdef DEBUG_TRACE - CPDF_ModuleMgr::Get()->ReportError(999, "Finished PDF rendering"); -#endif - // Now output to real device HDC hMemDC = CreateCompatibleDC(dc); - if (!hMemDC) { -#if defined(DEBUG) || defined(_DEBUG) - char str[128]; - memset(str, 0, sizeof(str)); - FXSYS_snprintf(str, sizeof(str) - 1, - "Error CreateCompatibleDC. Error code = %d", GetLastError()); - CPDF_ModuleMgr::Get()->ReportError(FPDFERR_OUT_OF_MEMORY, str); -#else - CPDF_ModuleMgr::Get()->ReportError(FPDFERR_OUT_OF_MEMORY, NULL); -#endif - } - HGDIOBJ hOldBitmap = SelectObject(hMemDC, pContext->m_hBitmap); -#ifdef DEBUG_TRACE - CPDF_ModuleMgr::Get()->ReportError(999, "Ready for screen rendering"); -#endif - BitBlt(dc, rect.left, rect.top, width, height, hMemDC, 0, 0, SRCCOPY); SelectObject(hMemDC, hOldBitmap); DeleteDC(hMemDC); -#ifdef DEBUG_TRACE - CPDF_ModuleMgr::Get()->ReportError(999, "Finished screen rendering"); -#endif - -#endif +#endif // !defined(_WIN32_WCE) if (bBackgroundAlphaNeeded || bHasImageMask) delete pBitmap; delete pContext; pPage->RemovePrivateData((void*)1); } -#endif +#endif // defined(_WIN32) DLLEXPORT void STDCALL FPDF_RenderPageBitmap(FPDF_BITMAP bitmap, FPDF_PAGE page, |