Revision 0e1f5a0c hw/tcx.c

b/hw/tcx.c
55 55
{
56 56
    int i;
57 57
    for(i = start; i < end; i++) {
58
        switch(s->ds->depth) {
58
        switch(ds_get_bits_per_pixel(s->ds)) {
59 59
        default:
60 60
        case 8:
61 61
            s->palette[i] = rgb_to_pixel8(s->r[i], s->g[i], s->b[i]);
......
200 200
    uint8_t *d, *s;
201 201
    void (*f)(TCXState *s1, uint8_t *dst, const uint8_t *src, int width);
202 202

  
203
    if (ts->ds->depth == 0)
203
    if (ds_get_bits_per_pixel(ts->ds) == 0)
204 204
        return;
205 205
    page = ts->vram_offset;
206 206
    y_start = -1;
207 207
    page_min = 0xffffffff;
208 208
    page_max = 0;
209
    d = ts->ds->data;
209
    d = ds_get_data(ts->ds);
210 210
    s = ts->vram;
211
    dd = ts->ds->linesize;
211
    dd = ds_get_linesize(ts->ds);
212 212
    ds = 1024;
213 213

  
214
    switch (ts->ds->depth) {
214
    switch (ds_get_bits_per_pixel(ts->ds)) {
215 215
    case 32:
216 216
        f = tcx_draw_line32;
217 217
        break;
......
278 278
    uint8_t *d, *s;
279 279
    uint32_t *cptr, *s24;
280 280

  
281
    if (ts->ds->depth != 32)
281
    if (ds_get_bits_per_pixel(ts->ds) != 32)
282 282
            return;
283 283
    page = ts->vram_offset;
284 284
    page24 = ts->vram24_offset;
......
286 286
    y_start = -1;
287 287
    page_min = 0xffffffff;
288 288
    page_max = 0;
289
    d = ts->ds->data;
289
    d = ds_get_data(ts->ds);
290 290
    s = ts->vram;
291 291
    s24 = ts->vram24;
292 292
    cptr = ts->cplane;
293
    dd = ts->ds->linesize;
293
    dd = ds_get_linesize(ts->ds);
294 294
    ds = 1024;
295 295

  
296 296
    for(y = 0; y < ts->height; y += 4, page += TARGET_PAGE_SIZE,

Also available in: Unified diff