| OLD | NEW | 
|---|
| 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 "core/fpdfapi/fpdf_page/pageint.h" | 7 #include "core/fpdfapi/fpdf_page/pageint.h" | 
| 8 | 8 | 
| 9 #include <memory> | 9 #include <memory> | 
| 10 #include <utility> | 10 #include <utility> | 
| (...skipping 759 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 770   SetGraphicStates(pFormObj.get(), TRUE, TRUE, TRUE); | 770   SetGraphicStates(pFormObj.get(), TRUE, TRUE, TRUE); | 
| 771   m_pObjectHolder->GetPageObjectList()->push_back(std::move(pFormObj)); | 771   m_pObjectHolder->GetPageObjectList()->push_back(std::move(pFormObj)); | 
| 772 } | 772 } | 
| 773 | 773 | 
| 774 CPDF_ImageObject* CPDF_StreamContentParser::AddImage(CPDF_Stream* pStream, | 774 CPDF_ImageObject* CPDF_StreamContentParser::AddImage(CPDF_Stream* pStream, | 
| 775                                                      CPDF_Image* pImage, | 775                                                      CPDF_Image* pImage, | 
| 776                                                      bool bInline) { | 776                                                      bool bInline) { | 
| 777   if (!pStream && !pImage) | 777   if (!pStream && !pImage) | 
| 778     return nullptr; | 778     return nullptr; | 
| 779 | 779 | 
| 780   CFX_Matrix ImageMatrix; | 780   CFX_Matrix ImageMatrix = m_pCurStates->m_CTM; | 
| 781   ImageMatrix.Copy(m_pCurStates->m_CTM); |  | 
| 782   ImageMatrix.Concat(m_mtContentToUser); | 781   ImageMatrix.Concat(m_mtContentToUser); | 
| 783 | 782 | 
| 784   std::unique_ptr<CPDF_ImageObject> pImageObj(new CPDF_ImageObject); | 783   std::unique_ptr<CPDF_ImageObject> pImageObj(new CPDF_ImageObject); | 
| 785   if (pImage) { | 784   if (pImage) { | 
| 786     pImageObj->SetUnownedImage( | 785     pImageObj->SetUnownedImage( | 
| 787         m_pDocument->GetPageData()->GetImage(pImage->GetStream())); | 786         m_pDocument->GetPageData()->GetImage(pImage->GetStream())); | 
| 788   } else if (pStream->GetObjNum()) { | 787   } else if (pStream->GetObjNum()) { | 
| 789     pImageObj->SetUnownedImage(m_pDocument->LoadImageF(pStream)); | 788     pImageObj->SetUnownedImage(m_pDocument->LoadImageF(pStream)); | 
| 790   } else { | 789   } else { | 
| 791     pImageObj->SetOwnedImage( | 790     pImageObj->SetOwnedImage( | 
| (...skipping 880 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1672         } else { | 1671         } else { | 
| 1673           PDF_ReplaceAbbr(pElement); | 1672           PDF_ReplaceAbbr(pElement); | 
| 1674         } | 1673         } | 
| 1675       } | 1674       } | 
| 1676       break; | 1675       break; | 
| 1677     } | 1676     } | 
| 1678     default: | 1677     default: | 
| 1679       break; | 1678       break; | 
| 1680   } | 1679   } | 
| 1681 } | 1680 } | 
| OLD | NEW | 
|---|