Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(503)

Side by Side Diff: core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp

Issue 497733005: Add GetValidBpc() check in CPDF_DIBSource::GetScanLine (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 PDFium Authors. All rights reserved. 1 // Copyright 2014 PDFium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
6 6
7 #include "../../../include/fxge/fx_ge.h" 7 #include "../../../include/fxge/fx_ge.h"
8 #include "../../../include/fxcodec/fx_codec.h" 8 #include "../../../include/fxcodec/fx_codec.h"
9 #include "../../../include/fpdfapi/fpdf_module.h" 9 #include "../../../include/fpdfapi/fpdf_module.h"
10 #include "../../../include/fpdfapi/fpdf_render.h" 10 #include "../../../include/fpdfapi/fpdf_render.h"
(...skipping 1029 matching lines...) Expand 10 before | Expand all | Expand 10 after
1040 } 1040 }
1041 FX_LPBYTE CPDF_DIBSource::GetBuffer() const 1041 FX_LPBYTE CPDF_DIBSource::GetBuffer() const
1042 { 1042 {
1043 if (m_pCachedBitmap) { 1043 if (m_pCachedBitmap) {
1044 return m_pCachedBitmap->GetBuffer(); 1044 return m_pCachedBitmap->GetBuffer();
1045 } 1045 }
1046 return NULL; 1046 return NULL;
1047 } 1047 }
1048 FX_LPCBYTE CPDF_DIBSource::GetScanline(int line) const 1048 FX_LPCBYTE CPDF_DIBSource::GetScanline(int line) const
1049 { 1049 {
1050 FX_DWORD src_pitch = (m_Width * m_bpc * m_nComponents + 7) / 8; 1050 FX_DWORD bpc = GetValidBpc();
1051 if (bpc == 0) {
1052 return NULL;
1053 }
1054 FX_SAFE_DWORD src_pitch = m_Width;
1055 src_pitch *= bpc;
1056 src_pitch *= m_nComponents;
1057 src_pitch += 7;
1058 src_pitch /= 8;
1059 if (!src_pitch.IsValid())
1060 return NULL;
1061 FX_DWORD src_pitch_value = src_pitch.ValueOrDie();
1051 FX_LPCBYTE pSrcLine = NULL; 1062 FX_LPCBYTE pSrcLine = NULL;
1052 if (m_pCachedBitmap) { 1063 if (m_pCachedBitmap) {
1053 if (line >= m_pCachedBitmap->GetHeight()) { 1064 if (line >= m_pCachedBitmap->GetHeight()) {
1054 line = m_pCachedBitmap->GetHeight() - 1; 1065 line = m_pCachedBitmap->GetHeight() - 1;
1055 } 1066 }
1056 pSrcLine = m_pCachedBitmap->GetScanline(line); 1067 pSrcLine = m_pCachedBitmap->GetScanline(line);
1057 } else if (m_pDecoder) { 1068 } else if (m_pDecoder) {
1058 pSrcLine = m_pDecoder->GetScanline(line); 1069 pSrcLine = m_pDecoder->GetScanline(line);
1059 } else { 1070 } else {
1060 if (m_pStreamAcc->GetSize() >= (line + 1) * src_pitch) { 1071 if (m_pStreamAcc->GetSize() >= (line + 1) * src_pitch_value) {
1061 pSrcLine = m_pStreamAcc->GetData() + line * src_pitch; 1072 pSrcLine = m_pStreamAcc->GetData() + line * src_pitch_value;
1062 } 1073 }
1063 } 1074 }
1064 if (pSrcLine == NULL) { 1075 if (pSrcLine == NULL) {
1065 FX_LPBYTE pLineBuf = m_pMaskedLine ? m_pMaskedLine : m_pLineBuf; 1076 FX_LPBYTE pLineBuf = m_pMaskedLine ? m_pMaskedLine : m_pLineBuf;
1066 FXSYS_memset8(pLineBuf, 0xff, m_Pitch); 1077 FXSYS_memset8(pLineBuf, 0xff, m_Pitch);
1067 return pLineBuf; 1078 return pLineBuf;
1068 } 1079 }
1069 if (m_bpc * m_nComponents == 1) { 1080 if (bpc * m_nComponents == 1) {
1070 if (m_bImageMask && m_bDefaultDecode) { 1081 if (m_bImageMask && m_bDefaultDecode) {
1071 for (FX_DWORD i = 0; i < src_pitch; i ++) { 1082 for (FX_DWORD i = 0; i < src_pitch_value; i++) {
1072 m_pLineBuf[i] = ~pSrcLine[i]; 1083 m_pLineBuf[i] = ~pSrcLine[i];
1073 } 1084 }
1074 } else if (m_bColorKey) { 1085 } else if (m_bColorKey) {
1075 FX_DWORD reset_argb, set_argb; 1086 FX_DWORD reset_argb, set_argb;
1076 reset_argb = m_pPalette ? m_pPalette[0] : 0xff000000; 1087 reset_argb = m_pPalette ? m_pPalette[0] : 0xff000000;
1077 set_argb = m_pPalette ? m_pPalette[1] : 0xffffffff; 1088 set_argb = m_pPalette ? m_pPalette[1] : 0xffffffff;
1078 if (m_pCompData[0].m_ColorKeyMin == 0) { 1089 if (m_pCompData[0].m_ColorKeyMin == 0) {
1079 reset_argb = 0; 1090 reset_argb = 0;
1080 } 1091 }
1081 if (m_pCompData[0].m_ColorKeyMax == 1) { 1092 if (m_pCompData[0].m_ColorKeyMax == 1) {
1082 set_argb = 0; 1093 set_argb = 0;
1083 } 1094 }
1084 set_argb = FXARGB_TODIB(set_argb); 1095 set_argb = FXARGB_TODIB(set_argb);
1085 reset_argb = FXARGB_TODIB(reset_argb); 1096 reset_argb = FXARGB_TODIB(reset_argb);
1086 FX_DWORD* dest_scan = (FX_DWORD*)m_pMaskedLine; 1097 FX_DWORD* dest_scan = (FX_DWORD*)m_pMaskedLine;
1087 for (int col = 0; col < m_Width; col ++) { 1098 for (int col = 0; col < m_Width; col ++) {
1088 if (pSrcLine[col / 8] & (1 << (7 - col % 8))) { 1099 if (pSrcLine[col / 8] & (1 << (7 - col % 8))) {
1089 *dest_scan = set_argb; 1100 *dest_scan = set_argb;
1090 } else { 1101 } else {
1091 *dest_scan = reset_argb; 1102 *dest_scan = reset_argb;
1092 } 1103 }
1093 dest_scan ++; 1104 dest_scan ++;
1094 } 1105 }
1095 return m_pMaskedLine; 1106 return m_pMaskedLine;
1096 } else { 1107 } else {
1097 FXSYS_memcpy32(m_pLineBuf, pSrcLine, src_pitch); 1108 FXSYS_memcpy32(m_pLineBuf, pSrcLine, src_pitch_value);
1098 } 1109 }
1099 return m_pLineBuf; 1110 return m_pLineBuf;
1100 } 1111 }
1101 if (m_bpc * m_nComponents <= 8) { 1112 if (bpc * m_nComponents <= 8) {
1102 if (m_bpc == 8) { 1113 if (bpc == 8) {
1103 FXSYS_memcpy32(m_pLineBuf, pSrcLine, src_pitch); 1114 FXSYS_memcpy32(m_pLineBuf, pSrcLine, src_pitch_value);
1104 } else { 1115 } else {
1105 int src_bit_pos = 0; 1116 int src_bit_pos = 0;
1106 for (int col = 0; col < m_Width; col ++) { 1117 for (int col = 0; col < m_Width; col ++) {
1107 int color_index = 0; 1118 int color_index = 0;
1108 for (FX_DWORD color = 0; color < m_nComponents; color ++) { 1119 for (FX_DWORD color = 0; color < m_nComponents; color ++) {
1109 int data = _GetBits8(pSrcLine, src_bit_pos, m_bpc); 1120 int data = _GetBits8(pSrcLine, src_bit_pos, bpc);
1110 color_index |= data << (color * m_bpc); 1121 color_index |= data << (color * bpc);
1111 src_bit_pos += m_bpc; 1122 src_bit_pos += bpc;
1112 } 1123 }
1113 m_pLineBuf[col] = color_index; 1124 m_pLineBuf[col] = color_index;
1114 } 1125 }
1115 } 1126 }
1116 if (m_bColorKey) { 1127 if (m_bColorKey) {
1117 FX_LPBYTE pDestPixel = m_pMaskedLine; 1128 FX_LPBYTE pDestPixel = m_pMaskedLine;
1118 FX_LPCBYTE pSrcPixel = m_pLineBuf; 1129 FX_LPCBYTE pSrcPixel = m_pLineBuf;
1119 for (int col = 0; col < m_Width; col ++) { 1130 for (int col = 0; col < m_Width; col ++) {
1120 FX_BYTE index = *pSrcPixel++; 1131 FX_BYTE index = *pSrcPixel++;
1121 if (m_pPalette) { 1132 if (m_pPalette) {
1122 *pDestPixel++ = FXARGB_B(m_pPalette[index]); 1133 *pDestPixel++ = FXARGB_B(m_pPalette[index]);
1123 *pDestPixel++ = FXARGB_G(m_pPalette[index]); 1134 *pDestPixel++ = FXARGB_G(m_pPalette[index]);
1124 *pDestPixel++ = FXARGB_R(m_pPalette[index]); 1135 *pDestPixel++ = FXARGB_R(m_pPalette[index]);
1125 } else { 1136 } else {
1126 *pDestPixel++ = index; 1137 *pDestPixel++ = index;
1127 *pDestPixel++ = index; 1138 *pDestPixel++ = index;
1128 *pDestPixel++ = index; 1139 *pDestPixel++ = index;
1129 } 1140 }
1130 *pDestPixel = (index < m_pCompData[0].m_ColorKeyMin || index > m _pCompData[0].m_ColorKeyMax) ? 0xff : 0; 1141 *pDestPixel = (index < m_pCompData[0].m_ColorKeyMin || index > m _pCompData[0].m_ColorKeyMax) ? 0xff : 0;
1131 pDestPixel ++ ; 1142 pDestPixel ++ ;
1132 } 1143 }
1133 return m_pMaskedLine; 1144 return m_pMaskedLine;
1134 } 1145 }
1135 return m_pLineBuf; 1146 return m_pLineBuf;
1136 } 1147 }
1137 if (m_bColorKey) { 1148 if (m_bColorKey) {
1138 if (m_nComponents == 3 && m_bpc == 8) { 1149 if (m_nComponents == 3 && bpc == 8) {
1139 FX_LPBYTE alpha_channel = m_pMaskedLine + 3; 1150 FX_LPBYTE alpha_channel = m_pMaskedLine + 3;
1140 for (int col = 0; col < m_Width; col ++) { 1151 for (int col = 0; col < m_Width; col ++) {
1141 FX_LPCBYTE pPixel = pSrcLine + col * 3; 1152 FX_LPCBYTE pPixel = pSrcLine + col * 3;
1142 alpha_channel[col * 4] = (pPixel[0] < m_pCompData[0].m_ColorKeyM in || 1153 alpha_channel[col * 4] = (pPixel[0] < m_pCompData[0].m_ColorKeyM in ||
1143 pPixel[0] > m_pCompData[0].m_ColorKeyM ax || 1154 pPixel[0] > m_pCompData[0].m_ColorKeyM ax ||
1144 pPixel[1] < m_pCompData[1].m_ColorKeyM in || pPixel[1] > m_pCompData[1].m_ColorKeyMax || 1155 pPixel[1] < m_pCompData[1].m_ColorKeyM in || pPixel[1] > m_pCompData[1].m_ColorKeyMax ||
1145 pPixel[2] < m_pCompData[2].m_ColorKeyM in || pPixel[2] > m_pCompData[2].m_ColorKeyMax) ? 0xff : 0; 1156 pPixel[2] < m_pCompData[2].m_ColorKeyM in || pPixel[2] > m_pCompData[2].m_ColorKeyMax) ? 0xff : 0;
1146 } 1157 }
1147 } else { 1158 } else {
1148 FXSYS_memset8(m_pMaskedLine, 0xff, m_Pitch); 1159 FXSYS_memset8(m_pMaskedLine, 0xff, m_Pitch);
(...skipping 377 matching lines...) Expand 10 before | Expand all | Expand 10 after
1526 if (!m_bCached) { 1537 if (!m_bCached) {
1527 if (m_pBitmap) { 1538 if (m_pBitmap) {
1528 delete m_pBitmap; 1539 delete m_pBitmap;
1529 m_pBitmap = NULL; 1540 m_pBitmap = NULL;
1530 } 1541 }
1531 if (m_pMask) { 1542 if (m_pMask) {
1532 delete m_pMask; 1543 delete m_pMask;
1533 } 1544 }
1534 } 1545 }
1535 } 1546 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698