From 66c80ed6e41bdc4bc6b264c0169070ce51b2a3cf Mon Sep 17 00:00:00 2001
From: Brian Wolff <bawolff@users.mediawiki.org>
Date: Sat, 16 Apr 2011 16:23:08 +0000
Subject: [PATCH] follow-up r86195 - That $valid really was reachable :P
 follow-up r86169 - It appears when merging PNGMetadataExtractor.php, I
 somehow deleted $duration (whoops!)

---
 includes/media/JpegMetadataExtractor.php | 1 +
 includes/media/PNGMetadataExtractor.php  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/includes/media/JpegMetadataExtractor.php b/includes/media/JpegMetadataExtractor.php
index fec70450fd..a556aa93e4 100644
--- a/includes/media/JpegMetadataExtractor.php
+++ b/includes/media/JpegMetadataExtractor.php
@@ -150,6 +150,7 @@ class JpegMetadataExtractor {
 
 		// the +12 is the length of an empty item.
 		while ( $offset + 12 <= $appLen ) {
+			$valid = true;
 			if ( substr( $app13, $offset, 4 ) !== '8BIM' ) {
 				// its supposed to be 8BIM
 				// but apparently sometimes isn't esp. in
diff --git a/includes/media/PNGMetadataExtractor.php b/includes/media/PNGMetadataExtractor.php
index 314208edce..a8a576ac42 100644
--- a/includes/media/PNGMetadataExtractor.php
+++ b/includes/media/PNGMetadataExtractor.php
@@ -56,6 +56,7 @@ class PNGMetadataExtractor {
 		$frameCount = 0;
 		$loopCount = 1;
 		$text = array();
+		$duration = 0.0;
 		$bitDepth = 0;
 		$colorType = 'unknown';
 
@@ -366,7 +367,6 @@ class PNGMetadataExtractor {
 			'loopCount' => $loopCount,
 			'duration' => $duration,
 			'text' => $text,
-			'duration' => $duration,
 			'bitDepth' => $bitDepth,
 			'colorType' => $colorType,
 		);
-- 
2.20.1