From 2cda7f8af0fd06f6125d8b9244b1aa0968f18abe Mon Sep 17 00:00:00 2001 From: baldurk Date: Wed, 27 Feb 2019 14:50:27 +0000 Subject: [PATCH] Fix access to Qt containers that need int indexes --- renderdoc/api/replay/basic_types.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/renderdoc/api/replay/basic_types.h b/renderdoc/api/replay/basic_types.h index d0fe86f6f..d6a409570 100644 --- a/renderdoc/api/replay/basic_types.h +++ b/renderdoc/api/replay/basic_types.h @@ -736,7 +736,7 @@ public: // copy construct the new elems for(size_t i = 0; i < usedCount; i++) - new(elems + i) T(in[i]); + new(elems + i) T(in[(int32_t)i]); return *this; } @@ -760,7 +760,7 @@ public: // copy construct the new elems for(size_t i = 0; i < usedCount; i++) - new(elems + i) T(in[i]); + new(elems + i) T(in[(int32_t)i]); return *this; } @@ -793,7 +793,7 @@ struct rdcstr : public rdcarray rdcstr(const QString &in) : rdcarray() { QByteArray arr = in.toUtf8(); - assign(arr.data(), arr.size()); + assign(arr.data(), (size_t)arr.size()); } operator QString() const { return QString::fromUtf8(elems, (int32_t)usedCount); } operator QVariant() const { return QVariant(QString::fromUtf8(elems, (int32_t)usedCount)); } @@ -828,7 +828,7 @@ struct bytebuf : public rdcarray bytebuf(const QByteArray &in) { resize(in.size()); - memcpy(elems, in.data(), in.size()); + memcpy(elems, in.data(), (size_t)in.size()); } operator QByteArray() const {