Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

cartography: Fix clang warning in GeoReference.h

We have unused width and height parameters. Unfortunately, I don't
want to change the API now. I believe Ara is using it.
  • Loading branch information...
commit c57eb4c61e76d94bfa7889ce20da356f24276491 1 parent c6fca33
@zmoratto zmoratto authored
View
2  src/vw/Cartography/Datum.cc
@@ -94,7 +94,6 @@ void vw::cartography::Datum::set_well_known_datum( std::string const& name ) {
m_meridian_name = "Reference Meridian";
m_semi_major_axis = m_semi_minor_axis = 1737400;
m_meridian_offset = 0.0;
- m_geocentric = false;
m_proj_str = "+a=1737400 +b=1737400";
return;
}
@@ -105,7 +104,6 @@ void vw::cartography::Datum::set_well_known_datum( std::string const& name ) {
m_meridian_name = "Reference Meridian";
m_semi_major_axis = m_semi_minor_axis = 3396190;
m_meridian_offset = 0.0;
- m_geocentric = false;
m_proj_str = "+a=3396190 +b=3396190";
return;
}
View
2  src/vw/Cartography/GeoReference.cc
@@ -485,7 +485,7 @@ namespace cartography {
// Simple GeoReference modification tools
GeoReference crop( GeoReference const& input,
double upper_left_x, double upper_left_y,
- double width, double height ) {
+ double /*width*/, double /*height*/ ) {
Vector2 top_left_ll;
if ( input.pixel_interpretation() == GeoReference::PixelAsArea ) {
top_left_ll = input.pixel_to_lonlat( Vector2(upper_left_x, upper_left_y ) - Vector2(0.5,0.5) );
View
10 src/vw/Cartography/GeoReference.h
@@ -178,22 +178,20 @@ namespace cartography {
virtual Vector2 lonlat_to_point(Vector2 lon_lat) const;
/// For a bbox in pixel coordinates, find what that bbox covers
- /// in lonlat
- virtual BBox2 pixel_to_lonlat_bbox(BBox2i pixel_bbox) const {
+ /// in lonlat
+ virtual BBox2 pixel_to_lonlat_bbox(BBox2i const& pixel_bbox) const {
if (!m_is_projected) {
return pixel_to_point_bbox(pixel_bbox);
}
-
return GeoReferenceBase::pixel_to_lonlat_bbox(pixel_bbox);
}
/// For a bbox in lonlat, find the bbox in pixel coordinates
- virtual BBox2i lonlat_to_pixel_bbox(BBox2 lonlat_bbox) const {
+ virtual BBox2i lonlat_to_pixel_bbox(BBox2 const& lonlat_bbox, size_t nsamples = 100) const {
if (!m_is_projected) {
return point_to_pixel_bbox(lonlat_bbox);
}
-
- return GeoReferenceBase::lonlat_to_pixel_bbox(lonlat_bbox);
+ return GeoReferenceBase::lonlat_to_pixel_bbox(lonlat_bbox, nsamples);
}
};
Please sign in to comment.
Something went wrong with that request. Please try again.