From 698aed79d6ad6e8e3a0c7a500c108d69f944b82d Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Tue, 26 Sep 2017 16:24:49 -0400 Subject: Cleanup FX macros This CL renames the FX_OS defines to have _OS_ in their names and drops the _DESKTOP suffix. The FXM defines have been changed to just FX. Change-Id: Iab172fba541713b5f6d14fb8098baf68e3364c74 Reviewed-on: https://pdfium-review.googlesource.com/14833 Reviewed-by: Tom Sepez Commit-Queue: dsinclair --- fpdfsdk/cpdfsdk_datetime.h | 2 +- fpdfsdk/fpdfannot_embeddertest.cpp | 20 ++++++++++---------- fpdfsdk/fpdfedit_embeddertest.cpp | 24 ++++++++++++------------ fpdfsdk/fpdfeditpage.cpp | 2 +- fpdfsdk/fpdfformfill_embeddertest.cpp | 2 +- fpdfsdk/fpdfsave.cpp | 2 +- fpdfsdk/fpdfview.cpp | 2 +- fpdfsdk/javascript/JS_Value.cpp | 4 ++-- fpdfsdk/javascript/PublicMethods.cpp | 6 +++--- fpdfsdk/javascript/util.cpp | 2 +- fpdfsdk/pwl/cpwl_font_map.cpp | 3 +-- 11 files changed, 34 insertions(+), 35 deletions(-) (limited to 'fpdfsdk') diff --git a/fpdfsdk/cpdfsdk_datetime.h b/fpdfsdk/cpdfsdk_datetime.h index 08d43cc200..cbd3c36d44 100644 --- a/fpdfsdk/cpdfsdk_datetime.h +++ b/fpdfsdk/cpdfsdk_datetime.h @@ -7,7 +7,7 @@ #ifndef FPDFSDK_CPDFSDK_DATETIME_H_ #define FPDFSDK_CPDFSDK_DATETIME_H_ -#if _FX_OS_ == _FX_ANDROID_ +#if _FX_OS_ == _FX_OS_ANDROID_ #include #else #include diff --git a/fpdfsdk/fpdfannot_embeddertest.cpp b/fpdfsdk/fpdfannot_embeddertest.cpp index a2127b299c..34643dfb48 100644 --- a/fpdfsdk/fpdfannot_embeddertest.cpp +++ b/fpdfsdk/fpdfannot_embeddertest.cpp @@ -306,11 +306,11 @@ TEST_F(FPDFAnnotEmbeddertest, AddAndSaveUnderlineAnnotation) { } TEST_F(FPDFAnnotEmbeddertest, ModifyRectQuadpointsWithAP) { -#if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ +#if _FX_PLATFORM_ == _FX_PLATFORM_APPLE_ const char md5_original[] = "63af8432fab95a67cdebb7cd0e514941"; const char md5_modified_highlight[] = "aec26075011349dec9bace891856b5f2"; const char md5_modified_square[] = "057f57a32be95975775e5ec513fdcb56"; -#elif _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ +#elif _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_ const char md5_original[] = "ade6762a70e85605546ce067e7d2148f"; const char md5_modified_highlight[] = "fb8440ed1a070b53ed5598ce7451cfad"; const char md5_modified_square[] = "7925f6726b343393f258e8b4e93dd65d"; @@ -481,12 +481,12 @@ TEST_F(FPDFAnnotEmbeddertest, RemoveAnnotation) { } TEST_F(FPDFAnnotEmbeddertest, AddAndModifyPath) { -#if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ +#if _FX_PLATFORM_ == _FX_PLATFORM_APPLE_ const char md5_original[] = "c35408717759562d1f8bf33d317483d2"; const char md5_modified_path[] = "cf3cea74bd46497520ff6c4d1ea228c8"; const char md5_two_paths[] = "e8994452fc4385337bae5522354e10ff"; const char md5_new_annot[] = "ee5372b31fede117fc83b9384598aa25"; -#elif _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ +#elif _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_ const char md5_original[] = "4f64add0190ede63f7bb9eb1e2e83edb"; const char md5_modified_path[] = "681f0d0738dded0722e146f6c219bfac"; const char md5_two_paths[] = "67c7e90fc3b64e20f6b69a1744f7f4f0"; @@ -660,11 +660,11 @@ TEST_F(FPDFAnnotEmbeddertest, ModifyAnnotationFlags) { } TEST_F(FPDFAnnotEmbeddertest, AddAndModifyImage) { -#if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ +#if _FX_PLATFORM_ == _FX_PLATFORM_APPLE_ const char md5_original[] = "c35408717759562d1f8bf33d317483d2"; const char md5_new_image[] = "ff012f5697436dfcaec25b32d1333596"; const char md5_modified_image[] = "86cf8cb2755a7a2046a543e66d9c1e61"; -#elif _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ +#elif _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_ const char md5_original[] = "4f64add0190ede63f7bb9eb1e2e83edb"; const char md5_new_image[] = "6fb176c20996cc554d0210d8c8b6138f"; const char md5_modified_image[] = "546959714dfb0dcd7e7b00259e8d178c"; @@ -739,11 +739,11 @@ TEST_F(FPDFAnnotEmbeddertest, AddAndModifyImage) { } TEST_F(FPDFAnnotEmbeddertest, AddAndModifyText) { -#if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ +#if _FX_PLATFORM_ == _FX_PLATFORM_APPLE_ const char md5_original[] = "c35408717759562d1f8bf33d317483d2"; const char md5_new_text[] = "e5680ed048c2cfd9a1d27212cdf41286"; const char md5_modified_text[] = "79f5cfb0b07caaf936f65f6a7a57ce77"; -#elif _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ +#elif _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_ const char md5_original[] = "4f64add0190ede63f7bb9eb1e2e83edb"; const char md5_new_text[] = "998abae4962f8f41e094e7612d8339fc"; const char md5_modified_text[] = "e89b82ca4589b8f0b45fff42ca3a96a4"; @@ -871,9 +871,9 @@ TEST_F(FPDFAnnotEmbeddertest, GetSetStringValue) { FPDF_ClosePage(page); // Open the saved annotation. -#if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ +#if _FX_PLATFORM_ == _FX_PLATFORM_APPLE_ const char md5[] = "4d64e61c9c0f8c60ab3cc3234bb73b1c"; -#elif _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ +#elif _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_ const char md5[] = "0e3710ea6476f5bcba2cd39eb42d54e2"; #else const char md5[] = "831a3c465a56d2e0c89aef7bdf15306a"; diff --git a/fpdfsdk/fpdfedit_embeddertest.cpp b/fpdfsdk/fpdfedit_embeddertest.cpp index 44d5aaf438..0fb736a9d4 100644 --- a/fpdfsdk/fpdfedit_embeddertest.cpp +++ b/fpdfsdk/fpdfedit_embeddertest.cpp @@ -412,7 +412,7 @@ TEST_F(FPDFEditEmbeddertest, PathOnTopOfText) { // Render and check the result. Text is slightly different on Mac. FPDF_BITMAP bitmap = RenderPage(page); -#if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ +#if _FX_PLATFORM_ == _FX_PLATFORM_APPLE_ const char md5[] = "f9e6fa74230f234286bfcada9f7606d8"; #else const char md5[] = "bc6e6eb50dda4695ba0fb4d04ed82ada"; @@ -538,7 +538,7 @@ TEST_F(FPDFEditEmbeddertest, AddStandardFontText) { FPDFPageObj_Transform(text_object1, 1, 0, 0, 1, 20, 20); FPDFPage_InsertObject(page, text_object1); FPDF_BITMAP page_bitmap = RenderPage(page); -#if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ +#if _FX_PLATFORM_ == _FX_PLATFORM_APPLE_ const char md5[] = "a4dddc1a3930fa694bbff9789dab4161"; #else const char md5[] = "7a35771853a1cbba38f6775807878625"; @@ -556,9 +556,9 @@ TEST_F(FPDFEditEmbeddertest, AddStandardFontText) { FPDFPageObj_Transform(text_object2, 1, 0, 0, 1, 100, 600); FPDFPage_InsertObject(page, text_object2); page_bitmap = RenderPage(page); -#if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ +#if _FX_PLATFORM_ == _FX_PLATFORM_APPLE_ const char md5_2[] = "a5c4ace4c6f27644094813fe1441a21c"; -#elif _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ +#elif _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_ const char md5_2[] = "b231b329a4b566fb9b42bfc15fe59bb7"; #else const char md5_2[] = "f85fae151851436072b7b3c6703e506a"; @@ -576,9 +576,9 @@ TEST_F(FPDFEditEmbeddertest, AddStandardFontText) { FPDFPageObj_Transform(text_object3, 1, 1.5, 2, 0.5, 200, 200); FPDFPage_InsertObject(page, text_object3); page_bitmap = RenderPage(page); -#if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ +#if _FX_PLATFORM_ == _FX_PLATFORM_APPLE_ const char md5_3[] = "40b3ef04f915ff4c4208948001763544"; -#elif _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ +#elif _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_ const char md5_3[] = "ba874b3b137f984510c4e287ed4ba7ae"; #else const char md5_3[] = "c5aed6a8ef05558c8c47d58c87cbcb46"; @@ -879,11 +879,11 @@ TEST_F(FPDFEditEmbeddertest, AddTrueTypeFontText) { FPDFPageObj_Transform(text_object, 1, 0, 0, 1, 400, 400); FPDFPage_InsertObject(page, text_object); FPDF_BITMAP page_bitmap = RenderPage(page); -#if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ +#if _FX_PLATFORM_ == _FX_PLATFORM_APPLE_ const char md5[] = "17d2b6cd574cf66170b09c8927529a94"; #else const char md5[] = "1722c6a9deed953d730de9cd13dcbd55"; -#endif // _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ +#endif // _FX_PLATFORM_ == _FX_PLATFORM_APPLE_ CompareBitmap(page_bitmap, 612, 792, md5); FPDFBitmap_Destroy(page_bitmap); @@ -897,11 +897,11 @@ TEST_F(FPDFEditEmbeddertest, AddTrueTypeFontText) { FPDFPage_InsertObject(page, text_object2); } FPDF_BITMAP page_bitmap2 = RenderPage(page); -#if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ +#if _FX_PLATFORM_ == _FX_PLATFORM_APPLE_ const char md5_2[] = "8eded4193ff1f0f77b8b600a825e97ea"; #else const char md5_2[] = "9d7885072058f6c3e68ecaf32e917f30"; -#endif // _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ +#endif // _FX_PLATFORM_ == _FX_PLATFORM_APPLE_ CompareBitmap(page_bitmap2, 612, 792, md5_2); FPDFBitmap_Destroy(page_bitmap2); @@ -930,7 +930,7 @@ TEST_F(FPDFEditEmbeddertest, TransformAnnot) { } // TODO(npm): Add tests using Japanese fonts in other OS. -#if _FXM_PLATFORM_ == _FXM_PLATFORM_LINUX_ +#if _FX_PLATFORM_ == _FX_PLATFORM_LINUX_ TEST_F(FPDFEditEmbeddertest, AddCIDFontText) { // Start with a blank page FPDF_PAGE page = FPDFPage_New(CreateNewDocument(), 0, 612, 792); @@ -984,7 +984,7 @@ TEST_F(FPDFEditEmbeddertest, AddCIDFontText) { FPDF_ClosePage(page); TestAndCloseSaved(612, 792, md5); } -#endif // _FXM_PLATFORM_ == _FXM_PLATFORM_LINUX_ +#endif // _FX_PLATFORM_ == _FX_PLATFORM_LINUX_ TEST_F(FPDFEditEmbeddertest, SaveAndRender) { const char md5[] = "3c20472b0552c0c22b88ab1ed8c6202b"; diff --git a/fpdfsdk/fpdfeditpage.cpp b/fpdfsdk/fpdfeditpage.cpp index b4e71bf254..a1f2f396a5 100644 --- a/fpdfsdk/fpdfeditpage.cpp +++ b/fpdfsdk/fpdfeditpage.cpp @@ -34,7 +34,7 @@ #include "fpdfsdk/fpdfxfa/cpdfxfa_page.h" #endif // PDF_ENABLE_XFA -#if _FX_OS_ == _FX_ANDROID_ +#if _FX_OS_ == _FX_OS_ANDROID_ #include #else #include diff --git a/fpdfsdk/fpdfformfill_embeddertest.cpp b/fpdfsdk/fpdfformfill_embeddertest.cpp index 2597b37160..f5151cc456 100644 --- a/fpdfsdk/fpdfformfill_embeddertest.cpp +++ b/fpdfsdk/fpdfformfill_embeddertest.cpp @@ -519,7 +519,7 @@ TEST_F(FPDFFormFillEmbeddertest, BUG_765384) { #endif // PDF_ENABLE_V8 TEST_F(FPDFFormFillEmbeddertest, FormText) { -#if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ +#if _FX_PLATFORM_ == _FX_PLATFORM_APPLE_ const char md5_1[] = "5f11dbe575fe197a37c3fb422559f8ff"; const char md5_2[] = "35b1a4b679eafc749a0b6fda750c0e8d"; const char md5_3[] = "65c64a7c355388f719a752aa1e23f6fe"; diff --git a/fpdfsdk/fpdfsave.cpp b/fpdfsdk/fpdfsave.cpp index 9f1e684d72..13475f690e 100644 --- a/fpdfsdk/fpdfsave.cpp +++ b/fpdfsdk/fpdfsave.cpp @@ -34,7 +34,7 @@ #include "xfa/fxfa/cxfa_widgetacciterator.h" #endif -#if _FX_OS_ == _FX_ANDROID_ +#if _FX_OS_ == _FX_OS_ANDROID_ #include #else #include diff --git a/fpdfsdk/fpdfview.cpp b/fpdfsdk/fpdfview.cpp index 5312383000..cb5edcf251 100644 --- a/fpdfsdk/fpdfview.cpp +++ b/fpdfsdk/fpdfview.cpp @@ -52,7 +52,7 @@ #include "public/fpdf_formfill.h" #endif // PDF_ENABLE_XFA -#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ +#if _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_ #include "core/fxge/cfx_windowsrenderdevice.h" // These checks are here because core/ and public/ cannot depend on each other. diff --git a/fpdfsdk/javascript/JS_Value.cpp b/fpdfsdk/javascript/JS_Value.cpp index 1a27d22270..ee81102583 100644 --- a/fpdfsdk/javascript/JS_Value.cpp +++ b/fpdfsdk/javascript/JS_Value.cpp @@ -31,12 +31,12 @@ double GetLocalTZA() { time_t t = 0; time(&t); localtime(&t); -#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ +#if _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_ // In gcc 'timezone' is a global variable declared in time.h. In VC++, that // variable was removed in VC++ 2015, with _get_timezone replacing it. long timezone = 0; _get_timezone(&timezone); -#endif // _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ +#endif // _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_ return (double)(-(timezone * 1000)); } diff --git a/fpdfsdk/javascript/PublicMethods.cpp b/fpdfsdk/javascript/PublicMethods.cpp index ba42c3ecbc..c065bd0946 100644 --- a/fpdfsdk/javascript/PublicMethods.cpp +++ b/fpdfsdk/javascript/PublicMethods.cpp @@ -90,7 +90,7 @@ void AlertIfPossible(CJS_EventContext* pContext, const wchar_t* swMsg) { pFormFillEnv->JS_appAlert(swMsg, nullptr, 0, 3); } -#if _FX_OS_ != _FX_ANDROID_ +#if _FX_OS_ != _FX_OS_ANDROID_ ByteString CalculateString(double dValue, int iDec, int* iDec2, @@ -752,7 +752,7 @@ bool CJS_PublicMethods::AFNumber_Format(CJS_Runtime* pRuntime, const std::vector& params, CJS_Value& vRet, WideString& sError) { -#if _FX_OS_ != _FX_ANDROID_ +#if _FX_OS_ != _FX_OS_ANDROID_ if (params.size() != 6) { sError = JSGetStringFromID(IDS_STRING_JSPARAMERROR); return false; @@ -994,7 +994,7 @@ bool CJS_PublicMethods::AFPercent_Format(CJS_Runtime* pRuntime, const std::vector& params, CJS_Value& vRet, WideString& sError) { -#if _FX_OS_ != _FX_ANDROID_ +#if _FX_OS_ != _FX_OS_ANDROID_ if (params.size() != 2) { sError = JSGetStringFromID(IDS_STRING_JSPARAMERROR); return false; diff --git a/fpdfsdk/javascript/util.cpp b/fpdfsdk/javascript/util.cpp index 04f1eb36cd..3fe7a86dc2 100644 --- a/fpdfsdk/javascript/util.cpp +++ b/fpdfsdk/javascript/util.cpp @@ -24,7 +24,7 @@ #include "fpdfsdk/javascript/cjs_runtime.h" #include "fpdfsdk/javascript/resource.h" -#if _FX_OS_ == _FX_ANDROID_ +#if _FX_OS_ == _FX_OS_ANDROID_ #include #endif diff --git a/fpdfsdk/pwl/cpwl_font_map.cpp b/fpdfsdk/pwl/cpwl_font_map.cpp index 94d5fb8518..522b6ef67f 100644 --- a/fpdfsdk/pwl/cpwl_font_map.cpp +++ b/fpdfsdk/pwl/cpwl_font_map.cpp @@ -338,8 +338,7 @@ const FPDF_CharsetFontMap CPWL_FontMap::defaultTTFMap[] = { {FX_CHARSET_ShiftJIS, "MS Gothic"}, {FX_CHARSET_Hangul, "Batang"}, {FX_CHARSET_MSWin_Cyrillic, "Arial"}, -#if _FXM_PLATFORM_ == _FXM_PLATFORM_LINUX_ || \ - _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ +#if _FX_PLATFORM_ == _FX_PLATFORM_LINUX_ || _FX_PLATFORM_ == _FX_PLATFORM_APPLE_ {FX_CHARSET_MSWin_EasternEuropean, "Arial"}, #else {FX_CHARSET_MSWin_EasternEuropean, "Tahoma"}, -- cgit v1.2.3