Unified · Split
| @@ -791,7 +791,7 @@ static void draw_line(FFDrawContext *draw, int x0, int y0, int x1, int y1, · 790 unmodified lines | |||
| 791 | for (p = 0; p < draw->nb_planes; p++) { | 791 | for (p = 0; p < draw->nb_planes; p++) { |
| 792 | if (draw->desc->comp[p].depth == 8) { | 792 | if (draw->desc->comp[p].depth == 8) { |
| 793 | if (draw->nb_planes == 1) { | 793 | if (draw->nb_planes == 1) { |
| 794 | for (i = 0; i < 4; i++) { | 794 | for (i = 0; i < draw->desc->nb_components; i++) { |
| 795 | out->data[0][y0 * out->linesize[0] + x0 * draw->pixelstep[0] + i] = color->comp[0].u8[i]; | 795 | out->data[0][y0 * out->linesize[0] + x0 * draw->pixelstep[0] + i] = color->comp[0].u8[i]; |
| 796 | } | 796 | } |
| 797 | } else { | 797 | } else { |
| @@ -799,8 +799,8 @@ static void draw_line(FFDrawContext *draw, int x0, int y0, int x1, int y1, · 1 unmodified line | |||
| 799 | } | 799 | } |
| 800 | } else { | 800 | } else { |
| 801 | if (draw->nb_planes == 1) { | 801 | if (draw->nb_planes == 1) { |
| 802 | for (i = 0; i < 4; i++) { | 802 | for (i = 0; i < draw->desc->nb_components; i++) { |
| 803 | AV_WN16(out->data[0] + y0 * out->linesize[0] + 2 * (x0 * draw->pixelstep[0] + i), color->comp[0].u16[i]); | 803 | AV_WN16(out->data[0] + y0 * out->linesize[0] + (x0 * draw->pixelstep[0] + i), color->comp[0].u16[i]); |
| 804 | } | 804 | } |
| 805 | } else { | 805 | } else { |
| 806 | AV_WN16(out->data[p] + out->linesize[p] * (y0 >> draw->vsub[p]) + (x0 >> draw->hsub[p]) * 2, color->comp[p].u16[0]); | 806 | AV_WN16(out->data[p] + out->linesize[p] * (y0 >> draw->vsub[p]) + (x0 >> draw->hsub[p]) * 2, color->comp[p].u16[0]); |
| @@ -965,7 +965,7 @@ static void draw_scope(OscilloscopeContext *s, int x0, int y0, int x1, int y1, · 158 unmodified lines | |||
| 965 | if (s->draw.nb_planes == 1) { | 965 | if (s->draw.nb_planes == 1) { |
| 966 | int i; | 966 | int i; |
| 967 | 967 | ||
| 968 | for (i = 0; i < s->draw.pixelstep[0]; i++) | 968 | for (i = 0; i < s->nb_comps; i++) |
| 969 | out->data[0][out->linesize[0] * y0 + x0 * s->draw.pixelstep[0] + i] = 255 * ((s->nb_values + state) & 1); | 969 | out->data[0][out->linesize[0] * y0 + x0 * s->draw.pixelstep[0] + i] = 255 * ((s->nb_values + state) & 1); |
| 970 | } else { | 970 | } else { |
| 971 | out->data[0][out->linesize[0] * y0 + x0] = 255 * ((s->nb_values + state) & 1); | 971 | out->data[0][out->linesize[0] * y0 + x0] = 255 * ((s->nb_values + state) & 1); |
| @@ -974,8 +974,8 @@ static void draw_scope(OscilloscopeContext *s, int x0, int y0, int x1, int y1, · 2 unmodified lines | |||
| 974 | if (s->draw.nb_planes == 1) { | 974 | if (s->draw.nb_planes == 1) { |
| 975 | int i; | 975 | int i; |
| 976 | 976 | ||
| 977 | for (i = 0; i < s->draw.pixelstep[0]; i++) | 977 | for (i = 0; i < s->nb_comps; i++) |
| 978 | AV_WN16(out->data[0] + out->linesize[0] * y0 + 2 * x0 * (s->draw.pixelstep[0] + i), (s->max - 1) * ((s->nb_values + state) & 1)); | 978 | AV_WN16(out->data[0] + out->linesize[0] * y0 + x0 * s->draw.pixelstep[0] + i, (s->max - 1) * ((s->nb_values + state) & 1)); |
| 979 | } else { | 979 | } else { |
| 980 | AV_WN16(out->data[0] + out->linesize[0] * y0 + 2 * x0, (s->max - 1) * ((s->nb_values + state) & 1)); | 980 | AV_WN16(out->data[0] + out->linesize[0] * y0 + 2 * x0, (s->max - 1) * ((s->nb_values + state) & 1)); |
| 981 | } | 981 | } |