-
Notifications
You must be signed in to change notification settings - Fork 2
/
cnijfilter-3.80-1.libraries.patch
82 lines (75 loc) · 2.92 KB
/
cnijfilter-3.80-1.libraries.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
diff -rupN cnijfilter-source-3.80-1.orig/backend/src/cnij_backend_common.c cnijfilter-source-3.80-1/backend/src/cnij_backend_common.c
--- cnijfilter-source-3.80-1.orig/backend/src/cnij_backend_common.c 2012-03-29 07:50:27.000000000 +0300
+++ cnijfilter-source-3.80-1/backend/src/cnij_backend_common.c 2014-12-13 17:21:01.000000000 +0200
@@ -38,6 +38,7 @@
// CUPS Header
#include <cups/cups.h>
#include <cups/ipp.h>
+#include <cups/ppd.h>
// Header file for CANON
#include "cnij_backend_common.h"
diff -rupN cnijfilter-source-3.80-1.orig/cngpij/cngpij/bjcups.c cnijfilter-source-3.80-1/cngpij/cngpij/bjcups.c
--- cnijfilter-source-3.80-1.orig/cngpij/cngpij/bjcups.c 2012-04-17 06:39:20.000000000 +0300
+++ cnijfilter-source-3.80-1/cngpij/cngpij/bjcups.c 2014-12-13 17:23:22.000000000 +0200
@@ -21,6 +21,7 @@
#include <config.h>
#endif // HAVE_CONFIG_H
+#define _IPP_PRIVATE_STRUCTURES 1
#include <cups/cups.h>
#include <cups/language.h>
#include <cups/ppd.h>
diff -rupN cnijfilter-source-3.80-1.orig/cngpijmnt/src/main.c cnijfilter-source-3.80-1/cngpijmnt/src/main.c
--- cnijfilter-source-3.80-1.orig/cngpijmnt/src/main.c 2012-04-26 12:49:34.000000000 +0300
+++ cnijfilter-source-3.80-1/cngpijmnt/src/main.c 2014-12-13 17:38:12.000000000 +0200
@@ -21,7 +21,10 @@
#include <config.h>
#endif // HAVE_CONFIG_H
+#define _IPP_PRIVATE_STRUCTURES 1
+
#include <cups/cups.h>
+#include <cups/ipp.h>
#include <cups/language.h>
#include <cups/ppd.h>
#include <unistd.h>
diff -rupN cnijfilter-source-3.80-1.orig/cngpijmon/src/bjcupsmon_cups.c cnijfilter-source-3.80-1/cngpijmon/src/bjcupsmon_cups.c
--- cnijfilter-source-3.80-1.orig/cngpijmon/src/bjcupsmon_cups.c 2012-05-22 12:49:27.000000000 +0300
+++ cnijfilter-source-3.80-1/cngpijmon/src/bjcupsmon_cups.c 2014-12-13 17:25:16.000000000 +0200
@@ -18,9 +18,11 @@
*/
/*** Includes ***/
+#define _IPP_PRIVATE_STRUCTURES 1
#include <cups/cups.h>
#include <cups/ppd.h>
#include <cups/language.h>
+#include <cups/ppd.h>
#include <sys/types.h>
#include <unistd.h>
#include <pwd.h>
diff -rupN cnijfilter-source-3.80-1.orig/cnijfilter/src/bjfimage.c cnijfilter-source-3.80-1/cnijfilter/src/bjfimage.c
--- cnijfilter-source-3.80-1.orig/cnijfilter/src/bjfimage.c 2012-03-22 03:50:19.000000000 +0200
+++ cnijfilter-source-3.80-1/cnijfilter/src/bjfimage.c 2014-12-14 03:27:44.504351000 +0200
@@ -39,6 +39,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include <png.h>
#include "cpktypes.h"
@@ -1520,8 +1521,8 @@ static short png_image_init( LPBJF_IMAGE
short tmpformat;
short retbyte = 0;
short bpp = 3;
- long width = 0;
- long length = 0;
+ png_uint_32 width = 0;
+ png_uint_32 length = 0;
long rstep = 0;
long RasterLength = 0;
long i;
@@ -1574,7 +1575,7 @@ static short png_image_init( LPBJF_IMAGE
goto onErr;
}
- if (setjmp (png_p->jmpbuf))
+ if (setjmp (png_jmpbuf(png_p)))
{
png_destroy_read_struct(&png_p, &info_p, (png_infopp)NULL);
goto onErr;