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

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
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 403 matching lines...) Expand 10 before | Expand all | Expand 10 after
414 CPDF_Object* m_pMaskStream; 414 CPDF_Object* m_pMaskStream;
415 FX_BOOL m_bHasMask; 415 FX_BOOL m_bHasMask;
416 protected: 416 protected:
417 FX_BOOL LoadColorInfo(CPDF_Dictionary* pFormReso urces, CPDF_Dictionary* pPageResources); 417 FX_BOOL LoadColorInfo(CPDF_Dictionary* pFormReso urces, CPDF_Dictionary* pPageResources);
418 DIB_COMP_DATA* GetDecodeAndMaskArray(FX_BOOL& bDefaultDecode, FX_BOOL& bColorKey); 418 DIB_COMP_DATA* GetDecodeAndMaskArray(FX_BOOL& bDefaultDecode, FX_BOOL& bColorKey);
419 CPDF_DIBSource* LoadMask(FX_DWORD& MatteColor); 419 CPDF_DIBSource* LoadMask(FX_DWORD& MatteColor);
420 CPDF_DIBSource* LoadMaskDIB(CPDF_Stream* pMask); 420 CPDF_DIBSource* LoadMaskDIB(CPDF_Stream* pMask);
421 void LoadJpxBitmap(); 421 void LoadJpxBitmap();
422 void LoadJbig2Bitmap(); 422 void LoadJbig2Bitmap();
423 void LoadPalette(); 423 void LoadPalette();
424 FX_BOOL» » » » CreateDecoder(); 424 int»» » » » CreateDecoder();
Lei Zhang 2015/01/30 06:43:58 Funny how a "bool" can return 2. :\
425 void TranslateScanline24bpp(FX_LPBYTE dest_sc an, FX_LPCBYTE src_scan) const; 425 void TranslateScanline24bpp(FX_LPBYTE dest_sc an, FX_LPCBYTE src_scan) const;
426 void ValidateDictParam(); 426 void ValidateDictParam();
427 CPDF_Document* m_pDocument; 427 CPDF_Document* m_pDocument;
428 const CPDF_Stream* m_pStream; 428 const CPDF_Stream* m_pStream;
429 CPDF_StreamAcc* m_pStreamAcc; 429 CPDF_StreamAcc* m_pStreamAcc;
430 const CPDF_Dictionary* m_pDict; 430 const CPDF_Dictionary* m_pDict;
431 CPDF_ColorSpace* m_pColorSpace; 431 CPDF_ColorSpace* m_pColorSpace;
432 FX_DWORD m_Family, m_bpc, m_bpc_orig, m_nComponents, m_Gr oupFamily; 432 FX_DWORD m_Family, m_bpc, m_bpc_orig, m_nComponents, m_Gr oupFamily;
433 FX_BOOL m_bLoadMask; 433 FX_BOOL m_bLoadMask;
434 FX_BOOL m_bDefaultDecode, m_bImageMask, m_bColor Key; 434 FX_BOOL m_bDefaultDecode, m_bImageMask, m_bColor Key;
(...skipping 17 matching lines...) Expand all
452 virtual void TranslateDownSamples(FX_LPBYTE dest_buf, FX_LPCBYTE src_buf, int pixels, int Bpp) const; 452 virtual void TranslateDownSamples(FX_LPBYTE dest_buf, FX_LPCBYTE src_buf, int pixels, int Bpp) const;
453 FX_LPCBYTE m_RampR; 453 FX_LPCBYTE m_RampR;
454 FX_LPCBYTE m_RampG; 454 FX_LPCBYTE m_RampG;
455 FX_LPCBYTE m_RampB; 455 FX_LPCBYTE m_RampB;
456 }; 456 };
457 struct _CPDF_UniqueKeyGen { 457 struct _CPDF_UniqueKeyGen {
458 void Generate(int count, ...); 458 void Generate(int count, ...);
459 FX_CHAR m_Key[128]; 459 FX_CHAR m_Key[128];
460 int m_KeyLen; 460 int m_KeyLen;
461 }; 461 };
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698