replace deprecated uint8 by int8_t etc etc

Device/InputOutput/OutputDataReadWriteTiff.cpp

@@ -68,8 +68,8 @@ void OutputDataReadWriteTiff::writeOutputData(const OutputData<double>& data,
 void OutputDataReadWriteTiff::read_header()
 {
     ASSERT(m_tiff);
-    uint32 width(0);
-    uint32 height(0);
+    uint32_t width(0);
+    uint32_t height(0);
     if (!TIFFGetField(m_tiff, TIFFTAG_IMAGEWIDTH, &width)
         || !TIFFGetField(m_tiff, TIFFTAG_IMAGELENGTH, &height)) {
         throw std::runtime_error("OutputDataReadWriteTiff::read_header() -> Error. "
@@ -79,7 +79,7 @@ void OutputDataReadWriteTiff::read_header()
     m_width = (size_t)width;
     m_height = (size_t)height;
 
-    uint16 orientationTag(0);
+    uint16_t orientationTag(0);
     TIFFGetField(m_tiff, TIFFTAG_ORIENTATION, &orientationTag);
 
     bool good = true;
@@ -127,7 +127,7 @@ void OutputDataReadWriteTiff::read_data()
     ASSERT(m_tiff);
 
     ASSERT(0 == m_bitsPerSample % 8);
-    uint16 bytesPerSample = m_bitsPerSample / 8;
+    uint16_t bytesPerSample = m_bitsPerSample / 8;
     tmsize_t buf_size = TIFFScanlineSize(m_tiff);
     tmsize_t expected_size = bytesPerSample * m_width;
     if (buf_size != expected_size)
@@ -141,12 +141,12 @@ void OutputDataReadWriteTiff::read_data()
 
     create_output_data();
 
-    std::vector<int8> line_buf;
+    std::vector<int8_t> line_buf;
     line_buf.resize(buf_size, 0);
 
     std::vector<unsigned> axes_indices(2);
 
-    for (uint32 row = 0; row < (uint32)m_height; row++) {
+    for (uint32_t row = 0; row < (uint32_t)m_height; row++) {
         if (TIFFReadScanline(m_tiff, buf, row) < 0)
             throw std::runtime_error(
                 "OutputDataReadWriteTiff::read_data() -> Error. Error in scanline.");
@@ -165,26 +165,26 @@ void OutputDataReadWriteTiff::read_data()
             case 1: // unsigned int
                 switch (m_bitsPerSample) {
                 case 8:
-                    sample = *reinterpret_cast<uint8*>(incoming);
+                    sample = *reinterpret_cast<uint8_t*>(incoming);
                     break;
                 case 16:
-                    sample = *reinterpret_cast<uint16*>(incoming);
+                    sample = *reinterpret_cast<uint16_t*>(incoming);
                     break;
                 case 32:
-                    sample = *reinterpret_cast<uint32*>(incoming);
+                    sample = *reinterpret_cast<uint32_t*>(incoming);
                     break;
                 }
                 break;
             case 2: // signed int
                 switch (m_bitsPerSample) {
                 case 8:
-                    sample = *reinterpret_cast<int8*>(incoming);
+                    sample = *reinterpret_cast<int8_t*>(incoming);
                     break;
                 case 16:
-                    sample = *reinterpret_cast<int16*>(incoming);
+                    sample = *reinterpret_cast<int16_t*>(incoming);
                     break;
                 case 32:
-                    sample = *reinterpret_cast<int32*>(incoming);
+                    sample = *reinterpret_cast<int32_t*>(incoming);
                     break;
                 }
                 break;
@@ -210,13 +210,13 @@ void OutputDataReadWriteTiff::write_header()
                  "Image converted from BornAgain intensity file.");
     TIFFSetField(m_tiff, TIFFTAG_SOFTWARE, "BornAgain");
 
-    uint32 width = static_cast<uint32>(m_width);
-    uint32 height = static_cast<uint32>(m_height);
+    uint32_t width = static_cast<uint32_t>(m_width);
+    uint32_t height = static_cast<uint32_t>(m_height);
     TIFFSetField(m_tiff, TIFFTAG_IMAGEWIDTH, width);
     TIFFSetField(m_tiff, TIFFTAG_IMAGELENGTH, height);
 
     // output format, hardcoded here
-    uint16 bitPerSample = 32, samplesPerPixel = 1;
+    uint16_t bitPerSample = 32, samplesPerPixel = 1;
     TIFFSetField(m_tiff, TIFFTAG_BITSPERSAMPLE, bitPerSample);
     TIFFSetField(m_tiff, TIFFTAG_SAMPLESPERPIXEL, samplesPerPixel);
 
@@ -235,7 +235,7 @@ void OutputDataReadWriteTiff::write_data()
     std::vector<sample_t> line_buf;
     line_buf.resize(m_width, 0);
     std::vector<unsigned> axes_indices(2);
-    for (unsigned row = 0; row < (uint32)m_height; row++) {
+    for (unsigned row = 0; row < (uint32_t)m_height; row++) {
         for (unsigned col = 0; col < line_buf.size(); ++col) {
             axes_indices[0] = col;
             axes_indices[1] = static_cast<unsigned>(m_height) - 1 - row;

Device/InputOutput/OutputDataReadWriteTiff.h

@@ -25,6 +25,7 @@
 #include "Device/Data/OutputData.h"
 #include <memory>
 #include <tiffio.h>
+#include <cstdint>
 
 //! Reads/write tiff files.
 
@@ -47,7 +48,7 @@ private:
 
     TIFF* m_tiff;
     size_t m_width, m_height;
-    uint16 m_bitsPerSample, m_samplesPerPixel, m_sampleFormat;
+    uint16_t m_bitsPerSample, m_samplesPerPixel, m_sampleFormat;
     std::unique_ptr<OutputData<double>> m_data;
 };