同步测试程序代码

This commit is contained in:
gb 2024-02-05 14:30:47 +08:00
parent 4a454d6473
commit 3ce1d9a368
6 changed files with 8 additions and 5 deletions

View File

@ -3,6 +3,7 @@
#include <json/gb_json.h>
#include <huagao/hgscanner_error.h>
#include <ImageApplyOutHole.h>
#include <sane/sane_ex.h>
#include <base/packet.h>
@ -85,7 +86,7 @@ int hole_filler::process(std::vector<PROCIMGINFO>& in, std::vector<PROCIMGINFO>&
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];

View File

@ -4,6 +4,7 @@
#include <huagao/hgscanner_error.h>
#include <sane/sane_option_definitions.h>
#include <lang/app_language.h>
#include <sane/sane_ex.h>

View File

@ -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)
{

View File

@ -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)

View File

@ -4,7 +4,9 @@
//
// created on 2022-12-06
//
#if !defined(WIN32)
#if defined(WIN32)
#include <stdint.h>
#else
#include <bits/stdint-uintn.h>
#endif
#include <string.h>

View File

@ -1,7 +1,7 @@
#include "utils.h"
#include "ini_file.h"
#include <huagao/brand.h>
#include <mutex>
#include <algorithm>