[vlc-commits] freetype: dwrite: fix -Wmicrosoft-exception-spec

[Francois Cartegnie]

vlc/vlc-3.0 | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Thu Jul 30 11:03:46 2020 +0200| [35926c31c3245abb4edabb529b38268ee08ae9fe] | committer: Francois Cartegnie

freetype: dwrite: fix -Wmicrosoft-exception-spec

(cherry picked from commit 6099ac613e9b99116d94371845f88808bfe8e626)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=35926c31c3245abb4edabb529b38268ee08ae9fe
---

 modules/text_renderer/freetype/fonts/dwrite.cpp | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/modules/text_renderer/freetype/fonts/dwrite.cpp b/modules/text_renderer/freetype/fonts/dwrite.cpp
index a30c535a01..7b9143432a 100644
--- a/modules/text_renderer/freetype/fonts/dwrite.cpp
+++ b/modules/text_renderer/freetype/fonts/dwrite.cpp
@@ -229,27 +229,28 @@ public:
     virtual ~TextSource() {}
 
     virtual HRESULT STDMETHODCALLTYPE GetLocaleName( UINT32, UINT32 *,
-                                             const WCHAR **ppwsz_locale_name )
+                                        const WCHAR **ppwsz_locale_name ) noexcept
     {
         *ppwsz_locale_name = L"en-US";
         return S_OK;
     }
 
     virtual HRESULT STDMETHODCALLTYPE GetNumberSubstitution( UINT32, UINT32 *,
-                                                     IDWriteNumberSubstitution **pp_substitution )
+                                        IDWriteNumberSubstitution **pp_substitution ) noexcept
     {
         mp_substitution->AddRef();
         *pp_substitution = mp_substitution;
         return S_OK;
     }
 
-    virtual DWRITE_READING_DIRECTION STDMETHODCALLTYPE GetParagraphReadingDirection()
+    virtual DWRITE_READING_DIRECTION STDMETHODCALLTYPE GetParagraphReadingDirection() noexcept
     {
         return DWRITE_READING_DIRECTION_LEFT_TO_RIGHT;
     }
 
-    virtual HRESULT STDMETHODCALLTYPE GetTextAtPosition( UINT32 i_text_position, const WCHAR **ppwsz_text,
-                                                 UINT32 *pi_text_length )
+    virtual HRESULT STDMETHODCALLTYPE GetTextAtPosition( UINT32 i_text_position,
+                                                         const WCHAR **ppwsz_text,
+                                                         UINT32 *pi_text_length ) noexcept
     {
         if( i_text_position > mi_text_length )
             return E_INVALIDARG;
@@ -260,8 +261,9 @@ public:
         return S_OK;
     }
 
-    virtual HRESULT STDMETHODCALLTYPE GetTextBeforePosition( UINT32 i_text_position, const WCHAR **ppwsz_text,
-                                                     UINT32 *pi_text_length )
+    virtual HRESULT STDMETHODCALLTYPE GetTextBeforePosition( UINT32 i_text_position,
+                                                             const WCHAR **ppwsz_text,
+                                                             UINT32 *pi_text_length ) noexcept
     {
         if( i_text_position > mi_text_length )
             return E_INVALIDARG;