diff options
| author | John Baldwin <jhb@FreeBSD.org> | 2022-08-22 11:13:26 -0700 |
|---|---|---|
| committer | John Baldwin <jhb@FreeBSD.org> | 2022-08-22 11:13:26 -0700 |
| commit | 5ec1777c7597496c62f0b09b8b0670380c894f10 (patch) | |
| tree | e6557ba438c1de1d0c63751e7a2a861649664cf3 /multimedia/pwcbsd/files/patch-pwc-dec23.c | |
| parent | emulators/parallels-tools: Remove devclass from DRIVER_MODULE on recent main. (diff) | |
multimedia/pwcbsd: Remove devclass from DRIVER_MODULE on recent main.
While here fix a couple of unused but set warnings by removing an
unused variable and commenting out another variable only used in
commented-out code.
Differential Revision: https://reviews.freebsd.org/D35948
Diffstat (limited to 'multimedia/pwcbsd/files/patch-pwc-dec23.c')
| -rw-r--r-- | multimedia/pwcbsd/files/patch-pwc-dec23.c | 46 |
1 files changed, 44 insertions, 2 deletions
diff --git a/multimedia/pwcbsd/files/patch-pwc-dec23.c b/multimedia/pwcbsd/files/patch-pwc-dec23.c index c173dafaa5a6..08796d35696f 100644 --- a/multimedia/pwcbsd/files/patch-pwc-dec23.c +++ b/multimedia/pwcbsd/files/patch-pwc-dec23.c @@ -1,5 +1,5 @@ ---- pwc-dec23.c.orig 2006-06-04 05:39:14.000000000 +0400 -+++ pwc-dec23.c 2015-02-16 22:09:58.000000000 +0300 +--- pwc-dec23.c.orig 2006-06-03 18:39:14.000000000 -0700 ++++ pwc-dec23.c 2022-07-26 09:51:27.868178000 -0700 @@ -261,7 +261,7 @@ { int flags; @@ -27,3 +27,45 @@ pdev->table_0004, pdev->table_8004); break; +@@ -347,7 +347,6 @@ + unsigned int reservoir, nbits_in_reservoir; + int first_4_bits; + unsigned int bytes_per_channel; +- int line_size; /* size of the line (4Y+U+V) */ + int passes; + const unsigned char *ptable0004, *ptable8004; + +@@ -368,8 +367,6 @@ + + get_nbits(reservoir, nbits_in_reservoir, stream, 4, first_4_bits); + +- line_size = pixels_per_line * 3; +- + for (passes = 0; passes < 2; passes++) { + if (passes == 0) { + bytes_per_channel = pixels_per_line; +@@ -605,12 +602,13 @@ + int flags, const void *data, int bandlength) + { + const struct pwc_dec23_private *pdev = data; +- unsigned char *pout, *pout_planar_y = NULL, *pout_planar_u = ++ //unsigned char *pout; ++ unsigned char *pout_planar_y = NULL, *pout_planar_u = + NULL, *pout_planar_v = NULL; + int i, n, stride, pixel_size; + + if (flags & PWCX_FLAG_BAYER) { +- pout = dst + (view->x * offset->y) + offset->x; ++ //pout = dst + (view->x * offset->y) + offset->x; + pixel_size = view->x * 4; + } else { + n = view->x * view->y; +@@ -632,7 +630,7 @@ + //TODO: + //DecompressBandBayer(pdev,src,pout,image.x,view->x,flags); + src += bandlength; +- pout += pixel_size; ++ //pout += pixel_size; + } else { + DecompressBand23(pdev, src, pout_planar_y, + pout_planar_u, pout_planar_v, image->x, |