eog/eog-casts.patch

52 lines
2.4 KiB
Diff
Raw Normal View History

Index: src/eog-metadata-reader.c
===================================================================
--- src/eog-metadata-reader.c.orig
+++ src/eog-metadata-reader.c
@@ -228,13 +228,13 @@ eog_metadata_reader_consume (EogMetadata
if (i + priv->size < len) {
/* read data in one block */
- memcpy ((guchar*) (priv->exif_chunk) + priv->bytes_read, &buf[i], priv->size);
+ memcpy ((void *) (priv->exif_chunk) + priv->bytes_read, (void *) &buf[i], priv->size);
priv->state = EMR_READ;
i = i + priv->size - 1; /* the for-loop consumes the other byte */
}
else {
int chunk_len = len - i;
- memcpy ((guchar*) (priv->exif_chunk) + priv->bytes_read, &buf[i], chunk_len);
+ memcpy ((void *) (priv->exif_chunk) + priv->bytes_read, (void *) &buf[i], chunk_len);
priv->bytes_read += chunk_len; /* bytes already read */
priv->size = (i + priv->size) - len; /* remaining data to read */
i = len - 1;
@@ -256,13 +256,13 @@ eog_metadata_reader_consume (EogMetadata
if (i + priv->size < len) {
/* read data in one block */
- memcpy ((guchar*) (priv->icc_chunk) + priv->bytes_read, &buf[i], priv->size);
+ memcpy ((void *) (priv->icc_chunk) + priv->bytes_read, (void *) &buf[i], priv->size);
priv->state = EMR_READ;
i = i + priv->size - 1; /* the for-loop consumes the other byte */
}
else {
int chunk_len = len - i;
- memcpy ((guchar*) (priv->icc_chunk) + priv->bytes_read, &buf[i], chunk_len);
+ memcpy ((void *) (priv->icc_chunk) + priv->bytes_read, (void *) &buf[i], chunk_len);
priv->bytes_read += chunk_len; /* bytes already read */
priv->size = (i + priv->size) - len; /* remaining data to read */
i = len - 1;
@@ -282,12 +282,12 @@ eog_metadata_reader_consume (EogMetadata
if (i + priv->size < len) {
/* read data in one block */
- memcpy ((guchar*) (priv->iptc_chunk) + priv->bytes_read, &buf[i], priv->size);
+ memcpy ((void *) (priv->iptc_chunk) + priv->bytes_read, (void *) &buf[i], priv->size);
priv->state = EMR_READ;
}
else {
int chunk_len = len - i;
- memcpy ((guchar*) (priv->iptc_chunk) + priv->bytes_read, &buf[i], chunk_len);
+ memcpy ((void *) (priv->iptc_chunk) + priv->bytes_read, (void *) &buf[i], chunk_len);
priv->bytes_read += chunk_len; /* bytes already read */
priv->size = (i + priv->size) - len; /* remaining data to read */
i = len - 1;