diff options
| author | Monsta <[email protected]> | 2015-01-06 13:34:48 +0300 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2015-03-15 22:45:54 +0100 |
| commit | 821e4a1be8a16a59316c5cca1f200b667c0c93d1 (patch) | |
| tree | c75549d52ca2fba7742ab1a16ac7f782d8eaa582 /src/eom-image.c | |
| parent | 6621348ea4f4fd49a959ac3dbf78efd5f7c0b1dd (diff) | |
| download | eom-821e4a1be8a16a59316c5cca1f200b667c0c93d1.tar.bz2 eom-821e4a1be8a16a59316c5cca1f200b667c0c93d1.tar.xz | |
some fixes from upstream:
https://git.gnome.org/browse/eog/commit/?id=ffd057a0be9610b49f2dc718060c82c4ee1065be
https://git.gnome.org/browse/eog/commit/?id=40919ebb2ce1fd70edae61c7b578c6a7ce8ef432
https://git.gnome.org/browse/eog/commit/?id=a3b769506abbbf7b24547b95c9c99349e99d44c0
Closes https://github.com/mate-desktop/eom/pull/67
Diffstat (limited to 'src/eom-image.c')
| -rw-r--r-- | src/eom-image.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/eom-image.c b/src/eom-image.c index 61164e9..d990f98 100644 --- a/src/eom-image.c +++ b/src/eom-image.c @@ -149,6 +149,7 @@ eom_image_free_mem_private (EomImage *image) #endif priv->status = EOM_IMAGE_STATUS_UNKNOWN; + priv->metadata_status = EOM_IMAGE_METADATA_NOT_READ; } } @@ -1195,17 +1196,17 @@ eom_image_has_data (EomImage *img, EomImageData req_data) priv = img->priv; if ((req_data & EOM_IMAGE_DATA_IMAGE) > 0) { - req_data = (req_data & !EOM_IMAGE_DATA_IMAGE); + req_data = (req_data & ~EOM_IMAGE_DATA_IMAGE); has_data = has_data && (priv->image != NULL); } if ((req_data & EOM_IMAGE_DATA_DIMENSION) > 0 ) { - req_data = (req_data & !EOM_IMAGE_DATA_DIMENSION); + req_data = (req_data & ~EOM_IMAGE_DATA_DIMENSION); has_data = has_data && (priv->width >= 0) && (priv->height >= 0); } if ((req_data & EOM_IMAGE_DATA_EXIF) > 0) { - req_data = (req_data & !EOM_IMAGE_DATA_EXIF); + req_data = (req_data & ~EOM_IMAGE_DATA_EXIF); #ifdef HAVE_EXIF has_data = has_data && (priv->exif != NULL); #else @@ -1214,7 +1215,7 @@ eom_image_has_data (EomImage *img, EomImageData req_data) } if ((req_data & EOM_IMAGE_DATA_XMP) > 0) { - req_data = (req_data & !EOM_IMAGE_DATA_XMP); + req_data = (req_data & ~EOM_IMAGE_DATA_XMP); #ifdef HAVE_EXEMPI has_data = has_data && (priv->xmp != NULL); #endif |