← Back to branch summary

~ubuntu-branches/debian/sid/v4l-utils/sid

« back to all changes in this revision

Viewing changes to .pc/allow-disabling-libjpeg.diff/lib/libv4lconvert/libv4lconvert.c

  • Committer: Package Import Robot
  • Author(s): Gregor Jasny
  • Date: 2012-04-14 19:42:06 UTC
  • mfrom: (1.1.10)
  • Revision ID: package-import@ubuntu.com-20120414194206-nmgagyd9wc5dz0br
Tags: 0.8.8-1
http://bugs.debian.org/667958
* Imported Upstream version 0.8.8
  - Revert Lenovo X201 upside down table entry (Closes: #667958)
  - libv4lconvert: Use bytesperline instead of width
  - libv4lconver: Add 06f8:301b pac7302 based cam to the quirk table
  - tinyjpeg: Better luminance quantization table for Pixart JPEG
  - tinyjpeg: Fix out of bounds array usage
* Add DVB tools package

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/allow-disabling-libjpeg.diff/lib/libv4lconvert/libv4lconvert.c
629
629
        unsigned int src_pix_fmt = fmt->fmt.pix.pixelformat;
630
630
        unsigned int width  = fmt->fmt.pix.width;
631
631
        unsigned int height = fmt->fmt.pix.height;
 
632
        unsigned int bytesperline = fmt->fmt.pix.bytesperline;
632
633
 
633
634
        switch (src_pix_fmt) {
634
635
        /* JPG and variants */
858
859
        case V4L2_PIX_FMT_SRGGB8:
859
860
                switch (dest_pix_fmt) {
860
861
                case V4L2_PIX_FMT_RGB24:
861
 
                        v4lconvert_bayer_to_rgb24(src, dest, width, height, src_pix_fmt);
 
862
                        v4lconvert_bayer_to_rgb24(src, dest, width, height, bytesperline, src_pix_fmt);
862
863
                        break;
863
864
                case V4L2_PIX_FMT_BGR24:
864
 
                        v4lconvert_bayer_to_bgr24(src, dest, width, height, src_pix_fmt);
 
865
                        v4lconvert_bayer_to_bgr24(src, dest, width, height, bytesperline, src_pix_fmt);
865
866
                        break;
866
867
                case V4L2_PIX_FMT_YUV420:
867
 
                        v4lconvert_bayer_to_yuv420(src, dest, width, height, src_pix_fmt, 0);
 
868
                        v4lconvert_bayer_to_yuv420(src, dest, width, height, bytesperline, src_pix_fmt, 0);
868
869
                        break;
869
870
                case V4L2_PIX_FMT_YVU420:
870
 
                        v4lconvert_bayer_to_yuv420(src, dest, width, height, src_pix_fmt, 1);
 
871
                        v4lconvert_bayer_to_yuv420(src, dest, width, height, bytesperline, src_pix_fmt, 1);
871
872
                        break;
872
873
                }
873
874
                if (src_size < (width * height)) {