E57 changes for GCC 9.2.

PDAL · Feb 7, 2020 · 3b8c0f5 · 3b8c0f5
1 parent c09f2b1
commit 3b8c0f5
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/plugins/e57/libE57Format/src/CheckedFile.cpp b/plugins/e57/libE57Format/src/CheckedFile.cpp
@@ -176,7 +176,7 @@ void CheckedFile::read(char* buf, size_t nRead, size_t /*bufSize*/)
    vector<char> page_buffer_v( physicalPageSize );
    char* page_buffer = &page_buffer_v[0];
 
-   auto   checksumMod = static_cast<const unsigned int>( std::nearbyint( 100.0 / checkSumPolicy_ ) );
+   auto   checksumMod = static_cast<unsigned int>( std::nearbyint( 100.0 / checkSumPolicy_ ) );
 
    while ( nRead > 0 )
    {
@@ -240,7 +240,7 @@ void CheckedFile::write(const char* buf, size_t nWrite)
    {
       const off_t physicalLength = length( Physical );
 
-      if ( page*physicalPageSize < physicalLength )
+      if ( (off_t)(page*physicalPageSize) < physicalLength )
       {
          readPhysicalPage( page_buffer, page );
       }
@@ -481,7 +481,7 @@ void CheckedFile::extend(off_t newLength, OffsetMode omode)
    /// Watch out for different int sizes here.
    size_t n = 0;
 
-   if (nWrite < logicalPageSize - pageOffset)
+   if (nWrite < (off_t)(logicalPageSize - pageOffset))
    {
       n = static_cast<size_t>(nWrite);
    }
@@ -498,7 +498,7 @@ void CheckedFile::extend(off_t newLength, OffsetMode omode)
    {
       const off_t physicalLength = length( Physical );
 
-      if ( page*physicalPageSize < physicalLength )
+      if ( (off_t)(page*physicalPageSize) < physicalLength )
       {
          readPhysicalPage( page_buffer, page );
       }
@@ -513,7 +513,7 @@ void CheckedFile::extend(off_t newLength, OffsetMode omode)
       pageOffset = 0;
       ++page;
 
-      if (nWrite < logicalPageSize)
+      if (nWrite < (off_t)logicalPageSize)
       {
          n = static_cast<size_t>(nWrite);
       }