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

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

[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,
-- 
2.34.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 2/2] avcodec/tiff: Remove unused function parameter

[Andreas Rheinhardt]

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

diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
index fd9db18c0b..dc566d307d 100644
--- a/libavcodec/tiff.c
+++ b/libavcodec/tiff.c
@@ -1879,7 +1879,6 @@ static const float xyz2rgb[3][3] = {
 };
 
 static void camera_xyz_coeff(TiffContext *s,
-                             float rgb2cam[3][4],
                              double cam2xyz[4][3])
 {
     double cam2rgb[4][3], num;
@@ -2040,7 +2039,6 @@ again:
 
     if (is_dng) {
         double cam2xyz[4][3];
-        float cmatrix[3][4];
         float pmin = FLT_MAX;
         int bps;
 
@@ -2061,7 +2059,7 @@ again:
                 }
             }
 
-            camera_xyz_coeff(s, cmatrix, cam2xyz);
+            camera_xyz_coeff(s, cam2xyz);
         }
 
         for (int c = 0; c < 3; c++)
-- 
2.34.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

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

[Rémi Denis-Courmont]

Yes, please.

-- 
雷米‧德尼-库尔蒙
http://www.remlab.net/
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

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

[Andreas Rheinhardt]

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

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".