| Index: trunk/phase3/includes/media/PNGMetadataExtractor.php |
| — | — | @@ -56,6 +56,7 @@ |
| 57 | 57 | $frameCount = 0; |
| 58 | 58 | $loopCount = 1; |
| 59 | 59 | $text = array(); |
| | 60 | + $duration = 0.0; |
| 60 | 61 | $bitDepth = 0; |
| 61 | 62 | $colorType = 'unknown'; |
| 62 | 63 | |
| — | — | @@ -366,7 +367,6 @@ |
| 367 | 368 | 'loopCount' => $loopCount, |
| 368 | 369 | 'duration' => $duration, |
| 369 | 370 | 'text' => $text, |
| 370 | | - 'duration' => $duration, |
| 371 | 371 | 'bitDepth' => $bitDepth, |
| 372 | 372 | 'colorType' => $colorType, |
| 373 | 373 | ); |
| Index: trunk/phase3/includes/media/JpegMetadataExtractor.php |
| — | — | @@ -150,6 +150,7 @@ |
| 151 | 151 | |
| 152 | 152 | // the +12 is the length of an empty item. |
| 153 | 153 | while ( $offset + 12 <= $appLen ) { |
| | 154 | + $valid = true; |
| 154 | 155 | if ( substr( $app13, $offset, 4 ) !== '8BIM' ) { |
| 155 | 156 | // its supposed to be 8BIM |
| 156 | 157 | // but apparently sometimes isn't esp. in |