sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed parameters order in image reader

Browse source
This commit is contained in:
Artem Pavlenko 2008-01-07 10:20:05 +00:00
parent 0dbaeafbe9
commit 4529e83562
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
plugins/input/raster/SConscript
View file

@ -35,7 +35,6 @@ raster_src = Split(
libraries = []
if env['PLATFORM'] == 'Darwin':
libraries.append('mapnik')
if env['BIDI'] : libraries.append('fribidi')
raster_inputdriver = env.SharedLibrary('raster', source=raster_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries)

5
plugins/input/raster/raster_featureset.cpp
View file

@ -54,11 +54,14 @@ feature_ptr raster_featureset<LookupPolicy>::next()
feature_ptr feature(new Feature(++id_));
try
{
std::auto_ptr<ImageReader> reader(mapnik::get_image_reader(curIter_->format(),curIter_->file()));
std::auto_ptr<ImageReader> reader(mapnik::get_image_reader(curIter_->file(),curIter_->format()));
std::cout << "READER = " << curIter_->format() << " " << curIter_->file() << "\n";
if (reader.get())
{
int image_width=reader->width();
int image_height=reader->height();
if (image_width>0 && image_height>0)
{
CoordTransform t(image_width,image_height,curIter_->envelope(),0,0);