summaryrefslogtreecommitdiffstats
path: root/office/texlive/branch2013/r30972-bug-fix-for-LuaTeX-crash-from-r30971.diff
blob: b19735a206affe97cd7e6d259079ceeee681f128 (plain)
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
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
Index: Build/source/texk/web2c/luatexdir/image/writepng.w
===================================================================
--- Build/source/texk/web2c/luatexdir/image/writepng.w	(revision 30929)
+++ Build/source/texk/web2c/luatexdir/image/writepng.w	(revision 30972)
@@ -1,7 +1,7 @@
 % writepng.w
 %
 % Copyright 1996-2006 Han The Thanh <thanh@@pdftex.org>
-% Copyright 2006-2011 Taco Hoekwater <taco@@luatex.org>
+% Copyright 2006-2013 Taco Hoekwater <taco@@luatex.org>
 %
 % This file is part of LuaTeX.
 %
@@ -23,8 +23,8 @@
     "$Id: writepng.w 4442 2012-05-25 22:40:34Z hhenkel $"
     "$URL: https://foundry.supelec.fr/svn/luatex/tags/beta-0.76.0/source/texk/web2c/luatexdir/image/writepng.w $";
 
+#include "ptexlib.h"
 #include <assert.h>
-#include "ptexlib.h"
 #include "image/image.h"
 #include "image/writepng.h"
 
Index: Build/source/texk/web2c/luatexdir/image/writejp2.w
===================================================================
--- Build/source/texk/web2c/luatexdir/image/writejp2.w	(revision 30929)
+++ Build/source/texk/web2c/luatexdir/image/writejp2.w	(revision 30972)
@@ -1,7 +1,7 @@
 % writejp2.w
 %
-% Copyright 2011-2012 Taco Hoekwater <taco@@luatex.org>
-% Copyright 2011-2012 Hartmut Henkel <hartmut@@luatex.org>
+% Copyright 2011-2013 Taco Hoekwater <taco@@luatex.org>
+% Copyright 2011-2013 Hartmut Henkel <hartmut@@luatex.org>
 %
 % This file is part of LuaTeX.
 %
@@ -28,9 +28,9 @@
 ISO/IEC 15444-1, Second edition, 2004-09-15, file |15444-1annexi.pdf|.
 
 @c
+#include "ptexlib.h"
 #include <math.h>
 #include <assert.h>
-#include "ptexlib.h"
 #include "image/image.h"
 #include "image/writejp2.h"
 #include "image/writejbig2.h"   /* read2bytes(), read4bytes() */
Index: Build/source/texk/web2c/luatexdir/image/writejbig2.w
===================================================================
--- Build/source/texk/web2c/luatexdir/image/writejbig2.w	(revision 30929)
+++ Build/source/texk/web2c/luatexdir/image/writejbig2.w	(revision 30972)
@@ -1,8 +1,8 @@
 % writejbig2.w
 %
 % Copyright 1996-2006 Han The Thanh <thanh@@pdftex.org>
-% Copyright 2006-2012 Taco Hoekwater <taco@@luatex.org>
-% Copyright 2003-2012 Hartmut Henkel <hartmut@@luatex.org>
+% Copyright 2006-2013 Taco Hoekwater <taco@@luatex.org>
+% Copyright 2003-2013 Hartmut Henkel <hartmut@@luatex.org>
 %
 % This file is part of LuaTeX.
 %
@@ -86,13 +86,10 @@
 
 #undef DEBUG
 
-#ifdef HAVE_CONFIG_H
-#include <w2c/config.h>
-#endif
+#include "ptexlib.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <assert.h>
-#include "ptexlib.h"
 #include "image/image.h"
 
 @ @c
Index: Build/source/texk/web2c/luatexdir/image/writejpg.w
===================================================================
--- Build/source/texk/web2c/luatexdir/image/writejpg.w	(revision 30929)
+++ Build/source/texk/web2c/luatexdir/image/writejpg.w	(revision 30972)
@@ -1,7 +1,7 @@
 % writejpg.w
 %
 % Copyright 1996-2006 Han The Thanh <thanh@@pdftex.org>
-% Copyright 2006-2011 Taco Hoekwater <taco@@luatex.org>
+% Copyright 2006-2013 Taco Hoekwater <taco@@luatex.org>
 %
 % This file is part of LuaTeX.
 %
@@ -23,8 +23,8 @@
     "$Id: writejpg.w 4442 2012-05-25 22:40:34Z hhenkel $"
     "$URL: https://foundry.supelec.fr/svn/luatex/tags/beta-0.76.0/source/texk/web2c/luatexdir/image/writejpg.w $";
 
+#include "ptexlib.h"
 #include <assert.h>
-#include "ptexlib.h"
 #include "image/image.h"
 #include "image/writejpg.h"
 
Index: Build/source/texk/web2c/luatexdir/ChangeLog
===================================================================
--- Build/source/texk/web2c/luatexdir/ChangeLog	(revision 30929)
+++ Build/source/texk/web2c/luatexdir/ChangeLog	(revision 30972)
@@ -1,3 +1,11 @@
+2013-06-27  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Bug fix for LuaTeX crash on 32bit Unix systems from Taco,
+	tlbuild mail 26 Jun 2013 16:10:35,
+	http://tug.org/pipermail/tex-live/2013-June/033782.html
+	* image/writejbig2.w, image/writejp2.w, image/writejpg.w,
+	image/writepng.w: Always first include ptexlib.h.
+
 2013-04-16  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* lua/luainit.w: Handle '--luac' and '--luaconly' (from Akira).