LinGui: fix a problem with height control

Attempting to increase the height would revert back to previous setting
due to rounding problems.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4333 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/gtk/src/hb-backend.c b/gtk/src/hb-backend.c
index d3f85a9c89ffba3ef71f778d6e2b37c16f3946b3..4b765da297411946f1b1639f538dea5c8262901c 100644 (file)
--- a/gtk/src/hb-backend.c
+++ b/gtk/src/hb-backend.c
@@ -3933,7 +3933,10 @@ ghb_set_scale_settings(GValue *settings, gint mode)
                job->anamorphic.dar_height = 0;
 
                if (keep_height && pic_par == 2)
+               {
                        width = ((double)height * crop_width / crop_height);
+                       width = MOD_ROUND(width, mod);
+               }
                job->width = width;
                job->height = height;
                job->maxWidth = max_width;

diff --git a/gtk/src/preview.h b/gtk/src/preview.h
index f89e4f335774d147ab0ed4bd690abddf93c88755..089d60d1cf62639de42a282c0ec71991d0c142ba 100644 (file)
--- a/gtk/src/preview.h
+++ b/gtk/src/preview.h
@@ -16,7 +16,7 @@
 #if !defined(_GHB_PREVIEW_H_)
 #define _GHB_PREVIEW_H_
 
-#define MOD_ROUND(v,m) ((m==1)?v:(m * ((v + (m>>1) - 1) / m)))
+#define MOD_ROUND(v,m) ((m==1)?v:(m * ((v + (m>>1)) / m)))
 #define MOD_DOWN(v,m)  (m * (v / m))
 #define MOD_UP(v,m)    (m * ((v + m - 1) / m))