diff mbox series

[FFmpeg-devel,1/2] avcodec/tiff: Remove commented-out code

Message ID AS8P250MB0744F5C729656212F053CD7F8F539@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM
State Accepted
Commit 87cc318bc27dc478b01bc2f97595b0394323d45d
Headers show
Series [FFmpeg-devel,1/2] avcodec/tiff: Remove commented-out code | expand

Checks

Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

Andreas Rheinhardt Sept. 25, 2022, 6:22 p.m. UTC 
Also remove a variable that is only used in this commented-out
codeblock. This fixes a -Wunused-variable warning.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavcodec/tiff.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

Comments

Rémi Denis-Courmont Sept. 26, 2022, 3:13 p.m. UTC | #1 
Yes, please.
Andreas Rheinhardt Sept. 28, 2022, 1:07 a.m. UTC | #2 
Andreas Rheinhardt:
> Also remove a variable that is only used in this commented-out
> codeblock. This fixes a -Wunused-variable warning.
> 
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
>  libavcodec/tiff.c | 7 +------
>  1 file changed, 1 insertion(+), 6 deletions(-)
> 
> diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
> index 3a610ada85..fd9db18c0b 100644
> --- a/libavcodec/tiff.c
> +++ b/libavcodec/tiff.c
> @@ -1882,7 +1882,7 @@ static void camera_xyz_coeff(TiffContext *s,
>                               float rgb2cam[3][4],
>                               double cam2xyz[4][3])
>  {
> -    double cam2rgb[4][3], inverse[4][3], num;
> +    double cam2rgb[4][3], num;
>      int i, j, k;
>  
>      for (i = 0; i < 3; i++) {
> @@ -1900,11 +1900,6 @@ static void camera_xyz_coeff(TiffContext *s,
>              cam2rgb[i][j] /= num;
>          s->premultiply[i] = 1.f / num;
>      }
> -
> -//    pseudoinverse(cam2rgb, inverse, colors);
> -//    for (i = 0; i < 3; i++)
> -//        for (j = 0; j < 3; j++)
> -//            rgb2cam[i][j] = inverse[j][i];
>  }
>  
>  static int decode_frame(AVCodecContext *avctx, AVFrame *p,

Will apply tonight unless there are reasonable objections.

- Andreas
diff mbox series

Patch

diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
index 3a610ada85..fd9db18c0b 100644
--- a/libavcodec/tiff.c
+++ b/libavcodec/tiff.c
@@ -1882,7 +1882,7 @@  static void camera_xyz_coeff(TiffContext *s,
                              float rgb2cam[3][4],
                              double cam2xyz[4][3])
 {
-    double cam2rgb[4][3], inverse[4][3], num;
+    double cam2rgb[4][3], num;
     int i, j, k;
 
     for (i = 0; i < 3; i++) {
@@ -1900,11 +1900,6 @@  static void camera_xyz_coeff(TiffContext *s,
             cam2rgb[i][j] /= num;
         s->premultiply[i] = 1.f / num;
     }
-
-//    pseudoinverse(cam2rgb, inverse, colors);
-//    for (i = 0; i < 3; i++)
-//        for (j = 0; j < 3; j++)
-//            rgb2cam[i][j] = inverse[j][i];
 }
 
 static int decode_frame(AVCodecContext *avctx, AVFrame *p,