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

fix compiler warnings by using proper OR operator

Browse source
This commit is contained in:
Dane Springmeyer 2010-01-11 17:31:37 +00:00
parent 8cd7645561
commit 38514efa44
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bindings/python/mapnik_python.cpp
View file

@ -196,7 +196,7 @@ void render_to_file1(const mapnik::Map& map,
const std::string& filename,
const std::string& format)
{
if (format == "pdf" | format == "svg" | format =="ps" | format == "ARGB32" | format == "RGB24")
if (format == "pdf" || format == "svg" || format =="ps" || format == "ARGB32" || format == "RGB24")
{
#if defined(HAVE_CAIRO)
mapnik::save_to_cairo_file(map,filename,format);
@ -215,7 +215,7 @@ void render_to_file1(const mapnik::Map& map,
void render_to_file2(const mapnik::Map& map,const std::string& filename)
{
std::string format = mapnik::guess_type(filename);
if (format == "pdf" | format == "svg" | format =="ps")
if (format == "pdf" || format == "svg" || format =="ps")
{
#if defined(HAVE_CAIRO)
mapnik::save_to_cairo_file(map,filename,format);

4
src/image_util.cpp
View file

@ -154,7 +154,7 @@ namespace mapnik
// TODO - expose as user option
/*
if (type == "ARGB32" | type == "RGB24")
if (type == "ARGB32" || type == "RGB24")
{
context->set_antialias(Cairo::ANTIALIAS_NONE);
}
@ -164,7 +164,7 @@ namespace mapnik
mapnik::cairo_renderer<Cairo::Context> ren(map, context);
ren.apply();
if (type == "ARGB32" | type == "RGB24")
if (type == "ARGB32" || type == "RGB24")
{
surface->write_to_png(filename);
}