[Bf-blender-cvs] [b015fc4247a] master: Cleanup: Use single declaration of TileNumber.

[Jeroen Bakker]

Commit: b015fc4247af95a2fb4f0d77d5e37aa96d88e10a
Author: Jeroen Bakker
Date:   Wed Dec 21 08:42:19 2022 +0100
Branches: master
https://developer.blender.org/rBb015fc4247af95a2fb4f0d77d5e37aa96d88e10a

Cleanup: Use single declaration of TileNumber.

We used int and int32_t.

===================================================================

M	source/blender/blenkernel/BKE_image_partial_update.hh
M	source/blender/blenkernel/BKE_image_wrappers.hh
M	source/blender/blenkernel/intern/image_partial_update.cc

===================================================================

diff --git a/source/blender/blenkernel/BKE_image_partial_update.hh b/source/blender/blenkernel/BKE_image_partial_update.hh
index b9b748880bb..6c7776c091c 100644
--- a/source/blender/blenkernel/BKE_image_partial_update.hh
+++ b/source/blender/blenkernel/BKE_image_partial_update.hh
@@ -18,6 +18,8 @@
 
 #include "BLI_rect.h"
 
+#include "BKE_image_wrappers.hh"
+
 #include "DNA_image_types.h"
 
 extern "C" {
@@ -27,7 +29,6 @@ struct PartialUpdateUser;
 
 namespace blender::bke::image {
 
-using TileNumber = int;
 
 namespace partial_update {
 
diff --git a/source/blender/blenkernel/BKE_image_wrappers.hh b/source/blender/blenkernel/BKE_image_wrappers.hh
index 344edd952f8..b3e81571e05 100644
--- a/source/blender/blenkernel/BKE_image_wrappers.hh
+++ b/source/blender/blenkernel/BKE_image_wrappers.hh
@@ -13,13 +13,16 @@
 
 namespace blender::bke::image {
 
+/** Type to use for UDIM tile numbers (1001). */
+using TileNumber = int32_t;
+
 struct ImageTileWrapper {
   ImageTile *image_tile;
   ImageTileWrapper(ImageTile *image_tile) : image_tile(image_tile)
   {
   }
 
-  int get_tile_number() const
+  TileNumber get_tile_number() const
   {
     return image_tile->tile_number;
   }
@@ -31,13 +34,13 @@ struct ImageTileWrapper {
 
   int get_tile_x_offset() const
   {
-    int tile_number = get_tile_number();
+    TileNumber tile_number = get_tile_number();
     return (tile_number - 1001) % 10;
   }
 
   int get_tile_y_offset() const
   {
-    int tile_number = get_tile_number();
+    TileNumber tile_number = get_tile_number();
     return (tile_number - 1001) / 10;
   }
 };
diff --git a/source/blender/blenkernel/intern/image_partial_update.cc b/source/blender/blenkernel/intern/image_partial_update.cc
index 6ffd323cc1e..ecf55d6b694 100644
--- a/source/blender/blenkernel/intern/image_partial_update.cc
+++ b/source/blender/blenkernel/intern/image_partial_update.cc
@@ -125,7 +125,6 @@ static PartialUpdateRegisterImpl *unwrap(struct PartialUpdateRegister *partial_u
   return static_cast<PartialUpdateRegisterImpl *>(static_cast<void *>(partial_update_register));
 }
 
-using TileNumber = int32_t;
 using ChangesetID = int64_t;
 constexpr ChangesetID UnknownChangesetID = -1;