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

Side by Side Diff: core/src/fxge/ge/fx_ge_fontmap.cpp

Issue 1362863002: Merge to XFA: Add missing 'return' keyword. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa
Patch Set: Created 5 years, 3 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 | « no previous file | 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 <limits> 7 #include <limits>
8 8
9 #include "../../../include/fxge/fx_ge.h" 9 #include "../../../include/fxge/fx_ge.h"
10 #include "../../../include/fxge/fx_freetype.h" 10 #include "../../../include/fxge/fx_freetype.h"
(...skipping 533 matching lines...) Expand 10 before | Expand all | Expand 10 after
544 return CFX_ByteString(); 544 return CFX_ByteString();
545 } 545 }
546 buffer.ReleaseBuffer(size); 546 buffer.ReleaseBuffer(size);
547 return buffer; 547 return buffer;
548 } 548 }
549 } 549 }
550 return CFX_ByteString(); 550 return CFX_ByteString();
551 } 551 }
552 CFX_ByteString CFX_FontMapper::GetPSNameFromTT(void* hFont) { 552 CFX_ByteString CFX_FontMapper::GetPSNameFromTT(void* hFont) {
553 if (m_pFontInfo == NULL) { 553 if (m_pFontInfo == NULL) {
554 CFX_ByteString(); 554 return CFX_ByteString();
555 } 555 }
556 CFX_ByteString result; 556 CFX_ByteString result;
557 FX_DWORD size = m_pFontInfo->GetFontData(hFont, 0x6e616d65, NULL, 0); 557 FX_DWORD size = m_pFontInfo->GetFontData(hFont, 0x6e616d65, NULL, 0);
558 if (size) { 558 if (size) {
559 uint8_t* buffer = FX_Alloc(uint8_t, size); 559 uint8_t* buffer = FX_Alloc(uint8_t, size);
560 m_pFontInfo->GetFontData(hFont, 0x6e616d65, buffer, size); 560 m_pFontInfo->GetFontData(hFont, 0x6e616d65, buffer, size);
561 result = GetNameFromTT(buffer, 6); 561 result = GetNameFromTT(buffer, 6);
562 FX_Free(buffer); 562 FX_Free(buffer);
563 } 563 }
564 return result; 564 return result;
(...skipping 1004 matching lines...) Expand 10 before | Expand all | Expand 10 after
1569 if (hFont == NULL) { 1569 if (hFont == NULL) {
1570 return FALSE; 1570 return FALSE;
1571 } 1571 }
1572 CFX_FontFaceInfo* pFont = (CFX_FontFaceInfo*)hFont; 1572 CFX_FontFaceInfo* pFont = (CFX_FontFaceInfo*)hFont;
1573 name = pFont->m_FaceName; 1573 name = pFont->m_FaceName;
1574 return TRUE; 1574 return TRUE;
1575 } 1575 }
1576 FX_BOOL CFX_FolderFontInfo::GetFontCharset(void* hFont, int& charset) { 1576 FX_BOOL CFX_FolderFontInfo::GetFontCharset(void* hFont, int& charset) {
1577 return FALSE; 1577 return FALSE;
1578 } 1578 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698