Chromium Code Reviews

Side by Side Diff: fpdfsdk/src/fsdk_baseform.cpp

Issue 1103343002: Fix windows-specific usage of CFX_WideStr::operator LPCWSTR(). (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Rebase from linux side. Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff |
« no previous file with comments | « core/src/fxcrt/fx_basic_util.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 #include "../../third_party/base/nonstd_unique_ptr.h" 7 #include "../../third_party/base/nonstd_unique_ptr.h"
8 #include "../include/fsdk_define.h" 8 #include "../include/fsdk_define.h"
9 #include "../include/fsdk_mgr.h" 9 #include "../include/fsdk_mgr.h"
10 #include "../include/fsdk_baseannot.h" 10 #include "../include/fsdk_baseannot.h"
(...skipping 1844 matching lines...)
1855 1855
1856 #ifdef _WIN32 1856 #ifdef _WIN32
1857 CPDF_Stream* CPDFSDK_InterForm::LoadImageFromFile(const CFX_WideString& sFile) 1857 CPDF_Stream* CPDFSDK_InterForm::LoadImageFromFile(const CFX_WideString& sFile)
1858 { 1858 {
1859 ASSERT(m_pDocument != NULL); 1859 ASSERT(m_pDocument != NULL);
1860 CPDF_Document* pDocument = m_pDocument->GetDocument(); 1860 CPDF_Document* pDocument = m_pDocument->GetDocument();
1861 ASSERT(pDocument != NULL); 1861 ASSERT(pDocument != NULL);
1862 1862
1863 CPDF_Stream* pRetStream = NULL; 1863 CPDF_Stream* pRetStream = NULL;
1864 1864
1865 » if (CFX_DIBitmap* pBmp = CFX_WindowsDIB::LoadFromFile(sFile)) 1865 » if (CFX_DIBitmap* pBmp = CFX_WindowsDIB::LoadFromFile(sFile.c_str()))
1866 { 1866 {
1867 int nWidth = pBmp->GetWidth(); 1867 int nWidth = pBmp->GetWidth();
1868 int nHeight = pBmp->GetHeight(); 1868 int nHeight = pBmp->GetHeight();
1869 1869
1870 CPDF_Image Image(pDocument); 1870 CPDF_Image Image(pDocument);
1871 Image.SetImage(pBmp, FALSE); 1871 Image.SetImage(pBmp, FALSE);
1872 CPDF_Stream* pImageStream = Image.GetStream(); 1872 CPDF_Stream* pImageStream = Image.GetStream();
1873 if (pImageStream) 1873 if (pImageStream)
1874 { 1874 {
1875 if (pImageStream->GetObjNum() == 0) 1875 if (pImageStream->GetObjNum() == 0)
(...skipping 1120 matching lines...)
2996 2996
2997 CPDF_Annot* pPDFAnnot = pAnnot->GetPDFAnnot(); 2997 CPDF_Annot* pPDFAnnot = pAnnot->GetPDFAnnot();
2998 ASSERT(pPDFAnnot != NULL); 2998 ASSERT(pPDFAnnot != NULL);
2999 2999
3000 CPDF_Rect rcAnnot; 3000 CPDF_Rect rcAnnot;
3001 pPDFAnnot->GetRect(rcAnnot); 3001 pPDFAnnot->GetRect(rcAnnot);
3002 3002
3003 return rcAnnot; 3003 return rcAnnot;
3004 } 3004 }
3005 3005
OLDNEW
« no previous file with comments | « core/src/fxcrt/fx_basic_util.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine