Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2094)

Unified Diff: core/fxge/dib/fx_dib_main.cpp

Issue 2075383002: Remove some fx_dib functions with unused parameters. (Closed) Base URL: https://pdfium.googlesource.com/pdfium@master
Patch Set: Fix build, fix skia Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « core/fxge/dib/fx_dib_convert.cpp ('k') | core/fxge/ge/fx_ge_text.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: core/fxge/dib/fx_dib_main.cpp
diff --git a/core/fxge/dib/fx_dib_main.cpp b/core/fxge/dib/fx_dib_main.cpp
index f4ea49b58f993366d73c73b5350842001fb56b4c..bda5ee53031dd02b1cb4199fd18d12ce804cebb6 100644
--- a/core/fxge/dib/fx_dib_main.cpp
+++ b/core/fxge/dib/fx_dib_main.cpp
@@ -12,16 +12,6 @@
#include "core/fxge/dib/dib_int.h"
#include "core/fxge/include/fx_ge.h"
-FX_BOOL ConvertBuffer(FXDIB_Format dest_format,
- uint8_t* dest_buf,
- int dest_pitch,
- int width,
- int height,
- const CFX_DIBSource* pSrcBitmap,
- int src_left,
- int src_top,
- uint32_t*& pal,
- void* pIccTransform);
void CmykDecode(uint32_t cmyk, int& c, int& m, int& y, int& k) {
c = FXSYS_GetCValue(cmyk);
m = FXSYS_GetMValue(cmyk);
@@ -398,25 +388,25 @@ void CFX_DIBSource::GetOverlapRect(int& dest_left,
width = dest_rect.right - dest_rect.left;
height = dest_rect.bottom - dest_rect.top;
}
+
FX_BOOL CFX_DIBitmap::TransferBitmap(int dest_left,
int dest_top,
int width,
int height,
const CFX_DIBSource* pSrcBitmap,
int src_left,
- int src_top,
- void* pIccTransform) {
- if (!m_pBuffer) {
+ int src_top) {
+ if (!m_pBuffer)
return FALSE;
- }
+
GetOverlapRect(dest_left, dest_top, width, height, pSrcBitmap->GetWidth(),
pSrcBitmap->GetHeight(), src_left, src_top, nullptr);
- if (width == 0 || height == 0) {
+ if (width == 0 || height == 0)
return TRUE;
- }
+
FXDIB_Format dest_format = GetFormat();
FXDIB_Format src_format = pSrcBitmap->GetFormat();
- if (dest_format == src_format && !pIccTransform) {
+ if (dest_format == src_format) {
if (GetBPP() == 1) {
for (int row = 0; row < height; row++) {
uint8_t* dest_scan = m_pBuffer + (dest_top + row) * m_Pitch;
@@ -443,22 +433,23 @@ FX_BOOL CFX_DIBitmap::TransferBitmap(int dest_left,
}
}
} else {
- if (m_pPalette) {
+ if (m_pPalette)
return FALSE;
- }
- if (m_bpp == 8) {
+
+ if (m_bpp == 8)
dest_format = FXDIB_8bppMask;
- }
+
uint8_t* dest_buf =
m_pBuffer + dest_top * m_Pitch + dest_left * GetBPP() / 8;
uint32_t* d_plt = nullptr;
if (!ConvertBuffer(dest_format, dest_buf, m_Pitch, width, height,
- pSrcBitmap, src_left, src_top, d_plt, pIccTransform)) {
+ pSrcBitmap, src_left, src_top, d_plt)) {
return FALSE;
}
}
return TRUE;
}
+
FX_BOOL CFX_DIBitmap::TransferMask(int dest_left,
int dest_top,
int width,
« no previous file with comments | « core/fxge/dib/fx_dib_convert.cpp ('k') | core/fxge/ge/fx_ge_text.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698