Commit c17cc0e1 authored by Jonathan Michalon's avatar Jonathan Michalon
Browse files

Revert "LibOVCC: Follow gio binding changes from Valac 0.13.0 and bump version check"

This reverts commit 6dbc562c.
We don't want to switch to 0.13 / 0.14 now as valadoc is not ready.
parent 765e56ab
......@@ -20,7 +20,7 @@ AC_SUBST(ovccincludedir)
# Checks for programs.
AC_PROG_CC
AM_PROG_VALAC([0.13.0])
AM_PROG_VALAC([0.11.1])
AC_PROG_LIBTOOL
OVCC_VALADOC_CHECK([0.2.1])
......
......@@ -263,12 +263,13 @@ namespace OVCC
File file)
throws Error
{
uint8[] data;
string data;
size_t length;
var uri = file.get_uri ();
debug ("Loading tileset file %s...", uri);
file.load_contents (null, out data, null);
var doc = Xml.Parser.read_memory ((string)data, data.length, uri, null,
file.load_contents (null, out data, out length, null);
var doc = Xml.Parser.read_memory (data, (int)length, uri, null,
Xml.ParserOption.DTDVALID |
Xml.ParserOption.PEDANTIC);
if (doc == null) {
......
......@@ -238,12 +238,13 @@ namespace OVCC
public bool load (File file)
throws Error
{
uint8[] data;
string data;
size_t length;
var uri = file.get_uri ();
debug ("""Loading tiles definitions from "%s"...""", uri);
file.load_contents (null, out data, null);
var doc = Xml.Parser.read_memory ((string)data, data.length, uri, null,
file.load_contents (null, out data, out length, null);
var doc = Xml.Parser.read_memory (data, (int)length, uri, null,
Xml.ParserOption.DTDVALID |
Xml.ParserOption.PEDANTIC);
if (doc == null) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment