diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2022-03-19 14:48:13 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2022-03-19 22:56:05 +0100 |
| commit | 59a7c40255b836ed75e64686fabb3e9938b755f0 (patch) | |
| tree | cc9ff5e8c092d8b33e82c482c891992661556eac /vcl | |
| parent | 892ef6e8b6888b3029041ab150b409f81a5c31b0 (diff) | |
reduce down to the part and config we are using and move to tools
Change-Id: Ifaddc59c3c7834808d368c138a5ec7c0b80db14c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131850
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/Library_vcl.mk | 2 | ||||
| -rw-r--r-- | vcl/source/fontsubset/fixmath.c | 13 | ||||
| -rw-r--r-- | vcl/source/fontsubset/fixmath.h | 23 | ||||
| -rw-r--r-- | vcl/source/fontsubset/sft.cxx | 2 |
4 files changed, 1 insertions, 39 deletions
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 50aeebcc9c95..d580ff3d2f6a 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -40,7 +40,6 @@ $(eval $(call gb_Library_set_precompiled_header,vcl,vcl/inc/pch/precompiled_vcl) $(eval $(call gb_Library_set_include,vcl,\ $$(INCLUDE) \ -I$(SRCDIR)/vcl/inc \ - -I$(SRCDIR)/external/libfixmath \ )) $(eval $(call gb_Library_add_defs,vcl,\ @@ -525,7 +524,6 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ $(eval $(call gb_Library_add_cobjects,vcl,\ vcl/source/filter/jpeg/transupp \ - vcl/source/fontsubset/fixmath \ )) vcl_headless_code= \ diff --git a/vcl/source/fontsubset/fixmath.c b/vcl/source/fontsubset/fixmath.c deleted file mode 100644 index 1871cb77d88c..000000000000 --- a/vcl/source/fontsubset/fixmath.c +++ /dev/null @@ -1,13 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#include "fixmath.h" -#include <fix16.c> - -/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/vcl/source/fontsubset/fixmath.h b/vcl/source/fontsubset/fixmath.h deleted file mode 100644 index 87aebf279436..000000000000 --- a/vcl/source/fontsubset/fixmath.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#pragma once - -#if defined _MSC_VER && !defined __clang__ -#pragma warning(push) -#pragma warning(disable : 4146) -#endif - -#include <fix16.h> - -#if defined _MSC_VER && !defined __clang__ -#pragma warning(pop) -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx index 7115b2251853..800f161a744a 100644 --- a/vcl/source/fontsubset/sft.cxx +++ b/vcl/source/fontsubset/sft.cxx @@ -36,7 +36,7 @@ #endif #include <sft.hxx> #include <impfontcharmap.hxx> -#include "fixmath.h" +#include <tools/fix16.hxx> #include "ttcr.hxx" #include "xlat.hxx" #include <rtl/crc.h> |