Merge pull request #39470 from aaronfranke/valid-image

Simplify some code in platform/uwp/export
This commit is contained in:
Rémi Verschelde 2020-06-12 10:45:29 +02:00 committed by GitHub
commit ed4718285d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -743,23 +743,7 @@ class EditorExportPlatformUWP : public EditorExportPlatform {
// TODO: Add resource creation or image rescaling to enable other scales:
// 1.25, 1.5, 2.0
real_t scales[] = { 1.0 };
bool valid_w = false;
bool valid_h = false;
for (int i = 0; i < 1; i++) {
int w = ceil(p_width * scales[i]);
int h = ceil(p_height * scales[i]);
if (w == p_image->get_width()) {
valid_w = true;
}
if (h == p_image->get_height()) {
valid_h = true;
}
}
return valid_w && valid_h;
return p_width == p_image->get_width() && p_height == p_image->get_height();
}
Vector<uint8_t> _fix_manifest(const Ref<EditorExportPreset> &p_preset, const Vector<uint8_t> &p_template, bool p_give_internet) const {