[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2-demos] master be07acd 2/2: * graph/*.*: Remove legacy blitter
From: |
Werner Lemberg |
Subject: |
[freetype2-demos] master be07acd 2/2: * graph/*.*: Remove legacy blitter ghosts. |
Date: |
Tue, 23 Nov 2021 23:07:50 -0500 (EST) |
branch: master
commit be07acd3fb7c801da7f51ddfe7a1af983c01f14f
Author: Alexei Podtelezhnikov <apodtele@gmail.com>
Commit: Alexei Podtelezhnikov <apodtele@gmail.com>
* graph/*.*: Remove legacy blitter ghosts.
---
graph/allegro/gralleg.c | 2 --
graph/batch/grbatch.c | 2 --
graph/grobjs.h | 73 -------------------------------------------------
graph/grtypes.h | 4 +--
4 files changed, 1 insertion(+), 80 deletions(-)
diff --git a/graph/allegro/gralleg.c b/graph/allegro/gralleg.c
index fa521b2..650b94e 100644
--- a/graph/allegro/gralleg.c
+++ b/graph/allegro/gralleg.c
@@ -192,8 +192,6 @@ static int init_surface(grSurface* surface, grBitmap*
bitmap)
surface->bitmap = *bitmap;
surface->refresh = 0;
surface->owner = 0;
- surface->saturation = 0;
- surface->blit_mono = 0;
surface->refresh_rect = alrefresh_rect;
surface->set_title = alset_title;
diff --git a/graph/batch/grbatch.c b/graph/batch/grbatch.c
index 053b394..9de621d 100644
--- a/graph/batch/grbatch.c
+++ b/graph/batch/grbatch.c
@@ -84,8 +84,6 @@
surface->bitmap = *bitmap;
surface->refresh = 0;
surface->owner = 0;
- surface->saturation = 0;
- surface->blit_mono = 0;
surface->refresh_rect = (grRefreshRectFunc)NULL; /* nothing to refresh */
surface->set_title = gr_batch_surface_set_title;
diff --git a/graph/grobjs.h b/graph/grobjs.h
index 7d8ab06..45ddbc6 100644
--- a/graph/grobjs.h
+++ b/graph/grobjs.h
@@ -23,76 +23,6 @@
#include "gblender.h"
- typedef struct grBiColor_
- {
- grColor foreground;
- grColor background;
-
- int num_levels;
- int max_levels;
- grColor* levels;
-
- } grBiColor;
-
-
-
- /**********************************************************************
- *
- * Technical note : explaining how the blitter works.
- *
- * The blitter is used to "draw" a given source bitmap into
- * a given target bitmap.
- *
- * The function called 'compute_clips' is used to compute clipping
- * constraints. These lead us to compute two areas :
- *
- * - the read area : is the rectangle, within the source bitmap,
- * which will be effectively "drawn" in the
- * target bitmap.
- *
- * - the write area : is the rectangle, within the target bitmap,
- * which will effectively "receive" the pixels
- * from the read area
- *
- * Note that both areas have the same dimensions, but are
- * located in distinct surfaces.
- *
- * These areas are computed by 'compute_clips' which is called
- * by each blitting function.
- *
- * Note that we use the Y-downwards convention within the blitter
- *
- **********************************************************************/
-
- typedef struct grBlitter_
- {
- int width; /* width in pixels of the areas */
- int height; /* height in pixels of the areas */
-
- int xread; /* x position of start point in read area */
- int yread; /* y position of start point in read area */
-
- int xwrite; /* x position of start point in write area */
- int ywrite; /* y position of start point in write area */
-
- int right_clip; /* amount of right clip */
-
- unsigned char* read; /* top left corner of read area in source map */
- unsigned char* write; /* top left corner of write area in target map */
-
- int read_line; /* byte increment to go down one row in read area */
- int write_line; /* byte increment to go down one row in write area */
-
- grBitmap source; /* source bitmap descriptor */
- grBitmap target; /* target bitmap descriptor */
-
- } grBlitter;
-
-
-
- typedef void (*grBlitterFunc)( grBlitter* blitter,
- grColor color );
-
typedef void (*grSetTitleFunc)( grSurface* surface,
const char* title_string );
@@ -142,9 +72,6 @@
grBool refresh;
grBool owner;
- const byte* saturation; /* used for gray surfaces only */
- grBlitterFunc blit_mono; /* 0 by default, set by grBlit.. */
-
grRefreshRectFunc refresh_rect;
grSetTitleFunc set_title;
grSetIconFunc set_icon;
diff --git a/graph/grtypes.h b/graph/grtypes.h
index 4c78f2c..c501298 100644
--- a/graph/grtypes.h
+++ b/graph/grtypes.h
@@ -86,9 +86,7 @@
#define gr_err_bad_argument -2
#define gr_err_bad_target_depth -3
#define gr_err_bad_source_depth -4
-#define gr_err_saturation_overflow -5
-#define gr_err_conversion_overflow -6
-#define gr_err_invalid_device -7
+#define gr_err_invalid_device -5
#ifdef GR_MAKE_OPTION_SINGLE_OBJECT
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2-demos] master be07acd 2/2: * graph/*.*: Remove legacy blitter ghosts.,
Werner Lemberg <=