Commit 1b99d805dbbdb88a481539b0f41f55d43f714c92
2020-10-14T23:01:02
os2: updates from Andrey Vasilkin's 2020-09-07 sources.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43
diff --git a/src/video/os2/SDL_os2util.c b/src/video/os2/SDL_os2util.c
index d5429f5..87e7d0b 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 3806914..6b9fe5b 100644
--- a/src/video/os2/SDL_os2util.h
+++ b/src/video/os2/SDL_os2util.h
@@ -30,8 +30,6 @@
#define INCL_GPI
#include <os2.h>
-/*#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 902f792..cf9d6f2 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,