2006-03-31 12:32:02 +02:00
|
|
|
/*****************************************************************************
|
|
|
|
*
|
|
|
|
* This file is part of Mapnik (c++ mapping toolkit)
|
2005-06-14 17:06:59 +02:00
|
|
|
*
|
2006-03-31 12:32:02 +02:00
|
|
|
* Copyright (C) 2006 Artem Pavlenko
|
2005-06-14 17:06:59 +02:00
|
|
|
*
|
2006-03-31 12:32:02 +02:00
|
|
|
* This library is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
|
|
* License as published by the Free Software Foundation; either
|
|
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This library is distributed in the hope that it will be useful,
|
2005-06-14 17:06:59 +02:00
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
2006-03-31 12:32:02 +02:00
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
* Lesser General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
|
|
* License along with this library; if not, write to the Free Software
|
|
|
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
2005-06-14 17:06:59 +02:00
|
|
|
*
|
2006-03-31 12:32:02 +02:00
|
|
|
*****************************************************************************/
|
2005-06-14 17:06:59 +02:00
|
|
|
|
|
|
|
//$Id: wkb.cpp 19 2005-03-22 13:53:27Z pavlenko $
|
|
|
|
|
2009-07-03 15:29:50 +02:00
|
|
|
#include <mapnik/global.hpp>
|
2006-10-04 13:22:18 +02:00
|
|
|
#include <mapnik/wkb.hpp>
|
|
|
|
#include <mapnik/geom_util.hpp>
|
2007-09-16 13:23:51 +02:00
|
|
|
#include <mapnik/feature.hpp>
|
2009-07-03 15:29:50 +02:00
|
|
|
|
2009-06-29 16:15:31 +02:00
|
|
|
// boost
|
2009-07-03 15:29:50 +02:00
|
|
|
#include <boost/utility.hpp>
|
2009-06-08 09:08:30 +02:00
|
|
|
|
2005-06-14 17:06:59 +02:00
|
|
|
namespace mapnik
|
|
|
|
{
|
2010-06-02 13:03:30 +02:00
|
|
|
struct wkb_reader : boost::noncopyable
|
|
|
|
{
|
|
|
|
private:
|
|
|
|
enum wkbByteOrder {
|
|
|
|
wkbXDR=0,
|
|
|
|
wkbNDR=1
|
|
|
|
};
|
|
|
|
const char* wkb_;
|
|
|
|
unsigned size_;
|
|
|
|
unsigned pos_;
|
|
|
|
wkbByteOrder byteOrder_;
|
|
|
|
bool needSwap_;
|
|
|
|
wkbFormat format_;
|
2009-02-09 20:43:57 +01:00
|
|
|
|
2010-06-02 13:03:30 +02:00
|
|
|
public:
|
|
|
|
|
|
|
|
enum wkbGeometryType {
|
|
|
|
wkbPoint=1,
|
|
|
|
wkbLineString=2,
|
|
|
|
wkbPolygon=3,
|
|
|
|
wkbMultiPoint=4,
|
|
|
|
wkbMultiLineString=5,
|
|
|
|
wkbMultiPolygon=6,
|
|
|
|
wkbGeometryCollection=7
|
|
|
|
};
|
|
|
|
|
2011-09-13 13:54:04 +02:00
|
|
|
wkb_reader(const char* wkb,unsigned size, wkbFormat format)
|
2010-06-02 13:03:30 +02:00
|
|
|
: wkb_(wkb),
|
|
|
|
size_(size),
|
|
|
|
pos_(0),
|
|
|
|
format_(format)
|
|
|
|
{
|
|
|
|
switch (format_)
|
2009-07-03 15:29:50 +02:00
|
|
|
{
|
2010-06-02 13:03:30 +02:00
|
|
|
case wkbSpatiaLite:
|
|
|
|
byteOrder_ = (wkbByteOrder) wkb_[1];
|
|
|
|
pos_ = 39;
|
|
|
|
break;
|
2009-02-10 20:09:16 +01:00
|
|
|
|
2010-06-02 13:03:30 +02:00
|
|
|
case wkbGeneric:
|
|
|
|
default:
|
|
|
|
byteOrder_ = (wkbByteOrder) wkb_[0];
|
|
|
|
pos_ = 1;
|
|
|
|
break;
|
|
|
|
}
|
2009-02-09 20:43:57 +01:00
|
|
|
|
2010-03-08 12:55:15 +01:00
|
|
|
#ifndef MAPNIK_BIG_ENDIAN
|
2010-06-02 13:03:30 +02:00
|
|
|
needSwap_=byteOrder_?wkbXDR:wkbNDR;
|
2010-03-08 12:55:15 +01:00
|
|
|
#else
|
2010-06-02 13:03:30 +02:00
|
|
|
needSwap_=byteOrder_?wkbNDR:wkbXDR;
|
|
|
|
#endif
|
|
|
|
}
|
2005-06-14 17:06:59 +02:00
|
|
|
|
2010-06-02 13:03:30 +02:00
|
|
|
~wkb_reader() {}
|
2005-06-14 17:06:59 +02:00
|
|
|
|
2011-09-13 13:54:04 +02:00
|
|
|
void read_multi(boost::ptr_vector<geometry_type> & paths)
|
2010-06-02 13:03:30 +02:00
|
|
|
{
|
|
|
|
int type=read_integer();
|
|
|
|
switch (type)
|
2009-07-03 15:29:50 +02:00
|
|
|
{
|
2010-06-02 13:03:30 +02:00
|
|
|
case wkbPoint:
|
2011-09-13 13:54:04 +02:00
|
|
|
read_point(paths);
|
2010-06-02 13:03:30 +02:00
|
|
|
break;
|
|
|
|
case wkbLineString:
|
2011-09-13 13:54:04 +02:00
|
|
|
read_linestring(paths);
|
2010-06-02 13:03:30 +02:00
|
|
|
break;
|
|
|
|
case wkbPolygon:
|
2011-09-13 13:54:04 +02:00
|
|
|
read_polygon(paths);
|
2010-06-02 13:03:30 +02:00
|
|
|
break;
|
|
|
|
case wkbMultiPoint:
|
2011-09-13 13:54:04 +02:00
|
|
|
read_multipoint(paths);
|
2010-06-02 13:03:30 +02:00
|
|
|
break;
|
|
|
|
case wkbMultiLineString:
|
2011-09-13 13:54:04 +02:00
|
|
|
read_multilinestring(paths);
|
2010-06-02 13:03:30 +02:00
|
|
|
break;
|
|
|
|
case wkbMultiPolygon:
|
2011-09-13 13:54:04 +02:00
|
|
|
read_multipolygon(paths);
|
2010-06-02 13:03:30 +02:00
|
|
|
break;
|
|
|
|
case wkbGeometryCollection:
|
2011-09-13 13:54:04 +02:00
|
|
|
read_collection(paths);
|
2010-06-02 13:03:30 +02:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
2009-07-03 15:29:50 +02:00
|
|
|
}
|
2010-06-02 13:03:30 +02:00
|
|
|
}
|
2007-11-02 13:50:15 +01:00
|
|
|
|
2011-09-13 13:54:04 +02:00
|
|
|
void read(boost::ptr_vector<geometry_type> & paths)
|
2010-06-02 13:03:30 +02:00
|
|
|
{
|
|
|
|
int type=read_integer();
|
|
|
|
switch (type)
|
2009-07-03 15:29:50 +02:00
|
|
|
{
|
2010-06-02 13:03:30 +02:00
|
|
|
case wkbPoint:
|
2011-09-13 13:54:04 +02:00
|
|
|
read_point(paths);
|
2010-06-02 13:03:30 +02:00
|
|
|
break;
|
|
|
|
case wkbLineString:
|
2011-09-13 13:54:04 +02:00
|
|
|
read_linestring(paths);
|
2010-06-02 13:03:30 +02:00
|
|
|
break;
|
|
|
|
case wkbPolygon:
|
2011-09-13 13:54:04 +02:00
|
|
|
read_polygon(paths);
|
2010-06-02 13:03:30 +02:00
|
|
|
break;
|
|
|
|
case wkbMultiPoint:
|
2011-09-13 13:54:04 +02:00
|
|
|
read_multipoint_2(paths);
|
2010-06-02 13:03:30 +02:00
|
|
|
break;
|
|
|
|
case wkbMultiLineString:
|
2011-09-13 13:54:04 +02:00
|
|
|
read_multilinestring_2(paths);
|
2010-06-02 13:03:30 +02:00
|
|
|
break;
|
|
|
|
case wkbMultiPolygon:
|
2011-09-13 13:54:04 +02:00
|
|
|
read_multipolygon_2(paths);
|
2010-06-02 13:03:30 +02:00
|
|
|
break;
|
|
|
|
case wkbGeometryCollection:
|
2011-09-13 13:54:04 +02:00
|
|
|
read_collection_2(paths);
|
2010-06-02 13:03:30 +02:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
2009-07-03 15:29:50 +02:00
|
|
|
}
|
2010-06-02 13:03:30 +02:00
|
|
|
}
|
2007-09-16 13:23:51 +02:00
|
|
|
|
2010-06-02 13:03:30 +02:00
|
|
|
private:
|
2009-07-03 15:29:50 +02:00
|
|
|
|
2010-06-02 13:03:30 +02:00
|
|
|
int read_integer()
|
|
|
|
{
|
|
|
|
boost::int32_t n;
|
|
|
|
if (needSwap_)
|
2009-07-03 15:29:50 +02:00
|
|
|
{
|
2010-06-02 13:03:30 +02:00
|
|
|
read_int32_xdr(wkb_+pos_,n);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
read_int32_ndr(wkb_+pos_,n);
|
|
|
|
}
|
|
|
|
pos_+=4;
|
2009-07-03 15:29:50 +02:00
|
|
|
|
2010-06-02 13:03:30 +02:00
|
|
|
return n;
|
|
|
|
}
|
|
|
|
|
|
|
|
double read_double()
|
|
|
|
{
|
|
|
|
double d;
|
|
|
|
if (needSwap_)
|
|
|
|
{
|
|
|
|
read_double_xdr(wkb_ + pos_, d);
|
2009-07-03 15:29:50 +02:00
|
|
|
}
|
2010-06-02 13:03:30 +02:00
|
|
|
else
|
2009-07-03 15:29:50 +02:00
|
|
|
{
|
2010-06-02 13:03:30 +02:00
|
|
|
read_double_ndr(wkb_ + pos_, d);
|
|
|
|
}
|
|
|
|
pos_+=8;
|
2009-07-03 15:29:50 +02:00
|
|
|
|
2010-06-02 13:03:30 +02:00
|
|
|
return d;
|
|
|
|
}
|
|
|
|
|
|
|
|
void read_coords(CoordinateArray& ar)
|
|
|
|
{
|
|
|
|
int size=sizeof(coord<double,2>)*ar.size();
|
|
|
|
if (!needSwap_)
|
|
|
|
{
|
|
|
|
std::memcpy(&ar[0],wkb_+pos_,size);
|
|
|
|
pos_+=size;
|
2009-07-03 15:29:50 +02:00
|
|
|
}
|
2010-06-02 13:03:30 +02:00
|
|
|
else
|
2009-07-03 15:29:50 +02:00
|
|
|
{
|
2010-06-02 13:03:30 +02:00
|
|
|
for (unsigned i=0;i<ar.size();++i)
|
2006-10-04 13:22:18 +02:00
|
|
|
{
|
2010-06-02 13:03:30 +02:00
|
|
|
read_double_xdr(wkb_ + pos_,ar[i].x);
|
|
|
|
read_double_xdr(wkb_ + pos_ + 8,ar[i].y);
|
|
|
|
pos_ += 16;
|
2006-10-04 13:22:18 +02:00
|
|
|
}
|
2010-06-02 13:03:30 +02:00
|
|
|
}
|
2009-07-03 15:29:50 +02:00
|
|
|
|
2010-06-02 13:03:30 +02:00
|
|
|
}
|
|
|
|
|
2011-09-13 13:54:04 +02:00
|
|
|
void read_point(boost::ptr_vector<geometry_type> & paths)
|
2010-06-02 13:03:30 +02:00
|
|
|
{
|
2010-11-03 14:19:15 +01:00
|
|
|
geometry_type * pt = new geometry_type(Point);
|
2010-06-02 13:03:30 +02:00
|
|
|
double x = read_double();
|
|
|
|
double y = read_double();
|
|
|
|
pt->move_to(x,y);
|
2011-09-13 13:54:04 +02:00
|
|
|
paths.push_back(pt);
|
2010-06-02 13:03:30 +02:00
|
|
|
}
|
|
|
|
|
2011-09-13 13:54:04 +02:00
|
|
|
void read_multipoint(boost::ptr_vector<geometry_type> & paths)
|
2010-06-02 13:03:30 +02:00
|
|
|
{
|
|
|
|
int num_points = read_integer();
|
|
|
|
for (int i=0;i<num_points;++i)
|
|
|
|
{
|
|
|
|
pos_+=5;
|
2011-09-13 13:54:04 +02:00
|
|
|
read_point(paths);
|
2009-07-03 15:29:50 +02:00
|
|
|
}
|
2010-06-02 13:03:30 +02:00
|
|
|
}
|
|
|
|
|
2011-09-13 13:54:04 +02:00
|
|
|
void read_multipoint_2(boost::ptr_vector<geometry_type> & paths)
|
2010-06-02 13:03:30 +02:00
|
|
|
{
|
2011-02-24 16:47:36 +01:00
|
|
|
geometry_type * pt = new geometry_type(MultiPoint);
|
2010-06-02 13:03:30 +02:00
|
|
|
int num_points = read_integer();
|
|
|
|
for (int i=0;i<num_points;++i)
|
2009-07-03 15:29:50 +02:00
|
|
|
{
|
2010-06-02 13:03:30 +02:00
|
|
|
pos_+=5;
|
2006-10-04 13:22:18 +02:00
|
|
|
double x = read_double();
|
|
|
|
double y = read_double();
|
|
|
|
pt->move_to(x,y);
|
2009-07-03 15:29:50 +02:00
|
|
|
}
|
2011-09-13 13:54:04 +02:00
|
|
|
paths.push_back(pt);
|
2010-06-02 13:03:30 +02:00
|
|
|
}
|
2007-09-16 13:23:51 +02:00
|
|
|
|
2011-09-13 13:54:04 +02:00
|
|
|
void read_linestring(boost::ptr_vector<geometry_type> & paths)
|
2010-06-02 13:03:30 +02:00
|
|
|
{
|
2010-11-03 14:19:15 +01:00
|
|
|
geometry_type * line = new geometry_type(LineString);
|
2010-06-02 13:03:30 +02:00
|
|
|
int num_points=read_integer();
|
|
|
|
CoordinateArray ar(num_points);
|
|
|
|
read_coords(ar);
|
|
|
|
line->set_capacity(num_points);
|
|
|
|
line->move_to(ar[0].x,ar[0].y);
|
|
|
|
for (int i=1;i<num_points;++i)
|
2009-07-03 15:29:50 +02:00
|
|
|
{
|
2010-06-02 13:03:30 +02:00
|
|
|
line->line_to(ar[i].x,ar[i].y);
|
2009-07-03 15:29:50 +02:00
|
|
|
}
|
2011-09-13 13:54:04 +02:00
|
|
|
paths.push_back(line);
|
2010-06-02 13:03:30 +02:00
|
|
|
}
|
2007-09-16 13:23:51 +02:00
|
|
|
|
2011-09-13 13:54:04 +02:00
|
|
|
void read_multilinestring(boost::ptr_vector<geometry_type> & paths)
|
2010-06-02 13:03:30 +02:00
|
|
|
{
|
|
|
|
int num_lines=read_integer();
|
|
|
|
for (int i=0;i<num_lines;++i)
|
2009-07-03 15:29:50 +02:00
|
|
|
{
|
2010-06-02 13:03:30 +02:00
|
|
|
pos_+=5;
|
2011-09-13 13:54:04 +02:00
|
|
|
read_linestring(paths);
|
2009-07-03 15:29:50 +02:00
|
|
|
}
|
2010-06-02 13:03:30 +02:00
|
|
|
}
|
|
|
|
|
2011-09-13 13:54:04 +02:00
|
|
|
void read_multilinestring_2(boost::ptr_vector<geometry_type> & paths)
|
2010-06-02 13:03:30 +02:00
|
|
|
{
|
2011-02-24 16:47:36 +01:00
|
|
|
geometry_type * line = new geometry_type(MultiLineString);
|
2010-06-02 13:03:30 +02:00
|
|
|
int num_lines=read_integer();
|
|
|
|
unsigned capacity = 0;
|
|
|
|
for (int i=0;i<num_lines;++i)
|
2009-07-03 15:29:50 +02:00
|
|
|
{
|
2010-06-02 13:03:30 +02:00
|
|
|
pos_+=5;
|
2006-10-04 13:22:18 +02:00
|
|
|
int num_points=read_integer();
|
2010-06-02 13:03:30 +02:00
|
|
|
capacity+=num_points;
|
|
|
|
CoordinateArray ar(num_points);
|
2006-10-04 13:22:18 +02:00
|
|
|
read_coords(ar);
|
2010-06-02 13:03:30 +02:00
|
|
|
line->set_capacity(capacity);
|
|
|
|
line->move_to(ar[0].x,ar[0].y);
|
2010-11-18 21:33:45 +01:00
|
|
|
for (int j=1;j<num_points;++j)
|
2010-06-02 13:03:30 +02:00
|
|
|
{
|
2010-11-18 21:33:45 +01:00
|
|
|
line->line_to(ar[j].x,ar[j].y);
|
2010-06-02 13:03:30 +02:00
|
|
|
}
|
2009-07-03 15:29:50 +02:00
|
|
|
}
|
2011-09-13 13:54:04 +02:00
|
|
|
paths.push_back(line);
|
2010-06-02 13:03:30 +02:00
|
|
|
}
|
2007-09-16 13:23:51 +02:00
|
|
|
|
2011-09-13 13:54:04 +02:00
|
|
|
void read_polygon(boost::ptr_vector<geometry_type> & paths)
|
2010-06-02 13:03:30 +02:00
|
|
|
{
|
2010-11-03 14:19:15 +01:00
|
|
|
geometry_type * poly = new geometry_type(Polygon);
|
2010-06-02 13:03:30 +02:00
|
|
|
int num_rings=read_integer();
|
|
|
|
unsigned capacity = 0;
|
|
|
|
for (int i=0;i<num_rings;++i)
|
2009-07-03 15:29:50 +02:00
|
|
|
{
|
2010-06-02 13:03:30 +02:00
|
|
|
int num_points=read_integer();
|
|
|
|
capacity+=num_points;
|
|
|
|
CoordinateArray ar(num_points);
|
|
|
|
read_coords(ar);
|
|
|
|
poly->set_capacity(capacity);
|
|
|
|
poly->move_to(ar[0].x,ar[0].y);
|
|
|
|
for (int j=1;j<num_points;++j)
|
2006-10-04 13:22:18 +02:00
|
|
|
{
|
2010-06-02 13:03:30 +02:00
|
|
|
poly->line_to(ar[j].x,ar[j].y);
|
2006-10-04 13:22:18 +02:00
|
|
|
}
|
2009-07-03 15:29:50 +02:00
|
|
|
}
|
2011-09-13 13:54:04 +02:00
|
|
|
paths.push_back(poly);
|
2010-06-02 13:03:30 +02:00
|
|
|
}
|
|
|
|
|
2011-09-13 13:54:04 +02:00
|
|
|
void read_multipolygon(boost::ptr_vector<geometry_type> & paths)
|
2010-06-02 13:03:30 +02:00
|
|
|
{
|
|
|
|
int num_polys=read_integer();
|
|
|
|
for (int i=0;i<num_polys;++i)
|
2009-07-03 15:29:50 +02:00
|
|
|
{
|
2010-06-02 13:03:30 +02:00
|
|
|
pos_+=5;
|
2011-09-13 13:54:04 +02:00
|
|
|
read_polygon(paths);
|
2009-07-03 15:29:50 +02:00
|
|
|
}
|
2010-06-02 13:03:30 +02:00
|
|
|
}
|
2011-02-24 16:47:36 +01:00
|
|
|
|
2011-09-13 13:54:04 +02:00
|
|
|
void read_multipolygon_2(boost::ptr_vector<geometry_type> & paths)
|
2010-06-02 13:03:30 +02:00
|
|
|
{
|
2011-02-24 16:47:36 +01:00
|
|
|
geometry_type * poly = new geometry_type(MultiPolygon);
|
2010-06-02 13:03:30 +02:00
|
|
|
int num_polys=read_integer();
|
|
|
|
unsigned capacity = 0;
|
|
|
|
for (int i=0;i<num_polys;++i)
|
2009-07-03 15:29:50 +02:00
|
|
|
{
|
2010-06-02 13:03:30 +02:00
|
|
|
pos_+=5;
|
2006-10-04 13:22:18 +02:00
|
|
|
int num_rings=read_integer();
|
2010-11-18 21:33:45 +01:00
|
|
|
for (int r=0;r<num_rings;++r)
|
2006-10-04 13:22:18 +02:00
|
|
|
{
|
2009-07-03 15:29:50 +02:00
|
|
|
int num_points=read_integer();
|
2010-06-02 13:03:30 +02:00
|
|
|
capacity += num_points;
|
2009-07-03 15:29:50 +02:00
|
|
|
CoordinateArray ar(num_points);
|
|
|
|
read_coords(ar);
|
|
|
|
poly->set_capacity(capacity);
|
|
|
|
poly->move_to(ar[0].x,ar[0].y);
|
|
|
|
for (int j=1;j<num_points;++j)
|
|
|
|
{
|
|
|
|
poly->line_to(ar[j].x,ar[j].y);
|
|
|
|
}
|
2010-06-02 13:03:30 +02:00
|
|
|
poly->line_to(ar[0].x,ar[0].y);
|
2006-10-04 13:22:18 +02:00
|
|
|
}
|
2009-07-03 15:29:50 +02:00
|
|
|
}
|
2011-09-13 13:54:04 +02:00
|
|
|
paths.push_back(poly);
|
2010-06-02 13:03:30 +02:00
|
|
|
}
|
2010-11-18 22:52:20 +01:00
|
|
|
|
2011-09-13 13:54:04 +02:00
|
|
|
void read_collection(boost::ptr_vector<geometry_type> & paths)
|
2010-11-18 22:52:20 +01:00
|
|
|
{
|
|
|
|
int num_geometries=read_integer();
|
|
|
|
for (int i=0;i<num_geometries;++i)
|
|
|
|
{
|
|
|
|
pos_+=1; // skip byte order
|
2011-09-13 13:54:04 +02:00
|
|
|
read(paths);
|
2010-11-18 22:52:20 +01:00
|
|
|
}
|
|
|
|
}
|
2009-07-03 15:29:50 +02:00
|
|
|
|
2011-09-13 13:54:04 +02:00
|
|
|
void read_collection_2(boost::ptr_vector<geometry_type> & paths)
|
2010-11-18 22:52:20 +01:00
|
|
|
{
|
|
|
|
int num_geometries=read_integer();
|
|
|
|
for (int i=0;i<num_geometries;++i)
|
|
|
|
{
|
|
|
|
pos_+=1; // skip byte order
|
2011-09-13 13:54:04 +02:00
|
|
|
read_multi(paths);
|
2010-11-18 22:52:20 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2011-09-13 13:54:04 +02:00
|
|
|
void geometry_utils::from_wkb (boost::ptr_vector<geometry_type>& paths,
|
2010-06-02 13:03:30 +02:00
|
|
|
const char* wkb,
|
|
|
|
unsigned size,
|
|
|
|
bool multiple_geometries,
|
|
|
|
wkbFormat format)
|
|
|
|
{
|
|
|
|
wkb_reader reader(wkb,size,format);
|
|
|
|
if (multiple_geometries)
|
2011-09-13 13:54:04 +02:00
|
|
|
return reader.read_multi(paths);
|
2010-06-02 13:03:30 +02:00
|
|
|
else
|
2011-09-13 13:54:04 +02:00
|
|
|
return reader.read(paths);
|
2010-06-02 13:03:30 +02:00
|
|
|
}
|
2005-06-14 17:06:59 +02:00
|
|
|
}
|