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

Side by Side Diff: core/src/fxcrt/extension.h

Issue 1177483002: Use stdint.h types throughout PDFium. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Created 5 years, 6 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/src/fxcodec/jbig2/JBig2_Segment.h ('k') | core/src/fxcrt/fx_arabic.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 #ifndef CORE_SRC_FXCRT_EXTENSION_H_ 7 #ifndef CORE_SRC_FXCRT_EXTENSION_H_
8 #define CORE_SRC_FXCRT_EXTENSION_H_ 8 #define CORE_SRC_FXCRT_EXTENSION_H_
9 9
10 #include "../../include/fxcrt/fx_safe_types.h" 10 #include "../../include/fxcrt/fx_safe_types.h"
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 , m_nCurPos(0) 153 , m_nCurPos(0)
154 , m_nGrowSize(FX_MEMSTREAM_BlockSize) 154 , m_nGrowSize(FX_MEMSTREAM_BlockSize)
155 , m_bUseRange(FALSE) 155 , m_bUseRange(FALSE)
156 { 156 {
157 m_Blocks.Add(pBuffer); 157 m_Blocks.Add(pBuffer);
158 m_dwFlags = FX_MEMSTREAM_Consecutive | (bTakeOver ? FX_MEMSTREAM_TakeOve r : 0); 158 m_dwFlags = FX_MEMSTREAM_Consecutive | (bTakeOver ? FX_MEMSTREAM_TakeOve r : 0);
159 } 159 }
160 ~CFX_MemoryStream() 160 ~CFX_MemoryStream()
161 { 161 {
162 if (m_dwFlags & FX_MEMSTREAM_TakeOver) { 162 if (m_dwFlags & FX_MEMSTREAM_TakeOver) {
163 for (FX_INT32 i = 0; i < m_Blocks.GetSize(); i++) { 163 for (int32_t i = 0; i < m_Blocks.GetSize(); i++) {
164 FX_Free((FX_LPBYTE)m_Blocks[i]); 164 FX_Free((FX_LPBYTE)m_Blocks[i]);
165 } 165 }
166 } 166 }
167 m_Blocks.RemoveAll(); 167 m_Blocks.RemoveAll();
168 } 168 }
169 virtual IFX_FileStream* Retain() override 169 virtual IFX_FileStream* Retain() override
170 { 170 {
171 m_dwCount ++; 171 m_dwCount ++;
172 return this; 172 return this;
173 } 173 }
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
263 if (m_nCurPos >= m_nCurSize) { 263 if (m_nCurPos >= m_nCurSize) {
264 return 0; 264 return 0;
265 } 265 }
266 if (m_bUseRange) { 266 if (m_bUseRange) {
267 size_t availSize = m_nOffset + m_nSize - m_nCurPos; 267 size_t availSize = m_nOffset + m_nSize - m_nCurPos;
268 if (availSize < size) { 268 if (availSize < size) {
269 size -= size - (size_t)availSize; 269 size -= size - (size_t)availSize;
270 } 270 }
271 } 271 }
272 size_t nRead = FX_MIN(size, m_nCurSize - m_nCurPos); 272 size_t nRead = FX_MIN(size, m_nCurSize - m_nCurPos);
273 if (!ReadBlock(buffer, (FX_INT32)m_nCurPos, nRead)) { 273 if (!ReadBlock(buffer, (int32_t)m_nCurPos, nRead)) {
274 return 0; 274 return 0;
275 } 275 }
276 return nRead; 276 return nRead;
277 } 277 }
278 virtual FX_BOOL WriteBlock(const void* buffer, F X_FILESIZE offset, size_t size) override 278 virtual FX_BOOL WriteBlock(const void* buffer, F X_FILESIZE offset, size_t size) override
279 { 279 {
280 if (!buffer || !size) { 280 if (!buffer || !size) {
281 return FALSE; 281 return FALSE;
282 } 282 }
283 if (m_bUseRange) { 283 if (m_bUseRange) {
284 offset += (FX_FILESIZE)m_nOffset; 284 offset += (FX_FILESIZE)m_nOffset;
285 } 285 }
286 if (m_dwFlags & FX_MEMSTREAM_Consecutive) { 286 if (m_dwFlags & FX_MEMSTREAM_Consecutive) {
287 FX_SAFE_SIZE_T newPos = size; 287 FX_SAFE_SIZE_T newPos = size;
288 newPos += offset; 288 newPos += offset;
289 if (!newPos.IsValid()) 289 if (!newPos.IsValid())
290 return FALSE; 290 return FALSE;
291 291
292 m_nCurPos = newPos.ValueOrDie(); 292 m_nCurPos = newPos.ValueOrDie();
293 if (m_nCurPos > m_nTotalSize) { 293 if (m_nCurPos > m_nTotalSize) {
294 m_nTotalSize = (m_nCurPos + m_nGrowSize - 1) / m_nGrowSize * m_n GrowSize; 294 m_nTotalSize = (m_nCurPos + m_nGrowSize - 1) / m_nGrowSize * m_n GrowSize;
295 if (m_Blocks.GetSize() < 1) { 295 if (m_Blocks.GetSize() < 1) {
296 void* block = FX_Alloc(FX_BYTE, m_nTotalSize); 296 void* block = FX_Alloc(uint8_t, m_nTotalSize);
297 m_Blocks.Add(block); 297 m_Blocks.Add(block);
298 } else { 298 } else {
299 m_Blocks[0] = FX_Realloc(FX_BYTE, m_Blocks[0], m_nTotalSize) ; 299 m_Blocks[0] = FX_Realloc(uint8_t, m_Blocks[0], m_nTotalSize) ;
300 } 300 }
301 if (!m_Blocks[0]) { 301 if (!m_Blocks[0]) {
302 m_Blocks.RemoveAll(); 302 m_Blocks.RemoveAll();
303 return FALSE; 303 return FALSE;
304 } 304 }
305 } 305 }
306 FXSYS_memcpy32((FX_LPBYTE)m_Blocks[0] + (size_t)offset, buffer, size ); 306 FXSYS_memcpy32((FX_LPBYTE)m_Blocks[0] + (size_t)offset, buffer, size );
307 if (m_nCurSize < m_nCurPos) { 307 if (m_nCurSize < m_nCurPos) {
308 m_nCurSize = m_nCurPos; 308 m_nCurSize = m_nCurPos;
309 } 309 }
(...skipping 30 matching lines...) Expand all
340 return TRUE; 340 return TRUE;
341 } 341 }
342 virtual FX_BOOL IsConsecutive() const override 342 virtual FX_BOOL IsConsecutive() const override
343 { 343 {
344 return m_dwFlags & FX_MEMSTREAM_Consecutive; 344 return m_dwFlags & FX_MEMSTREAM_Consecutive;
345 } 345 }
346 virtual void EstimateSize(size_t nInitSize, s ize_t nGrowSize) override 346 virtual void EstimateSize(size_t nInitSize, s ize_t nGrowSize) override
347 { 347 {
348 if (m_dwFlags & FX_MEMSTREAM_Consecutive) { 348 if (m_dwFlags & FX_MEMSTREAM_Consecutive) {
349 if (m_Blocks.GetSize() < 1) { 349 if (m_Blocks.GetSize() < 1) {
350 FX_LPBYTE pBlock = FX_Alloc(FX_BYTE, FX_MAX(nInitSize, 4096)); 350 FX_LPBYTE pBlock = FX_Alloc(uint8_t, FX_MAX(nInitSize, 4096));
351 m_Blocks.Add(pBlock); 351 m_Blocks.Add(pBlock);
352 } 352 }
353 m_nGrowSize = FX_MAX(nGrowSize, 4096); 353 m_nGrowSize = FX_MAX(nGrowSize, 4096);
354 } else if (m_Blocks.GetSize() < 1) { 354 } else if (m_Blocks.GetSize() < 1) {
355 m_nGrowSize = FX_MAX(nGrowSize, 4096); 355 m_nGrowSize = FX_MAX(nGrowSize, 4096);
356 } 356 }
357 } 357 }
358 virtual FX_LPBYTE GetBuffer() const override 358 virtual FX_LPBYTE GetBuffer() const override
359 { 359 {
360 return m_Blocks.GetSize() ? (FX_LPBYTE)m_Blocks[0] : NULL; 360 return m_Blocks.GetSize() ? (FX_LPBYTE)m_Blocks[0] : NULL;
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
393 size_t m_nOffset; 393 size_t m_nOffset;
394 size_t m_nSize; 394 size_t m_nSize;
395 FX_BOOL ExpandBlocks(size_t size) 395 FX_BOOL ExpandBlocks(size_t size)
396 { 396 {
397 if (m_nCurSize < size) { 397 if (m_nCurSize < size) {
398 m_nCurSize = size; 398 m_nCurSize = size;
399 } 399 }
400 if (size <= m_nTotalSize) { 400 if (size <= m_nTotalSize) {
401 return TRUE; 401 return TRUE;
402 } 402 }
403 FX_INT32 iCount = m_Blocks.GetSize(); 403 int32_t iCount = m_Blocks.GetSize();
404 size = (size - m_nTotalSize + m_nGrowSize - 1) / m_nGrowSize; 404 size = (size - m_nTotalSize + m_nGrowSize - 1) / m_nGrowSize;
405 m_Blocks.SetSize(m_Blocks.GetSize() + (FX_INT32)size); 405 m_Blocks.SetSize(m_Blocks.GetSize() + (int32_t)size);
406 while (size --) { 406 while (size --) {
407 FX_LPBYTE pBlock = FX_Alloc(FX_BYTE, m_nGrowSize); 407 FX_LPBYTE pBlock = FX_Alloc(uint8_t, m_nGrowSize);
408 m_Blocks.SetAt(iCount ++, pBlock); 408 m_Blocks.SetAt(iCount ++, pBlock);
409 m_nTotalSize += m_nGrowSize; 409 m_nTotalSize += m_nGrowSize;
410 } 410 }
411 return TRUE; 411 return TRUE;
412 } 412 }
413 }; 413 };
414 #ifdef __cplusplus 414 #ifdef __cplusplus
415 extern "C" { 415 extern "C" {
416 #endif 416 #endif
417 #define MT_N 848 417 #define MT_N 848
418 #define MT_M 456 418 #define MT_M 456
419 #define MT_Matrix_A 0x9908b0df 419 #define MT_Matrix_A 0x9908b0df
420 #define MT_Upper_Mask 0x80000000 420 #define MT_Upper_Mask 0x80000000
421 #define MT_Lower_Mask 0x7fffffff 421 #define MT_Lower_Mask 0x7fffffff
422 typedef struct _FX_MTRANDOMCONTEXT { 422 typedef struct _FX_MTRANDOMCONTEXT {
423 _FX_MTRANDOMCONTEXT() 423 _FX_MTRANDOMCONTEXT()
424 { 424 {
425 mti = MT_N + 1; 425 mti = MT_N + 1;
426 bHaveSeed = FALSE; 426 bHaveSeed = FALSE;
427 } 427 }
428 FX_DWORD mti; 428 FX_DWORD mti;
429 FX_BOOL bHaveSeed; 429 FX_BOOL bHaveSeed;
430 FX_DWORD mt[MT_N]; 430 FX_DWORD mt[MT_N];
431 } FX_MTRANDOMCONTEXT, * FX_LPMTRANDOMCONTEXT; 431 } FX_MTRANDOMCONTEXT, * FX_LPMTRANDOMCONTEXT;
432 typedef FX_MTRANDOMCONTEXT const * FX_LPCMTRANDOMCONTEXT; 432 typedef FX_MTRANDOMCONTEXT const * FX_LPCMTRANDOMCONTEXT;
433 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ 433 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
434 FX_BOOL FX_GenerateCryptoRandom(FX_LPDWORD pBuffer, FX_INT32 iCount); 434 FX_BOOL FX_GenerateCryptoRandom(FX_LPDWORD pBuffer, int32_t iCount);
435 #endif 435 #endif
436 #ifdef __cplusplus 436 #ifdef __cplusplus
437 } 437 }
438 #endif 438 #endif
439 439
440 #endif // CORE_SRC_FXCRT_EXTENSION_H_ 440 #endif // CORE_SRC_FXCRT_EXTENSION_H_
OLDNEW
« no previous file with comments | « core/src/fxcodec/jbig2/JBig2_Segment.h ('k') | core/src/fxcrt/fx_arabic.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698