[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2-demos] master ddeb7f6: * graph/win32/grwin32.c (gr_win32_surf
From: |
Alexei Podtelezhnikov |
Subject: |
[freetype2-demos] master ddeb7f6: * graph/win32/grwin32.c (gr_win32_surface_init): Clean up. |
Date: |
Tue, 5 Jan 2021 23:03:27 -0500 (EST) |
branch: master
commit ddeb7f6d8befcdfba1265ad10c353c04b90b4f55
Author: Alexei Podtelezhnikov <apodtele@gmail.com>
Commit: Alexei Podtelezhnikov <apodtele@gmail.com>
* graph/win32/grwin32.c (gr_win32_surface_init): Clean up.
---
ChangeLog | 4 ++++
graph/win32/grwin32.c | 28 +++++++++++-----------------
2 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index d02a11f..e25743a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2021-01-05 Alexei Podtelezhnikov <apodtele@gmail.com>
+
+ * graph/win32/grwin32.c (gr_win32_surface_init): Clean up.
+
2021-01-03 Alexei Podtelezhnikov <apodtele@gmail.com>
[graph/win32] Improve driver.
diff --git a/graph/win32/grwin32.c b/graph/win32/grwin32.c
index 89e81ce..71cd9c9 100644
--- a/graph/win32/grwin32.c
+++ b/graph/win32/grwin32.c
@@ -428,10 +428,6 @@ static grWin32Surface*
gr_win32_surface_init( grWin32Surface* surface,
grBitmap* bitmap )
{
- static RGBQUAD black = { 0, 0, 0, 0 };
- static RGBQUAD white = { 0xFF, 0xFF, 0xFF, 0 };
-
-
/* Set default mode */
if ( bitmap->mode == gr_pixel_mode_none )
{
@@ -461,7 +457,6 @@ gr_win32_surface_init( grWin32Surface* surface,
LOG(( "Win32: init_surface( %p, %p )\n", surface, bitmap ));
- LOG(( " -- input bitmap =\n" ));
LOG(( " -- mode = %d\n", bitmap->mode ));
LOG(( " -- grays = %d\n", bitmap->grays ));
LOG(( " -- width = %d\n", bitmap->width ));
@@ -501,12 +496,6 @@ gr_win32_surface_init( grWin32Surface* surface,
else
surface->shadow_bitmap.buffer = bitmap->buffer;
- LOG(( " -- output bitmap =\n" ));
- LOG(( " -- mode = %d\n", bitmap->mode ));
- LOG(( " -- grays = %d\n", bitmap->grays ));
- LOG(( " -- width = %d\n", bitmap->width ));
- LOG(( " -- height = %d\n", bitmap->rows ));
-
surface->bmiHeader.biSize = sizeof( BITMAPINFOHEADER );
surface->bmiHeader.biWidth = bitmap->width;
surface->bmiHeader.biHeight = bitmap->rows;
@@ -516,13 +505,13 @@ gr_win32_surface_init( grWin32Surface* surface,
{
case gr_pixel_mode_mono:
surface->bmiHeader.biBitCount = 1;
- surface->bmiColors[0] = white;
- surface->bmiColors[1] = black;
- break;
+ {
+ RGBQUAD white = { 0xFF, 0xFF, 0xFF, 0 };
+ RGBQUAD black = { 0, 0, 0, 0 };
- case gr_pixel_mode_rgb24:
- surface->bmiHeader.biBitCount = 24;
- surface->bmiHeader.biCompression = BI_RGB;
+ surface->bmiColors[0] = white;
+ surface->bmiColors[1] = black;
+ }
break;
case gr_pixel_mode_gray:
@@ -548,6 +537,11 @@ gr_win32_surface_init( grWin32Surface* surface,
surface->bmiHeader.biCompression = BI_RGB;
break;
+ case gr_pixel_mode_rgb24:
+ surface->bmiHeader.biBitCount = 24;
+ surface->bmiHeader.biCompression = BI_RGB;
+ break;
+
case gr_pixel_mode_rgb555:
surface->bmiHeader.biBitCount = 16;
surface->bmiHeader.biCompression = BI_RGB;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2-demos] master ddeb7f6: * graph/win32/grwin32.c (gr_win32_surface_init): Clean up.,
Alexei Podtelezhnikov <=