summaryrefslogtreecommitdiff
path: root/core/io
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <remi@verschelde.fr>2022-08-08 12:55:07 +0200
committerGitHub <noreply@github.com>2022-08-08 12:55:07 +0200
commitc8cdc10902312e19fcdaa3a39755f783649d6c81 (patch)
tree4ff4920d2b1513de7556061be0af18cc4d1a8d5a /core/io
parent6d94465f3cdb868531ff611fd8a045bffde8dba5 (diff)
parente27c5acedd4fee6016e365d41896b6820f9217bb (diff)
Merge pull request #62861 from samdze/image-size-vector2i
Make Image.get_size() return a Vector2i instead of a Vector2
Diffstat (limited to 'core/io')
-rw-r--r--core/io/image.cpp4
-rw-r--r--core/io/image.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/core/io/image.cpp b/core/io/image.cpp
index 0f20aabd7e..2d87523ca4 100644
--- a/core/io/image.cpp
+++ b/core/io/image.cpp
@@ -416,8 +416,8 @@ int Image::get_height() const {
return height;
}
-Vector2 Image::get_size() const {
- return Vector2(width, height);
+Vector2i Image::get_size() const {
+ return Vector2i(width, height);
}
bool Image::has_mipmaps() const {
diff --git a/core/io/image.h b/core/io/image.h
index 46820a4c08..9d415423be 100644
--- a/core/io/image.h
+++ b/core/io/image.h
@@ -209,7 +209,7 @@ private:
public:
int get_width() const; ///< Get image width
int get_height() const; ///< Get image height
- Vector2 get_size() const;
+ Vector2i get_size() const;
bool has_mipmaps() const;
int get_mipmap_count() const;