summaryrefslogtreecommitdiff
path: root/core/src/fpdfapi/fpdf_render
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2016-02-23 16:31:44 -0500
committerDan Sinclair <dsinclair@chromium.org>2016-02-23 16:31:44 -0500
commit435604d371de48044ae6c1567479b34e0d93e298 (patch)
treede6a27714d545afc11d83283b79acb17477f5b7d /core/src/fpdfapi/fpdf_render
parentaffe4b09575b297747e66bd0b807d2b1b04822fe (diff)
downloadpdfium-435604d371de48044ae6c1567479b34e0d93e298.tar.xz
Remove FXSYS_MulDiv(a, b, c).
This is a wrapper which does (a) * (b) / (c). Inline the operations. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1726893002 .
Diffstat (limited to 'core/src/fpdfapi/fpdf_render')
-rw-r--r--core/src/fpdfapi/fpdf_render/fpdf_render_pattern.cpp16
1 files changed, 6 insertions, 10 deletions
diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_pattern.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render_pattern.cpp
index 43ce995f05..4ad6f81d5e 100644
--- a/core/src/fpdfapi/fpdf_render/fpdf_render_pattern.cpp
+++ b/core/src/fpdfapi/fpdf_render/fpdf_render_pattern.cpp
@@ -319,7 +319,7 @@ FX_BOOL _GetScanlineIntersect(int y,
return FALSE;
}
}
- x = x1 + FXSYS_MulDiv(x2 - x1, y - y1, y2 - y1);
+ x = x1 + ((x2 - x1) * (y - y1) / (y2 - y1));
return TRUE;
}
static void DrawGouraud(CFX_DIBitmap* pBitmap,
@@ -355,15 +355,11 @@ static void DrawGouraud(CFX_DIBitmap* pBitmap,
if (!bIntersect) {
continue;
}
- r[nIntersects] =
- vertex1.r + FXSYS_MulDiv(vertex2.r - vertex1.r, y - vertex1.y,
- vertex2.y - vertex1.y);
- g[nIntersects] =
- vertex1.g + FXSYS_MulDiv(vertex2.g - vertex1.g, y - vertex1.y,
- vertex2.y - vertex1.y);
- b[nIntersects] =
- vertex1.b + FXSYS_MulDiv(vertex2.b - vertex1.b, y - vertex1.y,
- vertex2.y - vertex1.y);
+
+ FX_FLOAT y_dist = (y - vertex1.y) / (vertex2.y - vertex1.y);
+ r[nIntersects] = vertex1.r + ((vertex2.r - vertex1.r) * y_dist);
+ g[nIntersects] = vertex1.g + ((vertex2.g - vertex1.g) * y_dist);
+ b[nIntersects] = vertex1.b + ((vertex2.b - vertex1.b) * y_dist);
nIntersects++;
}
if (nIntersects != 2) {