ProgressiveDecoder: switch over loop, part 3
Change-Id: I945962d69fef18db1b02556d37982eeddd422748
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/81975
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
diff --git a/core/fxcodec/progressive_decoder.cpp b/core/fxcodec/progressive_decoder.cpp
index 501ca0b..00486cc 100644
--- a/core/fxcodec/progressive_decoder.cpp
+++ b/core/fxcodec/progressive_decoder.cpp
@@ -925,24 +925,25 @@
const uint8_t* scan_src2 =
pDeviceBitmap->GetScanline(pWeight->m_SrcEnd + dest_top) +
dest_ScanOffet;
- for (int dest_col = 0; dest_col < m_sizeX; dest_col++) {
- switch (pDeviceBitmap->GetFormat()) {
- case FXDIB_Format::kInvalid:
- case FXDIB_Format::k1bppMask:
- case FXDIB_Format::k1bppRgb:
+ switch (pDeviceBitmap->GetFormat()) {
+ case FXDIB_Format::kInvalid:
+ case FXDIB_Format::k1bppMask:
+ case FXDIB_Format::k1bppRgb:
+ return;
+ case FXDIB_Format::k8bppMask:
+ case FXDIB_Format::k8bppRgb:
+ if (pDeviceBitmap->HasPalette())
return;
- case FXDIB_Format::k8bppMask:
- case FXDIB_Format::k8bppRgb: {
- if (pDeviceBitmap->HasPalette())
- return;
-
+ for (int dest_col = 0; dest_col < m_sizeX; dest_col++) {
uint32_t dest_g = 0;
dest_g += pWeight->m_Weights[0] * (*scan_src1++);
dest_g += pWeight->m_Weights[1] * (*scan_src2++);
*scan_des++ = (uint8_t)(dest_g >> 16);
- } break;
- case FXDIB_Format::kRgb:
- case FXDIB_Format::kRgb32: {
+ }
+ break;
+ case FXDIB_Format::kRgb:
+ case FXDIB_Format::kRgb32:
+ for (int dest_col = 0; dest_col < m_sizeX; dest_col++) {
uint32_t dest_b = 0;
uint32_t dest_g = 0;
uint32_t dest_r = 0;
@@ -958,8 +959,10 @@
*scan_des++ = (uint8_t)((dest_g) >> 16);
*scan_des++ = (uint8_t)((dest_r) >> 16);
scan_des += dest_Bpp - 3;
- } break;
- case FXDIB_Format::kArgb: {
+ }
+ break;
+ case FXDIB_Format::kArgb:
+ for (int dest_col = 0; dest_col < m_sizeX; dest_col++) {
uint32_t dest_a = 0;
uint32_t dest_b = 0;
uint32_t dest_g = 0;
@@ -976,10 +979,10 @@
*scan_des++ = (uint8_t)((dest_g) >> 16);
*scan_des++ = (uint8_t)((dest_r) >> 16);
*scan_des++ = (uint8_t)((dest_a) >> 16);
- } break;
- default:
- return;
- }
+ }
+ break;
+ default:
+ return;
}
}
int dest_bottom = dest_top + m_sizeY - 1;