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

Side by Side Diff: core/src/fpdfapi/fpdf_page/fpdf_page_parser_new.cpp

Issue 361553002: Remove "this==NULL" and adjust corresponding callers (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: fix if check warning Created 6 years, 5 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 #include "../../../include/fpdfapi/fpdf_page.h" 7 #include "../../../include/fpdfapi/fpdf_page.h"
8 #include "../../../include/fpdfapi/fpdf_module.h" 8 #include "../../../include/fpdfapi/fpdf_module.h"
9 #include "pageint.h" 9 #include "pageint.h"
10 #if defined(_FPDFAPI_MINI_) 10 #if defined(_FPDFAPI_MINI_)
(...skipping 480 matching lines...) Expand 10 before | Expand all | Expand 10 after
491 } 491 }
492 m_pLastImageDict->SetAt(FX_BSTRC("ColorSpace"), pCSObj, m_pDocument); 492 m_pLastImageDict->SetAt(FX_BSTRC("ColorSpace"), pCSObj, m_pDocument);
493 } 493 }
494 } 494 }
495 } 495 }
496 } 496 }
497 } else { 497 } else {
498 m_bSameLastDict = TRUE; 498 m_bSameLastDict = TRUE;
499 } 499 }
500 m_ImageSrcBuf.Clear(); 500 m_ImageSrcBuf.Clear();
501 if (m_pLastCloneImageDict) { 501 if (m_pLastCloneImageDict)
502 m_pLastCloneImageDict->Release(); 502 m_pLastCloneImageDict->Release();
503 } 503
504 m_pLastCloneImageDict = (CPDF_Dictionary*)m_pLastImageDict->Clone(); 504 m_pLastCloneImageDict = (CPDF_Dictionary*)m_pLastImageDict->Clone();
505 if (m_pLastCloneImageDict->KeyExist(FX_BSTRC("Filter"))) { 505 if (m_pLastCloneImageDict->KeyExist(FX_BSTRC("Filter"))) {
506 m_WordState = 10; 506 m_WordState = 10;
507 m_InlineImageState = 0; 507 m_InlineImageState = 0;
508 } else { 508 } else {
509 int width = m_pLastCloneImageDict->GetInteger(FX_BSTRC("Width")); 509 int width = m_pLastCloneImageDict->GetInteger(FX_BSTRC("Width"));
510 int height = m_pLastCloneImageDict->GetInteger(FX_BSTRC("Height")); 510 int height = m_pLastCloneImageDict->GetInteger(FX_BSTRC("Height"));
511 int OrigSize = 0; 511 int OrigSize = 0;
512 CPDF_Object* pCSObj = m_pLastCloneImageDict->GetElementValue(FX_BSTRC("C olorSpace")); 512 CPDF_Object* pCSObj = m_pLastCloneImageDict->GetElementValue(FX_BSTRC("C olorSpace"));
513 if (pCSObj != NULL) { 513 if (pCSObj != NULL) {
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after
813 if (m_Matrices.GetSize() > 1) { 813 if (m_Matrices.GetSize() > 1) {
814 CFX_FloatRect rect1(m_Left, m_Bottom, m_Right, m_Top); 814 CFX_FloatRect rect1(m_Left, m_Bottom, m_Right, m_Top);
815 rect.Union(rect1); 815 rect.Union(rect1);
816 } 816 }
817 m_Left = rect.left; 817 m_Left = rect.left;
818 m_Right = rect.right; 818 m_Right = rect.right;
819 m_Top = rect.top; 819 m_Top = rect.top;
820 m_Bottom = rect.bottom; 820 m_Bottom = rect.bottom;
821 } 821 }
822 #endif 822 #endif
OLDNEW
« no previous file with comments | « core/src/fpdfapi/fpdf_page/fpdf_page_parser.cpp ('k') | core/src/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698