Merge

diff --cc custom.cpp
index c0beb809b9eec0db9907d57d8207d28dce81f504,9fcbc26275467447ec5ac51ed3f632e579109575..75b6bf9c4f36a041fdc425c3f70c1795d3e20f15
--- 1/custom.cpp
--- 2/custom.cpp
+++ b/custom.cpp
@@@ -12099,10 -12466,8 +12108,11 @@@ static void sync_equalline_handler(void
  
        custom_trigger_start();
  
 +      check_vsyncs_fast();
 +      vsync_linecnt++;
 +
        if (eventtab[ev_sync].active) {
+               check_vsyncs_fast();
                check_bpl_vdiw();
                do_imm_dmal();
        } else {

diff --cc drawing.cpp
index eb594588148fa18059e289ad8aeebd6293c4fc77,984fce1ace5240d0fcfe2b0022dbc65109951bf6..168816d5bb1a188a2aaa813788bb58ec69040ed8
--- 1/drawing.cpp
--- 2/drawing.cpp
+++ b/drawing.cpp
@@@ -5727,11 -5676,19 +5727,20 @@@ static void get_line(int monid, int gfx
                                }
                        }
                }
 +              denise_pixtotal_max--;
        }
        
+       denise_pixtotal *= 2;
+ 
+       if (buf1) {
+               int maxw = (uae_u32*)xlinebuffer_end - buf1;
+               if ((denise_pixtotal_max << hresolution) > maxw) {
+                       denise_pixtotal_max = maxw >> hresolution;
+               }
+       }
+ 
        if (xshift > 0) {
-               denise_pixtotal_max -= xshift;
+               denise_pixtotal_max -= xshift * 2;
        }
        if (!buf1) {
                denise_pixtotal_max = -0x7fffffff;

diff --cc od-win32/win32_scaler.cpp
Simple merge

diff --cc od-win32/writelog.cpp
Simple merge