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

Side by Side Diff: core/fxcodec/codec/fx_codec_jpeg.cpp

Issue 1861403002: Rename FX_SAFE_DWORD to FX_SAFE_UINT32 (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Created 4 years, 8 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 | « core/fxcodec/codec/fx_codec.cpp ('k') | core/fxcodec/codec/fx_codec_jpx_opj.cpp » ('j') | 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 <setjmp.h> 7 #include <setjmp.h>
8 8
9 #include "core/fxcodec/codec/codec_int.h" 9 #include "core/fxcodec/codec/codec_int.h"
10 #include "core/fxcrt/include/fx_safe_types.h" 10 #include "core/fxcrt/include/fx_safe_types.h"
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 135
136 struct jpeg_compress_struct cinfo; 136 struct jpeg_compress_struct cinfo;
137 memset(&cinfo, 0, sizeof(cinfo)); 137 memset(&cinfo, 0, sizeof(cinfo));
138 cinfo.err = &jerr; 138 cinfo.err = &jerr;
139 jpeg_create_compress(&cinfo); 139 jpeg_create_compress(&cinfo);
140 int Bpp = pSource->GetBPP() / 8; 140 int Bpp = pSource->GetBPP() / 8;
141 uint32_t nComponents = Bpp >= 3 ? (pSource->IsCmykImage() ? 4 : 3) : 1; 141 uint32_t nComponents = Bpp >= 3 ? (pSource->IsCmykImage() ? 4 : 3) : 1;
142 uint32_t pitch = pSource->GetPitch(); 142 uint32_t pitch = pSource->GetPitch();
143 uint32_t width = pdfium::base::checked_cast<uint32_t>(pSource->GetWidth()); 143 uint32_t width = pdfium::base::checked_cast<uint32_t>(pSource->GetWidth());
144 uint32_t height = pdfium::base::checked_cast<uint32_t>(pSource->GetHeight()); 144 uint32_t height = pdfium::base::checked_cast<uint32_t>(pSource->GetHeight());
145 FX_SAFE_DWORD safe_buf_len = width; 145 FX_SAFE_UINT32 safe_buf_len = width;
146 safe_buf_len *= height; 146 safe_buf_len *= height;
147 safe_buf_len *= nComponents; 147 safe_buf_len *= nComponents;
148 safe_buf_len += 1024; 148 safe_buf_len += 1024;
149 if (icc_length) { 149 if (icc_length) {
150 safe_buf_len += 255 * 18; 150 safe_buf_len += 255 * 18;
151 safe_buf_len += icc_length; 151 safe_buf_len += icc_length;
152 } 152 }
153 uint32_t dest_buf_length = 0; 153 uint32_t dest_buf_length = 0;
154 if (!safe_buf_len.IsValid()) { 154 if (!safe_buf_len.IsValid()) {
155 dest_buf = nullptr; 155 dest_buf = nullptr;
(...skipping 494 matching lines...) Expand 10 before | Expand all | Expand 10 after
650 uint8_t** avail_buf_ptr) { 650 uint8_t** avail_buf_ptr) {
651 if (avail_buf_ptr) { 651 if (avail_buf_ptr) {
652 *avail_buf_ptr = NULL; 652 *avail_buf_ptr = NULL;
653 if (((FXJPEG_Context*)pContext)->m_SrcMgr.bytes_in_buffer > 0) { 653 if (((FXJPEG_Context*)pContext)->m_SrcMgr.bytes_in_buffer > 0) {
654 *avail_buf_ptr = 654 *avail_buf_ptr =
655 (uint8_t*)((FXJPEG_Context*)pContext)->m_SrcMgr.next_input_byte; 655 (uint8_t*)((FXJPEG_Context*)pContext)->m_SrcMgr.next_input_byte;
656 } 656 }
657 } 657 }
658 return (uint32_t)((FXJPEG_Context*)pContext)->m_SrcMgr.bytes_in_buffer; 658 return (uint32_t)((FXJPEG_Context*)pContext)->m_SrcMgr.bytes_in_buffer;
659 } 659 }
OLDNEW
« no previous file with comments | « core/fxcodec/codec/fx_codec.cpp ('k') | core/fxcodec/codec/fx_codec_jpx_opj.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698