code.vuplus.com Git - vuplus_openembedded/blob - recipes/sane/sane-backends-1.0.19/sane-plustek.patch

   1 --- sane-backends-1.0.15/backend/plustek-usb.h.orig     2005-07-06 00:45:43.000000000 +0200
   2 +++ sane-backends-1.0.15/backend/plustek-usb.h  2005-07-06 00:47:36.000000000 +0200
   3 @@ -106,17 +106,20 @@
   4  #define _PHILO2WORD(x)  ((u_short)x->bHi * 256U + x->bLo)
   5
   6  /* useful for RGB-values */
   7 +#define PACKED8  __attribute__ ((packed,aligned(1)))
   8 +#define PACKED16 __attribute__ ((packed,aligned(2)))
   9 +
  10  typedef struct {
  11         u_char Red;
  12         u_char Green;
  13         u_char Blue;
  14 -} RGBByteDef, *pRGBByteDef;
  15 +} PACKED8 RGBByteDef, *pRGBByteDef;
  16
  17  typedef struct {
  18         u_short Red;
  19         u_short Green;
  20         u_short Blue;
  21 -} RGBUShortDef, *pRGBUShortDef;
  22 +} PACKED16 RGBUShortDef, *pRGBUShortDef;
  23
  24  typedef struct {
  25         u_long Red;
  26 @@ -126,22 +129,22 @@
  27
  28  typedef struct {
  29         u_char a_bColor[3];
  30 -} ColorByteDef, *pColorByteDef;
  31 +} PACKED8 ColorByteDef, *pColorByteDef;
  32
  33  typedef struct {
  34         u_char bHi;
  35         u_char bLo;
  36 -} HiLoDef, *pHiLoDef;
  37 +} PACKED8 HiLoDef, *pHiLoDef;
  38
  39  typedef union {
  40         HiLoDef HiLo[3];
  41         u_short Colors[3];
  42 -} ColorWordDef, *pColorWordDef;
  43 +} PACKED16 ColorWordDef, *pColorWordDef;
  44
  45  typedef union {
  46         HiLoDef HiLo;
  47         u_short Mono;
  48 -} MonoWordDef, *pMonoWordDef;
  49 +} PACKED16 MonoWordDef, *pMonoWordDef;
  50
  51  typedef union {
  52