Skip to content

Instantly share code, notes, and snippets.

@btel

btel/inkscape_clang_patch

Created November 7, 2013 23:43
Show Gist options

  • Select an option

    Learn more about clone URLs
  • Save btel/7363828 to your computer and use it in GitHub Desktop.

Select an option

Learn more about clone URLs
Save btel/7363828 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
inkscape_clang_patch
Only in inkscape-0.48.4-patched/: patch-clang.diff
diff -crB inkscape-0.48.4/src/2geom/sbasis.h inkscape-0.48.4-patched/src/2geom/sbasis.h
*** inkscape-0.48.4/src/2geom/sbasis.h Fri Jul 8 20:25:09 2011
--- inkscape-0.48.4-patched/src/2geom/sbasis.h Fri Nov 8 00:42:01 2013
***************
*** 75,84 ****
return d[i];
}
Linear& operator[](unsigned i) { return d.at(i); }
! Linear const* begin() const { return (Linear const*)&*d.begin();}
! Linear const* end() const { return (Linear const*)&*d.end();}
! Linear* begin() { return (Linear*)&*d.begin();}
! Linear* end() { return (Linear*)&*d.end();}
bool empty() const {return d.empty();}
Linear &back() {return d.back();}
Linear const &back() const {return d.back();}
--- 75,92 ----
return d[i];
}
Linear& operator[](unsigned i) { return d.at(i); }
!
! //Linear const* begin() const { return (Linear const*)&*d.begin();}
! //Linear const* end() const { return (Linear const*)&*d.end();}
! //Linear* begin() { return (Linear*)&*d.begin();}
! //Linear* end() { return (Linear*)&*d.end();}
!
! std::vector<Linear>::const_iterator begin() const { return d.begin(); }
! std::vector<Linear>::const_iterator end() const { return d.end(); }
!
! std::vector<Linear>::iterator begin() { return d.begin(); }
! std::vector<Linear>::iterator end() { return d.end(); }
!
bool empty() const {return d.empty();}
Linear &back() {return d.back();}
Linear const &back() const {return d.back();}
***************
*** 87,93 ****
void resize(unsigned n, Linear const& l) { d.resize(n, l);}
void reserve(unsigned n) { d.reserve(n);}
void clear() {d.clear();}
! void insert(Linear* before, const Linear* src_begin, const Linear* src_end) { d.insert(std::vector<Linear>::iterator(before), src_begin, src_end);}
//void insert(Linear* aa, Linear* bb, Linear* cc} { d.insert(aa, bb, cc);}
Linear& at(unsigned i) { return d.at(i);}
//void insert(Linear* before, int& n, Linear const &l) { d.insert(std::vector<Linear>::iterator(before), n, l);}
--- 95,105 ----
void resize(unsigned n, Linear const& l) { d.resize(n, l);}
void reserve(unsigned n) { d.reserve(n);}
void clear() {d.clear();}
!
! void insert(std::vector<Linear>::iterator before, std::vector<Linear>::const_iterator src_begin, std::vector<Linear>::const_iterator src_end) {
! d.insert(before, src_begin, src_end);
! }
!
//void insert(Linear* aa, Linear* bb, Linear* cc} { d.insert(aa, bb, cc);}
Linear& at(unsigned i) { return d.at(i);}
//void insert(Linear* before, int& n, Linear const &l) { d.insert(std::vector<Linear>::iterator(before), n, l);}
***************
*** 283,289 ****
inline SBasis truncate(SBasis const &a, unsigned terms) {
SBasis c;
! c.insert(c.begin(), a.begin(), a.begin() + std::min(terms, (unsigned)a.size()));
return c;
}
--- 295,307 ----
inline SBasis truncate(SBasis const &a, unsigned terms) {
SBasis c;
!
! std::vector<Linear>::const_iterator e = a.begin();
! std::advance(e, std::min(terms, (unsigned)a.size()));
!
! //c.insert(c.begin(), a.begin(), a.begin() + std::min(terms, (unsigned)a.size()));
! c.insert(c.begin(), a.begin(), e);
!
return c;
}
diff -crB inkscape-0.48.4/src/color-profile.cpp inkscape-0.48.4-patched/src/color-profile.cpp
*** inkscape-0.48.4/src/color-profile.cpp Sun Feb 19 02:41:36 2012
--- inkscape-0.48.4-patched/src/color-profile.cpp Fri Nov 8 00:42:01 2013
***************
*** 641,649 ****
cmsUInt8Number outofgamut = 0;
guchar check_color[4] = {
! SP_RGBA32_R_U(val),
! SP_RGBA32_G_U(val),
! SP_RGBA32_B_U(val),
255};
cmsDoTransform(ColorProfile::getTransfGamutCheck(), &check_color, &outofgamut, 1);
--- 641,649 ----
cmsUInt8Number outofgamut = 0;
guchar check_color[4] = {
! static_cast<guchar>(SP_RGBA32_R_U(val)),
! static_cast<guchar>(SP_RGBA32_G_U(val)),
! static_cast<guchar>(SP_RGBA32_B_U(val)),
255};
cmsDoTransform(ColorProfile::getTransfGamutCheck(), &check_color, &outofgamut, 1);
Only in inkscape-0.48.4-patched/src: color-profile.cpp.orig
diff -crB inkscape-0.48.4/src/dom/io/uristream.cpp inkscape-0.48.4-patched/src/dom/io/uristream.cpp
*** inkscape-0.48.4/src/dom/io/uristream.cpp Fri Jul 8 20:25:09 2011
--- inkscape-0.48.4-patched/src/dom/io/uristream.cpp Fri Nov 8 00:42:01 2013
***************
*** 116,122 ****
/**
*
*/
! UriInputStream::~UriInputStream() throw(StreamException)
{
close();
}
--- 116,122 ----
/**
*
*/
! UriInputStream::~UriInputStream()
{
close();
}
***************
*** 240,246 ****
/**
*
*/
! UriReader::~UriReader() throw (StreamException)
{
delete inputStream;
}
--- 240,246 ----
/**
*
*/
! UriReader::~UriReader()
{
delete inputStream;
}
***************
*** 328,334 ****
/**
*
*/
! UriOutputStream::~UriOutputStream() throw(StreamException)
{
close();
}
--- 328,334 ----
/**
*
*/
! UriOutputStream::~UriOutputStream()
{
close();
}
***************
*** 445,451 ****
/**
*
*/
! UriWriter::~UriWriter() throw (StreamException)
{
delete outputStream;
}
--- 445,451 ----
/**
*
*/
! UriWriter::~UriWriter()
{
delete outputStream;
}
diff -crB inkscape-0.48.4/src/dom/io/uristream.h inkscape-0.48.4-patched/src/dom/io/uristream.h
*** inkscape-0.48.4/src/dom/io/uristream.h Fri Jul 8 20:25:09 2011
--- inkscape-0.48.4-patched/src/dom/io/uristream.h Fri Nov 8 00:42:01 2013
***************
*** 67,73 ****
UriInputStream(const URI &source) throw(StreamException);
! virtual ~UriInputStream() throw(StreamException);
virtual int available() throw(StreamException);
--- 67,73 ----
UriInputStream(const URI &source) throw(StreamException);
! virtual ~UriInputStream();
virtual int available() throw(StreamException);
***************
*** 108,114 ****
UriReader(const URI &source) throw(StreamException);
! virtual ~UriReader() throw(StreamException);
virtual int available() throw(StreamException);
--- 108,114 ----
UriReader(const URI &source) throw(StreamException);
! virtual ~UriReader();
virtual int available() throw(StreamException);
***************
*** 140,146 ****
UriOutputStream(const URI &destination) throw(StreamException);
! virtual ~UriOutputStream() throw(StreamException);
virtual void close() throw(StreamException);
--- 140,146 ----
UriOutputStream(const URI &destination) throw(StreamException);
! virtual ~UriOutputStream();
virtual void close() throw(StreamException);
***************
*** 181,187 ****
UriWriter(const URI &source) throw(StreamException);
! virtual ~UriWriter() throw(StreamException);
virtual void close() throw(StreamException);
--- 181,187 ----
UriWriter(const URI &source) throw(StreamException);
! virtual ~UriWriter();
virtual void close() throw(StreamException);
diff -crB inkscape-0.48.4/src/dom/svgimpl.cpp inkscape-0.48.4-patched/src/dom/svgimpl.cpp
*** inkscape-0.48.4/src/dom/svgimpl.cpp Fri Jul 8 20:25:09 2011
--- inkscape-0.48.4-patched/src/dom/svgimpl.cpp Fri Nov 8 00:42:01 2013
***************
*** 119,125 ****
{ "SVGUnitTypes", SVG_UNIT_TYPES },
{ "SVGURIReference", SVG_URI_REFERENCE },
{ "SVGViewSpec", SVG_VIEW_SPEC },
! { "SVGZoomAndPan", SVG_ZOOM_AND_PAN }
};
--- 119,125 ----
{ "SVGUnitTypes", SVG_UNIT_TYPES },
{ "SVGURIReference", SVG_URI_REFERENCE },
{ "SVGViewSpec", SVG_VIEW_SPEC },
! { "SVGZoomAndPan", static_cast<int>(SVG_ZOOM_AND_PAN)}
};
diff -crB inkscape-0.48.4/src/io/inkjar.cpp inkscape-0.48.4-patched/src/io/inkjar.cpp
*** inkscape-0.48.4/src/io/inkjar.cpp Tue Feb 14 04:22:17 2012
--- inkscape-0.48.4-patched/src/io/inkjar.cpp Fri Nov 8 00:42:01 2013
***************
*** 68,74 ****
{
_filename = g_strdup(new_filename);
_last_filename = NULL;
! fd = -1;
}
//fixme: the following should probably just return a const gchar* and not
--- 68,75 ----
{
_filename = g_strdup(new_filename);
_last_filename = NULL;
! //fd = -1;
! fd=NULL;
}
//fixme: the following should probably just return a const gchar* and not
***************
*** 102,110 ****
return true;
}
bool JarFile::open()
{
! if ((fd = ::open(_filename, O_RDONLY)) < 0) {
fprintf(stderr, "open failed.\n");
return false;
}
--- 103,113 ----
return true;
}
+ #include <cstdio>
+
bool JarFile::open()
{
! if ((fd = fopen(_filename, O_RDONLY)) < 0) {
fprintf(stderr, "open failed.\n");
return false;
}
***************
*** 116,122 ****
bool JarFile::close()
{
! if (fd >= 0 && !::close(fd)) {
inflateEnd(&_zs);
return true;
}
--- 119,125 ----
bool JarFile::close()
{
! if (fd >= 0 && !fclose(fd)) {
inflateEnd(&_zs);
return true;
}
***************
*** 256,262 ****
if (method == 8 || flags & 0x0008) {
unsigned int file_length = 0;//uncompressed file length
! lseek(fd, eflen, SEEK_CUR);
guint8 *file_data = get_compressed_file(compressed_size, file_length,
crc, flags);
if (file_data == NULL) {
--- 259,265 ----
if (method == 8 || flags & 0x0008) {
unsigned int file_length = 0;//uncompressed file length
! fseek(fd, eflen, SEEK_CUR);
guint8 *file_data = get_compressed_file(compressed_size, file_length,
crc, flags);
if (file_data == NULL) {
***************
*** 274,280 ****
}
g_byte_array_append(gba, file_data, compressed_size);
} else {
! lseek(fd, compressed_size+eflen, SEEK_CUR);
g_byte_array_free(gba, FALSE);
return NULL;
}
--- 277,283 ----
}
g_byte_array_append(gba, file_data, compressed_size);
} else {
! fseek(fd, compressed_size+eflen, SEEK_CUR);
g_byte_array_free(gba, FALSE);
return NULL;
}
***************
*** 313,320 ****
std::printf("%d bytes written\n", out_a);
#endif
}
- lseek(fd, eflen, SEEK_CUR);
g_free(bytes);
if (!check_crc(crc, crc2, flags)) {
bytes = gba->data;
--- 316,323 ----
std::printf("%d bytes written\n", out_a);
#endif
}
g_free(bytes);
+ fseek(fd, eflen, SEEK_CUR);
if (!check_crc(crc, crc2, flags)) {
bytes = gba->data;
***************
*** 328,334 ****
int JarFile::read(guint8 *buf, int count)
{
int nbytes;
! if ((nbytes = ::read(fd, buf, count)) != count) {
fprintf(stderr, "read error\n");
exit(1);
return 0;
--- 331,338 ----
int JarFile::read(guint8 *buf, int count)
{
int nbytes;
! //if ((nbytes = ::read(fd, buf, count)) != count) {
! if ((nbytes = fread(buf, 1, count, fd)) != count) {
fprintf(stderr, "read error\n");
exit(1);
return 0;
***************
*** 357,365 ****
if (!_zs.avail_in) {
! if ((nbytes = ::read(fd, in_buffer,
(leftover_in < RDSZ ? leftover_in : RDSZ)))
< 0) {
fprintf(stderr, "jarfile read error");
}
_zs.avail_in = nbytes;
--- 361,372 ----
if (!_zs.avail_in) {
! /*if ((nbytes = ::read(fd, in_buffer,
(leftover_in < RDSZ ? leftover_in : RDSZ)))
< 0) {
+ */
+ if ((nbytes = fread(in_buffer, 1, (leftover_in < RDSZ ? leftover_in : RDSZ), fd))
+ < 0) {
fprintf(stderr, "jarfile read error");
}
_zs.avail_in = nbytes;
***************
*** 537,543 ****
}
}
} else if (gba->len > 0)
! ::write(1, gba->data, gba->len);
else
break;
}
--- 544,551 ----
}
}
} else if (gba->len > 0)
! //::write(1, gba->data, gba->len);
! fwrite(gba->data, 1, gba-len, stdout);
else
break;
}
diff -crB inkscape-0.48.4/src/io/inkjar.h inkscape-0.48.4-patched/src/io/inkjar.h
*** inkscape-0.48.4/src/io/inkjar.h Tue Feb 14 04:22:17 2012
--- inkscape-0.48.4-patched/src/io/inkjar.h Fri Nov 8 00:42:01 2013
***************
*** 27,32 ****
--- 27,33 ----
#endif
#include <glib.h>
+ #include <stdio.h>
namespace Inkjar {
***************
*** 91,97 ****
class JarFile {
public:
! JarFile() : fd(-1), _filename(NULL), _last_filename(NULL) {}
virtual ~JarFile();
JarFile(gchar const *new_filename);
--- 92,98 ----
class JarFile {
public:
! JarFile() : fd(NULL), _filename(NULL), _last_filename(NULL) {}
virtual ~JarFile();
JarFile(gchar const *new_filename);
***************
*** 106,112 ****
private:
! int fd;
gchar *_filename;
z_stream _zs;
gchar *_last_filename;
--- 107,114 ----
private:
! // int fd;
! FILE* fd;
gchar *_filename;
z_stream _zs;
gchar *_last_filename;
diff -crB inkscape-0.48.4/src/io/uristream.cpp inkscape-0.48.4-patched/src/io/uristream.cpp
*** inkscape-0.48.4/src/io/uristream.cpp Fri Jul 8 20:25:09 2011
--- inkscape-0.48.4-patched/src/io/uristream.cpp Fri Nov 8 00:42:01 2013
***************
*** 104,110 ****
*
*/
UriInputStream::UriInputStream(Inkscape::URI &source)
! throw (StreamException): uri(source)
{
//get information from uri
char const *schemestr = uri.getScheme();
--- 104,110 ----
*
*/
UriInputStream::UriInputStream(Inkscape::URI &source)
! : uri(source)
{
//get information from uri
char const *schemestr = uri.getScheme();
***************
*** 146,152 ****
*
*/
UriInputStream::UriInputStream(FILE *source, Inkscape::URI &uri)
! throw (StreamException): inf(source),
uri(uri)
{
scheme = SCHEME_FILE;
--- 146,152 ----
*
*/
UriInputStream::UriInputStream(FILE *source, Inkscape::URI &uri)
! : inf(source),
uri(uri)
{
scheme = SCHEME_FILE;
***************
*** 160,166 ****
/**
*
*/
! UriInputStream::~UriInputStream() throw(StreamException)
{
close();
}
--- 160,166 ----
/**
*
*/
! UriInputStream::~UriInputStream()
{
close();
}
***************
*** 170,176 ****
* this input stream without blocking by the next caller of a method for
* this input stream.
*/
! int UriInputStream::available() throw(StreamException)
{
return 0;
}
--- 170,176 ----
* this input stream without blocking by the next caller of a method for
* this input stream.
*/
! int UriInputStream::available()
{
return 0;
}
***************
*** 180,186 ****
* Closes this input stream and releases any system resources
* associated with the stream.
*/
! void UriInputStream::close() throw(StreamException)
{
if (closed)
return;
--- 180,186 ----
* Closes this input stream and releases any system resources
* associated with the stream.
*/
! void UriInputStream::close()
{
if (closed)
return;
***************
*** 207,213 ****
/**
* Reads the next byte of data from the input stream. -1 if EOF
*/
! int UriInputStream::get() throw(StreamException)
{
int retVal = -1;
if (!closed)
--- 207,213 ----
/**
* Reads the next byte of data from the input stream. -1 if EOF
*/
! int UriInputStream::get()
{
int retVal = -1;
if (!closed)
***************
*** 249,255 ****
*
*/
UriReader::UriReader(Inkscape::URI &uri)
- throw (StreamException)
{
inputStream = new UriInputStream(uri);
}
--- 249,254 ----
***************
*** 257,263 ****
/**
*
*/
! UriReader::~UriReader() throw (StreamException)
{
delete inputStream;
}
--- 256,262 ----
/**
*
*/
! UriReader::~UriReader()
{
delete inputStream;
}
***************
*** 265,271 ****
/**
*
*/
! int UriReader::available() throw(StreamException)
{
return inputStream->available();
}
--- 264,270 ----
/**
*
*/
! int UriReader::available()
{
return inputStream->available();
}
***************
*** 273,279 ****
/**
*
*/
! void UriReader::close() throw(StreamException)
{
inputStream->close();
}
--- 272,278 ----
/**
*
*/
! void UriReader::close()
{
inputStream->close();
}
***************
*** 281,287 ****
/**
*
*/
! gunichar UriReader::get() throw(StreamException)
{
gunichar ch = (gunichar)inputStream->get();
return ch;
--- 280,286 ----
/**
*
*/
! gunichar UriReader::get()
{
gunichar ch = (gunichar)inputStream->get();
return ch;
***************
*** 296,302 ****
* Temporary kludge
*/
UriOutputStream::UriOutputStream(FILE* fp, Inkscape::URI &destination)
! throw (StreamException): closed(false),
ownsFile(false),
outf(fp),
uri(destination),
--- 295,301 ----
* Temporary kludge
*/
UriOutputStream::UriOutputStream(FILE* fp, Inkscape::URI &destination)
! : closed(false),
ownsFile(false),
outf(fp),
uri(destination),
***************
*** 312,318 ****
*
*/
UriOutputStream::UriOutputStream(Inkscape::URI &destination)
! throw (StreamException): closed(false),
ownsFile(true),
outf(NULL),
uri(destination),
--- 311,317 ----
*
*/
UriOutputStream::UriOutputStream(Inkscape::URI &destination)
! : closed(false),
ownsFile(true),
outf(NULL),
uri(destination),
***************
*** 353,359 ****
/**
*
*/
! UriOutputStream::~UriOutputStream() throw(StreamException)
{
close();
}
--- 352,358 ----
/**
*
*/
! UriOutputStream::~UriOutputStream()
{
close();
}
***************
*** 362,368 ****
* Closes this output stream and releases any system resources
* associated with this stream.
*/
! void UriOutputStream::close() throw(StreamException)
{
if (closed)
return;
--- 361,367 ----
* Closes this output stream and releases any system resources
* associated with this stream.
*/
! void UriOutputStream::close()
{
if (closed)
return;
***************
*** 391,397 ****
* Flushes this output stream and forces any buffered output
* bytes to be written out.
*/
! void UriOutputStream::flush() throw(StreamException)
{
if (closed)
return;
--- 390,396 ----
* Flushes this output stream and forces any buffered output
* bytes to be written out.
*/
! void UriOutputStream::flush()
{
if (closed)
return;
***************
*** 415,421 ****
/**
* Writes the specified byte to this output stream.
*/
! void UriOutputStream::put(int ch) throw(StreamException)
{
if (closed)
return;
--- 414,420 ----
/**
* Writes the specified byte to this output stream.
*/
! void UriOutputStream::put(int ch)
{
if (closed)
return;
***************
*** 453,459 ****
*
*/
UriWriter::UriWriter(Inkscape::URI &uri)
- throw (StreamException)
{
outputStream = new UriOutputStream(uri);
}
--- 452,457 ----
***************
*** 461,467 ****
/**
*
*/
! UriWriter::~UriWriter() throw (StreamException)
{
delete outputStream;
}
--- 459,465 ----
/**
*
*/
! UriWriter::~UriWriter()
{
delete outputStream;
}
***************
*** 469,475 ****
/**
*
*/
! void UriWriter::close() throw(StreamException)
{
outputStream->close();
}
--- 467,473 ----
/**
*
*/
! void UriWriter::close()
{
outputStream->close();
}
***************
*** 477,483 ****
/**
*
*/
! void UriWriter::flush() throw(StreamException)
{
outputStream->flush();
}
--- 475,481 ----
/**
*
*/
! void UriWriter::flush()
{
outputStream->flush();
}
***************
*** 485,491 ****
/**
*
*/
! void UriWriter::put(gunichar ch) throw(StreamException)
{
int ich = (int)ch;
outputStream->put(ich);
--- 483,489 ----
/**
*
*/
! void UriWriter::put(gunichar ch)
{
int ich = (int)ch;
outputStream->put(ich);
diff -crB inkscape-0.48.4/src/io/uristream.h inkscape-0.48.4-patched/src/io/uristream.h
*** inkscape-0.48.4/src/io/uristream.h Fri Jul 8 20:25:09 2011
--- inkscape-0.48.4-patched/src/io/uristream.h Fri Nov 8 00:42:01 2013
***************
*** 35,51 ****
{
public:
! UriInputStream(FILE *source, Inkscape::URI &uri) throw(StreamException);
! UriInputStream(Inkscape::URI &source) throw(StreamException);
! virtual ~UriInputStream() throw(StreamException);
! virtual int available() throw(StreamException);
! virtual void close() throw(StreamException);
! virtual int get() throw(StreamException);
private:
--- 35,51 ----
{
public:
! UriInputStream(FILE *source, Inkscape::URI &uri);
! UriInputStream(Inkscape::URI &source);
! virtual ~UriInputStream();
! virtual int available();
! virtual void close();
! virtual int get();
private:
***************
*** 74,88 ****
public:
! UriReader(Inkscape::URI &source) throw(StreamException);
! virtual ~UriReader() throw(StreamException);
! virtual int available() throw(StreamException);
! virtual void close() throw(StreamException);
! virtual gunichar get() throw(StreamException);
private:
--- 74,88 ----
public:
! UriReader(Inkscape::URI &source);
! virtual ~UriReader();
! virtual int available();
! virtual void close();
! virtual gunichar get();
private:
***************
*** 106,122 ****
public:
! UriOutputStream(FILE *fp, Inkscape::URI &destination) throw(StreamException);
! UriOutputStream(Inkscape::URI &destination) throw(StreamException);
! virtual ~UriOutputStream() throw(StreamException);
! virtual void close() throw(StreamException);
! virtual void flush() throw(StreamException);
! virtual void put(int ch) throw(StreamException);
private:
--- 106,122 ----
public:
! UriOutputStream(FILE *fp, Inkscape::URI &destination);
! UriOutputStream(Inkscape::URI &destination);
! virtual ~UriOutputStream();
! virtual void close();
! virtual void flush();
! virtual void put(int ch);
private:
***************
*** 145,159 ****
public:
! UriWriter(Inkscape::URI &source) throw(StreamException);
! virtual ~UriWriter() throw(StreamException);
! virtual void close() throw(StreamException);
! virtual void flush() throw(StreamException);
! virtual void put(gunichar ch) throw(StreamException);
private:
--- 145,159 ----
public:
! UriWriter(Inkscape::URI &source);
! virtual ~UriWriter();
! virtual void close();
! virtual void flush();
! virtual void put(gunichar ch);
private:
diff -crB inkscape-0.48.4/src/io/xsltstream.cpp inkscape-0.48.4-patched/src/io/xsltstream.cpp
*** inkscape-0.48.4/src/io/xsltstream.cpp Fri Jul 8 20:25:09 2011
--- inkscape-0.48.4-patched/src/io/xsltstream.cpp Fri Nov 8 00:42:01 2013
***************
*** 30,36 ****
*
*/
XsltStyleSheet::XsltStyleSheet(InputStream &xsltSource)
- throw (StreamException)
: stylesheet(NULL)
{
if (!read(xsltSource)) {
--- 30,35 ----
***************
*** 86,92 ****
*
*/
XsltInputStream::XsltInputStream(InputStream &xmlSource, XsltStyleSheet &sheet)
- throw (StreamException)
: BasicInputStream(xmlSource), stylesheet(sheet)
{
//Load the data
--- 85,90 ----
***************
*** 110,116 ****
/**
*
*/
! XsltInputStream::~XsltInputStream() throw (StreamException)
{
xmlFree(outbuf);
}
--- 108,114 ----
/**
*
*/
! XsltInputStream::~XsltInputStream()
{
xmlFree(outbuf);
}
***************
*** 120,126 ****
* this input stream without blocking by the next caller of a method for
* this input stream.
*/
! int XsltInputStream::available() throw (StreamException)
{
return outsize - outpos;
}
--- 118,124 ----
* this input stream without blocking by the next caller of a method for
* this input stream.
*/
! int XsltInputStream::available()
{
return outsize - outpos;
}
***************
*** 130,136 ****
* Closes this input stream and releases any system resources
* associated with the stream.
*/
! void XsltInputStream::close() throw (StreamException)
{
closed = true;
}
--- 128,134 ----
* Closes this input stream and releases any system resources
* associated with the stream.
*/
! void XsltInputStream::close()
{
closed = true;
}
***************
*** 138,144 ****
/**
* Reads the next byte of data from the input stream. -1 if EOF
*/
! int XsltInputStream::get() throw (StreamException)
{
if (closed)
return -1;
--- 136,142 ----
/**
* Reads the next byte of data from the input stream. -1 if EOF
*/
! int XsltInputStream::get()
{
if (closed)
return -1;
***************
*** 161,167 ****
*
*/
XsltOutputStream::XsltOutputStream(OutputStream &dest, XsltStyleSheet &sheet)
- throw (StreamException)
: BasicOutputStream(dest), stylesheet(sheet)
{
flushed = false;
--- 159,164 ----
***************
*** 170,176 ****
/**
*
*/
! XsltOutputStream::~XsltOutputStream() throw (StreamException)
{
//do not automatically close
}
--- 167,173 ----
/**
*
*/
! XsltOutputStream::~XsltOutputStream()
{
//do not automatically close
}
***************
*** 179,185 ****
* Closes this output stream and releases any system resources
* associated with this stream.
*/
! void XsltOutputStream::close() throw (StreamException)
{
flush();
destination.close();
--- 176,182 ----
* Closes this output stream and releases any system resources
* associated with this stream.
*/
! void XsltOutputStream::close()
{
flush();
destination.close();
***************
*** 189,195 ****
* Flushes this output stream and forces any buffered output
* bytes to be written out.
*/
! void XsltOutputStream::flush() throw (StreamException)
{
if (flushed)
{
--- 186,192 ----
* Flushes this output stream and forces any buffered output
* bytes to be written out.
*/
! void XsltOutputStream::flush()
{
if (flushed)
{
***************
*** 230,236 ****
/**
* Writes the specified byte to this output stream.
*/
! void XsltOutputStream::put(int ch) throw (StreamException)
{
gunichar uch = (gunichar) ch;
outbuf.push_back(uch);
--- 227,233 ----
/**
* Writes the specified byte to this output stream.
*/
! void XsltOutputStream::put(int ch)
{
gunichar uch = (gunichar) ch;
outbuf.push_back(uch);
diff -crB inkscape-0.48.4/src/io/xsltstream.h inkscape-0.48.4-patched/src/io/xsltstream.h
*** inkscape-0.48.4/src/io/xsltstream.h Fri Jul 8 20:25:09 2011
--- inkscape-0.48.4-patched/src/io/xsltstream.h Fri Nov 8 00:42:01 2013
***************
*** 38,44 ****
/**
* Constructor with loading
*/
! XsltStyleSheet(InputStream &source) throw (StreamException);
/**
* Simple constructor, no loading
--- 38,44 ----
/**
* Constructor with loading
*/
! XsltStyleSheet(InputStream &source);
/**
* Simple constructor, no loading
***************
*** 73,88 ****
public:
! XsltInputStream(InputStream &xmlSource, XsltStyleSheet &stylesheet)
! throw (StreamException);
! virtual ~XsltInputStream() throw (StreamException);
! virtual int available() throw (StreamException);
! virtual void close() throw (StreamException);
! virtual int get() throw (StreamException);
private:
--- 73,87 ----
public:
! XsltInputStream(InputStream &xmlSource, XsltStyleSheet &stylesheet);
! virtual ~XsltInputStream();
! virtual int available();
! virtual void close();
! virtual int get();
private:
***************
*** 110,125 ****
public:
! XsltOutputStream(OutputStream &destination, XsltStyleSheet &stylesheet)
! throw (StreamException);
! virtual ~XsltOutputStream() throw (StreamException);
! virtual void close() throw (StreamException);
! virtual void flush() throw (StreamException);
! virtual void put(int ch) throw (StreamException);
private:
--- 109,123 ----
public:
! XsltOutputStream(OutputStream &destination, XsltStyleSheet &stylesheet);
! virtual ~XsltOutputStream();
! virtual void close();
! virtual void flush();
! virtual void put(int ch);
private:
diff -crB inkscape-0.48.4/src/libgdl/gdl-dock-object.h inkscape-0.48.4-patched/src/libgdl/gdl-dock-object.h
*** inkscape-0.48.4/src/libgdl/gdl-dock-object.h Fri Jul 8 20:25:09 2011
--- inkscape-0.48.4-patched/src/libgdl/gdl-dock-object.h Fri Nov 8 00:42:01 2013
***************
*** 215,221 ****
G_STMT_START { \
g_log (G_LOG_DOMAIN, \
G_LOG_LEVEL_DEBUG, \
! "%s:%d (%s) %s [%p %d%s:%d]: "format, \
__FILE__, \
__LINE__, \
__PRETTY_FUNCTION__, \
--- 215,221 ----
G_STMT_START { \
g_log (G_LOG_DOMAIN, \
G_LOG_LEVEL_DEBUG, \
! "%s:%d (%s) %s [%p %d%s:%d]: " format, \
__FILE__, \
__LINE__, \
__PRETTY_FUNCTION__, \
diff -crB inkscape-0.48.4/src/libgdl/gdl-tools.h inkscape-0.48.4-patched/src/libgdl/gdl-tools.h
*** inkscape-0.48.4/src/libgdl/gdl-tools.h Fri Jul 8 20:25:09 2011
--- inkscape-0.48.4-patched/src/libgdl/gdl-tools.h Fri Nov 8 00:42:01 2013
***************
*** 48,54 ****
#define GDL_TRACE_EXTRA(format, args...) G_STMT_START { \
g_log (G_LOG_DOMAIN, \
G_LOG_LEVEL_DEBUG, \
! "file %s: line %d (%s): "format, \
__FILE__, \
__LINE__, \
__PRETTY_FUNCTION__, \
--- 48,54 ----
#define GDL_TRACE_EXTRA(format, args...) G_STMT_START { \
g_log (G_LOG_DOMAIN, \
G_LOG_LEVEL_DEBUG, \
! "file %s: line %d (%s): " format, \
__FILE__, \
__LINE__, \
__PRETTY_FUNCTION__, \
diff -crB inkscape-0.48.4/src/libnrtype/Layout-TNG-OutIter.cpp inkscape-0.48.4-patched/src/libnrtype/Layout-TNG-OutIter.cpp
*** inkscape-0.48.4/src/libnrtype/Layout-TNG-OutIter.cpp Fri Jul 8 20:25:09 2011
--- inkscape-0.48.4-patched/src/libnrtype/Layout-TNG-OutIter.cpp Fri Nov 8 00:42:01 2013
***************
*** 197,203 ****
Layout::iterator Layout::sourceToIterator(void *source_cookie) const
{
! return sourceToIterator(source_cookie, Glib::ustring::const_iterator(std::string::const_iterator(NULL)));
}
Geom::OptRect Layout::glyphBoundingBox(iterator const &it, double *rotation) const
--- 197,219 ----
Layout::iterator Layout::sourceToIterator(void *source_cookie) const
{
! //return sourceToIterator(source_cookie, Glib::ustring::const_iterator(std::string::const_iterator(NULL)));
!
! // simply copied from above... what is an iterator to NULL?
! unsigned source_index;
! if (_characters.empty()) return end();
! for (source_index = 0 ; source_index < _input_stream.size() ; source_index++)
! if (_input_stream[source_index]->source_cookie == source_cookie) break;
! if (source_index == _input_stream.size()) return end();
!
! unsigned char_index = _sourceToCharacter(source_index);
!
! if (_input_stream[source_index]->Type() != TEXT_SOURCE)
! return iterator(this, char_index);
!
! InputStreamTextSource const *text_source = static_cast<InputStreamTextSource const *>(_input_stream[source_index]);
! //if (text_iterator <= text_source->text_begin) return iterator(this, char_index);
! return iterator(this, char_index);
}
Geom::OptRect Layout::glyphBoundingBox(iterator const &it, double *rotation) const
***************
*** 506,523 ****
*source_cookie = stream_item->source_cookie;
if (text_iterator && stream_item->Type() == TEXT_SOURCE) {
InputStreamTextSource const *text_source = static_cast<InputStreamTextSource const *>(stream_item);
! Glib::ustring::const_iterator text_iter_const = text_source->text_begin;
unsigned char_index = it._char_index;
unsigned original_input_source_index = _spans[_characters[char_index].in_span].in_input_stream_item;
// confusing algorithm because the iterator goes forwards while the index goes backwards.
// It's just that it's faster doing it that way
while (char_index && _spans[_characters[char_index - 1].in_span].in_input_stream_item == original_input_source_index) {
! ++text_iter_const;
char_index--;
}
! text_source->text->begin().base() + (text_iter_const.base() - text_source->text->begin().base());
! *text_iterator = Glib::ustring::iterator(std::string::iterator(const_cast<char*>(&*text_source->text->begin().base() + (text_iter_const.base() - text_source->text->begin().base()))));
// the caller owns the string, so they're going to want a non-const iterator
}
}
--- 522,544 ----
*source_cookie = stream_item->source_cookie;
if (text_iterator && stream_item->Type() == TEXT_SOURCE) {
InputStreamTextSource const *text_source = static_cast<InputStreamTextSource const *>(stream_item);
! //Glib::ustring::const_iterator text_iter_const = text_source->text_begin;
! Glib::ustring::iterator text_iter = const_cast<Glib::ustring*>(text_source->text)->begin();
unsigned char_index = it._char_index;
unsigned original_input_source_index = _spans[_characters[char_index].in_span].in_input_stream_item;
// confusing algorithm because the iterator goes forwards while the index goes backwards.
// It's just that it's faster doing it that way
while (char_index && _spans[_characters[char_index - 1].in_span].in_input_stream_item == original_input_source_index) {
! //++text_iter_const;
! ++text_iter;
char_index--;
}
! //text_source->text->begin().base() + (text_iter_const.base() - text_source->text->begin().base());
!
! // FIXME C++11
! //*text_iterator = Glib::ustring::iterator(std::string::iterator(const_cast<char*>(&*text_source->text->begin().base() + (text_iter_const.base() - text_source->text->begin().base()))));
// the caller owns the string, so they're going to want a non-const iterator
+ *text_iterator = text_iter;
}
}
diff -crB inkscape-0.48.4/src/remove-last.h inkscape-0.48.4-patched/src/remove-last.h
*** inkscape-0.48.4/src/remove-last.h Fri Jul 8 20:25:09 2011
--- inkscape-0.48.4-patched/src/remove-last.h Fri Nov 8 00:42:01 2013
***************
*** 12,19 ****
typename vector<T>::reverse_iterator i(find(seq.rbegin(), seq.rend(), elem));
g_assert( i != seq.rend() );
! typename vector<T>::iterator ii(&*i);
! seq.erase(ii);
}
--- 12,20 ----
typename vector<T>::reverse_iterator i(find(seq.rbegin(), seq.rend(), elem));
g_assert( i != seq.rend() );
! //typename vector<T>::iterator ii(&*i);
! //seq.erase(ii);
! seq.erase(i.base());
}
diff -crB inkscape-0.48.4/src/sp-conn-end.cpp inkscape-0.48.4-patched/src/sp-conn-end.cpp
*** inkscape-0.48.4/src/sp-conn-end.cpp Fri Jul 8 20:25:09 2011
--- inkscape-0.48.4-patched/src/sp-conn-end.cpp Fri Nov 8 00:42:01 2013
***************
*** 152,158 ****
// Set sensible values incase there the connector ends are not
// attached to any shapes.
Geom::PathVector conn_pv = path->curve->get_pathvector();
! double endPos[2] = { 0, conn_pv[0].size() };
SPConnEnd** _connEnd = path->connEndPair.getConnEnds();
for (unsigned h = 0; h < 2; ++h) {
--- 152,158 ----
// Set sensible values incase there the connector ends are not
// attached to any shapes.
Geom::PathVector conn_pv = path->curve->get_pathvector();
! double endPos[2] = { 0, static_cast<double>(conn_pv[0].size()) };
SPConnEnd** _connEnd = path->connEndPair.getConnEnds();
for (unsigned h = 0; h < 2; ++h) {
diff -crB inkscape-0.48.4/src/sp-guide.cpp inkscape-0.48.4-patched/src/sp-guide.cpp
*** inkscape-0.48.4/src/sp-guide.cpp Tue Feb 14 04:22:17 2012
--- inkscape-0.48.4-patched/src/sp-guide.cpp Fri Nov 8 00:42:01 2013
***************
*** 281,290 ****
Geom::Point B(C[Geom::X], 0);
Geom::Point D(0, C[Geom::Y]);
! pts.push_back(std::make_pair<Geom::Point, Geom::Point>(A, B));
! pts.push_back(std::make_pair<Geom::Point, Geom::Point>(B, C));
! pts.push_back(std::make_pair<Geom::Point, Geom::Point>(C, D));
! pts.push_back(std::make_pair<Geom::Point, Geom::Point>(D, A));
sp_guide_pt_pairs_to_guides(dt, pts);
--- 281,290 ----
Geom::Point B(C[Geom::X], 0);
Geom::Point D(0, C[Geom::Y]);
! pts.push_back(std::pair<Geom::Point, Geom::Point>(A, B));
! pts.push_back(std::pair<Geom::Point, Geom::Point>(B, C));
! pts.push_back(std::pair<Geom::Point, Geom::Point>(C, D));
! pts.push_back(std::pair<Geom::Point, Geom::Point>(D, A));
sp_guide_pt_pairs_to_guides(dt, pts);
diff -crB inkscape-0.48.4/src/sp-item-rm-unsatisfied-cns.cpp inkscape-0.48.4-patched/src/sp-item-rm-unsatisfied-cns.cpp
*** inkscape-0.48.4/src/sp-item-rm-unsatisfied-cns.cpp Fri Jul 8 20:25:09 2011
--- inkscape-0.48.4-patched/src/sp-item-rm-unsatisfied-cns.cpp Fri Nov 8 00:42:01 2013
***************
*** 24,31 ****
if (!approx_equal( sp_guide_distance_from_pt(cn.g, snappoints[snappoint_ix].getPoint()), 0) ) {
remove_last(cn.g->attached_items, SPGuideAttachment(&item, cn.snappoint_ix));
g_assert( i < item.constraints.size() );
! vector<SPGuideConstraint>::iterator const ei(&item.constraints[i]);
! item.constraints.erase(ei);
}
}
}
--- 24,31 ----
if (!approx_equal( sp_guide_distance_from_pt(cn.g, snappoints[snappoint_ix].getPoint()), 0) ) {
remove_last(cn.g->attached_items, SPGuideAttachment(&item, cn.snappoint_ix));
g_assert( i < item.constraints.size() );
! // vector<SPGuideConstraint>::iterator const ei(&item.constraints[i]);
! // item.constraints.erase(ei);
}
}
}
diff -crB inkscape-0.48.4/src/trace/siox.cpp inkscape-0.48.4-patched/src/trace/siox.cpp
*** inkscape-0.48.4/src/trace/siox.cpp Fri Jul 8 20:25:09 2011
--- inkscape-0.48.4-patched/src/trace/siox.cpp Fri Nov 8 00:42:01 2013
***************
*** 21,26 ****
--- 21,27 ----
#include <stdarg.h>
#include <map>
#include <algorithm>
+ #include <cstdlib>
namespace org
diff -crB inkscape-0.48.4/src/ui/tool/node.h inkscape-0.48.4-patched/src/ui/tool/node.h
*** inkscape-0.48.4/src/ui/tool/node.h Tue Feb 14 04:22:17 2012
--- inkscape-0.48.4-patched/src/ui/tool/node.h Fri Nov 8 00:42:01 2013
***************
*** 16,22 ****
--- 16,26 ----
#include <iosfwd>
#include <stdexcept>
#include <cstddef>
+ #if __cplusplus >= 201103L
+ #include <functional>
+ #else
#include <tr1/functional>
+ #endif
#include <boost/utility.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/optional.hpp>
***************
*** 32,42 ****
--- 36,48 ----
}
}
+ #if __cplusplus < 201103L
namespace std {
namespace tr1 {
template <typename N> struct hash< Inkscape::UI::NodeIterator<N> >;
}
}
+ #endif
namespace Inkscape {
namespace UI {
Only in inkscape-0.48.4-patched/src/ui/tool: node.h.orig
Only in inkscape-0.48.4-patched/src/ui/tool: node.h.rej
diff -crB inkscape-0.48.4/src/widgets/eek-preview.cpp inkscape-0.48.4-patched/src/widgets/eek-preview.cpp
*** inkscape-0.48.4/src/widgets/eek-preview.cpp Fri Jul 8 20:25:09 2011
--- inkscape-0.48.4-patched/src/widgets/eek-preview.cpp Fri Nov 8 00:42:01 2013
***************
*** 235,241 ****
GdkGC *gc = gdk_gc_new( widget->window );
EekPreview* preview = EEK_PREVIEW(widget);
! GdkColor fg = {0, preview->_r, preview->_g, preview->_b};
gdk_colormap_alloc_color( gdk_colormap_get_system(), &fg, FALSE, TRUE );
--- 235,241 ----
GdkGC *gc = gdk_gc_new( widget->window );
EekPreview* preview = EEK_PREVIEW(widget);
! GdkColor fg = {0, static_cast<guint16>(preview->_r), static_cast<guint16>(preview->_g), static_cast<guint16>(preview->_b)};
gdk_colormap_alloc_color( gdk_colormap_get_system(), &fg, FALSE, TRUE );
diff -crB inkscape-0.48.4/src/widgets/sp-color-icc-selector.cpp inkscape-0.48.4-patched/src/widgets/sp-color-icc-selector.cpp
*** inkscape-0.48.4/src/widgets/sp-color-icc-selector.cpp Wed Feb 15 15:44:43 2012
--- inkscape-0.48.4-patched/src/widgets/sp-color-icc-selector.cpp Fri Nov 8 00:42:01 2013
***************
*** 507,515 ****
if ( trans ) {
guint32 val = _color.toRGBA32(0);
guchar pre[4] = {
! SP_RGBA32_R_U(val),
! SP_RGBA32_G_U(val),
! SP_RGBA32_B_U(val),
255};
#ifdef DEBUG_LCMS
g_message("Shoving in [%02x] [%02x] [%02x]", pre[0], pre[1], pre[2]);
--- 507,515 ----
if ( trans ) {
guint32 val = _color.toRGBA32(0);
guchar pre[4] = {
! static_cast<guchar>(SP_RGBA32_R_U(val)),
! static_cast<guchar>(SP_RGBA32_G_U(val)),
! static_cast<guchar>(SP_RGBA32_B_U(val)),
255};
#ifdef DEBUG_LCMS
g_message("Shoving in [%02x] [%02x] [%02x]", pre[0], pre[1], pre[2]);
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment