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

Side by Side Diff: core/src/fpdfapi/fpdf_render/render_int.h

Issue 892553002: Fix JPX image rendering that regressed due to several security fixes. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Created 5 years, 10 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/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp ('k') | 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 #ifndef _FPDF_PAGEOBJ_H_ 7 #ifndef _FPDF_PAGEOBJ_H_
8 #include "../../../include/fpdfapi/fpdf_pageobj.h" 8 #include "../../../include/fpdfapi/fpdf_pageobj.h"
9 #endif 9 #endif
10 class CPDF_QuickStretcher; 10 class CPDF_QuickStretcher;
(...skipping 418 matching lines...) Expand 10 before | Expand all | Expand 10 after
429 const CPDF_Dictionary* m_pDict; 429 const CPDF_Dictionary* m_pDict;
430 CPDF_ColorSpace* m_pColorSpace; 430 CPDF_ColorSpace* m_pColorSpace;
431 FX_DWORD m_Family; 431 FX_DWORD m_Family;
432 FX_DWORD m_bpc; 432 FX_DWORD m_bpc;
433 FX_DWORD m_bpc_orig; 433 FX_DWORD m_bpc_orig;
434 FX_DWORD m_nComponents; 434 FX_DWORD m_nComponents;
435 FX_DWORD m_GroupFamily; 435 FX_DWORD m_GroupFamily;
436 FX_BOOL m_bLoadMask; 436 FX_BOOL m_bLoadMask;
437 FX_BOOL m_bDefaultDecode; 437 FX_BOOL m_bDefaultDecode;
438 FX_BOOL m_bImageMask; 438 FX_BOOL m_bImageMask;
439 FX_BOOL m_bDoBpcCheck;
439 FX_BOOL m_bColorKey; 440 FX_BOOL m_bColorKey;
440 DIB_COMP_DATA* m_pCompData; 441 DIB_COMP_DATA* m_pCompData;
441 FX_LPBYTE m_pLineBuf; 442 FX_LPBYTE m_pLineBuf;
442 FX_LPBYTE m_pMaskedLine; 443 FX_LPBYTE m_pMaskedLine;
443 CFX_DIBitmap* m_pCachedBitmap; 444 CFX_DIBitmap* m_pCachedBitmap;
444 ICodec_ScanlineDecoder* m_pDecoder; 445 ICodec_ScanlineDecoder* m_pDecoder;
445 }; 446 };
446 #define FPDF_HUGE_IMAGE_SIZE 60000000 447 #define FPDF_HUGE_IMAGE_SIZE 60000000
447 class CPDF_DIBTransferFunc : public CFX_FilteredDIB 448 class CPDF_DIBTransferFunc : public CFX_FilteredDIB
448 { 449 {
449 public: 450 public:
450 CPDF_DIBTransferFunc(const CPDF_TransferFunc* pTransferFunc); 451 CPDF_DIBTransferFunc(const CPDF_TransferFunc* pTransferFunc);
451 virtual FXDIB_Format GetDestFormat(); 452 virtual FXDIB_Format GetDestFormat();
452 virtual FX_ARGB* GetDestPalette() 453 virtual FX_ARGB* GetDestPalette()
453 { 454 {
454 return NULL; 455 return NULL;
455 } 456 }
456 virtual void TranslateScanline(FX_LPBYTE dest_buf, FX _LPCBYTE src_buf) const; 457 virtual void TranslateScanline(FX_LPBYTE dest_buf, FX _LPCBYTE src_buf) const;
457 virtual void TranslateDownSamples(FX_LPBYTE dest_buf, FX_LPCBYTE src_buf, int pixels, int Bpp) const; 458 virtual void TranslateDownSamples(FX_LPBYTE dest_buf, FX_LPCBYTE src_buf, int pixels, int Bpp) const;
458 FX_LPCBYTE m_RampR; 459 FX_LPCBYTE m_RampR;
459 FX_LPCBYTE m_RampG; 460 FX_LPCBYTE m_RampG;
460 FX_LPCBYTE m_RampB; 461 FX_LPCBYTE m_RampB;
461 }; 462 };
462 struct _CPDF_UniqueKeyGen { 463 struct _CPDF_UniqueKeyGen {
463 void Generate(int count, ...); 464 void Generate(int count, ...);
464 FX_CHAR m_Key[128]; 465 FX_CHAR m_Key[128];
465 int m_KeyLen; 466 int m_KeyLen;
466 }; 467 };
OLDNEW
« no previous file with comments | « core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698