WinGui:

- Fix the QueryGenerator setting incorrect width/height values for anamorphic modes.

git-svn-id: svn://localhost/HandBrake/trunk@2509 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/win/C#/Controls/PictureSettings.cs b/win/C#/Controls/PictureSettings.cs
index e642eaf..7704a36 100644 (file)
--- a/win/C#/Controls/PictureSettings.cs
+++ b/win/C#/Controls/PictureSettings.cs
@@ -10,33 +10,6 @@ namespace Handbrake.Controls
     // - Fix MAX Width / Height Code.\r
     // - Tie in the cropping controls.\r
     \r
-    /* Custom Anamorphic Mode \r
-     * \r
-     * DISPLAY WIDTH       STORAGE WIDTH   PIXEL WIDTH\r
-     * HEIGHT              KEEP ASPECT     PIXEL HEIGHT\r
-     *\r
-     * --- NOT KEEPING DISPLAY ASPECT ---\r
-     * Changing STORAGE WIDTH changes DISPLAY WIDTH to STORAGE WIDTH * PIXEL WIDTH / PIXEL HEIGHT\r
-     * Changing PIXEL dimensions changes DISPLAY WIDTH to STORAGE WIDTH * PIXEL WIDTH / PIXEL HEIGHT\r
-     * Changing DISPLAY WIDTH changes PIXEL WIDTH to DISPLAY WIDTH and PIXEL HEIGHT to STORAGE WIDTH\r
-     * Changing HEIGHT just....changes the height.\r
-     *\r
-     * --- KEEPING DISPLAY ASPECT RATIO ---\r
-     * DAR = DISPLAY WIDTH / DISPLAY HEIGHT (cache after every modification)\r
-     * Disable editing: PIXEL WIDTH, PIXEL HEIGHT\r
-     * Changing DISPLAY WIDTH:\r
-     *    Changes HEIGHT to keep DAR\r
-     *    Changes PIXEL WIDTH to new DISPLAY WIDTH\r
-     *    Changes PIXEL HEIGHT to STORAGE WIDTH\r
-     * Changing HEIGHT\r
-     *    Changes DISPLAY WIDTH to keep DAR\r
-     *    Changes PIXEL WIDTH to new DISPLAY WIDTH\r
-     *    Changes PIXEL HEIGHT to STORAGE WIDTH\r
-     * Changing STORAGE_WIDTH:\r
-     *    Changes PIXEL WIDTH to DISPLAY WIDTH\r
-     *    Changes PIXEL HEIGHT to new STORAGE WIDTH\r
-     */\r
-\r
     public partial class PictureSettings : UserControl\r
     {\r
         // Globals\r
@@ -47,7 +20,7 @@ namespace Handbrake.Controls
         public Title selectedTitle { get; set; }\r
         private Boolean heightChangeGuard;\r
         private Boolean looseAnamorphicHeightGuard;\r
-        private Boolean heightModJumpGaurd = false;\r
+        private Boolean heightModJumpGaurd;\r
 \r
         // Window Setup\r
         public PictureSettings()\r

diff --git a/win/C#/Functions/QueryGenerator.cs b/win/C#/Functions/QueryGenerator.cs
index a60ad31..16b2ace 100644 (file)
--- a/win/C#/Functions/QueryGenerator.cs
+++ b/win/C#/Functions/QueryGenerator.cs
@@ -122,7 +122,8 @@ namespace Handbrake.Functions
             {\r
 \r
                 if (mainWindow.pictureSettings.text_width.Text != "")\r
-                    query += " -w " + mainWindow.pictureSettings.text_width.Text;\r
+                    if (mainWindow.pictureSettings.drp_anamorphic.SelectedIndex != 1) // Prevent usage for strict anamorphic\r
+                        query += " -w " + mainWindow.pictureSettings.text_width.Text;\r
             }\r
             else\r
             {\r
@@ -134,12 +135,13 @@ namespace Handbrake.Functions
             if (mainWindow.maxHeight == 0)\r
             {\r
                 if (mainWindow.pictureSettings.text_height.Text != "")\r
-                    query += " -l " + mainWindow.pictureSettings.text_height.Text;\r
+                    if (mainWindow.pictureSettings.drp_anamorphic.SelectedIndex == 0 || mainWindow.pictureSettings.drp_anamorphic.SelectedIndex == 3) // Prevent usage for strict anamorphic\r
+                        query += " -l " + mainWindow.pictureSettings.text_height.Text;\r
             }\r
             else\r
             {\r
                 if (mainWindow.pictureSettings.text_height.Text != "")\r
-                    query += " -Y " + mainWindow.pictureSettings.text_height.Text;\r
+                        query += " -Y " + mainWindow.pictureSettings.text_height.Text;\r
             }\r
 \r
             string cropTop = mainWindow.pictureSettings.crop_top.Text;\r