Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace some memcpy calls with struct assignments #884

Merged
merged 1 commit into from
Mar 17, 2022
Merged

Replace some memcpy calls with struct assignments #884

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions src/read.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1257,7 +1257,7 @@ static avifBool avifDecoderGenerateImageGridTiles(avifDecoder * decoder, avifIma
return AVIF_FALSE;
}
avifProperty * dstProp = (avifProperty *)avifArrayPushPtr(&gridItem->properties);
memcpy(dstProp, srcProp, sizeof(avifProperty));
*dstProp = *srcProp;

if (!alpha && item->progressive) {
decoder->progressiveState = AVIF_PROGRESSIVE_STATE_AVAILABLE;
Expand Down Expand Up @@ -2023,7 +2023,7 @@ static avifBool avifParseItemPropertyAssociation(avifMeta * meta, const uint8_t
}

// Copy property to item
avifProperty * srcProp = &meta->properties.prop[propertyIndex];
const avifProperty * srcProp = &meta->properties.prop[propertyIndex];

static const char * supportedTypes[] = { "ispe", "auxC", "colr", "av1C", "pasp", "clap",
"irot", "imir", "pixi", "a1op", "lsel", "a1lx" };
Expand Down Expand Up @@ -2083,7 +2083,7 @@ static avifBool avifParseItemPropertyAssociation(avifMeta * meta, const uint8_t

// Supported and valid; associate it with this item.
avifProperty * dstProp = (avifProperty *)avifArrayPushPtr(&item->properties);
memcpy(dstProp, srcProp, sizeof(avifProperty));
*dstProp = *srcProp;
} else {
if (essential) {
// Discovered an essential item property that libavif doesn't support!
Expand Down Expand Up @@ -2240,7 +2240,7 @@ static avifBool avifParseItemInfoEntry(avifMeta * meta, const uint8_t * raw, siz
}

memcpy(item->type, itemType, sizeof(itemType));
memcpy(&item->contentType, &contentType, sizeof(contentType));
item->contentType = contentType;
return AVIF_TRUE;
}

Expand Down Expand Up @@ -3002,7 +3002,7 @@ avifResult avifDecoderSetIOFile(avifDecoder * decoder, const char * filename)
static avifResult avifExtentMerge(avifExtent * dst, const avifExtent * src)
{
if (!dst->size) {
memcpy(dst, src, sizeof(avifExtent));
*dst = *src;
return AVIF_RESULT_OK;
}
if (!src->size) {
Expand Down Expand Up @@ -3092,7 +3092,7 @@ static avifResult avifDecoderPrepareSample(avifDecoder * decoder, avifDecodeSamp

// avifDecoderItemRead is guaranteed to already be persisted by either the underlying IO
// or by mergedExtents; just reuse the buffer here.
memcpy(&sample->data, &itemContents, sizeof(avifROData));
sample->data = itemContents;
sample->ownsData = AVIF_FALSE;
sample->partialData = item->partialMergedExtents;
} else {
Expand All @@ -3113,7 +3113,7 @@ static avifResult avifDecoderPrepareSample(avifDecoder * decoder, avifDecodeSamp
sample->ownsData = !decoder->io->persistent;
sample->partialData = (bytesToRead != sample->size);
if (decoder->io->persistent) {
memcpy(&sample->data, &sampleContents, sizeof(avifROData));
sample->data = sampleContents;
} else {
avifRWDataSet((avifRWData *)&sample->data, sampleContents.data, sampleContents.size);
}
Expand Down Expand Up @@ -3627,22 +3627,22 @@ avifResult avifDecoderReset(avifDecoder * decoder)
const avifProperty * paspProp = avifPropertyArrayFind(colorProperties, "pasp");
if (paspProp) {
decoder->image->transformFlags |= AVIF_TRANSFORM_PASP;
memcpy(&decoder->image->pasp, &paspProp->u.pasp, sizeof(avifPixelAspectRatioBox));
decoder->image->pasp = paspProp->u.pasp;
}
const avifProperty * clapProp = avifPropertyArrayFind(colorProperties, "clap");
if (clapProp) {
decoder->image->transformFlags |= AVIF_TRANSFORM_CLAP;
memcpy(&decoder->image->clap, &clapProp->u.clap, sizeof(avifCleanApertureBox));
decoder->image->clap = clapProp->u.clap;
}
const avifProperty * irotProp = avifPropertyArrayFind(colorProperties, "irot");
if (irotProp) {
decoder->image->transformFlags |= AVIF_TRANSFORM_IROT;
memcpy(&decoder->image->irot, &irotProp->u.irot, sizeof(avifImageRotation));
decoder->image->irot = irotProp->u.irot;
}
const avifProperty * imirProp = avifPropertyArrayFind(colorProperties, "imir");
if (imirProp) {
decoder->image->transformFlags |= AVIF_TRANSFORM_IMIR;
memcpy(&decoder->image->imir, &imirProp->u.imir, sizeof(avifImageMirror));
decoder->image->imir = imirProp->u.imir;
}

if (!data->cicpSet && (data->tiles.count > 0)) {
Expand Down Expand Up @@ -3950,7 +3950,7 @@ avifResult avifDecoderNthImageTiming(const avifDecoder * decoder, uint32_t frame
if (!decoder->data->sourceSampleTable) {
// There isn't any real timing associated with this decode, so
// just hand back the defaults chosen in avifDecoderReset().
memcpy(outTiming, &decoder->imageTiming, sizeof(avifImageTiming));
*outTiming = decoder->imageTiming;
return AVIF_RESULT_OK;
}

Expand Down