diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-09-26 16:24:49 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-09-27 01:04:13 +0000 |
| commit | 698aed79d6ad6e8e3a0c7a500c108d69f944b82d (patch) | |
| tree | fbf7e66e0a2ec096561cd0ba5d3c4d577cd64667 /core/fxcodec/codec | |
| parent | 3070e94f608f36e7312fad2d471e3d7546f82ca2 (diff) | |
| download | pdfium-698aed79d6ad6e8e3a0c7a500c108d69f944b82d.tar.xz | |
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 <tsepez@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'core/fxcodec/codec')
| -rw-r--r-- | core/fxcodec/codec/ccodec_faxmodule.h | 2 | ||||
| -rw-r--r-- | core/fxcodec/codec/ccodec_jpegmodule.h | 2 | ||||
| -rw-r--r-- | core/fxcodec/codec/fx_codec_fax.cpp | 2 | ||||
| -rw-r--r-- | core/fxcodec/codec/fx_codec_jpeg.cpp | 4 | ||||
| -rw-r--r-- | core/fxcodec/codec/fx_codec_progress.cpp | 6 |
5 files changed, 8 insertions, 8 deletions
diff --git a/core/fxcodec/codec/ccodec_faxmodule.h b/core/fxcodec/codec/ccodec_faxmodule.h index 92e45e6719..58889d142b 100644 --- a/core/fxcodec/codec/ccodec_faxmodule.h +++ b/core/fxcodec/codec/ccodec_faxmodule.h @@ -26,7 +26,7 @@ class CCodec_FaxModule { bool BlackIs1, int Columns, int Rows); -#if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_ +#if _FX_OS_ == _FX_OS_WIN32_ || _FX_OS_ == _FX_OS_WIN64_ static void FaxEncode(const uint8_t* src_buf, int width, int height, diff --git a/core/fxcodec/codec/ccodec_jpegmodule.h b/core/fxcodec/codec/ccodec_jpegmodule.h index d7e484d56f..cc59924747 100644 --- a/core/fxcodec/codec/ccodec_jpegmodule.h +++ b/core/fxcodec/codec/ccodec_jpegmodule.h @@ -57,7 +57,7 @@ class CCodec_JpegModule { bool ReadScanline(Context* pContext, uint8_t* dest_buf); uint32_t GetAvailInput(Context* pContext, uint8_t** avail_buf_ptr); -#if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_ +#if _FX_OS_ == _FX_OS_WIN32_ || _FX_OS_ == _FX_OS_WIN64_ static bool JpegEncode(const RetainPtr<CFX_DIBSource>& pSource, uint8_t** dest_buf, FX_STRSIZE* dest_size); diff --git a/core/fxcodec/codec/fx_codec_fax.cpp b/core/fxcodec/codec/fx_codec_fax.cpp index 9c8eaa25ce..83ff5f7b3a 100644 --- a/core/fxcodec/codec/fx_codec_fax.cpp +++ b/core/fxcodec/codec/fx_codec_fax.cpp @@ -607,7 +607,7 @@ std::unique_ptr<CCodec_ScanlineDecoder> CCodec_FaxModule::CreateDecoder( EncodedByteAlign, BlackIs1); } -#if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_ +#if _FX_OS_ == _FX_OS_WIN32_ || _FX_OS_ == _FX_OS_WIN64_ namespace { const uint8_t BlackRunTerminator[128] = { 0x37, 10, 0x02, 3, 0x03, 2, 0x02, 2, 0x03, 3, 0x03, 4, 0x02, 4, diff --git a/core/fxcodec/codec/fx_codec_jpeg.cpp b/core/fxcodec/codec/fx_codec_jpeg.cpp index ea32f00a2e..b77fc87394 100644 --- a/core/fxcodec/codec/fx_codec_jpeg.cpp +++ b/core/fxcodec/codec/fx_codec_jpeg.cpp @@ -88,7 +88,7 @@ static void _error_do_nothing1(j_common_ptr cinfo, int) {} static void _error_do_nothing2(j_common_ptr cinfo, char*) {} -#if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_ +#if _FX_OS_ == _FX_OS_WIN32_ || _FX_OS_ == _FX_OS_WIN64_ static void _dest_do_nothing(j_compress_ptr cinfo) {} static boolean _dest_empty(j_compress_ptr cinfo) { @@ -506,7 +506,7 @@ uint32_t CCodec_JpegModule::GetAvailInput(Context* pContext, return (uint32_t)ctx->m_SrcMgr.bytes_in_buffer; } -#if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_ +#if _FX_OS_ == _FX_OS_WIN32_ || _FX_OS_ == _FX_OS_WIN64_ #define JPEG_BLOCK_SIZE 1048576 bool CCodec_JpegModule::JpegEncode(const RetainPtr<CFX_DIBSource>& pSource, uint8_t** dest_buf, diff --git a/core/fxcodec/codec/fx_codec_progress.cpp b/core/fxcodec/codec/fx_codec_progress.cpp index d93d46d57a..d28277173e 100644 --- a/core/fxcodec/codec/fx_codec_progress.cpp +++ b/core/fxcodec/codec/fx_codec_progress.cpp @@ -22,11 +22,11 @@ namespace { -#if _FX_OS_ == _FX_MACOSX_ +#if _FX_OS_ == _FX_OS_MACOSX_ const double kPngGamma = 1.7; -#else // _FX_OS_ == _FX_MACOSX_ +#else // _FX_OS_ == _FX_OS_MACOSX_ const double kPngGamma = 2.2; -#endif // _FX_OS_ == _FX_MACOSX_ +#endif // _FX_OS_ == _FX_OS_MACOSX_ void RGB2BGR(uint8_t* buffer, int width = 1) { if (buffer && width > 0) { |