~ubuntu-branches/ubuntu/trusty/grfcodec/trusty

« back to all changes in this revision

Viewing changes to debian/patches/fix-action-14-big-endian.patch

Committer: Package Import Robot
Author(s): Matthijs Kooijman
Date: 2011-12-06 14:43:46 UTC
mfrom: (1.1.4)
Revision ID: package-import@ubuntu.com-20111206144346-0mzy2iu6wdro48he

Tags: 5.1.2-1

* [36684f3] New upstream release 5.1.2.
* [14174a4] Remove fix-action-14-big-endian.patch, which is included upstream.

files removed:
.pc

.pc/.version

.pc/applied-patches

.pc/fix-action-14-big-endian.patch

.pc/fix-action-14-big-endian.patch/src

.pc/fix-action-14-big-endian.patch/src/act14.cpp

debian/patches/fix-action-14-big-endian.patch

files modified:
COPYING

changelog.txt

debian/changelog

debian/patches/series

debian/watch

src/ExpandingArray.h

src/IDs.cpp

src/act0.cpp

src/act0.h

src/act123.cpp

src/act123.h

src/act123_classes.cpp

src/act14.cpp

src/act5.cpp

src/act6.cpp

src/act79D.cpp

src/actB.cpp

src/actF.cpp

src/allocarray.h

src/command.cpp

src/command.h

src/data.cpp

src/data.h

src/globals.cpp

src/globals.h

src/grfcodec.cpp

src/help.cpp

src/help.h

src/inject.cpp

src/inject.h

src/inlines.h

src/lang/extra_czech.h

src/lang/extra_english.h

src/lang/help_czech.h

src/lang/help_english.h

src/lang/language_list.h

src/lang/message_czech.h

src/lang/message_english.h

src/language_mgr.cpp

src/language_mgr.h

src/mapescapes.cpp

src/mapescapes.h

src/message_mgr.cpp

src/message_mgr.h

src/messages.cpp

src/messages.h

src/nforenum.cpp

src/nforenum.h

src/nfosprite.h

src/pngsprit.cpp

src/pseudo.cpp

src/pseudo.h

src/pseudo_seq.cpp

src/rangedint.cpp

src/rangedint.h

src/readinfo.cpp

src/sanity.cpp

src/sanity.h

src/sanity_defines.h

src/singleton.h

src/strings.cpp

src/strings.h

src/win32.h

version.def

Show diffs side-by-side

added added

removed removed

debian/patches/fix-action-14-big-endian.patch

Description: Fix action 14 palette checking on big endian machines

This bug caused the openttd package to FTBFS on big endian platforms.

Cherry-picked from upstream. Changes to the changelog are left out.

Origin: upstream, http://dev.openttdcoop.org/projects/grfcodec/repository/revisions/423c64a32ec9

diff -r 08511c778a07 -r 423c64a32ec9 src/act14.cpp

--- a/src/act14.cpp

+++ b/src/act14.cpp

@@ -33,11 +33,15 @@

static bool Check14(PseudoSprite&data, uint&offset, vector<uint>&idstack)

{

- /* Define IDs in an endian-independant manner */

- static union {

- char text[5];

- uint id;

- } ID_INFO = {"INFO"}, ID_PALS = {"PALS"};

+ /* NFORenum reads the NFO, which is a text file. As per definition the

+ * NFO is LE ordered. If characters are interpreted as bytes they will

+ * therefore be read in LE order. ExtractDword does interpret the

+ * characters as bytes and construct a host endian ordered integer.

+ * Consequently, there is no need to swap endian for the read data; it

+ * will always be in the host order, or the constant below as long as

+ * they have the expected integer value, thus reverse due to LE. */

+ static const uint ID_INFO = 0x4F464E49; // INFO in reverse order (LE)

+ static const uint ID_PALS = 0x534C4150; // PALS in reverse order (LE)

uint type = data.ExtractByte(offset++);

while (type != 0) {

@@ -68,7 +72,7 @@

extern uint _act14_pal;

uint size = data.ExtractWord(offset);

offset += 2;

- if (idstack.size()==2 && idstack[0]==ID_INFO.id && idstack[1]==ID_PALS.id) {

+ if (idstack.size()==2 && idstack[0]==ID_INFO && idstack[1]==ID_PALS) {

uint pal=data.ExtractByte(offset);

if (size==1 && (pal=='D' || pal=='W' || pal=='A')) {

_act14_pal=pal;

Older »