Changeset 649:599b080126c4

Timestamp:

05/16/08 06:21:25 (2 years ago)

Author:

Mateusz Loskot <mateusz@…>

Branch:

default

Convert:

svn:1766ff46-f334-0410-ab20-d63176f87757/trunk@716

Message:

Get rid of annoying compiler warnings with wrapping unused parameters with a macro. So, we can still compile cleanly with highest level of warning reports.

Location:

src

Files:

• detail/reader10.cpp (modified) (1 diff)
• detail/reader11.cpp (modified) (2 diffs)
• las_c_api.cpp (modified) (1 diff)
• lasheader.cpp (modified) (2 diffs)

src/detail/reader10.cpp

@@ -251 +251 @@
 {
 #ifndef HAVE_LIBGEOTIFF
+    UNREFERENCED_PARAMETER(header);
     return false;
 #else

src/detail/reader11.cpp

@@ -267 +267 @@
         return false;
 
-    std::streamsize pos = (static_cast<std::streamsize>(n) * m_recordlength) + m_offset;
+    std::streamsize const pos = (static_cast<std::streamsize>(n) * m_recordlength) + m_offset;
 
     m_ifs.clear();
@@ -292 +292 @@
 }
 
-std::istream& ReaderImpl::GetStream() {
+std::istream& ReaderImpl::GetStream()
+{
     return m_ifs;
 }
 
-bool ReaderImpl::ReadVLR(LASHeader& header) {
-    
+bool ReaderImpl::ReadVLR(LASHeader& header)
+{    
+    // TODO: To be implemented
     VLRHeader vlrh = { 0 };
     LASVLR vlr;
 
+    // TODO: To be removed, when objects are used
+    UNREFERENCED_PARAMETER(header);
+    UNREFERENCED_PARAMETER(vlrh);
+    UNREFERENCED_PARAMETER(vlr);
+
     return true;
 }

src/las_c_api.cpp

@@ -1412 +1412 @@
         std::vector<liblas::uint8_t> *d = new std::vector<liblas::uint8_t>(((LASVLR*) hVLR)->GetData());
         *data = d->front();
-        *length = d->size();
+        *length = static_cast<int>(d->size());
     }
     catch (std::exception const& e) {

src/lasheader.cpp

@@ -498 +498 @@
 {
     m_vlrs.push_back(v);
-    m_dataRecordLen = m_vlrs.size();
+    m_dataRecordLen = static_cast<uint16_t>(m_vlrs.size());
 }
 
@@ -511 +511 @@
         
     m_vlrs.erase(m_vlrs.begin() + index);
-    m_dataRecordLen = m_vlrs.size();
+    m_dataRecordLen = static_cast<uint16_t>(m_vlrs.size());
     
 }