From 62a70f90c49cf7714c960186eb063ad55333e6f3 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Mon, 21 Mar 2016 15:00:20 -0700 Subject: Remove FX_WORD in favor of uint16_t. It isn't buying us anthing, and it looks strange in a struct when other uint types are already present. R=dsinclair@chromium.org Review URL: https://codereview.chromium.org/1821043003 . --- core/fxcodec/codec/fx_codec_flate.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'core/fxcodec/codec/fx_codec_flate.cpp') diff --git a/core/fxcodec/codec/fx_codec_flate.cpp b/core/fxcodec/codec/fx_codec_flate.cpp index 27416f1c67..d4ad241a4d 100644 --- a/core/fxcodec/codec/fx_codec_flate.cpp +++ b/core/fxcodec/codec/fx_codec_flate.cpp @@ -530,7 +530,7 @@ void TIFF_PredictorEncodeLine(uint8_t* dest_buf, } else { for (int i = row_size - BytesPerPixel; i >= BytesPerPixel; i -= BytesPerPixel) { - FX_WORD pixel = (dest_buf[i] << 8) | dest_buf[i + 1]; + uint16_t pixel = (dest_buf[i] << 8) | dest_buf[i + 1]; pixel -= (dest_buf[i - BytesPerPixel] << 8) | dest_buf[i - BytesPerPixel + 1]; dest_buf[i] = pixel >> 8; @@ -587,7 +587,7 @@ void TIFF_PredictLine(uint8_t* dest_buf, int BytesPerPixel = BitsPerComponent * Colors / 8; if (BitsPerComponent == 16) { for (FX_DWORD i = BytesPerPixel; i < row_size; i += 2) { - FX_WORD pixel = + uint16_t pixel = (dest_buf[i - BytesPerPixel] << 8) | dest_buf[i - BytesPerPixel + 1]; pixel += (dest_buf[i] << 8) | dest_buf[i + 1]; dest_buf[i] = pixel >> 8; -- cgit v1.2.3