Index: fpdfsdk/src/pdfwindow/PWL_Utils.cpp |
diff --git a/fpdfsdk/src/pdfwindow/PWL_Utils.cpp b/fpdfsdk/src/pdfwindow/PWL_Utils.cpp |
index 71a9d474b7265cf3af1c58dbfd31f52defade2fc..70ac8b9fcc048003e7f0b4804a23b52522dc61ed 100644 |
--- a/fpdfsdk/src/pdfwindow/PWL_Utils.cpp |
+++ b/fpdfsdk/src/pdfwindow/PWL_Utils.cpp |
@@ -4,7 +4,6 @@ |
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com |
-#include "fpdfsdk/include/pdfwindow/PDFWindow.h" |
#include "fpdfsdk/include/pdfwindow/PWL_Icon.h" |
#include "fpdfsdk/include/pdfwindow/PWL_Utils.h" |
#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h" |
@@ -14,8 +13,6 @@ |
#define IsFloatSmaller(fa, fb) ((fa) < (fb) && !IsFloatZero((fa) - (fb))) |
#define IsFloatEqual(fa, fb) IsFloatZero((fa) - (fb)) |
-/* ---------------------------- CPWL_Utils ------------------------------ */ |
- |
CFX_ByteString CPWL_Utils::GetAppStreamFromArray(const CPWL_PathData* pPathData, |
int32_t nCount) { |
CFX_ByteTextBuf csAP; |
@@ -143,37 +140,19 @@ CFX_ByteString CPWL_Utils::GetAP_Check(const CPDF_Rect& crBBox) { |
const int32_t num = 8; |
- CPWL_Point pts[num * 3] = {// 1 |
- CPWL_Point(0.28f, 0.52f), CPWL_Point(0.27f, 0.48f), |
- CPWL_Point(0.29f, 0.40f), |
- |
- // 2 |
- CPWL_Point(0.30f, 0.33f), CPWL_Point(0.31f, 0.29f), |
- CPWL_Point(0.31f, 0.28f), |
- |
- // 3 |
- CPWL_Point(0.39f, 0.28f), CPWL_Point(0.49f, 0.29f), |
- CPWL_Point(0.77f, 0.67f), |
- |
- // 4 |
- CPWL_Point(0.76f, 0.68f), CPWL_Point(0.78f, 0.69f), |
- CPWL_Point(0.76f, 0.75f), |
- |
- // 5 |
- CPWL_Point(0.76f, 0.75f), CPWL_Point(0.73f, 0.80f), |
- CPWL_Point(0.68f, 0.75f), |
- |
- // 6 |
- CPWL_Point(0.68f, 0.74f), CPWL_Point(0.68f, 0.74f), |
- CPWL_Point(0.44f, 0.47f), |
- |
- // 7 |
- CPWL_Point(0.43f, 0.47f), CPWL_Point(0.40f, 0.47f), |
- CPWL_Point(0.41f, 0.58f), |
- |
- // 8 |
- CPWL_Point(0.40f, 0.60f), CPWL_Point(0.28f, 0.66f), |
- CPWL_Point(0.30f, 0.56f)}; |
+ CPWL_Point pts[num * 3] = { |
Tom Sepez
2016/01/04 20:23:12
nit: (for someday downe th road) I'd be happier if
Lei Zhang
2016/01/05 02:27:09
Done. Today is some day.
|
+ CPWL_Point(0.28f, 0.52f), CPWL_Point(0.27f, 0.48f), |
+ CPWL_Point(0.29f, 0.40f), CPWL_Point(0.30f, 0.33f), |
+ CPWL_Point(0.31f, 0.29f), CPWL_Point(0.31f, 0.28f), |
+ CPWL_Point(0.39f, 0.28f), CPWL_Point(0.49f, 0.29f), |
+ CPWL_Point(0.77f, 0.67f), CPWL_Point(0.76f, 0.68f), |
+ CPWL_Point(0.78f, 0.69f), CPWL_Point(0.76f, 0.75f), |
+ CPWL_Point(0.76f, 0.75f), CPWL_Point(0.73f, 0.80f), |
+ CPWL_Point(0.68f, 0.75f), CPWL_Point(0.68f, 0.74f), |
+ CPWL_Point(0.68f, 0.74f), CPWL_Point(0.44f, 0.47f), |
+ CPWL_Point(0.43f, 0.47f), CPWL_Point(0.40f, 0.47f), |
+ CPWL_Point(0.41f, 0.58f), CPWL_Point(0.40f, 0.60f), |
+ CPWL_Point(0.28f, 0.66f), CPWL_Point(0.30f, 0.56f)}; |
for (int32_t j = 0; j < num * 3; j++) { |
pts[j].x *= fWidth; |
@@ -2338,7 +2317,6 @@ void CPWL_Utils::GetGraphics_Cross(CFX_ByteString& sPathData, |
const PWL_PATH_TYPE type) { |
FX_FLOAT fWidth = crBBox.right - crBBox.left; |
FX_FLOAT fHeight = crBBox.top - crBBox.bottom; |
- // FX_FLOAT fcatercorner = (FX_FLOAT)sqrt(fWidth*fWidth + fHeight*fHeight); |
CPWL_Point center_point(crBBox.left + fWidth / 2, |
crBBox.bottom + fHeight / 2); |