diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-12-28 20:23:02 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2018-12-29 09:58:09 +0100 |
| commit | 648f24f5d1dae3f0fd5b132d68a5e39066f2572d (patch) | |
| tree | 68a56efb90d57d8e33af2a190d09fbd1f570e413 /extensions/Module_extensions.mk | |
| parent | tdf#115691 Keep focus in effects list after preview (diff) | |
| download | core-648f24f5d1dae3f0fd5b132d68a5e39066f2572d.tar.gz core-648f24f5d1dae3f0fd5b132d68a5e39066f2572d.zip | |
tdf#114635: reimplement TWAIN-based scan using 32-bit shim on Windows
Since TWAIN is only actually available as 32-bit component on Windows,
to use it in a 64-bit program, we need a 32-bit shim program that does
all actual communication with TWAIN subsystem.
This change reimplements TWAIN implementation to be a separate 32-bit
process. Image is transfered from the shim to main program using file
mapping API.
This reverts most of commit 585d9806961342e95f7318fb947bd31e9f86dee0.
64-bit LibreOffice doesn't bundle TWAIN DSM library now. TWAIN DSM
source code is still used for TWAIN headers.
Change-Id: I46f178ad36acd97a9eff156624b99036fcbb83f8
Reviewed-on: https://gerrit.libreoffice.org/65688
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'extensions/Module_extensions.mk')
| -rw-r--r-- | extensions/Module_extensions.mk | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk index f86235abc224..f84a9ca4fbec 100644 --- a/extensions/Module_extensions.mk +++ b/extensions/Module_extensions.mk @@ -17,9 +17,12 @@ ifneq ($(filter-out iOS ANDROID,$(OS)),) $(eval $(call gb_Module_add_targets,extensions,\ Library_abp \ Library_ldapbe2 \ - $(if $(filter WNT,$(OS)),Library_WinUserInfoBe) \ Library_log \ Library_scn \ + $(if $(filter WNT,$(OS)), \ + Library_WinUserInfoBe \ + $(if $(filter TRUE,$(BUILD_X86)),Executable_twain32shim) \ + ) \ UIConfig_sabpilot \ UIConfig_scanner \ )) |