Fix all clang warnings
diff --git a/examples/avif_example1.c b/examples/avif_example1.c index 9c2323b..367fe8a 100644 --- a/examples/avif_example1.c +++ b/examples/avif_example1.c
@@ -8,6 +8,9 @@ int main(int argc, char * argv[]) { + (void)argc; + (void)argv; + #if 1 int width = 32; int height = 32;
diff --git a/include/avif/internal.h b/include/avif/internal.h index dd78d03..22d213f 100644 --- a/include/avif/internal.h +++ b/include/avif/internal.h
@@ -79,6 +79,7 @@ // Write void avifStreamFinishWrite(avifStream * stream); void avifStreamWrite(avifStream * stream, const uint8_t * data, size_t size); +void avifStreamWriteChars(avifStream * stream, const char * chars, size_t size); avifBoxMarker avifStreamWriteBox(avifStream * stream, const char * type, int version /* -1 for "not a FullBox" */, size_t contentSize); void avifStreamFinishBox(avifStream * stream, avifBoxMarker marker); void avifStreamWriteU8(avifStream * stream, uint8_t v);
diff --git a/src/avif.c b/src/avif.c index f2a1ba7..64e4310 100644 --- a/src/avif.c +++ b/src/avif.c
@@ -33,6 +33,10 @@ info->aomIndexU = 2; info->aomIndexV = 1; break; + + case AVIF_PIXEL_FORMAT_NONE: + default: + break; } }
diff --git a/src/colr.c b/src/colr.c index 26ef4c9..aeb4f12 100644 --- a/src/colr.c +++ b/src/colr.c
@@ -64,6 +64,7 @@ xyY[2] = XYZ[1]; } +#if 0 static void convertXYYToXYZ(float * xyY, float * XYZ) { if (xyY[2] <= 0.0f) { @@ -93,6 +94,7 @@ xy[0] = xyY[0]; xy[1] = xyY[1]; } +#endif static float calcMaxY(float r, float g, float b, gbMat3 * colorants) {
diff --git a/src/read.c b/src/read.c index 1a0ad89..0ca2015 100644 --- a/src/read.c +++ b/src/read.c
@@ -156,7 +156,7 @@ uint16_t itemCount; CHECK(avifStreamReadU16(&s, &itemCount)); // unsigned int(16) item_count; - for (int itemIndex = 0; itemIndex < itemCount; ++itemIndex) { + for (int i = 0; i < itemCount; ++i) { uint16_t itemID; // unsigned int(16) item_ID; CHECK(avifStreamReadU16(&s, &itemID)); // uint16_t dataReferenceIndex; // unsigned int(16) data_reference_index;
diff --git a/src/stream.c b/src/stream.c index e2c6b5d..0908c8f 100644 --- a/src/stream.c +++ b/src/stream.c
@@ -206,6 +206,11 @@ stream->offset += size; } +void avifStreamWriteChars(avifStream * stream, const char * chars, size_t size) +{ + avifStreamWrite(stream, (uint8_t *)chars, size); +} + avifBoxMarker avifStreamWriteBox(avifStream * stream, const char * type, int version, size_t contentSize) { avifBoxMarker marker = stream->offset;
diff --git a/src/write.c b/src/write.c index 838b49a..b3fa37b 100644 --- a/src/write.c +++ b/src/write.c
@@ -83,11 +83,11 @@ // Write ftyp avifBoxMarker ftyp = avifStreamWriteBox(&s, "ftyp", -1, 0); - avifStreamWrite(&s, "mif1", 4); // unsigned int(32) major_brand; - avifStreamWriteU32(&s, 0); // unsigned int(32) minor_version; - avifStreamWrite(&s, "mif1", 4); // unsigned int(32) compatible_brands[]; - avifStreamWrite(&s, "avif", 4); // ... compatible_brands[] - avifStreamWrite(&s, "miaf", 4); // ... compatible_brands[] + avifStreamWriteChars(&s, "mif1", 4); // unsigned int(32) major_brand; + avifStreamWriteU32(&s, 0); // unsigned int(32) minor_version; + avifStreamWriteChars(&s, "mif1", 4); // unsigned int(32) compatible_brands[]; + avifStreamWriteChars(&s, "avif", 4); // ... compatible_brands[] + avifStreamWriteChars(&s, "miaf", 4); // ... compatible_brands[] avifStreamFinishBox(&s, ftyp); // ----------------------------------------------------------------------- @@ -109,10 +109,10 @@ // Write hdlr avifBoxMarker hdlr = avifStreamWriteBox(&s, "hdlr", 0, 0); - avifStreamWriteU32(&s, 0); // unsigned int(32) pre_defined = 0; - avifStreamWrite(&s, "pict", 4); // unsigned int(32) handler_type; - avifStreamWriteZeros(&s, 12); // const unsigned int(32)[3] reserved = 0; - avifStreamWrite(&s, "libavif", 8); // string name; (writing null terminator) + avifStreamWriteU32(&s, 0); // unsigned int(32) pre_defined = 0; + avifStreamWriteChars(&s, "pict", 4); // unsigned int(32) handler_type; + avifStreamWriteZeros(&s, 12); // const unsigned int(32)[3] reserved = 0; + avifStreamWriteChars(&s, "libavif", 8); // string name; (writing null terminator) avifStreamFinishBox(&s, hdlr); // ----------------------------------------------------------------------- @@ -156,17 +156,17 @@ avifStreamWriteU16(&s, hasAlpha ? 2 : 1); // unsigned int(16) entry_count; avifBoxMarker infe0 = avifStreamWriteBox(&s, "infe", 2, 0); - avifStreamWriteU16(&s, 1); // unsigned int(16) item_ID; - avifStreamWriteU16(&s, 0); // unsigned int(16) item_protection_index; - avifStreamWrite(&s, "av01", 4); // unsigned int(32) item_type; - avifStreamWrite(&s, "Color", 6); // string item_name; (writing null terminator) + avifStreamWriteU16(&s, 1); // unsigned int(16) item_ID; + avifStreamWriteU16(&s, 0); // unsigned int(16) item_protection_index; + avifStreamWriteChars(&s, "av01", 4); // unsigned int(32) item_type; + avifStreamWriteChars(&s, "Color", 6); // string item_name; (writing null terminator) avifStreamFinishBox(&s, infe0); if (hasAlpha) { avifBoxMarker infe1 = avifStreamWriteBox(&s, "infe", 2, 0); - avifStreamWriteU16(&s, 2); // unsigned int(16) item_ID; - avifStreamWriteU16(&s, 0); // unsigned int(16) item_protection_index; - avifStreamWrite(&s, "av01", 4); // unsigned int(32) item_type; - avifStreamWrite(&s, "Alpha", 6); // string item_name; (writing null terminator) + avifStreamWriteU16(&s, 2); // unsigned int(16) item_ID; + avifStreamWriteU16(&s, 0); // unsigned int(16) item_protection_index; + avifStreamWriteChars(&s, "av01", 4); // unsigned int(32) item_type; + avifStreamWriteChars(&s, "Alpha", 6); // string item_name; (writing null terminator) avifStreamFinishBox(&s, infe1); } avifStreamFinishBox(&s, iinf); @@ -207,7 +207,7 @@ if (image->profileFormat == AVIF_PROFILE_FORMAT_NCLX) { avifBoxMarker colr = avifStreamWriteBox(&s, "colr", -1, 0); - avifStreamWrite(&s, "nclx", 4); // unsigned int(32) colour_type; + avifStreamWriteChars(&s, "nclx", 4); // unsigned int(32) colour_type; avifStreamWriteU16(&s, image->nclx.colourPrimaries); // unsigned int(16) colour_primaries; avifStreamWriteU16(&s, image->nclx.transferCharacteristics); // unsigned int(16) transfer_characteristics; avifStreamWriteU16(&s, image->nclx.matrixCoefficients); // unsigned int(16) matrix_coefficients; @@ -217,7 +217,7 @@ ipmaPush(&ipmaColor, ipcoIndex); } else if ((image->profileFormat == AVIF_PROFILE_FORMAT_ICC) && image->icc.data && (image->icc.data > 0)) { avifBoxMarker colr = avifStreamWriteBox(&s, "colr", -1, 0); - avifStreamWrite(&s, "prof", 4); // unsigned int(32) colour_type; + avifStreamWriteChars(&s, "prof", 4); // unsigned int(32) colour_type; avifStreamWrite(&s, image->icc.data, image->icc.size); avifStreamFinishBox(&s, colr); ++ipcoIndex; @@ -242,7 +242,7 @@ ipmaPush(&ipmaAlpha, ipcoIndex); avifBoxMarker auxC = avifStreamWriteBox(&s, "auxC", 0, 0); - avifStreamWrite(&s, alphaURN, alphaURNSize); // string aux_type; + avifStreamWriteChars(&s, alphaURN, alphaURNSize); // string aux_type; avifStreamFinishBox(&s, auxC); ++ipcoIndex; ipmaPush(&ipmaAlpha, ipcoIndex); @@ -363,6 +363,9 @@ case AVIF_PIXEL_FORMAT_YUV422: cfg.g_profile = 2; break; case AVIF_PIXEL_FORMAT_YUV420: cfg.g_profile = 0; break; case AVIF_PIXEL_FORMAT_YV12: cfg.g_profile = 0; break; + case AVIF_PIXEL_FORMAT_NONE: + default: + break; } } }