[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - solenv/bin

[Mike Kaganski]

 solenv/bin/modules/installer/windows/file.pm |    8 ++++++++
 1 file changed, 8 insertions(+)

New commits:
commit f207ae9c7010b04f8a10554a3c9b62991fe51247
Author: Mike Kaganski <mike.kagan...@collabora.com>
Date:   Fri Mar 23 14:17:14 2018 +0100

    tdf#116581: also read UTF16-encoded version string from TTF
    
    Change-Id: I47d8a755450b085be39346615f06cee4f920859f
    Reviewed-on: https://gerrit.libreoffice.org/51781
    Tested-by: Jenkins <c...@libreoffice.org>
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
    (cherry picked from commit 2367557493c216be5b5e8156ba6493d440a10b0f)
    Reviewed-on: https://gerrit.libreoffice.org/52327
    Reviewed-by: Caolán McNamara <caol...@redhat.com>
    Tested-by: Caolán McNamara <caol...@redhat.com>

diff --git a/solenv/bin/modules/installer/windows/file.pm 
b/solenv/bin/modules/installer/windows/file.pm
index 1a12becb6076..b8176a54794c 100644
--- a/solenv/bin/modules/installer/windows/file.pm
+++ b/solenv/bin/modules/installer/windows/file.pm
@@ -560,12 +560,20 @@ sub get_fileversion
         close TTF;
 
         my $ttfversion = "(Version )([0-9]+[.]*([0-9][.])*[0-9]+)";
+        # UTF16-encoded version string
+        my $ttfversionU = "(V\0e\0r\0s\0i\0o\0n\0 
\0)(([0-9]\0)+([.]\0([0-9]\0)+)*)";
 
         if ($ttfdata =~ /$ttfversion/ms)
         {
             my ($version, $subversion, $microversion, $vervariant) = 
split(/\./,$2);
             $fileversion = int($version) . "." . int($subversion) . "." . 
int($microversion) . "." . int($vervariant);
         }
+        elsif ($ttfdata =~ /$ttfversionU/ms)
+        {
+            my $verfound = $2
+            my ($version, $subversion, $microversion, $vervariant) = 
split(/\./,$verfound =~ s/\0//g);
+            $fileversion = int($version) . "." . int($subversion) . "." . 
int($microversion) . "." . int($vervariant);
+        }
         else
         {
             $fileversion = "1.0.0.0";
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits