From 382a1154d0ffac9ca5feecf869ad5a98725c89f3 Mon Sep 17 00:00:00 2001 From: gb <741021719@qq.com> Date: Mon, 19 Jun 2023 16:06:41 +0800 Subject: [PATCH] delete repeat definitions --- hgdriver/hgdev/PaperSize.h | 2 -- hgdriver/hgdev/common_setting.h | 4 +--- hgdriver/hgdev/image_process.cpp | 27 --------------------------- 3 files changed, 1 insertion(+), 32 deletions(-) diff --git a/hgdriver/hgdev/PaperSize.h b/hgdriver/hgdev/PaperSize.h index 94b47af..fd0da0e 100644 --- a/hgdriver/hgdev/PaperSize.h +++ b/hgdriver/hgdev/PaperSize.h @@ -11,8 +11,6 @@ #ifdef __linux__ typedef CSSIZE Size; typedef CSSIZE SIZE; -typedef unsigned long DWORD; -typedef long LONG; #endif typedef struct Paper_Status { diff --git a/hgdriver/hgdev/common_setting.h b/hgdriver/hgdev/common_setting.h index 644e7e9..98be51f 100644 --- a/hgdriver/hgdev/common_setting.h +++ b/hgdriver/hgdev/common_setting.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once // hg_scanner_cfg is the base configuration definitions // @@ -28,8 +28,6 @@ typedef CSSIZE* PCSSIZEL, * LPCSSIZEL; #else typedef CSSIZE Size; typedef CSSIZE SIZE; -typedef unsigned long DWORD; -typedef long LONG; #endif enum hg_scanner_type diff --git a/hgdriver/hgdev/image_process.cpp b/hgdriver/hgdev/image_process.cpp index a5e379a..8a53949 100644 --- a/hgdriver/hgdev/image_process.cpp +++ b/hgdriver/hgdev/image_process.cpp @@ -4,36 +4,9 @@ #include #if !defined(WIN32) && !defined(_WIN64) #include -#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 MAKEWORD(a, b) (((a) & 0x0ff) | (((b) & 0x0ff) << 8)) #define MAKELONG(a, b) (((a) & 0x0ffff) | (((b) & 0x0ffff) << 16)) -#define _countof(a) (sizeof(a) / sizeof((a)[0])) #else #include #include