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

Side by Side Diff: core/src/fxcodec/jbig2/JBig2_Image.cpp

Issue 1438573002: Merge to XFA: Fix relative includes within core/ (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa
Patch Set: Created 5 years, 1 month 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/src/fxcodec/jbig2/JBig2_HuffmanTable.cpp ('k') | core/src/fxcodec/jbig2/JBig2_List.h » ('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 <limits.h> 7 #include <limits.h>
8 8
9 #include "../../../include/fxcrt/fx_coordinates.h"
10 #include "../../../include/fxcrt/fx_safe_types.h"
11 #include "JBig2_Image.h" 9 #include "JBig2_Image.h"
10 #include "core/include/fxcrt/fx_coordinates.h"
11 #include "core/include/fxcrt/fx_safe_types.h"
12 12
13 CJBig2_Image::CJBig2_Image(int32_t w, int32_t h) { 13 CJBig2_Image::CJBig2_Image(int32_t w, int32_t h) {
14 m_nWidth = w; 14 m_nWidth = w;
15 m_nHeight = h; 15 m_nHeight = h;
16 if (m_nWidth <= 0 || m_nHeight <= 0 || m_nWidth > INT_MAX - 31) { 16 if (m_nWidth <= 0 || m_nHeight <= 0 || m_nWidth > INT_MAX - 31) {
17 m_pData = NULL; 17 m_pData = NULL;
18 m_bNeedFree = FALSE; 18 m_bNeedFree = FALSE;
19 return; 19 return;
20 } 20 }
21 m_nStride = ((w + 31) >> 5) << 2; 21 m_nStride = ((w + 31) >> 5) << 2;
(...skipping 1068 matching lines...) Expand 10 before | Expand all | Expand 10 after
1090 dp[2] = (uint8_t)(tmp >> 8); 1090 dp[2] = (uint8_t)(tmp >> 8);
1091 dp[3] = (uint8_t)tmp; 1091 dp[3] = (uint8_t)tmp;
1092 } 1092 }
1093 lineSrc += m_nStride; 1093 lineSrc += m_nStride;
1094 lineDst += pDst->m_nStride; 1094 lineDst += pDst->m_nStride;
1095 } 1095 }
1096 } 1096 }
1097 } 1097 }
1098 return 1; 1098 return 1;
1099 } 1099 }
OLDNEW
« no previous file with comments | « core/src/fxcodec/jbig2/JBig2_HuffmanTable.cpp ('k') | core/src/fxcodec/jbig2/JBig2_List.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698