1 files changed, 12 insertions, 9 deletions

diff --git a/src/gui/painting/qdatabuffer_p.h b/src/gui/painting/qdatabuffer_p.h
index b8bb44de6c..8f467afe4e 100644
--- a/src/gui/painting/qdatabuffer_p.h
+++ b/src/gui/painting/qdatabuffer_p.h
@@ -26,7 +26,7 @@ template <typename Type> class QDataBuffer
 {
     Q_DISABLE_COPY_MOVE(QDataBuffer)
 public:
-    QDataBuffer(int res)
+    explicit QDataBuffer(qsizetype res)
     {
         capacity = res;
         if (res) {
@@ -51,11 +51,11 @@ public:
 
     inline bool isEmpty() const { return siz==0; }
 
-    inline int size() const { return siz; }
+    qsizetype size() const { return siz; }
     inline Type *data() const { return buffer; }
 
-    inline Type &at(int i) { Q_ASSERT(i >= 0 && i < siz); return buffer[i]; }
-    inline const Type &at(int i) const { Q_ASSERT(i >= 0 && i < siz); return buffer[i]; }
+    Type &at(qsizetype i) { Q_ASSERT(i >= 0 && i < siz); return buffer[i]; }
+    const Type &at(qsizetype i) const { Q_ASSERT(i >= 0 && i < siz); return buffer[i]; }
     inline Type &last() { Q_ASSERT(!isEmpty()); return buffer[siz-1]; }
     inline const Type &last() const { Q_ASSERT(!isEmpty()); return buffer[siz-1]; }
     inline Type &first() { Q_ASSERT(!isEmpty()); return buffer[0]; }
@@ -72,12 +72,12 @@ public:
         --siz;
     }
 
-    inline void resize(int size) {
+    void resize(qsizetype size) {
         reserve(size);
         siz = size;
     }
 
-    inline void reserve(int size) {
+    void reserve(qsizetype size) {
         if (size > capacity) {
             if (capacity == 0)
                 capacity = 1;
@@ -88,14 +88,17 @@ public:
         }
     }
 
-    inline void shrink(int size) {
+    void shrink(qsizetype size) {
+        Q_ASSERT(capacity >= size);
         capacity = size;
         if (size) {
             buffer = (Type*) realloc(static_cast<void*>(buffer), capacity * sizeof(Type));
             Q_CHECK_PTR(buffer);
+            siz = std::min(siz, size);
         } else {
             free(buffer);
             buffer = nullptr;
+            siz = 0;
         }
     }
 
@@ -108,8 +111,8 @@ public:
     inline QDataBuffer &operator<<(const Type &t) { add(t); return *this; }
 
 private:
-    int capacity;
-    int siz;
+    qsizetype capacity;
+    qsizetype siz;
     Type *buffer;
 };