eessppeelllloo/veejay
1
0
Fork 0
mirror of https://github.com/game-stop/veejay.git synced 2025-12-20 14:50:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

small fix, little bit faster

Browse Source 
git-svn-id: svn://code.dyne.org/veejay/trunk@843 eb8d1916-c9e9-0310-b8de-cf0c9472ead5
This commit is contained in:
Niels Elburg
2007-03-13 21:26:41 +00:00
parent e79f7aa8dc
commit c8d72d4c68
3 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
veejay-current/gveejay-reloaded/callback.c
View File

@@ -1262,8 +1262,8 @@ void on_button_vimsupdate_clicked(GtkWidget *widget, gpointer user_data)
multi_vims( multi_vims(
VIMS_BUNDLE_ATTACH_KEY, VIMS_BUNDLE_ATTACH_KEY,
"2 %d %d %s", "2 %d %d %s",
info->uc.selected_vims_accel[0],
info->uc.selected_vims_accel[1], info->uc.selected_vims_accel[1],
info->uc.selected_vims_accel[0],
info->uc.selected_vims_args ); info->uc.selected_vims_args );
} }
info->uc.reload_hint[HINT_BUNDLES] = 1; info->uc.reload_hint[HINT_BUNDLES] = 1;

BIN
veejay-current/share/button_rand.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

32
veejay-current/veejay/vj-font.c
View File

@@ -126,6 +126,7 @@ typedef struct {
void *plain; void *plain;
int time; int time;
char *add; char *add;
char *prev;
pthread_mutex_t mutex; pthread_mutex_t mutex;
} vj_font_t; } vj_font_t;
@@ -1714,24 +1715,35 @@ static void draw_glyph(
uint8_t *U = picture->data[1]; uint8_t *U = picture->data[1];
uint8_t *V = picture->data[2]; uint8_t *V = picture->data[2];
uint8_t *bitbuffer = bitmap->buffer;
uint32_t bitmap_rows = bitmap->rows;
uint32_t bitmap_wid = bitmap->width;
uint32_t bitmap_pitch = bitmap->pitch;
int p,left,top,bot,pos;
if (bitmap->pixel_mode == ft_pixel_mode_mono) if (bitmap->pixel_mode == ft_pixel_mode_mono)
{ {
in_glyph = 0; in_glyph = 0;
for (r=0; (r < bitmap->rows) && (r+y < height); r++) for (r=0; (r < bitmap_rows) && (r+y < height); r++)
{ {
for (c=0; (c < bitmap->width) && (c+x < width); c++) for (c=0; (c < bitmap_wid) && (c+x < width); c++)
{ {
int p = (c+x) + ((y+r)*width); p = (c+x) + ((y+r)*width);
int left = (c+x-1) + ((y+r)*width); left = (c+x-1) + ((y+r)*width);
int top = (c+x) + ((y+r-1)*width); top = (c+x) + ((y+r-1)*width);
int bot = (c+x) + ((y+r+1)*width); bot = (c+x) + ((y+r+1)*width);
dpixel[0] = Y[ p ]; dpixel[0] = Y[ p ];
dpixel[1] = U[ p ]; dpixel[1] = U[ p ];
dpixel[2] = V[ p ]; dpixel[2] = V[ p ];
spixel = bitmap->buffer[r*bitmap->pitch +c/8] & (0x80>>(c%8)); pos = r * bitmap_pitch + (c >> 3 );
// spixel = bitmap->buffer[r*bitmap->pitch +c/8] & (0x80>>(c%8));
spixel = bitbuffer[ pos ] & ( 0x80 >> ( c % 8 ));
if (spixel) if (spixel)
{ {
dpixel[0] = yuv_fgcolor[0]; dpixel[0] = yuv_fgcolor[0];
@@ -1760,14 +1772,14 @@ static void draw_glyph(
if (in_glyph) if (in_glyph)
{ {
if ( (r-1 >= 0) && (! bitmap->buffer[(r-1)*bitmap->pitch +c/8] & (0x80>>(c%8))) ) if ( (r-1 >= 0) && (! bitbuffer[(r-1)*bitmap->pitch +c/8] & (0x80>>(c%8))) )
{ {
Y[ top ] = yuv_lncolor[0]; Y[ top ] = yuv_lncolor[0];
U[ top ] = yuv_lncolor[1]; U[ top ] = yuv_lncolor[1];
V[ top ] = yuv_lncolor[2]; V[ top ] = yuv_lncolor[2];
} }
if ( (r+1 < height) && (! bitmap->buffer[(r+1)*bitmap->pitch +c/8] & (0x80>>(c%8))) ) if ( (r+1 < height) && (! bitbuffer[(r+1)*bitmap->pitch +c/8] & (0x80>>(c%8))) )
{ {
Y[ bot ] = yuv_lncolor[0]; Y[ bot ] = yuv_lncolor[0];
U[ bot ] = yuv_lncolor[1]; U[ bot ] = yuv_lncolor[1];