Hello community, here is the log from the commit of package grfcodec for openSUSE:Factory checked in at 2016-07-03 12:28:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/grfcodec (Old) and /work/SRC/openSUSE:Factory/.grfcodec.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grfcodec" Changes: -------- --- /work/SRC/openSUSE:Factory/grfcodec/grfcodec.changes 2014-06-24 22:47:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.grfcodec.new/grfcodec.changes 2016-07-03 12:28:34.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Jun 30 19:36:47 UTC 2016 - [email protected] + +- Update to 6.0.6 + * Fixes build with GCC6. +- Changed spec to build with optflags + +------------------------------------------------------------------- Old: ---- grfcodec-6.0.4-source.tar.xz New: ---- grfcodec-6.0.6-source.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grfcodec.spec ++++++ --- /var/tmp/diff_new_pack.zd4oZ9/_old 2016-07-03 12:28:35.000000000 +0200 +++ /var/tmp/diff_new_pack.zd4oZ9/_new 2016-07-03 12:28:35.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package grfcodec # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,24 +17,20 @@ Name: grfcodec -Version: 6.0.4 +Version: 6.0.6 Release: 0 -%define srcver %{version} Summary: A suite of programs to modify Transport Tycoon Deluxe's GRF files License: GPL-2.0+ Group: Development/Tools/Building Url: http://dev.openttdcoop.org/projects/grfcodec/ -Source: http://binaries.openttd.org/extra/%{name}/%{srcver}/%{name}-%{srcver}-source.tar.xz - -BuildRoot: %{_tmppath}/%{name}-%{version}-build - +Source: http://binaries.openttd.org/extra/grfcodec/%{version}/grfcodec-%{version}-source.tar.xz BuildRequires: boost-devel > 1.36 BuildRequires: gcc-c++ BuildRequires: libpng-devel BuildRequires: xz - Provides: nforenum = %{version} Obsoletes: nforenum < %{version} +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description A suite of programs to modify Transport Tycoon Deluxe's GRF files. @@ -48,7 +44,7 @@ %setup -q %build -make %{?_smp_mflags} +CXXFLAGS="%{optflags}" make %{?_smp_mflags} %install make install DESTDIR=%{buildroot} prefix=%{_prefix} ++++++ grfcodec-6.0.4-source.tar.xz -> grfcodec-6.0.6-source.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grfcodec-6.0.4/.devzone/build/files new/grfcodec-6.0.6/.devzone/build/files --- old/grfcodec-6.0.4/.devzone/build/files 1970-01-01 01:00:00.000000000 +0100 +++ new/grfcodec-6.0.6/.devzone/build/files 2015-05-09 12:59:46.000000000 +0200 @@ -0,0 +1,2 @@ +R;%{RPMBUILDDIR}/RPMS/%{ARCH}/*.%{ARCH}.rpm +5;%{RPMBUILDDIR}/SRPMS/*.src.rpm diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grfcodec-6.0.4/.devzone/build/grfcodec.spec new/grfcodec-6.0.6/.devzone/build/grfcodec.spec --- old/grfcodec-6.0.4/.devzone/build/grfcodec.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/grfcodec-6.0.6/.devzone/build/grfcodec.spec 2015-05-09 12:59:46.000000000 +0200 @@ -0,0 +1,54 @@ +Name: %{dz_repo} +Version: 999.%{dz_version} +Release: %{_vendor}%{?suse_version} +Summary: A suite of programs to develop NewGRFs +Group: Development/Tools/Building +License: GPLv2+ +URL: http://dev.openttdcoop.org/projects/grfcodec +Source0: %{name}-%{dz_version}.tar + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot + +BuildRequires: gcc-c++ +BuildRequires: boost-devel > 1.36 +BuildRequires: libpng-devel + +Provides: nforenum = %{version} +Obsoletes: nforenum < %{version} + +#We need Mercurial for auto version detection: (not needed with source tarball) +BuildRequires: mercurial + +%description +A suite of programs to modify Transport Tycoon Deluxe's GRF files. +Contains GRFCodec for encoding and decoding the actual GRF files, +GRFID for extracting the (unique) NewGRF identifier and NFORenum, +a format correcter and linter for the NFO language. NFO and PCX +or PNG files are encoded to form GRF files. + +%prep +%setup -qn %{name} + +%build +make %{?_smp_mflags} + +%install +make install DESTDIR=%{buildroot} prefix=%{_prefix} + +%clean + +%files +%defattr(-,root,root,-) +%{_bindir}/grfcodec +%{_bindir}/grfid +%{_bindir}/grfstrip +%{_bindir}/nforenum +%dir %{_datadir}/doc/grfcodec +%doc %{_datadir}/doc/grfcodec/COPYING +%doc %{_datadir}/doc/grfcodec/*.txt +%{_mandir}/man1/grfcodec.1* +%{_mandir}/man1/grfid.1* +%{_mandir}/man1/grfstrip.1* +%{_mandir}/man1/nforenum.1* + +%changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grfcodec-6.0.4/.devzone/build/nightlies/cleanup_days new/grfcodec-6.0.6/.devzone/build/nightlies/cleanup_days --- old/grfcodec-6.0.4/.devzone/build/nightlies/cleanup_days 1970-01-01 01:00:00.000000000 +0100 +++ new/grfcodec-6.0.6/.devzone/build/nightlies/cleanup_days 2015-05-09 12:59:46.000000000 +0200 @@ -0,0 +1 @@ +0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grfcodec-6.0.4/.devzone/build/nightlies/cleanup_releases new/grfcodec-6.0.6/.devzone/build/nightlies/cleanup_releases --- old/grfcodec-6.0.4/.devzone/build/nightlies/cleanup_releases 1970-01-01 01:00:00.000000000 +0100 +++ new/grfcodec-6.0.6/.devzone/build/nightlies/cleanup_releases 2015-05-09 12:59:46.000000000 +0200 @@ -0,0 +1 @@ +1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grfcodec-6.0.4/.devzone/build/nightlies/enable new/grfcodec-6.0.6/.devzone/build/nightlies/enable --- old/grfcodec-6.0.4/.devzone/build/nightlies/enable 1970-01-01 01:00:00.000000000 +0100 +++ new/grfcodec-6.0.6/.devzone/build/nightlies/enable 2015-05-09 12:59:46.000000000 +0200 @@ -0,0 +1 @@ +libpng diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grfcodec-6.0.4/.devzone/build/type new/grfcodec-6.0.6/.devzone/build/type --- old/grfcodec-6.0.4/.devzone/build/type 1970-01-01 01:00:00.000000000 +0100 +++ new/grfcodec-6.0.6/.devzone/build/type 2015-05-09 12:59:46.000000000 +0200 @@ -0,0 +1 @@ +rpm diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grfcodec-6.0.4/.hgignore new/grfcodec-6.0.6/.hgignore --- old/grfcodec-6.0.4/.hgignore 1970-01-01 01:00:00.000000000 +0100 +++ new/grfcodec-6.0.6/.hgignore 2015-05-09 12:59:46.000000000 +0200 @@ -0,0 +1,27 @@ +# Use glob syntax: +syntax: glob + +# The local object files +objs + +# Local "overrides" for the Makefile +Makefile.local + +# Ignore the binaries +grfcodec +grfcodec.exe +grfid +grfid.exe +grfstrip +grfstrip.exe +nforenum +nforenum.exe + +# Automatically generated source files +version.h +endian.h + +# Bundle/tarbal names +grfcodec-* + +bundle diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grfcodec-6.0.4/.hgtags new/grfcodec-6.0.6/.hgtags --- old/grfcodec-6.0.4/.hgtags 1970-01-01 01:00:00.000000000 +0100 +++ new/grfcodec-6.0.6/.hgtags 2016-06-27 21:03:46.000000000 +0200 @@ -0,0 +1,31 @@ +f6b68e2b8e39316b850cdc208ad4d1aa86b049ce 0.9.10 +ab6e15950217fa56434166cb933ab52caf2b39a2 0.9.9 +7ca08b05ca680eb96969595dbce25f93ee259f82 0.9.8 +6daf6d4ab0521bd10c8e686c0dc39a10d3026f1a 1.0.0-RC1 +e5a433743592de6adc755d95e8e71181abb428c3 1.0.0 +e143e7e1b74880aa5574e835d6bca50f9ba6a061 3.4.6 +1708008263e7beb2b679522f8eac3f317c5b34f8 3.4.5 +f12eb05435064153c4ec06dac687240088e8d95c 3.4.4 +a13cd11189d4cb5948ae2264467f7f25d70cfe1a 3.4.3 +a18bb7bee6767dbe5f9ce852f7feabdfe0e567a3 3.4.2 +9e23cbde2f22b6c790ee9a4081a3cff2cf4582d1 3.4.1 +0c04c2e03e61b8468fb4c6090b72aca5ac479d1e 3.4.0 +d6723ac85f4a16b131e16bdfc99857b184948213 3.3.1 +f33ded354fef6ced09f75d369c47fb218b41e876 3.3.0 +7b17dd5f588319a79f894a3ac120a17da3be6161 3.2.1 +cbdbd889196efb9222fb9f4422efe0e064533510 3.2.0 +24a4fb47d16b816d33403c41f589dec8a980a5e0 4.0.0-RC1 +44cea243912d399232b90749714f0bc136bcf994 4.0.0 +497d42cab57407a4d942a1ae1ac99cae4138b46c 5.0.0 +497d42cab57407a4d942a1ae1ac99cae4138b46c 5.0.0 +ac479f6b6a55d4d5898bef9eee4d45979a434cd2 5.0.0 +19d2fe3f473f9c4864a8347d9db6277787b22ab9 5.1.0 +b9156b157db0f34211e8983e6882c54ff2436969 5.1.1 +0dfdd367a767c57ee921e01edb32bde52ef9168b 5.1.2 +d21b89e50d2bb844f46c32f22b459ed51c54d15a 5.1.3 +69f0359f37b440e4af07c25758ab3970da45debb 6.0.0 +be3925c6962ffd007a1878d6cdfdb3e2ed40d85c 6.0.1 +ff6a1ed8bd699ba916781f5f0b0cbf6503250045 6.0.2 +5505d3603b81fb8d2716c8ca7198003f044f3f89 6.0.3 +e017bcbde0282c12ff49dd0e0a299d3b09555ac3 6.0.4 +c83b33fc5a10d8952b37f92180fc764e3c43fb93 6.0.5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grfcodec-6.0.4/.ottdrev new/grfcodec-6.0.6/.ottdrev --- old/grfcodec-6.0.4/.ottdrev 2014-03-31 20:16:01.000000000 +0200 +++ new/grfcodec-6.0.6/.ottdrev 2016-06-27 21:03:47.000000000 +0200 @@ -1 +1 @@ -6.0.4 980 0 6.0.4 +6.0.6 991 0 6.0.6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grfcodec-6.0.4/build-number.txt new/grfcodec-6.0.6/build-number.txt --- old/grfcodec-6.0.4/build-number.txt 2014-03-31 20:15:29.000000000 +0200 +++ new/grfcodec-6.0.6/build-number.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -#Created by the Bamboo Continuous Integration Server -#Mon Mar 31 20:15:29 CEST 2014 -build.number=13 -build.timestamp="2014-03-31 20\:15\:29" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grfcodec-6.0.4/changelog.txt new/grfcodec-6.0.6/changelog.txt --- old/grfcodec-6.0.4/changelog.txt 2014-03-31 20:15:29.000000000 +0200 +++ new/grfcodec-6.0.6/changelog.txt 2016-06-27 21:03:46.000000000 +0200 @@ -1,3 +1,16 @@ +Changes in 6.0.6 (2016-06-27) +- Support for building with GCC 6 / C++14 + +Changes in 6.0.5 (2015-05-09) +- NFORenum specific changes: + - Data file updates + - Callback 160 + - Action 4 language ID 0x66 (Latin). + - Action 5, type 0x18 (black recolour sprite) added +- GRFcodec specific changes: + - Fix checks for opening sprites causing sprites to be read from the wrong file + - Change default height for sprite sheets to 16000 rows so it does not hit memory issues on 32 bits computers + Changes in 6.0.4 (2014-03-31) - NFORenum specific changes: - Data file updates diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grfcodec-6.0.4/docs/readme.txt new/grfcodec-6.0.6/docs/readme.txt --- old/grfcodec-6.0.4/docs/readme.txt 2014-03-31 20:15:29.000000000 +0200 +++ new/grfcodec-6.0.6/docs/readme.txt 2015-05-09 12:59:46.000000000 +0200 @@ -1,6 +1,6 @@ GRF development tools README -Last updated: 2014-03-31 -Release version: 6.0.4 +Last updated: 2015-05-09 +Release version: 6.0.5 ------------------------------------------------------------------------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grfcodec-6.0.4/released.ptxt new/grfcodec-6.0.6/released.ptxt --- old/grfcodec-6.0.4/released.ptxt 2013-07-15 21:04:01.000000000 +0200 +++ new/grfcodec-6.0.6/released.ptxt 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -2013-07-15 19:04 UTC diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grfcodec-6.0.4/src/data.cpp new/grfcodec-6.0.6/src/data.cpp --- old/grfcodec-6.0.4/src/data.cpp 2014-03-31 20:15:29.000000000 +0200 +++ new/grfcodec-6.0.6/src/data.cpp 2015-05-09 12:59:46.000000000 +0200 @@ -164,7 +164,7 @@ #define OFFSET 0x88 /* Allow replacing sprite ranges with offsets */ #define W(cnt) cnt & 0xFF, cnt >> 8 /* Construct word count */ static const unsigned char _dat5[]={ -NDF_HEADER(0x04, 16), +NDF_HEADER(0x04, 17), /*04*/ OFFSET, OPTIONS(3), 0x30, 0x70, 0xF0, /*05*/ OFFSET, OPTIONS(1), 0x30, /*06*/ OFFSET, OPTIONS(2), 0x4A, 0x5A, @@ -185,6 +185,7 @@ /*15*/ OFFSET, OPTIONS(1), 0xAF, /*16*/ OFFSET, OPTIONS(1), 0x09, /*17*/ OFFSET, OPTIONS(1), 0x10, +/*18*/ RECOLOUR, OPTIONS(1), 0x01, 00, NDF_END }; @@ -238,8 +239,8 @@ #define GROUNDVEHICLE MASK(TRAIN) | MASK(ROADVEH) #define VEHICLE MASK(TRAIN) | MASK(ROADVEH) | MASK(SHIP) | MASK(AIRCRAFT) static const unsigned char _datcallbacks[]={ -NDF_HEADER(0x05, 23), -/* Count: */ W(0x160), +NDF_HEADER(0x05, 24), +/* Count: */ W(0x161), /* 00*/ NONE, NONE, NONE, NONE, NONE, NONE, NONE, NONE, NONE, NONE, NONE, NONE, NONE, NONE, NONE, NONE, /* 10*/ GROUNDVEHICLE | MASK(SHIP), GROUNDVEHICLE, VEHICLE, STATION, STATION, VEHICLE, GROUNDVEHICLE, HOUSE, /* 18*/ MASK(STATION) | VEHICLE, VEHICLE, HOUSE, HOUSE, HOUSE, TRAIN, HOUSE, HOUSE, @@ -267,6 +268,7 @@ /*148*/ HOUSE, STATION, INDUSTRY, INDUSTRY, INDUSTRY, HOUSE, HOUSE, HOUSE, /*150*/ AIRTILE, NONE, AIRTILE, AIRTILE, AIRTILE, AIRPORT, AIRPORT, OBJECT, /*158*/ OBJECT, OBJECT, OBJECT, OBJECT, OBJECT, OBJECT, VEHICLE, INDUSTRY, +/*160*/ VEHICLE, NDF_END }; #undef W @@ -298,7 +300,7 @@ * * Names of languages by ID (empty if not defined), each terminated by newline */ -static const char _datlangs[]="\x00\x07" +static const char _datlangs[]="\x00\x08" // x0/x4/x8/xC x1/x5/x9/xD x2/x6/xA/xE x3/x7/xB/xF /*0x*/ "American\n" "English\n" "German\n" "French\n" /*0x*/ "Spanish\n" "Esperanto\n" "Ido\n" "Russian\n" @@ -331,7 +333,7 @@ /*5x*/ "Urdu\n" "\n" "\n" "\n" // x0/x4/x8/xC x1/x5/x9/xD x2/x6/xA/xE x3/x7/xB/xF /*6x*/ "\n" "Hebrew\n" "Persian\n" "\n" -/*6x*/ "\n" "\n" "\n" "\n" +/*6x*/ "\n" "\n" "Latin\n" "\n" /*6x*/ "\n" "\n" "\n" "\n" /*6x*/ "\n" "\n" "\n" "\n" // x0/x4/x8/xC x1/x5/x9/xD x2/x6/xA/xE x3/x7/xB/xF diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grfcodec-6.0.4/src/grfcodec.cpp new/grfcodec-6.0.6/src/grfcodec.cpp --- old/grfcodec-6.0.4/src/grfcodec.cpp 2014-03-31 20:15:29.000000000 +0200 +++ new/grfcodec-6.0.6/src/grfcodec.cpp 2015-05-09 12:59:46.000000000 +0200 @@ -913,7 +913,7 @@ char directory[MAXDIR]; char *grffile = NULL; int action = 0; - int width = 800, height = -1, box = 16, compress = 1; + int width = 800, height = 16000, box = 16, compress = 1; U8 *palette = NULL; int *colourmap = NULL; int useplaintext = 1; @@ -945,10 +945,10 @@ printf("%s\n", version); return 0; case 'w': - width = min(max(atoi(optarg), 0), 65535); + width = min(max(atoi(optarg), 16), 65535); break; case 'h': - height = min(max(atoi(optarg), 0), 65535); + height = min(max(atoi(optarg), 16), 65535); break; case 'b': box = atoi(optarg); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grfcodec-6.0.4/src/info.cpp new/grfcodec-6.0.6/src/info.cpp --- old/grfcodec-6.0.4/src/info.cpp 2012-09-21 21:55:18.000000000 +0200 +++ new/grfcodec-6.0.6/src/info.cpp 2015-05-09 12:59:46.000000000 +0200 @@ -38,7 +38,7 @@ int infover; imgfile = NULL; - imgname = NULL; + imgname = ""; getline(f,buffer); // read first line, a comment @@ -92,19 +92,19 @@ void inforeader::PrepareReal(const SpriteInfo&info){ int oldy=inf.ypos; inf=info; - if ( inf.forcereopen || !imgfile || !imgname || (stricmp(inf.name.c_str(), imgname) != 0) || oldy > inf.ypos) { + if ( inf.forcereopen || !imgfile || inf.name != imgname || oldy > inf.ypos) { // new file delete imgfile; - imgname = inf.name.c_str(); + imgname = inf.name; if (_interactive) { - printf("Loading %s\n", imgname); + printf("Loading %s\n", imgname.c_str()); } imgfile = MakeReader(); if (!imgfile) { - printf("\nError: can't open %s\n", imgname); + printf("\nError: can't open %s\n", imgname.c_str()); exit(2); } @@ -124,12 +124,12 @@ pcxread* inforeader::MakeReader()const{ #ifdef WITH_PNG - if(toupper(imgname[strlen(imgname)-1])=='X')//pcx - return new pcxread(new singlefile(imgname, "rb", NULL)); + if(toupper(imgname[imgname.length()-1])=='X')//pcx + return new pcxread(new singlefile(imgname.c_str(), "rb", NULL)); else //png - return new pngread(new singlefile(imgname, "rb", NULL)); + return new pngread(new singlefile(imgname.c_str(), "rb", NULL)); #else - return new pcxread(new singlefile(imgname, "rb", NULL)); + return new pcxread(new singlefile(imgname.c_str(), "rb", NULL)); #endif } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grfcodec-6.0.4/src/info.h new/grfcodec-6.0.6/src/info.h --- old/grfcodec-6.0.4/src/info.h 2012-09-21 21:55:18.000000000 +0200 +++ new/grfcodec-6.0.6/src/info.h 2015-05-09 12:59:46.000000000 +0200 @@ -3,6 +3,7 @@ #include <stdio.h> +#include <string> #include "pcxsprit.h" #include "pngsprit.h" @@ -29,7 +30,7 @@ protected: - const char *imgname; + string imgname; int *colourmap; AllocArray<Sprite> nfofile; private: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grfcodec-6.0.4/src/path.cpp new/grfcodec-6.0.6/src/path.cpp --- old/grfcodec-6.0.4/src/path.cpp 2012-09-21 21:55:18.000000000 +0200 +++ new/grfcodec-6.0.6/src/path.cpp 2016-06-27 21:03:46.000000000 +0200 @@ -116,10 +116,10 @@ Wrk++; if (*++pB) Ret |= FILENAME; - safestrncpy(nameP, pB, MAXFILE); - *pB-- = 0; - if (*pB == 0 || (*pB == ':' && pB == &buf[2])) - break; + safestrncpy(nameP, pB, MAXFILE); + *pB-- = 0; + if (*pB == 0 || (*pB == ':' && pB == &buf[2])) + break; } continue; case '*' : diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grfcodec-6.0.4/src/pseudo.cpp new/grfcodec-6.0.6/src/pseudo.cpp --- old/grfcodec-6.0.4/src/pseudo.cpp 2014-03-31 20:15:29.000000000 +0200 +++ new/grfcodec-6.0.6/src/pseudo.cpp 2016-06-27 21:03:46.000000000 +0200 @@ -35,8 +35,6 @@ #include <boost/tokenizer.hpp> using namespace boost::gregorian; -using namespace boost::lambda; -using namespace boost; #define foreach BOOST_FOREACH using namespace std; @@ -405,7 +403,8 @@ return*this; } PseudoSprite&PseudoSprite::SetNoEol(uint i){ - if(GetState(LINEBREAKS))beauty[i]|=NOBREAK;return*this; + if(GetState(LINEBREAKS))beauty[i]|=NOBREAK; + return*this; } PseudoSprite&PseudoSprite::SetGRFID(uint i){ @@ -716,7 +715,7 @@ sections.push_back(Tokenize(line, '\t')); // Count the columns - uint columns = (uint)max_element(sections.begin(),sections.end(), bind(&vector<string>::size,_1) < bind(&vector<string>::size,_2))->size(); + uint columns = (uint)max_element(sections.begin(),sections.end(), boost::lambda::bind(&vector<string>::size,boost::lambda::_1) < boost::lambda::bind(&vector<string>::size,boost::lambda::_2))->size(); // For each column, for(uint i=0;i<columns;i++){ @@ -731,7 +730,7 @@ // Tabs are expanded, write each line foreach(const vector<string>&line, sections) - for_each(line.begin(),line.end(),out<<_1)('\n'); + for_each(line.begin(),line.end(),out<<boost::lambda::_1)('\n'); }else out<<buffer;
