lmh188
/
code_app
mirror of http://192.168.10.5:8099/sane/code_app.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of http://192.168.10.5:8099/sane/code_app

This commit is contained in:
yangjiaxuan 2023-02-11 17:15:43 +08:00
parent 4db64342fe 599dcfb7ce
commit 61bdc3fc99
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/scanner/dialog_imageeditor.cpp
View File

@ -32,6 +32,7 @@ Dialog_ImageEditor::Dialog_ImageEditor(QWidget *parent)
Dialog_ImageEditor::~Dialog_ImageEditor()
{
delete m_scene;
delete ui;
}
@ -40,7 +41,8 @@ void Dialog_ImageEditor::setImage(const QImage &image)
m_imageSize = image.size();
m_dpi_x = image.dotsPerMeterX();
m_dpi_y = image.dotsPerMeterY();
m_scene->addPixmap(QPixmap::fromImage(image));
QPixmap bitmap = QPixmap::fromImage(image);
m_scene->addPixmap(bitmap);
on_btn_fit_clicked();
}

4
sdk/oldwebscan/hgscannersdk/CMakeLists.txt
View File

@ -5,8 +5,8 @@ if(CMAKE_HOST_SYSTEM_NAME MATCHES "Windows")
endif()
add_compile_options(-std=c++11)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC -O2")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -O2")
aux_source_directory(${PROJECT_SOURCE_DIR} DIR_SRCS)
file(GLOB DIR_HEADS "${PROJECT_SOURCE_DIR}/*.h" "${PROJECT_SOURCE_DIR}/*.hpp")
set(DIR_SRCS ${DIR_SRCS} ${DIR_HEADS})