| author | Alan Coopersmith <Alan.Coopersmith@Oracle.COM> |
| Sun, 26 Mar 2017 13:26:42 -0700 | |
| changeset 7803 | bab5480f2396 |
| parent 7345 | cf697ee09e57 |
| permissions | -rw-r--r-- |
|
4923
b9e3f6b6a101
21696841 Update HPLIP to 3.15.7
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
3831
diff
changeset
|
1 |
source: in-house |
|
b9e3f6b6a101
21696841 Update HPLIP to 3.15.7
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
3831
diff
changeset
|
2 |
SPRO C++ changes. |
|
3831
33bc4f8fb536
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
1276
diff
changeset
|
3 |
|
|
33bc4f8fb536
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
1276
diff
changeset
|
4 |
--- a/prnt/hpcups/HPCupsFilter.cpp 2014-04-04 03:39:07.000000000 -0700 |
|
4923
b9e3f6b6a101
21696841 Update HPLIP to 3.15.7
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
3831
diff
changeset
|
5 |
+++ b/prnt/hpcups/HPCupsFilter.cpp 2014-04-11 12:24:59.109386019 -0700 |
|
3831
33bc4f8fb536
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
1276
diff
changeset
|
6 |
@@ -37,6 +37,8 @@ |
|
33bc4f8fb536
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
1276
diff
changeset
|
7 |
#include <time.h> |
|
33bc4f8fb536
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
1276
diff
changeset
|
8 |
#include "utils.h" |
|
33bc4f8fb536
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
1276
diff
changeset
|
9 |
|
|
33bc4f8fb536
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
1276
diff
changeset
|
10 |
+extern "C" int getdomainname(char*, int); |
|
1276
dc3977b83042
15795105 SUNBT7173056 Update hplip from 3.10.9 to 3.12.4
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
165
diff
changeset
|
11 |
+ |
|
3831
33bc4f8fb536
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
1276
diff
changeset
|
12 |
#define HP_FILE_VERSION_STR "03.09.08.0" |
|
33bc4f8fb536
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
1276
diff
changeset
|
13 |
|
|
33bc4f8fb536
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
1276
diff
changeset
|
14 |
static HPCupsFilter filter; |
|
33bc4f8fb536
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
1276
diff
changeset
|
15 |
@@ -597,7 +599,7 @@ |
|
33bc4f8fb536
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
1276
diff
changeset
|
16 |
char hpPreProcessedRasterFile[MAX_FILE_PATH_LEN]; //temp file needed to store raster data with swaped pages. |
|
33bc4f8fb536
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
1276
diff
changeset
|
17 |
|
|
33bc4f8fb536
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
1276
diff
changeset
|
18 |
|
|
33bc4f8fb536
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
1276
diff
changeset
|
19 |
- sprintf(hpPreProcessedRasterFile, "%s/hp_%s_cups_SwapedPagesXXXXXX",CUPS_TMP_DIR, m_JA.user_name); |
|
33bc4f8fb536
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
1276
diff
changeset
|
20 |
+ snprintf(hpPreProcessedRasterFile, sizeof(hpPreProcessedRasterFile), "%s/hp_%s_cups_SwapedPagesXXXXXX", CUPS_TMP_DIR, m_JA.user_name); |
|
33bc4f8fb536
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
1276
diff
changeset
|
21 |
|
|
33bc4f8fb536
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
1276
diff
changeset
|
22 |
|
|
33bc4f8fb536
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
1276
diff
changeset
|
23 |
while (cupsRasterReadHeader2(cups_raster, &cups_header)) |
|
33bc4f8fb536
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
1276
diff
changeset
|
24 |
--- a/common/utils.h 2014-04-04 03:42:15.000000000 -0700 |
|
4923
b9e3f6b6a101
21696841 Update HPLIP to 3.15.7
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
3831
diff
changeset
|
25 |
+++ b/common/utils.h 2014-04-11 12:49:00.832008556 -0700 |
|
3831
33bc4f8fb536
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
1276
diff
changeset
|
26 |
@@ -22,7 +22,8 @@ |
|
33bc4f8fb536
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
1276
diff
changeset
|
27 |
#define SCAN_PLUGIN_SOAPHT "bb_soapht.so" |
|
33bc4f8fb536
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
1276
diff
changeset
|
28 |
|
|
33bc4f8fb536
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
1276
diff
changeset
|
29 |
#define HPLIP_PLUGIN_STATE "/var/lib/hp/hplip.state" |
|
33bc4f8fb536
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
1276
diff
changeset
|
30 |
-#define CUPS_TMP_DIR getenv("TMPDIR") ? : getenv("HOME") ?:"/tmp"
|
|
33bc4f8fb536
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
1276
diff
changeset
|
31 |
+//#define CUPS_TMP_DIR getenv("TMPDIR") ? : getenv("HOME") ?:"/tmp"
|
|
33bc4f8fb536
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
1276
diff
changeset
|
32 |
+#define CUPS_TMP_DIR "/tmp" |
|
33bc4f8fb536
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
1276
diff
changeset
|
33 |
|
|
33bc4f8fb536
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
1276
diff
changeset
|
34 |
enum UTILS_CONF_RESULT |
|
33bc4f8fb536
18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
1276
diff
changeset
|
35 |
{
|