[Libreoffice-commits] core.git: 2 commits - vcl/unx

[Caolán McNamara (via logerrit)]

 vcl/unx/generic/gdi/cairotextrender.cxx |   16 ----------------
 1 file changed, 16 deletions(-)

New commits:
commit e0e613ad27c29c35a982f34f1af84b1c342eb4e5
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Apr 4 16:58:09 2023 +0100
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Apr 4 21:42:03 2023 +0200

    remove cairo_set_matrix calls that do nothing anymore
    
    in the past there was intermediate calls that these affected
    
    Change-Id: I5bb15046ff5869522dfafe72e16f9be4707c1f7e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150027
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx 
b/vcl/unx/generic/gdi/cairotextrender.cxx
index 1c4efb9064d4..664c8dbea9cd 100644
--- a/vcl/unx/generic/gdi/cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/cairotextrender.cxx
@@ -361,21 +361,8 @@ void CairoTextRender::DrawTextLayout(const 
GenericSalLayout& rLayout, const SalG
         cairo_matrix_scale(&m, nWidth, nHeight);
 
         if (nGlyphRotation)
-        {
             cairo_matrix_rotate(&m, toRadian(Degree10(nGlyphRotation * 900)));
 
-            cairo_matrix_t em_square;
-            cairo_matrix_init_identity(&em_square);
-            cairo_get_matrix(cr, &em_square);
-
-            cairo_matrix_scale(&em_square, aFace->units_per_EM,
-                aFace->units_per_EM);
-            cairo_set_matrix(cr, &em_square);
-
-            cairo_matrix_init_identity(&em_square);
-            cairo_set_matrix(cr, &em_square);
-        }
-
         if (rInstance.NeedsArtificialItalic())
         {
             cairo_matrix_t shear;
commit 3e1ee22e8ac6d2217547bf9a591e38af5c6da440
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Apr 4 16:53:13 2023 +0100
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Apr 4 21:41:53 2023 +0200

    cairo_font_extents is unused
    
    since:
    
    commit 6c9948d80aaa1d4827ccf741d900093abe7a973e
    Date:   Mon May 3 06:51:50 2021 +0800
    
        vcl: adjust cairo text renderer for vertical writing
    
    Change-Id: I853b5f3b8c8979468d6c72617b7991f4c7d509d1
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150026
    Tested-by: Caolán McNamara <caol...@redhat.com>
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx 
b/vcl/unx/generic/gdi/cairotextrender.cxx
index 93020e8f0884..1c4efb9064d4 100644
--- a/vcl/unx/generic/gdi/cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/cairotextrender.cxx
@@ -372,9 +372,6 @@ void CairoTextRender::DrawTextLayout(const 
GenericSalLayout& rLayout, const SalG
                 aFace->units_per_EM);
             cairo_set_matrix(cr, &em_square);
 
-            cairo_font_extents_t font_extents;
-            cairo_font_extents(cr, &font_extents);
-
             cairo_matrix_init_identity(&em_square);
             cairo_set_matrix(cr, &em_square);
         }