From 2114dafd2ef11ab9b920b3a655ac8d4daac07c7c Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Thu, 18 Dec 2008 21:37:05 +0100
Subject: [PATCH] Ignore missing times when determining earliest time from JPEG
data
darcs-hash:20081218203705-7ad00-ebd597d34d9e34d5e9502ea2c0d5d4a45025e676.gz
---
inc/JpegMeta.php | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/inc/JpegMeta.php b/inc/JpegMeta.php
index f6d146c4d..e660afd69 100644
--- a/inc/JpegMeta.php
+++ b/inc/JpegMeta.php
@@ -591,12 +591,12 @@ class JpegMeta
$aux{7} = "-";
$t = strtotime($aux);
- if ($t > $latestTime) {
+ if ($t && $t > $latestTime) {
$latestTime = $t;
$latestTimeSource = "ExifDateTime";
}
- if ($t < $earliestTime) {
+ if ($t && $t < $earliestTime) {
$earliestTime = $t;
$earliestTimeSource = "ExifDateTime";
}
@@ -610,12 +610,12 @@ class JpegMeta
$aux{7} = "-";
$t = strtotime($aux);
- if ($t > $latestTime) {
+ if ($t && $t > $latestTime) {
$latestTime = $t;
$latestTimeSource = "ExifDateTimeOriginal";
}
- if ($t < $earliestTime) {
+ if ($t && $t < $earliestTime) {
$earliestTime = $t;
$earliestTimeSource = "ExifDateTimeOriginal";
}
@@ -629,12 +629,12 @@ class JpegMeta
$aux{7} = "-";
$t = strtotime($aux);
- if ($t > $latestTime) {
+ if ($t && $t > $latestTime) {
$latestTime = $t;
$latestTimeSource = "ExifDateTimeDigitized";
}
- if ($t < $earliestTime) {
+ if ($t && $t < $earliestTime) {
$earliestTime = $t;
$earliestTimeSource = "ExifDateTimeDigitized";
}
@@ -647,12 +647,12 @@ class JpegMeta
$aux = substr($aux, 0, 4) . "-" . substr($aux, 4, 2) . "-" . substr($aux, 6, 2);
$t = strtotime($aux);
- if ($t > $latestTime) {
+ if ($t && $t > $latestTime) {
$latestTime = $t;
$latestTimeSource = "IPTCDateCreated";
}
- if ($t < $earliestTime) {
+ if ($t && $t < $earliestTime) {
$earliestTime = $t;
$earliestTimeSource = "IPTCDateCreated";
}
@@ -663,12 +663,12 @@ class JpegMeta
$t = $this->_info['file']['UnixTime'];
- if ($t > $latestTime) {
+ if ($t && $t > $latestTime) {
$latestTime = $t;
$latestTimeSource = "FileModified";
}
- if ($t < $earliestTime) {
+ if ($t && $t < $earliestTime) {
$earliestTime = $t;
$earliestTimeSource = "FileModified";
}
--
GitLab