qint64 problems

nci · Mar 6, 2018 · db672f9 · db672f9
1 parent d4bbfa2
commit db672f9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/tools/import/plugins/raw/rawplugin.cpp b/tools/import/plugins/raw/rawplugin.cpp
@@ -141,9 +141,9 @@ RawPlugin::setFile(QStringList files)
       else if (m_voxelType == _Int) bpv = 4;
       else if (m_voxelType == _Float) bpv = 4;
 
-      if (fin.size() == 13+nX*nY*nZ*bpv)
+      if (fin.size() == 13+(qint64)nX*(qint64)nY*(qint64)nZ*(qint64)bpv)
 	m_skipBytes = 13;
-      else if (fin.size() == 12+nX*nY*nZ*bpv)
+      else if (fin.size() == 12+(qint64)nX*(qint64)nY*(qint64)nZ*(qint64)bpv)
 	m_skipBytes = 12;
       else
 	m_skipBytes = 0;

diff --git a/tools/import/plugins/rawslabs/rawslabsplugin.cpp b/tools/import/plugins/rawslabs/rawslabsplugin.cpp
@@ -627,7 +627,7 @@ void
 RawSlabsPlugin::getDepthSlice(int slc,
 			     uchar *slice)
 {
-  int nbytes = m_width*m_height*m_bytesPerVoxel;
+  qint64 nbytes = m_width*m_height*m_bytesPerVoxel;
   if (slc < 0 || slc >= m_depth)
     {
       memset(slice, 0, nbytes);
@@ -683,8 +683,8 @@ RawSlabsPlugin::getWidthSlice(int slc,
       int slcno = ((fno > 0) ? k-m_slices[fno-1] : k);
 
       fin.seek((qint64)(m_skipBytes +
-	       (slcno*m_width*m_height + 
-		slc*m_height)*m_bytesPerVoxel));
+	       ((qint64)slcno*m_width*m_height + 
+		(qint64)slc*m_height)*m_bytesPerVoxel));
       fin.read((char*)(slice+(qint64)(k*m_height*m_bytesPerVoxel)),
 	       (qint64)(m_height*m_bytesPerVoxel));
     }