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 /external/twain_dsm/Module_twain_dsm.mk | |
parent | c3c2ac6afad6b154d83dbe555f5b276e5909718b (diff) |
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 'external/twain_dsm/Module_twain_dsm.mk')
-rw-r--r-- | external/twain_dsm/Module_twain_dsm.mk | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/external/twain_dsm/Module_twain_dsm.mk b/external/twain_dsm/Module_twain_dsm.mk index 10db9b9a4dac..bbaedb77b5d0 100644 --- a/external/twain_dsm/Module_twain_dsm.mk +++ b/external/twain_dsm/Module_twain_dsm.mk @@ -10,15 +10,11 @@ $(eval $(call gb_Module_Module,twain_dsm)) ifeq ($(OS),WNT) - +ifeq ($(BUILD_X86),TRUE) $(eval $(call gb_Module_add_targets,twain_dsm,\ UnpackedTarball_twain_dsm \ - $(if $(filter X86_64,$(CPUNAME)), \ - ExternalProject_twain_dsm \ - ExternalPackage_twain_dsm \ - ) \ )) - +endif endif # vim: set noet sw=4 ts=4: |