1 --- a/prnt/hpcups/HPCupsFilter.cpp Tue Dec 21 02:30:42 2010 |
1 Home brewed patch |
2 +++ b/prnt/hpcups/HPCupsFilter.cpp Tue Dec 21 02:31:05 2010 |
2 |
3 @@ -36,6 +36,8 @@ |
3 --- a/prnt/hpcups/HPCupsFilter.cpp 2014-04-04 03:39:07.000000000 -0700 |
4 #include <sys/utsname.h> |
4 +++ hplip-3.14.4/prnt/hpcups/HPCupsFilter.cpp 2014-04-11 12:24:59.109386019 -0700 |
|
5 @@ -37,6 +37,8 @@ |
5 #include <time.h> |
6 #include <time.h> |
6 #include <sys/timeb.h> |
7 #include "utils.h" |
|
8 |
|
9 +extern "C" int getdomainname(char*, int); |
7 + |
10 + |
8 +extern "C" int getdomainname(char*, int); |
|
9 |
|
10 #define HP_FILE_VERSION_STR "03.09.08.0" |
11 #define HP_FILE_VERSION_STR "03.09.08.0" |
11 |
12 |
|
13 static HPCupsFilter filter; |
|
14 @@ -597,7 +599,7 @@ |
|
15 char hpPreProcessedRasterFile[MAX_FILE_PATH_LEN]; //temp file needed to store raster data with swaped pages. |
|
16 |
|
17 |
|
18 - sprintf(hpPreProcessedRasterFile, "%s/hp_%s_cups_SwapedPagesXXXXXX",CUPS_TMP_DIR, m_JA.user_name); |
|
19 + snprintf(hpPreProcessedRasterFile, sizeof(hpPreProcessedRasterFile), "%s/hp_%s_cups_SwapedPagesXXXXXX", CUPS_TMP_DIR, m_JA.user_name); |
|
20 |
|
21 |
|
22 while (cupsRasterReadHeader2(cups_raster, &cups_header)) |
|
23 --- a/prnt/hpcups/CommonDefinitions.h 2014-04-04 03:39:07.000000000 -0700 |
|
24 +++ hplip-3.14.4/prnt/hpcups/CommonDefinitions.h 2014-04-11 12:03:54.025798599 -0700 |
|
25 @@ -305,7 +305,7 @@ |
|
26 /* 0x68 */ ZJI_BITMAP_PIXELS, |
|
27 /* 0x69 */ ZJI_BITMAP_LINES, |
|
28 /* 0x6A */ ZJI_BITMAP_BPP, |
|
29 -/* 0x6B */ ZJI_BITMAP_STRIDE, |
|
30 +/* 0x6B */ ZJI_BITMAP_STRIDE |
|
31 |
|
32 } ZJ_ITEM; |
|
33 |
|
34 --- a/io/hpmud/hpmud.h 2014-04-04 03:42:17.000000000 -0700 |
|
35 +++ hplip-3.14.4/io/hpmud/hpmud.h 2014-04-11 12:12:13.756537138 -0700 |
|
36 @@ -46,7 +46,7 @@ |
|
37 HPMUD_R_INVALID_TIMEOUT = 47, |
|
38 HPMUD_R_DATFILE_ERROR = 48, |
|
39 HPMUD_R_IO_TIMEOUT = 49, |
|
40 - HPMUD_R_INVALID_MDNS = 50, |
|
41 + HPMUD_R_INVALID_MDNS = 50 |
|
42 }; |
|
43 |
|
44 enum HPMUD_IO_MODE |
|
45 @@ -57,7 +57,7 @@ |
|
46 HPMUD_DOT4_PHOENIX_MODE=4, /* (ie: clj2550, clj2840, lj3050, lj3055, clj4730mfp) */ |
|
47 HPMUD_DOT4_BRIDGE_MODE=5, /* (ie: clj2500) not USB compatable, use HPMUD_RAW_MODE, tested on F10 12/10/08 DES */ |
|
48 HPMUD_MLC_GUSHER_MODE=6, /* most new devices */ |
|
49 - HPMUD_MLC_MISER_MODE=7, /* old stuff */ |
|
50 + HPMUD_MLC_MISER_MODE=7 /* old stuff */ |
|
51 }; |
|
52 |
|
53 enum HPMUD_BUS_ID |
|
54 @@ -78,7 +78,7 @@ |
|
55 HPMUD_SCANTYPE_SOAPHT = 5, /* HorseThief (ie: ljm1522) */ |
|
56 HPMUD_SCANTYPE_SCL_DUPLEX = 6, |
|
57 HPMUD_SCANTYPE_LEDM = 7, |
|
58 - HPMUD_SCANTYPE_MARVELL2 = 8, /* (Tsunami lj 1212 and series) */ |
|
59 + HPMUD_SCANTYPE_MARVELL2 = 8 /* (Tsunami lj 1212 and series) */ |
|
60 }; |
|
61 |
|
62 enum HPMUD_SCANSRC |
|
63 @@ -86,7 +86,7 @@ |
|
64 HPMUD_SCANSRC_NA = 0, |
|
65 HPMUD_SCANSRC_FLATBED = 0x1, |
|
66 HPMUD_SCANSRC_ADF= 0x2, |
|
67 - HPMUD_SCANSRC_CAMERA = 0x4, |
|
68 + HPMUD_SCANSRC_CAMERA = 0x4 |
|
69 }; |
|
70 |
|
71 enum HPMUD_STATUSTYPE |
|
72 @@ -97,21 +97,21 @@ |
|
73 HPMUD_STATUSTYPE_PML = 3, /* laserjet pml */ |
|
74 HPMUD_STATUSTYPE_EWS = 6, /* laserjet hp ews */ |
|
75 HPMUD_STATUSTYPE_PJL = 8, /* laserjet pjl */ |
|
76 - HPMUD_STATUSTYPE_PJLPML = 9, /* laserjet pjl and pml */ |
|
77 + HPMUD_STATUSTYPE_PJLPML = 9 /* laserjet pjl and pml */ |
|
78 }; |
|
79 |
|
80 enum HPMUD_SUPPORT_TYPE |
|
81 { |
|
82 HPMUD_SUPPORT_TYPE_NONE = 0, /* not supported */ |
|
83 HPMUD_SUPPORT_TYPE_HPIJS = 1, /* supported by hpijs only */ |
|
84 - HPMUD_SUPPORT_TYPE_HPLIP = 2, /* supported by hpijs and "hp" backend */ |
|
85 + HPMUD_SUPPORT_TYPE_HPLIP = 2 /* supported by hpijs and "hp" backend */ |
|
86 }; |
|
87 |
|
88 enum HPMUD_PLUGIN_TYPE |
|
89 { |
|
90 HPMUD_PLUGIN_TYPE_NONE = 0, |
|
91 HPMUD_PLUGIN_TYPE_REQUIRED = 1, |
|
92 - HPMUD_PLUGIN_TYPE_OPTIONAL = 2, |
|
93 + HPMUD_PLUGIN_TYPE_OPTIONAL = 2 |
|
94 }; |
|
95 |
|
96 |
|
97 --- a/common/utils.h 2014-04-04 03:42:15.000000000 -0700 |
|
98 +++ hplip-3.14.4/common/utils.h 2014-04-11 12:49:00.832008556 -0700 |
|
99 @@ -22,7 +22,8 @@ |
|
100 #define SCAN_PLUGIN_SOAPHT "bb_soapht.so" |
|
101 |
|
102 #define HPLIP_PLUGIN_STATE "/var/lib/hp/hplip.state" |
|
103 -#define CUPS_TMP_DIR getenv("TMPDIR") ? : getenv("HOME") ?:"/tmp" |
|
104 +//#define CUPS_TMP_DIR getenv("TMPDIR") ? : getenv("HOME") ?:"/tmp" |
|
105 +#define CUPS_TMP_DIR "/tmp" |
|
106 |
|
107 enum UTILS_CONF_RESULT |
|
108 { |
|
109 @@ -30,7 +31,7 @@ |
|
110 UTILS_CONF_FILE_NOT_FOUND, // =1, |
|
111 UTILS_CONF_SECTION_NOT_FOUND, // =2, |
|
112 UTILS_CONF_KEY_NOT_FOUND, // =3, |
|
113 - UTILS_CONF_DATFILE_ERROR, // = 4, |
|
114 + UTILS_CONF_DATFILE_ERROR // = 4, |
|
115 }; |
|
116 |
|
117 |
|
118 @@ -38,14 +39,14 @@ |
|
119 { |
|
120 UTILS_PLUGIN_STATUS_OK = 0, |
|
121 UTILS_PLUGIN_STATUS_MISMATCH, // = 1, |
|
122 - UTILS_PLUGIN_STATUS_NOT_INSTALLED, // = 2, |
|
123 + UTILS_PLUGIN_STATUS_NOT_INSTALLED // = 2, |
|
124 }; |
|
125 |
|
126 enum UTILS_PLUGIN_LIBRARY_TYPE |
|
127 { |
|
128 UTILS_PRINT_PLUGIN_LIBRARY = 0, // = 0, |
|
129 UTILS_SCAN_PLUGIN_LIBRARY, // =1, |
|
130 - UTILS_FAX_PLUGIN_LIBRARY, // =2, |
|
131 + UTILS_FAX_PLUGIN_LIBRARY//, // =2, |
|
132 // UTILS_GENERAL_PLUGIN_LIBRARY //=4, // Future use.. |
|
133 }; |
|
134 |