[Liblas-commits] hg: 3 new changesets
liblas-commits at liblas.org
liblas-commits at liblas.org
Mon May 24 15:17:22 EDT 2010
changeset 66220bcd00a6 in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=66220bcd00a6
summary: ignore unreferenced parameters when we don't have GDAL/GeoTIFF
changeset 3a7b4786535a in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=3a7b4786535a
summary: clean up warning about casting base_difference
changeset ef1cb9adc93c in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=ef1cb9adc93c
summary: drop the size of extra data down to a uint16_t with a cast to quiet warning.
diffstat:
src/detail/writer/point.cpp | 2 +-
src/lasformat.cpp | 4 ++--
src/lasspatialreference.cpp | 5 +++++
3 files changed, 8 insertions(+), 3 deletions(-)
diffs (44 lines):
diff -r 08fd3638254b -r ef1cb9adc93c src/detail/writer/point.cpp
--- a/src/detail/writer/point.cpp Mon May 24 10:42:45 2010 -0500
+++ b/src/detail/writer/point.cpp Mon May 24 13:16:45 2010 -0600
@@ -180,7 +180,7 @@
} else if (data.size() < static_cast<uint32_t>(size)){
// size can be casted now that we have already checked if it is less than 0
- int16_t difference = size - data.size();
+ int16_t difference = static_cast<uint16_t>(size) - static_cast<uint16_t>(data.size());
detail::write_n(GetStream(), data.front(), data.size());
detail::write_n(GetStream(), *m_blanks, static_cast<std::streamsize>(difference));
diff -r 08fd3638254b -r ef1cb9adc93c src/lasformat.cpp
--- a/src/lasformat.cpp Mon May 24 10:42:45 2010 -0500
+++ b/src/lasformat.cpp Mon May 24 13:16:45 2010 -0600
@@ -90,11 +90,11 @@
}
else if (base_difference > 0) {
// Expand m_size to include new_base_size
- m_size = m_size + base_difference;
+ m_size = m_size + static_cast<liblas::uint16_t>(base_difference);
m_base_size = new_base_size;
}
else {
- m_size = m_size - base_difference;
+ m_size = m_size - static_cast<liblas::uint16_t>(base_difference);
m_base_size = new_base_size;
}
diff -r 08fd3638254b -r ef1cb9adc93c src/lasspatialreference.cpp
--- a/src/lasspatialreference.cpp Mon May 24 10:42:45 2010 -0500
+++ b/src/lasspatialreference.cpp Mon May 24 13:16:45 2010 -0600
@@ -510,6 +510,11 @@
}
ResetVLRs();
+#else
+ detail::ignore_unused_variable_warning(citation);
+ detail::ignore_unused_variable_warning(verticalUnits);
+ detail::ignore_unused_variable_warning(verticalDatum);
+ detail::ignore_unused_variable_warning(verticalCSType);
#endif /* def HAVE_LIBGEOTIFF */
}
More information about the Liblas-commits
mailing list