From b39c12dd7b3129749e62ec7f7afc94dc8070ac36 Mon Sep 17 00:00:00 2001 From: Alessandro Zummo Date: Thu, 18 Jun 2009 15:54:09 +0200 Subject: [PATCH] Define MM_PER_INCH once for all --- backend/abaton.c | 1 - backend/agfafocus.c | 1 - backend/apple.c | 1 - backend/artec.c | 1 - backend/artec_eplus48u.h | 1 - backend/as6e.h | 1 - backend/avision.c | 1 - backend/bh.h | 1 - backend/canon.c | 1 - backend/canon_dr.h | 1 - backend/cardscan.h | 1 - backend/coolscan.c | 1 - backend/epjitsu.h | 1 - backend/epson.c | 4 ---- backend/epson2.h | 1 - backend/fujitsu.h | 1 - backend/genesys_low.h | 1 - backend/gt68xx_low.h | 1 - backend/hp-accessor.c | 1 + backend/hp-option.c | 1 + backend/hp.h | 1 - backend/hp3500.c | 1 - backend/hp4200.h | 1 - backend/hs2p-scsi.h | 1 - backend/ibm.c | 1 - backend/leo.h | 1 - backend/ma1509.h | 1 - backend/matsushita.h | 1 - backend/microtek.c | 1 - backend/microtek2.h | 1 - backend/mustek.h | 1 - backend/mustek_usb.h | 1 - backend/mustek_usb2.h | 1 - backend/pie.c | 1 - backend/pint.c | 1 - backend/plustek-pp.h | 1 - backend/plustek.h | 1 - backend/ricoh.c | 1 - backend/rts8891_low.h | 1 - backend/s9036.c | 1 - backend/sceptre.h | 1 - backend/sm3840.h | 1 - backend/sp15c.h | 1 - backend/st400.c | 1 - backend/tamarack.c | 1 - backend/teco1.h | 1 - backend/teco2.h | 1 - backend/teco3.h | 1 - backend/test.h | 1 - backend/umax.c | 1 - backend/umax_pp.c | 1 - backend/xerox_mfp.h | 1 - include/sane/sanei_backend.h | 4 ++++ 53 files changed, 6 insertions(+), 53 deletions(-) diff --git a/backend/abaton.c b/backend/abaton.c index d6b21ac81..548785d17 100644 --- a/backend/abaton.c +++ b/backend/abaton.c @@ -81,7 +81,6 @@ #include "abaton.h" -#define MM_PER_INCH 25.4 static int num_devices; static Abaton_Device *first_dev; diff --git a/backend/agfafocus.c b/backend/agfafocus.c index 1b518a566..bc215585f 100644 --- a/backend/agfafocus.c +++ b/backend/agfafocus.c @@ -47,7 +47,6 @@ # define PATH_MAX 1024 #endif -#define MM_PER_INCH 25.4 #undef Byte #define Byte SANE_Byte diff --git a/backend/apple.c b/backend/apple.c index a120f9a24..1f5ae9ded 100644 --- a/backend/apple.c +++ b/backend/apple.c @@ -135,7 +135,6 @@ #include "apple.h" -#define MM_PER_INCH 25.4 static int num_devices; static Apple_Device *first_dev; diff --git a/backend/artec.c b/backend/artec.c index ea120ce1f..21b7c292d 100644 --- a/backend/artec.c +++ b/backend/artec.c @@ -85,7 +85,6 @@ #define ARTEC_SUB 16 #define ARTEC_LAST_MOD "05/26/2001 17:28 EST" -#define MM_PER_INCH 25.4 #ifndef PATH_MAX #define PATH_MAX 1024 diff --git a/backend/artec_eplus48u.h b/backend/artec_eplus48u.h index 7c3b90751..cc30214e8 100644 --- a/backend/artec_eplus48u.h +++ b/backend/artec_eplus48u.h @@ -36,7 +36,6 @@ typedef SANE_Byte Artec48U_Packet[ARTEC48U_PACKET_SIZE]; #define HIBYTE(w) ((SANE_Byte)(((SANE_Word)(w) >> 8) & 0xFF)) #define LOBYTE(w) ((SANE_Byte)(w)) -#define MM_PER_INCH 25.4 #define CHECK_DEV_NOT_NULL(dev, func_name) \ do { \ diff --git a/backend/as6e.h b/backend/as6e.h index 118a40887..7132d6b8e 100644 --- a/backend/as6e.h +++ b/backend/as6e.h @@ -118,7 +118,6 @@ typedef struct AS6E_Scan #define READPIPE 0 #define WRITEPIPE 1 -#define MM_PER_INCH 25.4 #define SCAN_BUF_SIZE 32768 diff --git a/backend/avision.c b/backend/avision.c index da5bcccd9..26646642b 100644 --- a/backend/avision.c +++ b/backend/avision.c @@ -1182,7 +1182,6 @@ Lexmark X4500 MFP #define AVISION_INQUIRY_SIZE_V2 0x88 #define AVISION_INQUIRY_SIZE_MAX AVISION_INQUIRY_SIZE_V2 -#define MM_PER_INCH 25.4 #define AVISION_BASE_RES 300 diff --git a/backend/bh.h b/backend/bh.h index bb04e60bc..62115c63a 100644 --- a/backend/bh.h +++ b/backend/bh.h @@ -206,7 +206,6 @@ typedef enum } BH_Option; /* macros for accessing the value for an option within a scanning context */ -#define MM_PER_INCH 25.4 #define _OPT_VAL_WORD(s, o) ((s)->val[(o)].w) #define _OPT_VAL_WORD_THOUSANDTHS(s, o) \ (SANE_UNFIX(_OPT_VAL_WORD((s), (o))) * 1000.0 / MM_PER_INCH) diff --git a/backend/canon.c b/backend/canon.c index f3dcf4bb5..bfb430044 100644 --- a/backend/canon.c +++ b/backend/canon.c @@ -127,7 +127,6 @@ #define SANE_I18N(text) text #endif -#define MM_PER_INCH 25.4 static SANE_Byte primaryHigh[256], primaryLow[256], secondaryHigh[256], secondaryLow[256]; /* modification for FB1200S */ diff --git a/backend/canon_dr.h b/backend/canon_dr.h index 65e833b33..3bb737c51 100644 --- a/backend/canon_dr.h +++ b/backend/canon_dr.h @@ -397,7 +397,6 @@ enum { /* ------------------------------------------------------------------------- */ -#define MM_PER_INCH 25.4 #define MM_PER_UNIT_UNFIX SANE_UNFIX(SANE_FIX(MM_PER_INCH / 1200.0)) #define MM_PER_UNIT_FIX SANE_FIX(SANE_UNFIX(SANE_FIX(MM_PER_INCH / 1200.0))) diff --git a/backend/cardscan.h b/backend/cardscan.h index 43d2a9739..41fd2c35a 100644 --- a/backend/cardscan.h +++ b/backend/cardscan.h @@ -117,7 +117,6 @@ struct scanner /* ------------------------------------------------------------------------- */ -#define MM_PER_INCH 25.4 #define MM_PER_UNIT_UNFIX SANE_UNFIX(SANE_FIX(MM_PER_INCH / 1200.0)) #define MM_PER_UNIT_FIX SANE_FIX(SANE_UNFIX(SANE_FIX(MM_PER_INCH / 1200.0))) diff --git a/backend/coolscan.c b/backend/coolscan.c index 4a1f9b324..e093885ae 100644 --- a/backend/coolscan.c +++ b/backend/coolscan.c @@ -1872,7 +1872,6 @@ sense_handler (int scsi_fd, unsigned char * result, void *arg) /* ------------------------------------------------------------------------- */ -#define MM_PER_INCH 25.4 /* ilu per mm */ #define length_quant SANE_UNFIX(SANE_FIX(MM_PER_INCH / 2700.0)) diff --git a/backend/epjitsu.h b/backend/epjitsu.h index 9dbb530fa..26017abda 100644 --- a/backend/epjitsu.h +++ b/backend/epjitsu.h @@ -263,7 +263,6 @@ struct scanner /* ------------------------------------------------------------------------- */ -#define MM_PER_INCH 25.4 #define MM_PER_UNIT_UNFIX SANE_UNFIX(SANE_FIX(MM_PER_INCH / 1200.0)) #define MM_PER_UNIT_FIX SANE_FIX(SANE_UNFIX(SANE_FIX(MM_PER_INCH / 1200.0))) diff --git a/backend/epson.c b/backend/epson.c index f80647fb1..91cfe5379 100644 --- a/backend/epson.c +++ b/backend/epson.c @@ -341,10 +341,6 @@ #define PATH_MAX (1024) #endif -#ifndef MM_PER_INCH -#define MM_PER_INCH 25.4 -#endif - #define walloc(x) (x *)malloc(sizeof(x)) #define walloca(x) (x *)alloca(sizeof(x)) diff --git a/backend/epson2.h b/backend/epson2.h index 8ab5f6508..9a56caceb 100644 --- a/backend/epson2.h +++ b/backend/epson2.h @@ -83,7 +83,6 @@ #define LINES_SHUFFLE_MAX 17 /* 2 x 8 lines plus 1 */ #define SANE_EPSON_MAX_RETRIES 14 /* warmup max retry */ -#define MM_PER_INCH 25.4 #define CMD_SIZE_EXT_STATUS 42 /* NOTE: you can find these codes with "man ascii". */ diff --git a/backend/fujitsu.h b/backend/fujitsu.h index 6bff688ac..3305c9652 100644 --- a/backend/fujitsu.h +++ b/backend/fujitsu.h @@ -640,7 +640,6 @@ struct fujitsu /* ------------------------------------------------------------------------- */ -#define MM_PER_INCH 25.4 #define MM_PER_UNIT_UNFIX SANE_UNFIX(SANE_FIX(MM_PER_INCH / 1200.0)) #define MM_PER_UNIT_FIX SANE_FIX(SANE_UNFIX(SANE_FIX(MM_PER_INCH / 1200.0))) diff --git a/backend/genesys_low.h b/backend/genesys_low.h index 409e8e6eb..ccc47d021 100644 --- a/backend/genesys_low.h +++ b/backend/genesys_low.h @@ -69,7 +69,6 @@ if (status != SANE_STATUS_GOOD) return status; \ } while (SANE_FALSE) -#define MM_PER_INCH 25.4 /* Flags */ #define GENESYS_FLAG_UNTESTED (1 << 0) /* Print a warning for these scanners */ diff --git a/backend/gt68xx_low.h b/backend/gt68xx_low.h index 0a3355f34..182c748bf 100644 --- a/backend/gt68xx_low.h +++ b/backend/gt68xx_low.h @@ -70,7 +70,6 @@ #define HIBYTE(w) ((SANE_Byte)(((SANE_Word)(w) >> 8) & 0xFF)) #define LOBYTE(w) ((SANE_Byte)(w)) -#define MM_PER_INCH 25.4 /* return if an error occured while the function was called */ #ifdef MAX_DEBUG diff --git a/backend/hp-accessor.c b/backend/hp-accessor.c index f405b8011..b1acd7ceb 100644 --- a/backend/hp-accessor.c +++ b/backend/hp-accessor.c @@ -47,6 +47,7 @@ extern int sanei_debug_hp; */ #define DEBUG_DECLARE_ONLY #include "../include/sane/config.h" +#include "../include/sane/sanei_backend.h" #include "../include/lassert.h" #include diff --git a/backend/hp-option.c b/backend/hp-option.c index f2336658c..4d80098d0 100644 --- a/backend/hp-option.c +++ b/backend/hp-option.c @@ -69,6 +69,7 @@ extern int sanei_debug_hp; */ #define DEBUG_DECLARE_ONLY #include "../include/sane/config.h" +#include "../include/sane/sanei_backend.h" #include "../include/lalloca.h" #include diff --git a/backend/hp.h b/backend/hp.h index cf4d4eb04..9e7a7022c 100644 --- a/backend/hp.h +++ b/backend/hp.h @@ -70,7 +70,6 @@ #define HP_CONFIG_FILE STRINGIFY(BACKEND_NAME) ".conf" -#define MM_PER_INCH 25.4 #define DEVPIX_PER_INCH 300.0 #define MM_PER_DEVPIX (MM_PER_INCH / DEVPIX_PER_INCH) diff --git a/backend/hp3500.c b/backend/hp3500.c index f40b58a85..56b48b03c 100644 --- a/backend/hp3500.c +++ b/backend/hp3500.c @@ -117,7 +117,6 @@ typedef int (*rts8801_callback) (void *param, unsigned bytes, void *data); #define DEBUG 1 -#define MM_PER_INCH 25.4 #define SCANNER_UNIT_TO_FIXED_MM(number) SANE_FIX(number * MM_PER_INCH / 1200) #define FIXED_MM_TO_SCANNER_UNIT(number) SANE_UNFIX(number) * 1200 / MM_PER_INCH diff --git a/backend/hp4200.h b/backend/hp4200.h index 1a3d2453a..13c0d7fd8 100644 --- a/backend/hp4200.h +++ b/backend/hp4200.h @@ -27,7 +27,6 @@ #define min(a, b) (((a) < (b)) ? (a) : (b)) #define max(a, b) (((a) > (b)) ? (a) : (b)) -#define MM_PER_INCH 25.4 /*--------------------------------------------------------------------------*/ diff --git a/backend/hs2p-scsi.h b/backend/hs2p-scsi.h index 335390e2d..eecb60c9f 100644 --- a/backend/hs2p-scsi.h +++ b/backend/hs2p-scsi.h @@ -521,7 +521,6 @@ typedef struct mode_page_connect } MP_CXN; /* 1 inch = 6 picas = 72 points = 25.4 mm */ -#define MM_PER_INCH 25.4 #define DEFAULT_MUD 1200 /* WHY ? */ /* BASIC MEASUREMENT UNIT * 00H INCH diff --git a/backend/ibm.c b/backend/ibm.c index 5dcce9ca0..e1c11ebd0 100644 --- a/backend/ibm.c +++ b/backend/ibm.c @@ -76,7 +76,6 @@ #include "ibm.h" #include "ibm-scsi.c" -#define MM_PER_INCH 25.4 #define MAX(a,b) ((a) > (b) ? (a) : (b)) static int num_devices = 0; diff --git a/backend/leo.h b/backend/leo.h index 1ce60ece5..e90271d3f 100644 --- a/backend/leo.h +++ b/backend/leo.h @@ -201,7 +201,6 @@ getbitfield (unsigned char *pageaddr, int mask, int shift) /*--------------------------------------------------------------------------*/ -#define MM_PER_INCH 25.4 #define mmToIlu(mm) (((mm) * dev->x_resolution) / MM_PER_INCH) #define iluToMm(ilu) (((ilu) * MM_PER_INCH) / dev->x_resolution) diff --git a/backend/ma1509.h b/backend/ma1509.h index cbec0d9ce..455ca9cd0 100644 --- a/backend/ma1509.h +++ b/backend/ma1509.h @@ -63,7 +63,6 @@ #endif #define MA1509_CONFIG_FILE "ma1509.conf" -#define MM_PER_INCH 25.4 /* Convenience macros */ #if defined(MIN) diff --git a/backend/matsushita.h b/backend/matsushita.h index b8f93bd58..77301cf9a 100644 --- a/backend/matsushita.h +++ b/backend/matsushita.h @@ -162,7 +162,6 @@ getbitfield (unsigned char *pageaddr, int mask, int shift) /*--------------------------------------------------------------------------*/ -#define MM_PER_INCH 25.4 #define mmToIlu(mm) (((mm) * 1200) / MM_PER_INCH) #define iluToMm(ilu) (((ilu) * MM_PER_INCH) / 1200) diff --git a/backend/microtek.c b/backend/microtek.c index e4fc466cf..74a0af9cc 100644 --- a/backend/microtek.c +++ b/backend/microtek.c @@ -85,7 +85,6 @@ # define PATH_MAX 1024 #endif -#define MM_PER_INCH 25.4 #define SCSI_BUFF_SIZE sanei_scsi_max_request_size diff --git a/backend/microtek2.h b/backend/microtek2.h index 0cace8635..474973848 100644 --- a/backend/microtek2.h +++ b/backend/microtek2.h @@ -78,7 +78,6 @@ #endif /* HAVE_AUTHORIZATION */ -#define MM_PER_INCH 25.4 #define ENDIAN_TYPE(d) { unsigned i, test = 0; \ for (i=0; i < sizeof(int); i++ ) \ diff --git a/backend/mustek.h b/backend/mustek.h index 57db2954f..5532af598 100644 --- a/backend/mustek.h +++ b/backend/mustek.h @@ -55,7 +55,6 @@ # define PATH_MAX 1024 #endif #define MUSTEK_CONFIG_FILE "mustek.conf" -#define MM_PER_INCH 25.4 #define MAX_WAITING_TIME 60 /* How long to wait for scanner to become ready */ #define MAX_LINE_DIST 40 /* Extra lines needed for LD correction */ diff --git a/backend/mustek_usb.h b/backend/mustek_usb.h index 9babd2a71..7e6840287 100644 --- a/backend/mustek_usb.h +++ b/backend/mustek_usb.h @@ -56,7 +56,6 @@ #define DISABLE(OPTION) s->opt[OPTION].cap |= SANE_CAP_INACTIVE #define IS_ACTIVE(OPTION) (((s->opt[OPTION].cap) & SANE_CAP_INACTIVE) == 0) -#define MM_PER_INCH 25.4 #define MUSTEK_USB_CONFIG_FILE "mustek_usb.conf" #define SCAN_BUFFER_SIZE (64 * 1024) diff --git a/backend/mustek_usb2.h b/backend/mustek_usb2.h index a85546d87..b80c51a83 100644 --- a/backend/mustek_usb2.h +++ b/backend/mustek_usb2.h @@ -60,7 +60,6 @@ #define RIE(function) do {status = function; if (status != SANE_STATUS_GOOD) \ return status;} while (SANE_FALSE) -#define MM_PER_INCH 25.4 #define SCAN_BUFFER_SIZE (64 * 1024) #define MAX_RESOLUTIONS 12 #define DEF_LINEARTTHRESHOLD 128 diff --git a/backend/pie.c b/backend/pie.c index 136f492aa..33768900a 100644 --- a/backend/pie.c +++ b/backend/pie.c @@ -115,7 +115,6 @@ #define BUILD 9 #define PIE_CONFIG_FILE "pie.conf" -#define MM_PER_INCH 25.4 #define LINEART_STR "Lineart" #define HALFTONE_STR "Halftone" diff --git a/backend/pint.c b/backend/pint.c index 58ecd25da..638d68b8a 100644 --- a/backend/pint.c +++ b/backend/pint.c @@ -63,7 +63,6 @@ extern int errno; #include "pint.h" -#define MM_PER_INCH 25.4 #define DECIPOINTS_PER_MM (720.0 / MM_PER_INCH) #define TWELVEHUNDS_PER_MM (1200.0 / MM_PER_INCH) diff --git a/backend/plustek-pp.h b/backend/plustek-pp.h index 65759c8a0..e63b1ccb8 100644 --- a/backend/plustek-pp.h +++ b/backend/plustek-pp.h @@ -475,7 +475,6 @@ typedef struct { #ifndef __KERNEL__ -#define MM_PER_INCH 25.4 #define PLUSTEK_CONFIG_FILE "plustek_pp.conf" diff --git a/backend/plustek.h b/backend/plustek.h index 68cf5711a..be657c159 100644 --- a/backend/plustek.h +++ b/backend/plustek.h @@ -106,7 +106,6 @@ /************************ some definitions ***********************************/ -#define MM_PER_INCH 25.4 #define PLUSTEK_CONFIG_FILE "plustek.conf" diff --git a/backend/ricoh.c b/backend/ricoh.c index 5b8f46395..fa6a2286f 100644 --- a/backend/ricoh.c +++ b/backend/ricoh.c @@ -71,7 +71,6 @@ #include "ricoh.h" -#define MM_PER_INCH 25.4 #define MAX(a,b) ((a) > (b) ? (a) : (b)) static int num_devices = 0; diff --git a/backend/rts8891_low.h b/backend/rts8891_low.h index b09f6b13d..78e86f202 100644 --- a/backend/rts8891_low.h +++ b/backend/rts8891_low.h @@ -57,7 +57,6 @@ #define DBG_io2 7 /* io functions that are called very often */ #define DBG_data 8 /* log image data */ -#define MM_PER_INCH 25.4 /* Flags */ #define RTS8891_FLAG_UNTESTED (1 << 0) /* Print a warning for these scanners */ diff --git a/backend/s9036.c b/backend/s9036.c index 1bc30f669..9313622dc 100644 --- a/backend/s9036.c +++ b/backend/s9036.c @@ -41,7 +41,6 @@ #define BACKEND_NAME s9036 #include "../include/sane/sanei_backend.h" -#define MM_PER_INCH 25.4 #undef Byte #define Byte SANE_Byte diff --git a/backend/sceptre.h b/backend/sceptre.h index 8bc41029d..53dfeae33 100644 --- a/backend/sceptre.h +++ b/backend/sceptre.h @@ -229,7 +229,6 @@ CDB; /*--------------------------------------------------------------------------*/ -#define MM_PER_INCH 25.4 #define length_quant SANE_UNFIX(SANE_FIX(MM_PER_INCH / 600)) #define mmToIlu(mm) ((mm) / length_quant) #define iluToMm(ilu) ((ilu) * length_quant) diff --git a/backend/sm3840.h b/backend/sm3840.h index 0edcf44fc..abcd1b742 100755 --- a/backend/sm3840.h +++ b/backend/sm3840.h @@ -119,7 +119,6 @@ typedef struct SM3840_Scan #define SM3840_CONFIG_FILE "sm3840.conf" -#define MM_PER_INCH 25.4 #define SCAN_BUF_SIZE 65536 diff --git a/backend/sp15c.h b/backend/sp15c.h index 6522abe02..52535e057 100644 --- a/backend/sp15c.h +++ b/backend/sp15c.h @@ -192,7 +192,6 @@ struct sp15c /* ------------------------------------------------------------------------- */ -#define MM_PER_INCH 25.4 #define length_quant SANE_UNFIX(SANE_FIX(MM_PER_INCH / 1200.0)) #define mmToIlu(mm) ((mm) / length_quant) #define iluToMm(ilu) ((ilu) * length_quant) diff --git a/backend/st400.c b/backend/st400.c index 891600f25..6801ffa9a 100644 --- a/backend/st400.c +++ b/backend/st400.c @@ -103,7 +103,6 @@ static ST400_Model st400_models[] = { { 0, NULL, 0, NULL, 0, 0, 0, NULL, NULL, NULL, NULL } }; -#define MM_PER_INCH 25.4 static ST400_Device *st400_devices = NULL; static unsigned int st400_num_devices = 0; diff --git a/backend/tamarack.c b/backend/tamarack.c index 7820b2760..c5b8d878b 100644 --- a/backend/tamarack.c +++ b/backend/tamarack.c @@ -76,7 +76,6 @@ #define TAMARACK_CONFIG_FILE "tamarack.conf" -#define MM_PER_INCH 25.4 static int num_devices; static Tamarack_Device *first_dev; diff --git a/backend/teco1.h b/backend/teco1.h index 8fe0cd641..ae86d0047 100644 --- a/backend/teco1.h +++ b/backend/teco1.h @@ -214,7 +214,6 @@ getbitfield (unsigned char *pageaddr, int mask, int shift) /*--------------------------------------------------------------------------*/ -#define MM_PER_INCH 25.4 #define mmToIlu(mm) (((mm) * dev->def->x_resolution_max) / MM_PER_INCH) #define iluToMm(ilu) (((ilu) * MM_PER_INCH) / dev->def->x_resolution_max) diff --git a/backend/teco2.h b/backend/teco2.h index 680b68ea1..9975f034c 100644 --- a/backend/teco2.h +++ b/backend/teco2.h @@ -237,7 +237,6 @@ getbitfield (unsigned char *pageaddr, int mask, int shift) /*--------------------------------------------------------------------------*/ -#define MM_PER_INCH 25.4 #define mmToIlu(mm) (((mm) * dev->def->x_resolution_max) / MM_PER_INCH) #define iluToMm(ilu) (((ilu) * MM_PER_INCH) / dev->def->x_resolution_max) diff --git a/backend/teco3.h b/backend/teco3.h index a5ecc46e1..b239981bb 100644 --- a/backend/teco3.h +++ b/backend/teco3.h @@ -228,7 +228,6 @@ getbitfield (unsigned char *pageaddr, int mask, int shift) /*--------------------------------------------------------------------------*/ -#define MM_PER_INCH 25.4 #define mmToIlu(mm) (((mm) * 300) / MM_PER_INCH) #define iluToMm(ilu) (((ilu) * MM_PER_INCH) / 300) diff --git a/backend/test.h b/backend/test.h index 6d253fd63..dcd54b635 100644 --- a/backend/test.h +++ b/backend/test.h @@ -46,7 +46,6 @@ #ifndef test_h #define test_h -#define MM_PER_INCH 25.4 typedef enum { diff --git a/backend/umax.c b/backend/umax.c index a98ac922b..adaa924c8 100644 --- a/backend/umax.c +++ b/backend/umax.c @@ -101,7 +101,6 @@ in ADF mode this is done often: #define BACKEND_NAME umax #define UMAX_CONFIG_FILE "umax.conf" -#define MM_PER_INCH 25.4 /* ------------------------------------------------------------ SANE INTERNATIONALISATION ------------------ */ diff --git a/backend/umax_pp.c b/backend/umax_pp.c index 746d5654f..00f9e26d7 100644 --- a/backend/umax_pp.c +++ b/backend/umax_pp.c @@ -182,7 +182,6 @@ static const SANE_String_Const astra_models[] = #define UMAX_PP_MODE_GRAYSCALE 1 #define UMAX_PP_MODE_COLOR 2 -#define MM_PER_INCH 25.4 #define MM_TO_PIXEL(mm, res) (SANE_UNFIX(mm) * (float )res / MM_PER_INCH) #define PIXEL_TO_MM(px, res) (SANE_FIX((float )(px * MM_PER_INCH / (res / 10)) / 10.0)) diff --git a/backend/xerox_mfp.h b/backend/xerox_mfp.h index 0f1f87147..094b40fab 100644 --- a/backend/xerox_mfp.h +++ b/backend/xerox_mfp.h @@ -16,7 +16,6 @@ #define UNCONST(ptr) ((void *)(long)(ptr)) -#define MM_PER_INCH 25.4 #define PNT_PER_MM (1200. / MM_PER_INCH) #define PADDING_SIZE 16 diff --git a/include/sane/sanei_backend.h b/include/sane/sanei_backend.h index 2f1842f8e..a3d3d4461 100644 --- a/include/sane/sanei_backend.h +++ b/include/sane/sanei_backend.h @@ -56,6 +56,10 @@ #define M_PI 3.14159265358979323846 #endif +#ifndef MM_PER_INCH +#define MM_PER_INCH 25.4 +#endif + #ifdef HAVE_SIGPROCMASK # define SIGACTION sigaction #else