diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-12-28 20:23:02 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2019-06-20 09:35:09 +0200 |
| commit | 39567b97ee270327b7bd9ad6277549963ae04077 (patch) | |
| tree | 75e5ecdf3aa8ba3dd56db6eeacfc9e8623c46fcb /Repository.mk | |
| parent | 9d241cb1723a165960ba14183fd8e3c580c71241 (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>
Reviewed-on: https://gerrit.libreoffice.org/74415
Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'Repository.mk')
| -rw-r--r-- | Repository.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Repository.mk b/Repository.mk index 396bdf585b3a..9c1b992c425e 100644 --- a/Repository.mk +++ b/Repository.mk @@ -149,6 +149,7 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,brand, \ unoinfo \ unopkg \ unopkg_com \ + twain32shim \ ) \ )) @@ -958,7 +959,6 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\ )) \ sfx2_classification \ $(if $(filter OPENCL,$(BUILD_TYPE)),sc_opencl_runtimetest) \ - $(if $(and $(filter WNT,$(OS)), $(filter X86_64,$(CPUNAME))),twain_dsm) \ $(if $(ENABLE_HTMLHELP),\ helpcontent2_html_dynamic \ helpcontent2_html_media \ |