[vlc-devel] [PATCH 16/41] vout:gdi: rename variable that is also a define

Steve Lhomme robux4 at ycbcr.xyz
Fri Mar 22 16:13:54 CET 2019


The compiler should be nice and warn there is something wrong.
---
 modules/video_output/win32/wingdi.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/video_output/win32/wingdi.c b/modules/video_output/win32/wingdi.c
index bf6e9909e1..348d42b722 100644
--- a/modules/video_output/win32/wingdi.c
+++ b/modules/video_output/win32/wingdi.c
@@ -148,23 +148,23 @@ static void Display(vout_display_t *vd, picture_t *picture)
 #define rect_src_clipped sys->sys.area.rect_src_clipped
 #define rect_dest sys->sys.area.rect_dest
 #define rect_dest_clipped sys->sys.area.rect_dest_clipped
-    RECT rect_dst = rect_dest_clipped;
+    RECT dst_rect = rect_dest_clipped;
     HDC hdc = GetDC(sys->sys.hvideownd);
 
-    OffsetRect(&rect_dst, -rect_dest.left, -rect_dest.top);
+    OffsetRect(&dst_rect, -rect_dest.left, -rect_dest.top);
     SelectObject(sys->off_dc, sys->off_bitmap);
 
     if (RECTWidth(rect_dest_clipped) != RECTWidth(rect_src_clipped) ||
         RECTHeight(rect_dest_clipped) != RECTHeight(rect_src_clipped)) {
-        StretchBlt(hdc, rect_dst.left, rect_dst.top,
-                   rect_dst.right, rect_dst.bottom,
+        StretchBlt(hdc, dst_rect.left, dst_rect.top,
+                   dst_rect.right, dst_rect.bottom,
                    sys->off_dc,
                    rect_src_clipped.left,  rect_src_clipped.top,
                    rect_src_clipped.right, rect_src_clipped.bottom,
                    SRCCOPY);
     } else {
-        BitBlt(hdc, rect_dst.left, rect_dst.top,
-               rect_dst.right, rect_dst.bottom,
+        BitBlt(hdc, dst_rect.left, dst_rect.top,
+               dst_rect.right, dst_rect.bottom,
                sys->off_dc,
                rect_src_clipped.left, rect_src_clipped.top,
                SRCCOPY);
-- 
2.17.1



More information about the vlc-devel mailing list