Reorder getNextImage arguments to continue the overall method naming pattern
diff --git a/include/avif/internal.h b/include/avif/internal.h index 5e4c217..0f58486 100644 --- a/include/avif/internal.h +++ b/include/avif/internal.h
@@ -218,8 +218,8 @@ struct avifCodec; struct avifCodecInternal; -typedef avifBool (*avifCodecGetNextImageFunc)(struct avifDecoder * decoder, - struct avifCodec * codec, +typedef avifBool (*avifCodecGetNextImageFunc)(struct avifCodec * codec, + struct avifDecoder * decoder, const avifDecodeSample * sample, avifBool alpha, avifImage * image);
diff --git a/src/codec_aom.c b/src/codec_aom.c index 4d45a0c..4b1f70b 100644 --- a/src/codec_aom.c +++ b/src/codec_aom.c
@@ -84,8 +84,8 @@ #if defined(AVIF_CODEC_AOM_DECODE) -static avifBool aomCodecGetNextImage(struct avifDecoder * decoder, - struct avifCodec * codec, +static avifBool aomCodecGetNextImage(struct avifCodec * codec, + struct avifDecoder * decoder, const avifDecodeSample * sample, avifBool alpha, avifImage * image)
diff --git a/src/codec_dav1d.c b/src/codec_dav1d.c index cc2f8e8..91f1f4d 100644 --- a/src/codec_dav1d.c +++ b/src/codec_dav1d.c
@@ -49,8 +49,8 @@ avifFree(codec->internal); } -static avifBool dav1dCodecGetNextImage(struct avifDecoder * decoder, - struct avifCodec * codec, +static avifBool dav1dCodecGetNextImage(struct avifCodec * codec, + struct avifDecoder * decoder, const avifDecodeSample * sample, avifBool alpha, avifImage * image)
diff --git a/src/codec_libgav1.c b/src/codec_libgav1.c index 1c88772..91f1dc5 100644 --- a/src/codec_libgav1.c +++ b/src/codec_libgav1.c
@@ -23,8 +23,8 @@ avifFree(codec->internal); } -static avifBool gav1CodecGetNextImage(struct avifDecoder * decoder, - struct avifCodec * codec, +static avifBool gav1CodecGetNextImage(struct avifCodec * codec, + struct avifDecoder * decoder, const avifDecodeSample * sample, avifBool alpha, avifImage * image)
diff --git a/src/read.c b/src/read.c index 6d186e1..9dc5396 100644 --- a/src/read.c +++ b/src/read.c
@@ -3231,7 +3231,7 @@ const avifDecodeSample * sample = &tile->input->samples.sample[nextImageIndex]; - if (!tile->codec->getNextImage(decoder, tile->codec, sample, tile->input->alpha, tile->image)) { + if (!tile->codec->getNextImage(tile->codec, decoder, sample, tile->input->alpha, tile->image)) { return tile->input->alpha ? AVIF_RESULT_DECODE_ALPHA_FAILED : AVIF_RESULT_DECODE_COLOR_FAILED; } }