Merge branch 'master' into lsolesen-patch-1

pel · Jan 4, 2017 · f40b1ff · f40b1ff
2 parents 55171fe + 8750c5c
commit f40b1ff
Show file tree

Hide file tree

Showing 3 changed files with 341 additions and 586 deletions.
diff --git a/src/PelEntryRational.php b/src/PelEntryRational.php
@@ -166,7 +166,7 @@ public function getText($brief = false)
                 $minutes = $this->value[1][0] / $this->value[1][1];
                 $seconds = $this->value[2][0] / $this->value[2][1];
 
-                return sprintf('%s� %s\' %s" (%.2f�)', $degrees, $minutes, $seconds, $degrees + $minutes / 60 + $seconds / 3600);
+                return sprintf('%s° %s\' %s" (%.2f°)', $degrees, $minutes, $seconds, $degrees + $minutes / 60 + $seconds / 3600);
 
             default:
                 return parent::getText($brief);

diff --git a/src/PelJpeg.php b/src/PelJpeg.php
@@ -591,10 +591,13 @@ public function getBytes()
      * @param
      *            string the filename to save in. An existing file with the
      *            same name will be overwritten!
+     *
+     * @return integer|FALSE The number of bytes that were written to the
+     *         file, or FALSE on failure.
      */
     public function saveFile($filename)
     {
-        file_put_contents($filename, $this->getBytes());
+        return file_put_contents($filename, $this->getBytes());
     }
 
     /**