From f54155b484f1e0372f3566ddd81605a0534ce799 Mon Sep 17 00:00:00 2001
From: Syping <schiedelrafael@keppe.org>
Date: Thu, 1 Feb 2018 02:05:26 +0100
Subject: [PATCH] let -d work like it should
---
main.cpp | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/main.cpp b/main.cpp
index 9702b7e..d13f19d 100644
--- a/main.cpp
+++ b/main.cpp
@@ -32,6 +32,7 @@ int main(int argc, char *argv[])
if (args.length() >= 3)
{
+ bool isDefault = true;
bool avatarMode = false;
bool convertToGTA = true;
bool customFormat = false;
@@ -53,38 +54,50 @@ int main(int argc, char *argv[])
{
if (args.at(4) == "-a")
{
+ isDefault = false;
avatarMode = true;
}
else if (args.at(4) == "-p")
{
+ isDefault = false;
avatarMode = false;
}
+ else if (args.at(4) == "-d")
+ {
+ isDefault = true;
+ }
else if (args.at(4) == "-aiar")
{
+ isDefault = false;
avatarMode = true;
keepAspectRatio = false;
}
else if (args.at(4) == "-akar")
{
+ isDefault = false;
avatarMode = true;
keepAspectRatio = true;
}
else if (args.at(4) == "-piar")
{
+ isDefault = false;
avatarMode = false;
keepAspectRatio = false;
}
else if (args.at(4) == "-pkar")
{
+ isDefault = false;
avatarMode = false;
keepAspectRatio = true;
}
else if (args.at(4) == "-diar")
{
+ isDefault = true;
keepAspectRatio = false;
}
else if (args.at(4) == "-dkar")
{
+ isDefault = true;
keepAspectRatio = true;
}
}
@@ -121,6 +134,17 @@ int main(int argc, char *argv[])
int avatarZoneX = 145;
int avatarZoneY = 66;
+ if (isDefault)
+ {
+ if (image.width() == image.height())
+ {
+ avatarMode = true;
+ }
+ else
+ {
+ avatarMode = false;
+ }
+ }
if (!avatarMode)
{
QImage snapmaticImage(snapmaticRes, QImage::Format_RGB888);