[Bf-blender-cvs] [d84ba71149e] lanpr-under-gp: LineArt: Memory utility changed to size_t instead of int.

[YimingWu]

Commit: d84ba71149e8da21f9fe82050ff7a7cb2da823ae
Author: YimingWu
Date:   Fri Jul 31 23:41:30 2020 +0800
Branches: lanpr-under-gp
https://developer.blender.org/rBd84ba71149e8da21f9fe82050ff7a7cb2da823ae

LineArt: Memory utility changed to size_t instead of int.

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

M	source/blender/editors/include/ED_lineart.h
M	source/blender/editors/lineart/lineart_intern.h
M	source/blender/editors/lineart/lineart_util.c

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

diff --git a/source/blender/editors/include/ED_lineart.h b/source/blender/editors/include/ED_lineart.h
index 4a37e2909e2..820fd8e6f2d 100644
--- a/source/blender/editors/include/ED_lineart.h
+++ b/source/blender/editors/include/ED_lineart.h
@@ -41,8 +41,8 @@
 
 typedef struct LineartStaticMemPoolNode {
   Link item;
-  int size;
-  int used_byte;
+  size_t size;
+  size_t used_byte;
   /* User memory starts here */
 } LineartStaticMemPoolNode;
 
diff --git a/source/blender/editors/lineart/lineart_intern.h b/source/blender/editors/lineart/lineart_intern.h
index 5f2ad5e3add..f3f2df753c6 100644
--- a/source/blender/editors/lineart/lineart_intern.h
+++ b/source/blender/editors/lineart/lineart_intern.h
@@ -53,9 +53,9 @@ void *list_append_pointer_static_pool(struct LineartStaticMemPool *mph, ListBase
 void *list_pop_pointer_no_free(ListBase *h);
 void list_remove_pointer_item_no_free(ListBase *h, LinkData *lip);
 
-LineartStaticMemPoolNode *mem_new_static_pool(struct LineartStaticMemPool *smp, int size);
-void *mem_static_aquire(struct LineartStaticMemPool *smp, int size);
-void *mem_static_aquire_thread(struct LineartStaticMemPool *smp, int size);
+LineartStaticMemPoolNode *mem_new_static_pool(struct LineartStaticMemPool *smp, size_t size);
+void *mem_static_aquire(struct LineartStaticMemPool *smp, size_t size);
+void *mem_static_aquire_thread(struct LineartStaticMemPool *smp, size_t size);
 void *mem_static_destroy(LineartStaticMemPool *smp);
 
 void tmat_make_ortho_matrix_44d(double (*mProjection)[4],
diff --git a/source/blender/editors/lineart/lineart_util.c b/source/blender/editors/lineart/lineart_util.c
index 799bd24a9b8..32896bedcdb 100644
--- a/source/blender/editors/lineart/lineart_util.c
+++ b/source/blender/editors/lineart/lineart_util.c
@@ -85,20 +85,20 @@ void list_remove_pointer_item_no_free(ListBase *h, LinkData *lip)
   BLI_remlink(h, (void *)lip);
 }
 
-LineartStaticMemPoolNode *mem_new_static_pool(LineartStaticMemPool *smp, int size)
+LineartStaticMemPoolNode *mem_new_static_pool(LineartStaticMemPool *smp, size_t size)
 {
-  int set_size = size;
+  size_t set_size = size;
   if (set_size < LRT_MEMORY_POOL_64MB) {
     set_size = LRT_MEMORY_POOL_64MB; /* Prevent too many small allocations. */
   }
-  int total_size = size + sizeof(LineartStaticMemPoolNode);
+  size_t total_size = size + sizeof(LineartStaticMemPoolNode);
   LineartStaticMemPoolNode *smpn = MEM_callocN(total_size, "mempool");
   smpn->size = total_size;
   smpn->used_byte = sizeof(LineartStaticMemPoolNode);
   BLI_addhead(&smp->pools, smpn);
   return smpn;
 }
-void *mem_static_aquire(LineartStaticMemPool *smp, int size)
+void *mem_static_aquire(LineartStaticMemPool *smp, size_t size)
 {
   LineartStaticMemPoolNode *smpn = smp->pools.first;
   void *ret;
@@ -113,7 +113,7 @@ void *mem_static_aquire(LineartStaticMemPool *smp, int size)
 
   return ret;
 }
-void *mem_static_aquire_thread(LineartStaticMemPool *smp, int size)
+void *mem_static_aquire_thread(LineartStaticMemPool *smp, size_t size)
 {
   LineartStaticMemPoolNode *smpn = smp->pools.first;
   void *ret;