52 lines
1.9 KiB
Diff
52 lines
1.9 KiB
Diff
|
--- libeog/eog-metadata-reader.c
|
||
|
|
+++ libeog/eog-metadata-reader.c
|
||
|
|
@@ -257,13 +257,13 @@
|
||
|
|
|
||
|
|
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;
|
||
|
|
@@ -283,12 +283,12 @@
|
||
|
|
|
||
|
|
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;
|
||
|
|
--- shell/recent-files/egg-recent-view-gtk.c
|
||
|
|
+++ shell/recent-files/egg-recent-view-gtk.c
|
||
|
|
@@ -822,13 +822,13 @@
|
||
|
|
|
||
|
|
if (view->menu != NULL)
|
||
|
|
g_object_remove_weak_pointer (G_OBJECT (view->menu),
|
||
|
|
- (gpointer *) &view->menu);
|
||
|
|
+ &view->menu);
|
||
|
|
|
||
|
|
view->menu = menu;
|
||
|
|
|
||
|
|
if (view->menu != NULL)
|
||
|
|
g_object_add_weak_pointer (G_OBJECT (view->menu),
|
||
|
|
- (gpointer *) &view->menu);
|
||
|
|
+ &view->menu);
|
||
|
|
}
|
||
|
|
|
||
|
|
/**
|