Chromium Code Reviews| Index: core/src/fpdfapi/fpdf_render/fpdf_render_pattern.cpp |
| diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_pattern.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render_pattern.cpp |
| index 43ce995f0537365203b377a448ce871836f15aa5..d9a78e4f3a019b2a25f975ec68e47005b1119d6e 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,12 @@ 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); |
| + r[nIntersects] = vertex1.r + ((vertex2.r - vertex1.r) * (y - vertex1.y) / |
|
Lei Zhang
2016/02/23 21:22:40
Calculate (y - vertex1.y) / (vertex2.y - vertex1.y
dsinclair
2016/02/23 21:31:26
Done.
|
| + (vertex2.y - vertex1.y)); |
| + g[nIntersects] = vertex1.g + ((vertex2.g - vertex1.g) * (y - vertex1.y) / |
| + (vertex2.y - vertex1.y)); |
| + b[nIntersects] = vertex1.b + ((vertex2.b - vertex1.b) * (y - vertex1.y) / |
| + (vertex2.y - vertex1.y)); |
| nIntersects++; |
| } |
| if (nIntersects != 2) { |