Skip to content

V
vlc
Commit 0e26bab0 authored by Laurent Aimar's avatar Laurent Aimar
Browse files
Options

Fixed scte27.c win32 compilation.

parent a84e47ee
Show whitespace changes
Inline Side-by-side
Showing with 15 additions and 15 deletions
modules/codec/scte27.c
View file @ 0e26bab0
...@@ -82,7 +82,7 @@ static scte27_color_t bs_read_color(bs_t *bs) ...@@ -82,7 +82,7 @@ static scte27_color_t bs_read_color(bs_t *bs)
return color; return color;
} }
static inline void SetPixel(picture_t *picture, int x, int y, int value) static inline void SetYUVPPixel(picture_t *picture, int x, int y, int value)
{ {
picture->p->p_pixels[y * picture->p->i_pitch + x] = value; picture->p->p_pixels[y * picture->p->i_pitch + x] = value;
} }
...@@ -288,13 +288,13 @@ static subpicture_region_t *DecodeSimpleBitmap(decoder_t *dec, ...@@ -288,13 +288,13 @@ static subpicture_region_t *DecodeSimpleBitmap(decoder_t *dec,
for (int dy = 0; dy <= outline_thickness; dy++) { for (int dy = 0; dy <= outline_thickness; dy++) {
for (int dx = 0; dx <= outline_thickness; dx++) { for (int dx = 0; dx <= outline_thickness; dx++) {
if (circle[dy][dx]) { if (circle[dy][dx]) {
SetPixel(r->p_picture, SetYUVPPixel(r->p_picture,
bx + bitmap_oh + dx, by + bitmap_ov + dy, COLOR_OUTLINE); bx + bitmap_oh + dx, by + bitmap_ov + dy, COLOR_OUTLINE);
SetPixel(r->p_picture, SetYUVPPixel(r->p_picture,
bx + bitmap_oh - dx, by + bitmap_ov + dy, COLOR_OUTLINE); bx + bitmap_oh - dx, by + bitmap_ov + dy, COLOR_OUTLINE);
SetPixel(r->p_picture, SetYUVPPixel(r->p_picture,
bx + bitmap_oh + dx, by + bitmap_ov - dy, COLOR_OUTLINE); bx + bitmap_oh + dx, by + bitmap_ov - dy, COLOR_OUTLINE);
SetPixel(r->p_picture, SetYUVPPixel(r->p_picture,
bx + bitmap_oh - dx, by + bitmap_ov - dy, COLOR_OUTLINE); bx + bitmap_oh - dx, by + bitmap_ov - dy, COLOR_OUTLINE);
} }
} }
...@@ -306,7 +306,7 @@ static subpicture_region_t *DecodeSimpleBitmap(decoder_t *dec, ...@@ -306,7 +306,7 @@ static subpicture_region_t *DecodeSimpleBitmap(decoder_t *dec,
for (int by = 0; by < bitmap_v; by++) { for (int by = 0; by < bitmap_v; by++) {
for (int bx = 0; bx < bitmap_h; bx++) { for (int bx = 0; bx < bitmap_h; bx++) {
if (bitmap[by * bitmap_h + bx]) if (bitmap[by * bitmap_h + bx])
SetPixel(r->p_picture, SetYUVPPixel(r->p_picture,
bx + bitmap_oh + shadow_right, bx + bitmap_oh + shadow_right,
by + bitmap_ov + shadow_bottom, by + bitmap_ov + shadow_bottom,
COLOR_SHADOW); COLOR_SHADOW);
...@@ -318,7 +318,7 @@ static subpicture_region_t *DecodeSimpleBitmap(decoder_t *dec, ...@@ -318,7 +318,7 @@ static subpicture_region_t *DecodeSimpleBitmap(decoder_t *dec,
for (int by = 0; by < bitmap_v; by++) { for (int by = 0; by < bitmap_v; by++) {
for (int bx = 0; bx < bitmap_h; bx++) { for (int bx = 0; bx < bitmap_h; bx++) {
if (bitmap[by * bitmap_h + bx]) if (bitmap[by * bitmap_h + bx])
SetPixel(r->p_picture, SetYUVPPixel(r->p_picture,
bx + bitmap_oh, by + bitmap_ov, COLOR_CHARACTER); bx + bitmap_oh, by + bitmap_ov, COLOR_CHARACTER);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment