From aab0ad5abacb00ec7e9b04f6448f03a3ae3deb6d Mon Sep 17 00:00:00 2001 From: Toni Wilen Date: Wed, 29 Jul 2020 17:38:58 +0300 Subject: [PATCH] PAL/NTSC vertical size adjustment in Default filtering mode. --- od-win32/win32_scaler.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/od-win32/win32_scaler.cpp b/od-win32/win32_scaler.cpp index e7916353..63b9dc68 100644 --- a/od-win32/win32_scaler.cpp +++ b/od-win32/win32_scaler.cpp @@ -241,6 +241,7 @@ void getfilterrect2(int monid, RECT *sr, RECT *dr, RECT *zr, int dst_width, int float autoaspectratio; int keep_aspect = currprefs.gf[ad->picasso_on].gfx_filter_keep_aspect; int filter_aspect = currprefs.gf[ad->picasso_on].gfx_filter_aspect; + int palntscadjust = 1; float filter_horiz_zoom = currprefs.gf[ad->picasso_on].gfx_filter_horiz_zoom / 1000.0f; float filter_vert_zoom = currprefs.gf[ad->picasso_on].gfx_filter_vert_zoom / 1000.0f; @@ -310,6 +311,7 @@ void getfilterrect2(int monid, RECT *sr, RECT *dr, RECT *zr, int dst_width, int int h = (dst_height / 2) << currprefs.gfx_vresolution; filter_aspect = 0; keep_aspect = 0; + palntscadjust = 1; if (w >= 640 && w <= 800 && h >= 480 && h <= 600) { scalemode = AUTOSCALE_NONE; } else { @@ -667,11 +669,17 @@ cont: } if (currprefs.ntscmode) { + if (palntscadjust && ispal()) { + dstratio = dstratio * (625 / 525.0); + } if (keep_aspect == 2 && ispal ()) dstratio = dstratio * 0.93f; else if (keep_aspect == 1 && !ispal ()) dstratio = dstratio * 0.98f; } else { + if (palntscadjust && !ispal()) { + dstratio = dstratio * (625 / 525.0); + } if (keep_aspect == 2 && ispal ()) dstratio = dstratio * 0.95f; else if (keep_aspect == 1 && !ispal ()) -- 2.47.3