aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/image.cpp4
-rw-r--r--core/os/os.h2
2 files changed, 4 insertions, 2 deletions
diff --git a/core/image.cpp b/core/image.cpp
index 70a7b2bce..c7f21d559 100644
--- a/core/image.cpp
+++ b/core/image.cpp
@@ -1013,8 +1013,8 @@ void Image::shrink_x2() {
copymem(w.ptr(), &r[ofs], new_size);
}
- width /= 2;
- height /= 2;
+ width = MAX(width / 2, 1);
+ height = MAX(height / 2, 1);
data = new_img;
} else {
diff --git a/core/os/os.h b/core/os/os.h
index 38bbbc0a5..3806217f5 100644
--- a/core/os/os.h
+++ b/core/os/os.h
@@ -335,6 +335,8 @@ public:
virtual String get_data_dir() const;
virtual String get_resource_dir() const;
+ virtual Error move_to_trash(const String &p_path) { return FAILED; }
+
enum SystemDir {
SYSTEM_DIR_DESKTOP,
SYSTEM_DIR_DCIM,