replaced deprecated libtiff v4.3 typedefs with C99 fixed width integers

boostorg · Jun 9, 2022 · 93ff3f8 · 93ff3f8
1 parent 9ecdb87
commit 93ff3f8
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 18 deletions.
diff --git a/include/boost/gil/extension/io/tiff/detail/device.hpp b/include/boost/gil/extension/io/tiff/detail/device.hpp
@@ -15,6 +15,7 @@
 #include <boost/gil/io/device.hpp>
 
 #include <algorithm>
+#include <cstdint>
 #include <memory>
 #include <sstream>
 #include <type_traits>
@@ -221,9 +222,9 @@ class tiff_device_base
     {
         if( TIFFReadTile( _tiff_file.get()
                         , reinterpret_cast< tdata_t >( &buffer.front() )
-                        , (uint32) x
-                        , (uint32) y
-                        , (uint32) z
+                        , static_cast< std::uint32_t >( x )
+                        , static_cast< std::uint32_t >( y )
+                        , static_cast< std::uint32_t >( z )
                         , plane
                         ) == -1 )
         {
@@ -234,9 +235,9 @@ class tiff_device_base
     }
 
     template< typename Buffer >
-    void write_scaline( Buffer&     buffer
-                      , uint32      row
-                      , tsample_t   plane
+    void write_scaline( Buffer&       buffer
+                      , std::uint32_t row
+                      , tsample_t     plane
                       )
     {
        io_error_if( TIFFWriteScanline( _tiff_file.get()
@@ -248,9 +249,9 @@ class tiff_device_base
                    );
     }
 
-    void write_scaline( byte_t*     buffer
-                      , uint32      row
-                      , tsample_t   plane
+    void write_scaline( byte_t*        buffer
+                      , std::uint32_t  row
+                      , tsample_t      plane
                       )
     {
        io_error_if( TIFFWriteScanline( _tiff_file.get()
@@ -263,11 +264,11 @@ class tiff_device_base
     }
 
     template< typename Buffer >
-    void write_tile( Buffer&     buffer
-                   , uint32      x
-                   , uint32      y
-                   , uint32      z
-                   , tsample_t   plane
+    void write_tile( Buffer&         buffer
+                   , std::uint32_t   x
+                   , std::uint32_t   y
+                   , std::uint32_t   z
+                   , tsample_t       plane
                    )
     {
        if( TIFFWriteTile( _tiff_file.get()
@@ -300,8 +301,8 @@ class tiff_device_base
                         )
     {
         bool result = true;
-        uint32 tw = static_cast< uint32 >( width  );
-        uint32 th = static_cast< uint32 >( height );
+        std::uint32_t tw = static_cast< std::uint32_t >( width  );
+        std::uint32_t th = static_cast< std::uint32_ >( height );
 
         TIFFDefaultTileSize( _tiff_file.get()
                            , &tw

diff --git a/include/boost/gil/extension/io/tiff/detail/write.hpp b/include/boost/gil/extension/io/tiff/detail/write.hpp
@@ -18,6 +18,7 @@
 #include <boost/gil/io/detail/dynamic.hpp>
 
 #include <algorithm>
+#include <cstdint>
 #include <string>
 #include <type_traits>
 #include <vector>
@@ -393,8 +394,8 @@ class writer< Device
                 }
 
                 this->_io_dev.write_tile( row
-                                        , static_cast< uint32 >( j )
-                                        , static_cast< uint32 >( i )
+                                        , static_cast< std::uint32_t >( j )
+                                        , static_cast< std::uint32_t >( i )
                                         , 0
                                         , 0
                                         );