summaryrefslogtreecommitdiff
path: root/src/Photo.vala
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2014-09-23 09:36:56 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2014-09-23 09:36:56 +0200
commit8004f1a7ad3cc6a3659517f3374bdf1b63416b24 (patch)
treeb7b82cc6e01cd47d22f660e25508a7d8d555dc89 /src/Photo.vala
parent28c68a75acac7ac3ce7fb169bc6aa65e16551c53 (diff)
parent566dc060676b41e1e58a446b7dcc4159e242fee6 (diff)
Merge tag 'upstream/0.20.0'
Upstream version 0.20.0
Diffstat (limited to 'src/Photo.vala')
-rw-r--r--src/Photo.vala28
1 files changed, 18 insertions, 10 deletions
diff --git a/src/Photo.vala b/src/Photo.vala
index ab449dc..34b2676 100644
--- a/src/Photo.vala
+++ b/src/Photo.vala
@@ -619,6 +619,12 @@ public abstract class Photo : PhotoSource, Dateable {
interrogator.interrogate();
DetectedPhotoInformation? detected = interrogator.get_detected_photo_information();
+ if (detected == null || interrogator.get_is_photo_corrupted()) {
+ // TODO: Probably should remove from database, but simply exiting for now (prior code
+ // didn't even do this check)
+ return;
+ }
+
bpr.dim = detected.image_dim;
bpr.filesize = info.get_size();
bpr.timestamp = timestamp.tv_sec;
@@ -1149,9 +1155,12 @@ public abstract class Photo : PhotoSource, Dateable {
return ImportResult.DECODE_ERROR;
}
+ if (interrogator.get_is_photo_corrupted())
+ return ImportResult.NOT_AN_IMAGE;
+
// if not detected photo information, unsupported
DetectedPhotoInformation? detected = interrogator.get_detected_photo_information();
- if (detected == null)
+ if (detected == null || detected.file_format == PhotoFileFormat.UNKNOWN)
return ImportResult.UNSUPPORTED_FORMAT;
// copy over supplied MD5s if provided
@@ -1261,7 +1270,7 @@ public abstract class Photo : PhotoSource, Dateable {
try {
interrogator.interrogate();
DetectedPhotoInformation? detected = interrogator.get_detected_photo_information();
- if (detected != null)
+ if (detected != null && !interrogator.get_is_photo_corrupted() && detected.file_format != PhotoFileFormat.UNKNOWN)
params.row.master.file_format = detected.file_format;
} catch (Error err) {
debug("Unable to interrogate photo file %s: %s", file.get_path(), err.message);
@@ -1288,7 +1297,7 @@ public abstract class Photo : PhotoSource, Dateable {
PhotoFileInterrogator interrogator = new PhotoFileInterrogator(file, options);
interrogator.interrogate();
detected = interrogator.get_detected_photo_information();
- if (detected == null) {
+ if (detected == null || interrogator.get_is_photo_corrupted()) {
critical("Photo update: %s no longer a recognized image", to_string());
return null;
@@ -2232,7 +2241,7 @@ public abstract class Photo : PhotoSource, Dateable {
}
DetectedPhotoInformation? detected = interrogator.get_detected_photo_information();
- if (detected == null) {
+ if (detected == null || interrogator.get_is_photo_corrupted()) {
critical("file_exif_updated: %s no longer an image", to_string());
return;
@@ -3216,14 +3225,15 @@ public abstract class Photo : PhotoSource, Dateable {
*
* @return A Pixbuf with the image data from unmodified_precached.
*/
- public Gdk.Pixbuf? get_prefetched_copy() {
+ public Gdk.Pixbuf get_prefetched_copy() throws Error {
lock (unmodified_precached) {
if (unmodified_precached == null) {
try {
populate_prefetched();
} catch (Error e) {
- warning("raw pixbuf for %s could not be loaded", this.to_string());
- return null;
+ message("pixbuf for %s could not be loaded: %s", to_string(), e.message);
+
+ throw e;
}
}
@@ -3322,12 +3332,10 @@ public abstract class Photo : PhotoSource, Dateable {
populate_prefetched();
Gdk.Pixbuf pixbuf = get_prefetched_copy();
-
+
// remember to delete the cached copy if it isn't being used.
secs_since_access.start();
debug("pipeline being run against %s, timer restarted.", this.to_string());
-
- assert(pixbuf != null);
//
// Image transformation pipeline