From 1b99d805dbbdb88a481539b0f41f55d43f714c92 Mon Sep 17 00:00:00 2001 From: Ozkan Sezer Date: Wed, 14 Oct 2020 23:01:02 +0300 Subject: [PATCH] os2: updates from Andrey Vasilkin's 2020-09-07 sources. --- src/video/os2/SDL_os2util.c | 4 ++-- src/video/os2/SDL_os2util.h | 2 -- src/video/os2/SDL_os2video.c | 3 ++- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/video/os2/SDL_os2util.c b/src/video/os2/SDL_os2util.c index d5429f54f..87e7d0b29 100644 --- a/src/video/os2/SDL_os2util.c +++ b/src/video/os2/SDL_os2util.c @@ -49,9 +49,9 @@ HPOINTER utilCreatePointer(SDL_Surface *surface, ULONG ulHotX, ULONG ulHotY) return NULLHANDLE; } - // pulDst - last line of surface (image) part of the result bitmap's + // pulDst - last line of surface (image) part of the result bitmap pulDst = &pulBitmap[ (surface->h - 1) * surface->w ]; - // pulDstMask - last line of mask part of the result bitmap's + // pulDstMask - last line of mask part of the result bitmap pulDstMask = &pulBitmap[ (2 * surface->h - 1) * surface->w ]; // pulSrc - first line of source image pulSrc = (PULONG)surface->pixels; diff --git a/src/video/os2/SDL_os2util.h b/src/video/os2/SDL_os2util.h index 380691432..6b9fe5bc4 100644 --- a/src/video/os2/SDL_os2util.h +++ b/src/video/os2/SDL_os2util.h @@ -30,8 +30,6 @@ #define INCL_GPI #include -/*#define debug(s,...) SDL_LogDebug( SDL_LOG_CATEGORY_VIDEO, __func__"(): "##s, ##__VA_ARGS__ )*/ - HPOINTER utilCreatePointer(SDL_Surface *surface, ULONG ulHotX, ULONG ulHotY); #endif /* _SDL_os2util_h */ diff --git a/src/video/os2/SDL_os2video.c b/src/video/os2/SDL_os2video.c index 902f7929c..cf9d6f28f 100644 --- a/src/video/os2/SDL_os2video.c +++ b/src/video/os2/SDL_os2video.c @@ -1677,7 +1677,8 @@ static int OS2_GetDisplayDPI(_THIS, SDL_VideoDisplay *display, float *ddpi, static void OS2_GetDisplayModes(_THIS, SDL_VideoDisplay *display) { - debug( "Enter" ); +// debug( "Enter" ); + SDL_AddDisplayMode( display, &display->current_mode ); } static int OS2_SetDisplayMode(_THIS, SDL_VideoDisplay *display,