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

delete repeat definitions

This commit is contained in:
gb 2023-06-19 16:06:41 +08:00
parent 21be8eb172
commit 382a1154d0
3 changed files with 1 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hgdriver/hgdev/PaperSize.h
View File

@ -11,8 +11,6 @@
#ifdef __linux__ #ifdef __linux__
typedef CSSIZE Size; typedef CSSIZE Size;
typedef CSSIZE SIZE; typedef CSSIZE SIZE;
typedef unsigned long DWORD;
typedef long LONG;
#endif #endif
typedef struct Paper_Status { typedef struct Paper_Status {

4
hgdriver/hgdev/common_setting.h
View File

@ -1,4 +1,4 @@
#pragma once #pragma once
// hg_scanner_cfg is the base configuration definitions // hg_scanner_cfg is the base configuration definitions
// //
@ -28,8 +28,6 @@ typedef CSSIZE* PCSSIZEL, * LPCSSIZEL;
#else #else
typedef CSSIZE Size; typedef CSSIZE Size;
typedef CSSIZE SIZE; typedef CSSIZE SIZE;
typedef unsigned long DWORD;
typedef long LONG;
#endif #endif
enum hg_scanner_type enum hg_scanner_type

27
hgdriver/hgdev/image_process.cpp
View File

@ -4,36 +4,9 @@
#include <string.h> #include <string.h>
#if !defined(WIN32) && !defined(_WIN64) #if !defined(WIN32) && !defined(_WIN64)
#include <unistd.h> #include <unistd.h>
#pragma pack(push)
#pragma pack(1)
typedef struct BITMAPFILEHEADER
{
u_int16_t bfType;
u_int32_t bfSize;
u_int16_t bfReserved1;
u_int16_t bfReserved2;
u_int32_t bfOffBits;
}BITMAPFILEHEADER;
typedef struct BITMAPINFOHEADER
{
u_int32_t biSize;
u_int32_t biWidth;
u_int32_t biHeight;
u_int16_t biPlanes;
u_int16_t biBitCount;
u_int32_t biCompression;
u_int32_t biSizeImage;
u_int32_t biXPelsPerMeter;
u_int32_t biYPelsPerMeter;
u_int32_t biClrUsed;
u_int32_t biClrImportant;
}BITMAPINFODEADER;
#pragma pack(pop)
#define BI_RGB 0 #define BI_RGB 0
#define MAKEWORD(a, b) (((a) & 0x0ff) | (((b) & 0x0ff) << 8)) #define MAKEWORD(a, b) (((a) & 0x0ff) | (((b) & 0x0ff) << 8))
#define MAKELONG(a, b) (((a) & 0x0ffff) | (((b) & 0x0ffff) << 16)) #define MAKELONG(a, b) (((a) & 0x0ffff) | (((b) & 0x0ffff) << 16))
#define _countof(a) (sizeof(a) / sizeof((a)[0]))
#else #else
#include <Windows.h> #include <Windows.h>
#include <shlobj.h> #include <shlobj.h>