12273af6f1
This is a regression from commit
acb803b730 (tdf#125591 DOC import:
lazy-load metafiles with explicit size, 2019-06-11), which assumed that
once maSwapInfo.maPrefSize stores the preferred size, it'll be set on
the Graphic when it's loaded later.
It seems there was no support for that, it was just an accident that the
guessed size of the metafile was about right.
Handle this explicitly in ImpGraphic::loadPrepared(), so that the bugdoc
(which has a custom preferred size) aspect ratio is correct.
Change-Id: Ic7c4009ad6723a2e16129d27600c904311ff3daf
Reviewed-on: https://gerrit.libreoffice.org/79899
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
60 lines
1.6 KiB
Makefile
60 lines
1.6 KiB
Makefile
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
|
|
#
|
|
# 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/.
|
|
#
|
|
|
|
$(eval $(call gb_CppunitTest_CppunitTest,vcl_graphic_test))
|
|
|
|
$(eval $(call gb_CppunitTest_add_exception_objects,vcl_graphic_test, \
|
|
vcl/qa/cppunit/GraphicTest \
|
|
vcl/qa/cppunit/GraphicDescriptorTest \
|
|
vcl/qa/cppunit/GraphicFormatDetectorTest \
|
|
))
|
|
|
|
$(eval $(call gb_CppunitTest_use_externals,vcl_graphic_test,\
|
|
boost_headers \
|
|
glm_headers \
|
|
))
|
|
|
|
$(eval $(call gb_CppunitTest_set_include,vcl_graphic_test,\
|
|
$$(INCLUDE) \
|
|
-I$(SRCDIR)/vcl/inc \
|
|
))
|
|
|
|
$(eval $(call gb_CppunitTest_use_libraries,vcl_graphic_test, \
|
|
comphelper \
|
|
cppu \
|
|
cppuhelper \
|
|
sal \
|
|
svt \
|
|
test \
|
|
tl \
|
|
unotest \
|
|
vcl \
|
|
utl \
|
|
))
|
|
|
|
$(eval $(call gb_CppunitTest_use_sdk_api,vcl_graphic_test))
|
|
|
|
$(eval $(call gb_CppunitTest_use_ure,vcl_graphic_test))
|
|
$(eval $(call gb_CppunitTest_use_vcl,vcl_graphic_test))
|
|
|
|
$(eval $(call gb_CppunitTest_use_components,vcl_graphic_test,\
|
|
configmgr/source/configmgr \
|
|
i18npool/util/i18npool \
|
|
ucb/source/core/ucb1 \
|
|
unotools/util/utl \
|
|
emfio/emfio \
|
|
drawinglayer/drawinglayer \
|
|
))
|
|
|
|
$(eval $(call gb_CppunitTest_use_configuration,vcl_graphic_test))
|
|
|
|
# we need to explicitly depend on Library_gie because it's dynamically loaded for .gif
|
|
$(call gb_CppunitTest_get_target,vcl_graphic_test) : $(call gb_Library_get_target,gie)
|
|
|
|
# vim: set noet sw=4 ts=4:
|