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

Rename opacity to image_opacity.

Browse source
This commit is contained in:
Hermann Kraus 2012-01-20 22:45:47 +01:00
parent 21a58b7b7a
commit e177cd52a7
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/mapnik/symbolizer.hpp
View file

@ -99,7 +99,7 @@ protected:
symbolizer_with_image(path_expression_ptr filename = path_expression_ptr());
symbolizer_with_image(symbolizer_with_image const& rhs);
path_expression_ptr image_filename_;
float opacity_;
float image_opacity_;
transform_type matrix_;
};
}

8
src/symbolizer.cpp
View file

@ -72,7 +72,7 @@ metawriter_with_properties symbolizer_base::get_metawriter() const
symbolizer_with_image::symbolizer_with_image(path_expression_ptr file)
: image_filename_( file ),
opacity_(1.0f)
image_opacity_(1.0f)
{
matrix_[0] = 1.0;
@ -85,7 +85,7 @@ symbolizer_with_image::symbolizer_with_image(path_expression_ptr file)
symbolizer_with_image::symbolizer_with_image( symbolizer_with_image const& rhs)
: image_filename_(rhs.image_filename_),
opacity_(rhs.opacity_),
image_opacity_(rhs.image_opacity_),
matrix_(rhs.matrix_) {}
path_expression_ptr symbolizer_with_image::get_filename() const
@ -120,12 +120,12 @@ std::string const symbolizer_with_image::get_transform_string() const
void symbolizer_with_image::set_opacity(float opacity)
{
opacity_ = opacity;
image_opacity_ = opacity;
}
float symbolizer_with_image::get_opacity() const
{
return opacity_;
return image_opacity_;
}
} // end of namespace mapnik