diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-09-28 08:51:48 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-09-28 15:27:49 +0000 |
| commit | 9c392c82abee05ac2fd42e69984e2de8e48b797a (patch) | |
| tree | 0922ea5a2db6b1d2df95e6129663a00ba47499a7 /core/fxcodec | |
| parent | 94df367590a2ccd4f799df8958ddc014f496edb1 (diff) | |
| download | pdfium-9c392c82abee05ac2fd42e69984e2de8e48b797a.tar.xz | |
Simplify some OS checks to PLATFORM checks
This CL simplifies the OS == WIN{32|64} checks to be PLATFORM == WINDOWS
checks.
Change-Id: I1493d316dd457b0228e4ef39db4cf1d2b8abf97d
Reviewed-on: https://pdfium-review.googlesource.com/14870
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'core/fxcodec')
| -rw-r--r-- | core/fxcodec/codec/ccodec_faxmodule.h | 4 | ||||
| -rw-r--r-- | core/fxcodec/codec/ccodec_jpegmodule.h | 4 | ||||
| -rw-r--r-- | core/fxcodec/codec/fx_codec_fax.cpp | 4 | ||||
| -rw-r--r-- | core/fxcodec/codec/fx_codec_jpeg.cpp | 8 |
4 files changed, 10 insertions, 10 deletions
diff --git a/core/fxcodec/codec/ccodec_faxmodule.h b/core/fxcodec/codec/ccodec_faxmodule.h index 58889d142b..4f8ab78ac4 100644 --- a/core/fxcodec/codec/ccodec_faxmodule.h +++ b/core/fxcodec/codec/ccodec_faxmodule.h @@ -26,14 +26,14 @@ class CCodec_FaxModule { bool BlackIs1, int Columns, int Rows); -#if _FX_OS_ == _FX_OS_WIN32_ || _FX_OS_ == _FX_OS_WIN64_ +#if _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_ static void FaxEncode(const uint8_t* src_buf, int width, int height, int pitch, std::unique_ptr<uint8_t, FxFreeDeleter>* dest_buf, uint32_t* dest_size); -#endif +#endif // _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_ }; #endif // CORE_FXCODEC_CODEC_CCODEC_FAXMODULE_H_ diff --git a/core/fxcodec/codec/ccodec_jpegmodule.h b/core/fxcodec/codec/ccodec_jpegmodule.h index ca561317aa..9f4c80d08d 100644 --- a/core/fxcodec/codec/ccodec_jpegmodule.h +++ b/core/fxcodec/codec/ccodec_jpegmodule.h @@ -57,11 +57,11 @@ 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_OS_WIN32_ || _FX_OS_ == _FX_OS_WIN64_ +#if _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_ static bool JpegEncode(const RetainPtr<CFX_DIBSource>& pSource, uint8_t** dest_buf, size_t* dest_size); -#endif +#endif // _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_ }; #endif // CORE_FXCODEC_CODEC_CCODEC_JPEGMODULE_H_ diff --git a/core/fxcodec/codec/fx_codec_fax.cpp b/core/fxcodec/codec/fx_codec_fax.cpp index 83ff5f7b3a..c800fda283 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_OS_WIN32_ || _FX_OS_ == _FX_OS_WIN64_ +#if _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_ namespace { const uint8_t BlackRunTerminator[128] = { 0x37, 10, 0x02, 3, 0x03, 2, 0x02, 2, 0x03, 3, 0x03, 4, 0x02, 4, @@ -801,4 +801,4 @@ void CCodec_FaxModule::FaxEncode( encoder.Encode(dest_buf, dest_size); } -#endif +#endif // _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_ diff --git a/core/fxcodec/codec/fx_codec_jpeg.cpp b/core/fxcodec/codec/fx_codec_jpeg.cpp index b1dffbb210..5b3c25d0f7 100644 --- a/core/fxcodec/codec/fx_codec_jpeg.cpp +++ b/core/fxcodec/codec/fx_codec_jpeg.cpp @@ -88,13 +88,13 @@ static void _error_do_nothing1(j_common_ptr cinfo, int) {} static void _error_do_nothing2(j_common_ptr cinfo, char*) {} -#if _FX_OS_ == _FX_OS_WIN32_ || _FX_OS_ == _FX_OS_WIN64_ +#if _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_ static void _dest_do_nothing(j_compress_ptr cinfo) {} static boolean _dest_empty(j_compress_ptr cinfo) { return false; } -#endif +#endif // _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_ } // extern "C" #define JPEG_MARKER_ICC (JPEG_APP0 + 2) @@ -506,7 +506,7 @@ uint32_t CCodec_JpegModule::GetAvailInput(Context* pContext, return (uint32_t)ctx->m_SrcMgr.bytes_in_buffer; } -#if _FX_OS_ == _FX_OS_WIN32_ || _FX_OS_ == _FX_OS_WIN64_ +#if _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_ #define JPEG_BLOCK_SIZE 1048576 bool CCodec_JpegModule::JpegEncode(const RetainPtr<CFX_DIBSource>& pSource, uint8_t** dest_buf, @@ -607,4 +607,4 @@ bool CCodec_JpegModule::JpegEncode(const RetainPtr<CFX_DIBSource>& pSource, return true; } -#endif +#endif // _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_ |