summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2013-06-27 08:15:18 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2013-06-27 08:15:18 +0000
commit6ed4872095697781b61866dab425550c7ff7afb9 (patch)
tree684515e0618ac5974b8ca0a502d4d1010b42ae9f
parentc2aa3009af632035235e37fad48f08818debf827 (diff)
Bug fix for LuaTeX crash on 32bit Unix systems (from Taco) -- grom trunk r30971
git-svn-id: svn://tug.org/texlive/branches/branch2013@30972 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/web2c/luatexdir/ChangeLog8
-rw-r--r--Build/source/texk/web2c/luatexdir/image/writejbig2.w9
-rw-r--r--Build/source/texk/web2c/luatexdir/image/writejp2.w6
-rw-r--r--Build/source/texk/web2c/luatexdir/image/writejpg.w4
-rw-r--r--Build/source/texk/web2c/luatexdir/image/writepng.w4
5 files changed, 18 insertions, 13 deletions
diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog
index 0532154a0bd..955d8864a30 100644
--- a/Build/source/texk/web2c/luatexdir/ChangeLog
+++ b/Build/source/texk/web2c/luatexdir/ChangeLog
@@ -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).
diff --git a/Build/source/texk/web2c/luatexdir/image/writejbig2.w b/Build/source/texk/web2c/luatexdir/image/writejbig2.w
index d47fa17b0d0..2e84bcdeb5e 100644
--- a/Build/source/texk/web2c/luatexdir/image/writejbig2.w
+++ b/Build/source/texk/web2c/luatexdir/image/writejbig2.w
@@ -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 @@ static const char _svn_version[] =
#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
diff --git a/Build/source/texk/web2c/luatexdir/image/writejp2.w b/Build/source/texk/web2c/luatexdir/image/writejp2.w
index 7082335b679..47424d1c416 100644
--- a/Build/source/texk/web2c/luatexdir/image/writejp2.w
+++ b/Build/source/texk/web2c/luatexdir/image/writejp2.w
@@ -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 @@ Information technology --- JPEG~2000 image coding system: Core coding system.
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() */
diff --git a/Build/source/texk/web2c/luatexdir/image/writejpg.w b/Build/source/texk/web2c/luatexdir/image/writejpg.w
index 2269ad295e9..bb1714a7e94 100644
--- a/Build/source/texk/web2c/luatexdir/image/writejpg.w
+++ b/Build/source/texk/web2c/luatexdir/image/writejpg.w
@@ -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 @@ static const char _svn_version[] =
"$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 <assert.h>
#include "ptexlib.h"
+#include <assert.h>
#include "image/image.h"
#include "image/writejpg.h"
diff --git a/Build/source/texk/web2c/luatexdir/image/writepng.w b/Build/source/texk/web2c/luatexdir/image/writepng.w
index 17624b18f7f..57079f5c5fc 100644
--- a/Build/source/texk/web2c/luatexdir/image/writepng.w
+++ b/Build/source/texk/web2c/luatexdir/image/writepng.w
@@ -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 @@ static const char _svn_version[] =
"$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 <assert.h>
#include "ptexlib.h"
+#include <assert.h>
#include "image/image.h"
#include "image/writepng.h"