commit f35e41a75bcbecae76ca1fda3fb6b2300b6bb8e2
author Joe Drago <jdrago@netflix.com> Mon Feb 11 17:01:41 2019 -0800
committer Joe Drago <jdrago@netflix.com> Mon Feb 11 17:01:41 2019 -0800
tree a00fc355a25115ad7b67aa8af390f69b1816fe5d
parent e7ce20d237576d1991a53e9f789dd5bebc2b6c89

Cleanup nclx API to use temp structs

src/avif.c

diff --git a/src/avif.c b/src/avif.c
index 6bb1b2d..8ccb645 100644
--- a/src/avif.c
+++ b/src/avif.c
@@ -81,14 +81,11 @@
     }
 }
 
-void avifImageSetProfileNCLX(avifImage * image, uint16_t colourPrimaries, uint16_t transferCharacteristics, uint16_t matrixCoefficients, uint8_t fullRangeFlag)
+void avifImageSetProfileNCLX(avifImage * image, avifNclxColorProfile * nclx)
 {
     avifImageSetProfileNone(image);
     image->profileFormat = AVIF_PROFILE_FORMAT_NCLX;
-    image->nclx.colourPrimaries = colourPrimaries;
-    image->nclx.transferCharacteristics = transferCharacteristics;
-    image->nclx.matrixCoefficients = matrixCoefficients;
-    image->nclx.fullRangeFlag = fullRangeFlag;
+    memcpy(&image->nclx, nclx, sizeof(avifNclxColorProfile));
 }
 
 void avifImageAllocatePlanes(avifImage * image, uint32_t planes)

src/read.c

diff --git a/src/read.c b/src/read.c
index 73e7952..1a0ad89 100644
--- a/src/read.c
+++ b/src/read.c
@@ -703,11 +703,7 @@
         if (colorOBUItem->colr.format == AVIF_PROFILE_FORMAT_ICC) {
             avifImageSetProfileICC(image, colorOBUItem->colr.icc, colorOBUItem->colr.iccSize);
         } else if (colorOBUItem->colr.format == AVIF_PROFILE_FORMAT_NCLX) {
-            avifImageSetProfileNCLX(image,
-                colorOBUItem->colr.nclx.colourPrimaries,
-                colorOBUItem->colr.nclx.transferCharacteristics,
-                colorOBUItem->colr.nclx.matrixCoefficients,
-                colorOBUItem->colr.nclx.fullRangeFlag);
+            avifImageSetProfileNCLX(image, &colorOBUItem->colr.nclx);
         }
     }