← Back to branch summary

~ubuntu-branches/ubuntu/maverick/vice/maverick

« back to all changes in this revision

Viewing changes to src/video/video-render.c

  • Committer: Bazaar Package Importer
  • Author(s): Zed Pobre
  • Date: 2005-02-01 11:30:26 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20050201113026-3eyakzsmmheclvjg
Tags: 1.16-1
http://bugs.debian.org/287640
http://bugs.debian.org/286767
http://bugs.debian.org/152952
http://bugs.debian.org/207942
* New upstream version
* Fixes crash on 64-bit architectures (closes: #287640)
* x128 working again (closes: #286767)
* Works fine with /dev/dsp in use (not in the main changelog, but tested
  on my local machine as working).  Presumably, this also takes care of
  the issue with dsp being held.  I'm not sure if this is because I'm
  testing it on a 2.6 kernel now -- if you are still having problems
  with /dev/dsp, please reopen the bugs. (closes: #152952, #207942)
* Don't kill Makefile.in on clean

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/video/video-render.c
103
103
    int rendermode;
104
104
 
105
105
#if 0
106
 
printf("w:%i h:%i xs:%i ys:%i xt:%i yt:%i ps:%i pt:%i d%i\n",
107
 
        width, height, xs, ys, xt, yt, pitchs, pitcht, depth);
 
106
    log_debug("w:%i h:%i xs:%i ys:%i xt:%i yt:%i ps:%i pt:%i d%i",
 
107
              width, height, xs, ys, xt, yt, pitchs, pitcht, depth);
108
108
#endif
109
109
 
110
110
    if (width <= 0)
191
191
void render_yuv_image(int double_size,
192
192
                      int double_scan,
193
193
                      int pal_mode,
 
194
                      int pal_blur,
194
195
                      int pal_scanline_shade,
195
196
                      fourcc_t format,
196
197
                      image_t* image,
263
264
        renderyuv_2x_4_1_1_pal(image, plane_y, plane_u, plane_v,
264
265
                               src, src_pitch, src_color,
265
266
                               src_x, src_y, src_w, src_h, dest_x, dest_y,
266
 
                               pal_mode, double_scan, pal_scanline_shade);
 
267
                               pal_blur, double_scan, pal_scanline_shade);
267
268
        break;
268
269
      }
269
270
    }
280
281
        renderyuv_2x_4_2_2_pal(image, shift_y0, shift_u, shift_v, shift_y1,
281
282
                               src, src_pitch, src_color,
282
283
                               src_x, src_y, src_w, src_h, dest_x, dest_y,
283
 
                               pal_mode, double_scan, pal_scanline_shade);
 
284
                               pal_blur, double_scan, pal_scanline_shade);
284
285
        break;
285
286
      }
286
287
    }
299
300
        renderyuv_4_1_1_pal(image, plane_y, plane_u, plane_v,
300
301
                            src, src_pitch, src_color,
301
302
                            src_x, src_y, src_w, src_h, dest_x, dest_y,
302
 
                            pal_mode);
 
303
                            pal_blur);
303
304
        break;
304
305
      }
305
306
    }
315
316
        renderyuv_4_2_2_pal(image, shift_y0, shift_u, shift_v, shift_y1,
316
317
                            src, src_pitch, src_color,
317
318
                            src_x, src_y, src_w, src_h, dest_x, dest_y,
318
 
                            pal_mode);
 
319
                            pal_blur);
319
320
        break;
320
321
      }
321
322
    }