commit 3cf850bbc89ba178c44dcbd56e4427ac7c559ef7
author Yuan Tong <tongyuan200097@gmail.com> Fri Jan 22 18:18:54 2021 +0800
committer Yuan Tong <tongyuan200097@gmail.com> Fri Jan 22 19:09:25 2021 +0800
tree 9d1b58fa3c96e65b25599b48515431dc8914a813
parent e4850bee802d51dc9f2a7f720abd8cd0aa5c6671

minor fixes

apps/shared/avifjpeg.c

diff --git a/apps/shared/avifjpeg.c b/apps/shared/avifjpeg.c
index 42ef981..ded4cdb 100644
--- a/apps/shared/avifjpeg.c
+++ b/apps/shared/avifjpeg.c
@@ -148,6 +148,7 @@
     avifRGBImage rgb;
     avifRGBImage rgbPremultiplied;
     avifRGBImageSetDefaults(&rgb, avif);
+    avifRGBImageSetDefaults(&rgbPremultiplied, avif);
     rgb.format = avif->alphaPremultiplied ? AVIF_RGB_FORMAT_RGB : AVIF_RGB_FORMAT_RGBA;
     rgb.chromaUpsampling = chromaUpsampling;
     rgb.depth = 8;

include/avif/internal.h

diff --git a/include/avif/internal.h b/include/avif/internal.h
index 7c11145..aaa4cf6 100644
--- a/include/avif/internal.h
+++ b/include/avif/internal.h
@@ -11,7 +11,7 @@
 #endif
 
 // Yes, clamp macros are nasty. Do not use them.
-#define AVIF_CLAMP(x, low, high) (((x) < (low))) ? (low) : (((high) < (x)) ? (high) : (x))
+#define AVIF_CLAMP(x, low, high) ((((x) < (low))) ? (low) : (((high) < (x)) ? (high) : (x)))
 #define AVIF_MIN(a, b) (((a) < (b)) ? (a) : (b))
 #define AVIF_MAX(a, b) (((a) > (b)) ? (a) : (b))
 

src/reformat_libyuv.c

diff --git a/src/reformat_libyuv.c b/src/reformat_libyuv.c
index 061a579..d0c9348 100644
--- a/src/reformat_libyuv.c
+++ b/src/reformat_libyuv.c
@@ -12,12 +12,12 @@
     (void)rgb;
     return AVIF_RESULT_NOT_IMPLEMENTED;
 }
-avifResult avifRGBImagePremultiplyLibYUV(avifRGBImage * rgb)
+avifResult avifRGBImagePremultiplyAlphaLibYUV(avifRGBImage * rgb)
 {
     (void)rgb;
     return AVIF_RESULT_NOT_IMPLEMENTED;
 }
-avifResult avifRGBImageUnpremultiplyLibYUV(avifRGBImage * rgb)
+avifResult avifRGBImageUnpremultiplyAlphaLibYUV(avifRGBImage * rgb)
 {
     (void)rgb;
     return AVIF_RESULT_NOT_IMPLEMENTED;

src/write.c

diff --git a/src/write.c b/src/write.c
index 700c5f9..e8ae8ac 100644
--- a/src/write.c
+++ b/src/write.c
@@ -461,8 +461,8 @@
 
         // Prepare all AV1 items
 
-        const char ** pColorIrefType;
-        uint16_t * pColorIrefToID;
+        const char ** pColorIrefType = NULL;
+        uint16_t * pColorIrefToID = NULL;
 
         uint16_t gridColorID = 0;
         if (cellCount > 1) {