Replace twaindsm.dll by twain_32.dll

scanengine.cpp

@@ -34,19 +34,19 @@
 
 ScanEngine::ScanEngine() : m_scanner(nullptr)
 {
-//    QList<QString> scanners = QtTWAIN::QTWAINScannerManager::scannerList();
-//    qDebug() << scanners;
-//    if (scanners.size() > 0) {
-//        m_scanner = QtTWAIN::QTWAINScannerManager::acquireScanner(scanners.at(0));
-//        QObject::connect(m_scanner, &QtTWAIN::QTWAINScanner::imageReady, this, [this](const QImage &img) {
-//            QByteArray imgData;
-//            QBuffer buff(&imgData);
-//            buff.open(QIODevice::WriteOnly);
-//            img.save(&buff, "PNG");
-//            m_scannedImage = imgData.toBase64();
-//            scannedImageChanged();
-//        });
-//    }
+    QList<QString> scanners = QtTWAIN::QTWAINScannerManager::scannerList();
+    qDebug() << scanners;
+    if (scanners.size() > 0) {
+        m_scanner = QtTWAIN::QTWAINScannerManager::acquireScanner(scanners.at(0));
+        QObject::connect(m_scanner, &QtTWAIN::QTWAINScanner::imageReady, this, [this](const QImage &img) {
+            QByteArray imgData;
+            QBuffer buff(&imgData);
+            buff.open(QIODevice::WriteOnly);
+            img.save(&buff, "PNG");
+            m_scannedImage = imgData.toBase64();
+            scannedImageChanged();
+        });
+    }
 }
 
 ScanEngine::~ScanEngine() {
@@ -66,6 +66,5 @@ QString ScanEngine::scannerName() const
 }
 
 void ScanEngine::scan() {
-    QtTWAIN::QTWAINContext::instance()->userSelectScanner();
-//    m_scanner->scan();
+    m_scanner->scan();
 }

src/dsm/qdsminterface.cpp

@@ -74,7 +74,7 @@ using namespace QtTWAIN;
 
 QDSMInterface::QDSMInterface() : dPtr(new QDSMInterfacePrivate)
 {
-    dPtr->load("TWAINDSM.dll");
+    dPtr->load("TWAIN_32.dll");
 }
 
 QDSMInterface::~QDSMInterface()

src/qtwainscannermanager.cpp

@@ -35,7 +35,7 @@ void QTWAINScannerManager::init(WId winId)
 {
     QTWAINContext *ctx = QTWAINContext::instance();
     ctx->openDSM(winId);
-//    ctx->fetchScannerList();
+    ctx->fetchScannerList();
 }
 
 QList<QString> QTWAINScannerManager::scannerList()