summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--core/fpdfapi/render/cpdf_dibsource.cpp18
-rw-r--r--core/fxcodec/codec/fx_codec.cpp18
-rw-r--r--core/fxcodec/codec/fx_codec_flate.cpp33
-rw-r--r--core/fxcodec/fx_codec.h4
4 files changed, 38 insertions, 35 deletions
diff --git a/core/fpdfapi/render/cpdf_dibsource.cpp b/core/fpdfapi/render/cpdf_dibsource.cpp
index eb7acac62c..153491aa06 100644
--- a/core/fpdfapi/render/cpdf_dibsource.cpp
+++ b/core/fpdfapi/render/cpdf_dibsource.cpp
@@ -54,24 +54,6 @@ bool GetBitValue(const uint8_t* pSrc, uint32_t pos) {
return pSrc[pos / 8] & (1 << (7 - pos % 8));
}
-FX_SAFE_UINT32 CalculatePitch8(uint32_t bpc, uint32_t components, int width) {
- FX_SAFE_UINT32 pitch = bpc;
- pitch *= components;
- pitch *= width;
- pitch += 7;
- pitch /= 8;
- return pitch;
-}
-
-FX_SAFE_UINT32 CalculatePitch32(int bpp, int width) {
- FX_SAFE_UINT32 pitch = bpp;
- pitch *= width;
- pitch += 31;
- pitch /= 32; // quantized to number of 32-bit words.
- pitch *= 4; // and then back to bytes, (not just /8 in one step).
- return pitch;
-}
-
bool IsAllowedBPCValue(int bpc) {
return bpc == 1 || bpc == 2 || bpc == 4 || bpc == 8 || bpc == 16;
}
diff --git a/core/fxcodec/codec/fx_codec.cpp b/core/fxcodec/codec/fx_codec.cpp
index 4d094e54fb..22e4bc50cc 100644
--- a/core/fxcodec/codec/fx_codec.cpp
+++ b/core/fxcodec/codec/fx_codec.cpp
@@ -1839,3 +1839,21 @@ std::tuple<float, float, float> AdobeCMYK_to_sRGB(float c,
// more expensive.
return std::make_tuple(r * (1.0f / 255), g * (1.0f / 255), b * (1.0f / 255));
}
+
+FX_SAFE_UINT32 CalculatePitch8(uint32_t bpc, uint32_t components, int width) {
+ FX_SAFE_UINT32 pitch = bpc;
+ pitch *= components;
+ pitch *= width;
+ pitch += 7;
+ pitch /= 8;
+ return pitch;
+}
+
+FX_SAFE_UINT32 CalculatePitch32(int bpp, int width) {
+ FX_SAFE_UINT32 pitch = bpp;
+ pitch *= width;
+ pitch += 31;
+ pitch /= 32; // quantized to number of 32-bit words.
+ pitch *= 4; // and then back to bytes, (not just /8 in one step).
+ return pitch;
+}
diff --git a/core/fxcodec/codec/fx_codec_flate.cpp b/core/fxcodec/codec/fx_codec_flate.cpp
index dc7448b3e8..2270de5eb3 100644
--- a/core/fxcodec/codec/fx_codec_flate.cpp
+++ b/core/fxcodec/codec/fx_codec_flate.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "core/fxcodec/codec/codec_int.h"
+#include "core/fxcodec/fx_codec.h"
#include <algorithm>
#include <limits>
@@ -273,14 +273,14 @@ void PNG_PredictLine(uint8_t* pDestData,
int bpc,
int nColors,
int nPixels) {
- int row_size = (nPixels * bpc * nColors + 7) / 8;
- int BytesPerPixel = (bpc * nColors + 7) / 8;
+ const uint32_t row_size = CalculatePitch8(bpc, nColors, nPixels).ValueOrDie();
+ const uint32_t BytesPerPixel = (bpc * nColors + 7) / 8;
uint8_t tag = pSrcData[0];
if (tag == 0) {
memmove(pDestData, pSrcData + 1, row_size);
return;
}
- for (int byte = 0; byte < row_size; byte++) {
+ for (uint32_t byte = 0; byte < row_size; ++byte) {
uint8_t raw_byte = pSrcData[byte + 1];
switch (tag) {
case 1: {
@@ -339,6 +339,7 @@ bool PNG_Predictor(uint8_t*& data_buf,
int Colors,
int BitsPerComponent,
int Columns) {
+ // TODO(thestig): Look into using CalculatePitch8() here.
const int BytesPerPixel = (Colors * BitsPerComponent + 7) / 8;
const int row_size = (Colors * BitsPerComponent * Columns + 7) / 8;
if (row_size <= 0)
@@ -348,7 +349,7 @@ bool PNG_Predictor(uint8_t*& data_buf,
return false;
const int last_row_size = data_size % (row_size + 1);
uint8_t* dest_buf = FX_Alloc2D(uint8_t, row_size, row_count);
- int byte_cnt = 0;
+ uint32_t byte_cnt = 0;
uint8_t* pSrcData = data_buf;
uint8_t* pDestData = dest_buf;
for (int row = 0; row < row_count; row++) {
@@ -365,7 +366,8 @@ bool PNG_Predictor(uint8_t*& data_buf,
byte_cnt += move_size;
continue;
}
- for (int byte = 0; byte < row_size && byte_cnt < (int)data_size; byte++) {
+ for (int byte = 0; byte < row_size && byte_cnt < data_size;
+ ++byte, ++byte_cnt) {
uint8_t raw_byte = pSrcData[byte + 1];
switch (tag) {
case 1: {
@@ -416,7 +418,6 @@ bool PNG_Predictor(uint8_t*& data_buf,
pDestData[byte] = raw_byte;
break;
}
- byte_cnt++;
}
pSrcData += row_size + 1;
pDestData += row_size;
@@ -613,14 +614,13 @@ CCodec_FlateScanlineDecoder::CCodec_FlateScanlineDecoder(const uint8_t* src_buf,
int Colors,
int BitsPerComponent,
int Columns)
- : CCodec_ScanlineDecoder(
- width,
- height,
- width,
- height,
- nComps,
- bpc,
- (static_cast<uint32_t>(width) * nComps * bpc + 7) / 8),
+ : CCodec_ScanlineDecoder(width,
+ height,
+ width,
+ height,
+ nComps,
+ bpc,
+ CalculatePitch8(bpc, nComps, width).ValueOrDie()),
m_SrcBuf(src_buf),
m_SrcSize(src_size),
m_pScanline(FX_Alloc(uint8_t, m_Pitch)),
@@ -635,8 +635,7 @@ CCodec_FlateScanlineDecoder::CCodec_FlateScanlineDecoder(const uint8_t* src_buf,
m_BitsPerComponent = BitsPerComponent;
m_Columns = Columns;
m_PredictPitch =
- (static_cast<uint32_t>(m_BitsPerComponent) * m_Colors * m_Columns + 7) /
- 8;
+ CalculatePitch8(m_BitsPerComponent, m_Colors, m_Columns).ValueOrDie();
m_pLastLine = FX_Alloc(uint8_t, m_PredictPitch);
m_pPredictRaw = FX_Alloc(uint8_t, m_PredictPitch + 1);
m_pPredictBuffer = FX_Alloc(uint8_t, m_PredictPitch);
diff --git a/core/fxcodec/fx_codec.h b/core/fxcodec/fx_codec.h
index e64d95f45f..5ed29d4da5 100644
--- a/core/fxcodec/fx_codec.h
+++ b/core/fxcodec/fx_codec.h
@@ -15,6 +15,7 @@
#include "core/fxcodec/fx_codec_def.h"
#include "core/fxcrt/fx_coordinates.h"
+#include "core/fxcrt/fx_safe_types.h"
#include "core/fxcrt/fx_string.h"
class CCodec_BasicModule;
@@ -115,4 +116,7 @@ void FaxG4Decode(const uint8_t* src_buf,
int height,
int pitch);
+FX_SAFE_UINT32 CalculatePitch8(uint32_t bpc, uint32_t components, int width);
+FX_SAFE_UINT32 CalculatePitch32(int bpp, int width);
+
#endif // CORE_FXCODEC_FX_CODEC_H_
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 20:39:14 +0000