HGGitLab

Commit 64a4dcb8 authored by luoliangyi's avatar luoliangyi

增加windows上面的sane动态库

parent 5a06d2a8
...@@ -1881,7 +1881,7 @@ void MainWindow::on_act_about_triggered() ...@@ -1881,7 +1881,7 @@ void MainWindow::on_act_about_triggered()
about = (SANE_About*)malloc(len + 128); about = (SANE_About*)malloc(len + 128);
if (about) if (about)
{ {
bzero(about, len + 128); memset(about, 0, len + 128);
if (sane_io_control(m_saneDeviceHandle, IO_CTRL_CODE_ABOUT_INFO, about, &len) == SANE_STATUS_GOOD) if (sane_io_control(m_saneDeviceHandle, IO_CTRL_CODE_ABOUT_INFO, about, &len) == SANE_STATUS_GOOD)
{ {
title = tr("about %1").arg(QString::fromStdString(about->title)); title = tr("about %1").arg(QString::fromStdString(about->title));
......
...@@ -10,7 +10,7 @@ CONFIG += c++11 ...@@ -10,7 +10,7 @@ CONFIG += c++11
# deprecated API in order to know how to port your code away from it. # deprecated API in order to know how to port your code away from it.
DEFINES += QT_DEPRECATED_WARNINGS DEFINES += QT_DEPRECATED_WARNINGS
DEFINES += APP_USE_TWAIN #DEFINES += APP_USE_TWAIN
RC_ICONS = ../../../app/scanner/image_rsc/logo/logo.ico RC_ICONS = ../../../app/scanner/image_rsc/logo/logo.ico
...@@ -21,7 +21,7 @@ RC_ICONS = ../../../app/scanner/image_rsc/logo/logo.ico ...@@ -21,7 +21,7 @@ RC_ICONS = ../../../app/scanner/image_rsc/logo/logo.ico
win32 { win32 {
contains(QT_ARCH, i386) { contains(QT_ARCH, i386) {
LIBS += -L../../../release/lib/windows/x86 -lHGBase -lHGImgFmt -lHGImgProc -lHGTwainUser LIBS += -L../../../release/lib/windows/x86 -lHGBase -lHGImgFmt -lHGImgProc -lHGTwainUser -lhgsane
CONFIG(release, debug|release) { CONFIG(release, debug|release) {
DESTDIR = ../../../release/bin/windows/x86/ DESTDIR = ../../../release/bin/windows/x86/
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment