diff --git a/hgdriver/hgdev/imgproc-pak/fill_hole.cpp b/hgdriver/hgdev/imgproc-pak/fill_hole.cpp index 9b07c31..7fddafb 100644 --- a/hgdriver/hgdev/imgproc-pak/fill_hole.cpp +++ b/hgdriver/hgdev/imgproc-pak/fill_hole.cpp @@ -3,6 +3,7 @@ #include #include #include +#include #include @@ -85,7 +86,7 @@ int hole_filler::process(std::vector& in, std::vector& src.push_back(v.img); result.info = v.info; - worker.apply(src, result.info.paper_side != PAPER_SIDE_FRONT && result.info.paper_side != PAPER_SIDE_BACK); + worker.apply(src, result.info.pos.paper_side != PAPER_SIDE_FRONT && result.info.pos.paper_side != PAPER_SIDE_BACK); if (src.size()) { result.img = src[0]; diff --git a/hgdriver/hgdev/imgproc-pak/multi_out.cpp b/hgdriver/hgdev/imgproc-pak/multi_out.cpp index a518c73..96216b1 100644 --- a/hgdriver/hgdev/imgproc-pak/multi_out.cpp +++ b/hgdriver/hgdev/imgproc-pak/multi_out.cpp @@ -4,6 +4,7 @@ #include #include #include +#include diff --git a/hgdriver/hgdev/scanner_manager.cpp b/hgdriver/hgdev/scanner_manager.cpp index bc447f1..5ab6c56 100644 --- a/hgdriver/hgdev/scanner_manager.cpp +++ b/hgdriver/hgdev/scanner_manager.cpp @@ -716,7 +716,7 @@ scanner_err hg_scanner_mgr::hg_scanner_set_parameter(scanner_handle h, const cha } scanner_err hg_scanner_mgr::hg_scanner_start(scanner_handle h, void* async_event, int num) { - return (scanner_err)SCAN_PTR(h)->start(); + return (scanner_err)SCAN_PTR(h)->start(nullptr); } scanner_err hg_scanner_mgr::hg_scanner_stop(scanner_handle h) { diff --git a/sdk/base/huagaoxxx_warraper_ex.h b/sdk/base/huagaoxxx_warraper_ex.h index 2a092ad..e1d10d9 100644 --- a/sdk/base/huagaoxxx_warraper_ex.h +++ b/sdk/base/huagaoxxx_warraper_ex.h @@ -154,7 +154,6 @@ // #endif #define _TO_STR(str) #str -#define MAKE_STR(str) _TO_STR(str) #define GET_BACKEND_NAME MAKE_STR(BACKEND_NAME) diff --git a/sdk/base/packet.h b/sdk/base/packet.h index 65ab5e9..cc501de 100644 --- a/sdk/base/packet.h +++ b/sdk/base/packet.h @@ -4,7 +4,9 @@ // // created on 2022-12-06 // -#if !defined(WIN32) +#if defined(WIN32) +#include +#else #include #endif #include diff --git a/sdk/base/utils.cpp b/sdk/base/utils.cpp index b7e9420..a3a62ba 100644 --- a/sdk/base/utils.cpp +++ b/sdk/base/utils.cpp @@ -1,7 +1,7 @@ #include "utils.h" #include "ini_file.h" - +#include #include #include