Merge branch 'master' of https://gitee.com/luoliangyi163/hgproject

app/scanner/config.cpp

@@ -85,7 +85,7 @@ std::string config::read_mini_file(QString file)
         l = ftell(src);
         fseek(src, 0, SEEK_SET);
         buf = (char*)malloc(l + 4);
-        bzero(buf, l + 4);
+        memset(buf, 0, l + 4);
         fread(buf, 1, l, src);
         fclose(src);
         ret = buf;

build-qt/windows/HGSolution/HGScanner.pro

@@ -67,6 +67,10 @@ SOURCES += \
     ../../../app/scanner/widget_imgproc_base.cpp \
     ../../../app/scanner/widget_statusbar.cpp \
     ../../../app/scanner/dialog_admin.cpp \
+    ../../../app/scanner/dialog_log.cpp \
+    ../../../app/scanner/config.cpp \
+    ../../../app/scanner/json.cpp \
+    ../../../app/scanner/cJSON.c \
     ../../../ui/HGImgThumb.cpp \
     ../../../ui/HGImgView.cpp \
     ../../../ui/HGUIGlobal.cpp
@@ -94,6 +98,10 @@ HEADERS += \
     ../../../app/scanner/widget_imgproc_base.h \
     ../../../app/scanner/widget_statusbar.h \
     ../../../app/scanner/dialog_admin.h \
+    ../../../app/scanner/dialog_log.h \
+    ../../../app/scanner/config.h \
+    ../../../third_party/json/json.h \
+    ../../../third_party/json/cJSON.h \
     ../../../ui/HGImgThumb.h \
     ../../../ui/HGImgView.h \
     ../../../ui/HGUIGlobal.h
@@ -118,7 +126,8 @@ FORMS += \
     ../../../app/scanner/dialog_savequality.ui \
     ../../../app/scanner/mainwindow.ui \
     ../../../app/scanner/widget_imgproc_base.ui \
-    ../../../app/scanner/widget_statusbar.ui
+    ../../../app/scanner/widget_statusbar.ui \
+    ../../../app/scanner/dialog_log.ui
 
 TRANSLATIONS += \
     ../../../app/scanner/Scanner_zh_CN.ts