From 81c61cd35c0908c622e62507b37c47fb49093f3c Mon Sep 17 00:00:00 2001
From: Oliver Vogel <oliver@olivervogel.net>
Date: Fri, 16 Aug 2013 19:23:34 +0200
Subject: [PATCH] added exif method (read)

---
 public/exif.jpg                  | Bin 0 -> 7791 bytes
 src/Intervention/Image/Image.php |  17 +++++++++++++++++
 tests/ImageTest.php              |  21 +++++++++++++++++++++
 3 files changed, 38 insertions(+)
 create mode 100644 public/exif.jpg

diff --git a/public/exif.jpg b/public/exif.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..ab98706c205e3054afaf64359c11890fb3d45214
GIT binary patch
literal 7791
zcmeGhTW}lI_3o}-mSjhYZDIn$EXteK*2`9Gfk`acu}!1Ik>tF7I;-84ykxbj?5=Dj
z9~}sxw9Irm389p9h9L<pw0{Kpo@pV__fH9Z0G&>oPzvopn-FN}V@5squ689k=24h_
z)z{wpIOp7R&pCVU*?V>BFVrtE(nL)vB9zIXn-D@C<e^p~26`0yA!;>pl0HHTb)DUx
zr#3cdXrPHAs1Xa#r>Gd|_dx$4>SogKg#OukB;<e=IHITEc^!HGeFs7t0#-XFs0ERo
znNtl_pHnMrI+tKKW;k9_FklmkMWXR!WH=d3u+foZERu|lpq;WbFKX;=wIs^GlX;jj
zWvbT^dYHD?3p~s;`#^__i((q`yIOUml1&|{RI83OW$~bHqix>wDw7?Wf)?vW+WHIi
zH;|ub^vQGvQT4x|E;2&G9hk2E8*~);JswYo$KTQ65Bj{mVDAdQe?@O!cXw}hcVEy?
zN~19ci)*UW=j-h140Lq`db+y0dT`a%V@?Tv5C-+9P|$+{D8Nu5L<cD*NY#G}N>cS_
zsVyL-lOhEK#)Ux??Qpu>o(``M9HSjcA)2v}0Yo_{hIY_Sx69*X{Bb}A8OMz)qt3Bi
zTzBZ;oiSI>u~Uzy)~xN#K3#|pYDb<+yVo7hUAl0Y*N3h-efF;P<M-u-iF0R+#H#bN
z7sWT9IQq=<)t9eq+i>EMyPv%O*<bwOtuKH52fuvf?cK%sPk-Sn-}vFL{`j}elY2@F
z_dM|EH-Gf&SN|SFG!4=^h)iymbBKs=V|1khBsduAcE;{J)`KN@I{VzE_}an+?a1+T
zu9w#bFRyc90o?0{&YcG#&a4t9W)p^Z(H7y|CD_muq5cx`Gi1#m+Jb&Jz4iguTc5AL
zSbxJe-gNNzKm-k^rZWz_EnxFpPwhv{b?YXthphzv*V8k|-|FCmb{(M&D4&a*?EKkd
z2OfRvOaJP5yBH_9B*DD`bpRghj0pKE8f>7QRijchV2F1zn$eA1K~-f!F|8P)s8q`s
zf%~{k%Nic9Aaiq44O65f1JA)|lc%Wd;L2itVs9Qm=3?fA8BJA-Ink(Ab{1~u0qI9G
zNJA?86%mVaNJIvzq6%h(ycL@oMubgDHk5`${z6rf4M`y^0pCHW)0usrFfDg8W<mEu
z)zo-pi^e-EhNLPw;K?>kR}95c0+cLh_8?o*Gxi{@De2}wF`9$z1zEQ-J4(j9J(wuV
z<MsgT*kqmJ50n~)Fs+2Llc_X_gd;4<3M?zA)xuWw_jpLkq^4X2OUYN$r8FTws~FqX
zWM%wr?UIrOb}4vPmkk1+smWWjHo13R<PB9D=L`;OK!ltr&FGd_;65gX7K@Fxi$#;o
zqGj_Cw3k{o$IB*sM&q~c!yHHn@S0lLGbh5!1rL>!l4ZUwjL3paDb+C4vaBkl#uUGW
z!6LN4J1uxtD$TVbd=>&^v+40(VcsxhXoPLrYRNuYPjFq0MWNYp2QvMwlfdwPtr5y=
z?ePtS>lHHYAT?AJnFXIXT)d4<0uD=P-zLy06fPD4BSQ@zA}CY?a_Yg8HY7&i`=PdI
zh6n_Eegi^yz5`=~cUFDL!n}sjOQPx@1xIY*!Mv?~NN)u-;c3|I2HYc`Pt%U8@sOE@
z%9I`t&AHfCUNnmoh!GMzGDHgj^`j`j8`}qy+NBkS=bE;*(MwOlM2(3`RmL$5pI%%A
zwW<jEqP@x+cxe)%v4h)Q1i(dJh*C{&C1PZo&WOh@U6y!J-z{&)+lgvh$4PJiUI~wz
z45r6h)^e9LwOVNdxl~OmNp_^1$YJg~2@H62a#cf}6cth93{e08${(s&f!=EpV+h7f
zmrE=(|7-o3swTI6E)X_;J0zo*+CM2SPB!vfsg0_O7h#@QGp6;ad}g~9v^*BLjkse@
z)eeuzQpvK^3RC$h3k;gO1+mCgNf7OT^Q5r^`ECo`PVOs|(yFX#EyfL+{8N)Q0;ZrH
zs)B9ZVW<`O80%tdl=8|D&aQ&`3nctq1^2-#o?A>#cHl<55PWUHowr;feRH=3NuM&K
zkpmyhO^2q)EKHB+I8=B`U`NGI#QZ+N@wN}ngUiR+<>Tzt$63?6ZUk>Z5V663umi0?
zV-T=aRDi(E!ohD2`UX5Y=~aND`+X=_l!ilM0y8vMFuxIQ^ZG@h`i0KPIm4(V!(l}q
z;PAC^fLF`m8dnKN2O?o~%a&S&;}3`iTM!{aj)wmF-S3B3Nf-_78OlU5m9#h~O&!+6
z+~FO0{_p{QL<nuUmA$2wtd%Qe(csuxSyuF9Z8SufC!vqQ;Sftmj02+~a+zcIW@gy5
zs)_8-K)j!iM5AmXF%TUbN+hBmXW_mY3rFBT(H|X54kePY&1|EDU^PuBCbQ$)8f(F5
zG}KUPVPRolAwHmLrEqj)WCZhw#rlDwUq7T6T&-Wx*H|3JMV;3qa>`{fM>xS%jnNQD
zYN}AK*ld@yl|?A<HeCh6G+A8W!=fyfMa9s;u2HN$VOp`S==PL0);5~F3~LgYHj`O;
zg7x0YWqS$Tn3xAO-s>&vIOK-2qOMjoUYwW*G1uV5D#^4aa&Vr_!&%mPQO!%&qF)tS
zW{7YA7Dq$)XNLaBaDOzBho2eXe<=2`NGutNn4}q1kcx+vA|<~_w2^|(2ym!=Ut)nz
z7FDgxfyPpqD~aLTD`F|c+J;P$FA1y+;>C#=nM`t8(G5=F#p&_U5NJIhNkTFb9|kAf
zJQ&#=izJ4l(c#E&d@M3Jyg88ucxuF&JFfCo{9diO!hbQ>JYjJ1hvET#56bf93u<hF
zoOrO&lcif*@4L5zu}1@tHG3vuxQzjEtK^iV!wWyO1Vfg1Qj+8GJ#aLnbMvAQY5=7V
zWkHkS0^C~``%0Swm}I(IG!{5b94mpfKY%luv-mkqDTxrS!lCdY<rnKqOw<wtEOLk}
zxNC>BTdmNu+%8*S*#gTJShm2j1(q%Fe`JB?rASoZXt4lSo|dc>T(%lnDVM|Ha5`L0
zr>nySkI&<Bd3=7a*XQ;61AbB(jX79cQ*O7r)8E+_2=smAtQ4einpr6tvQno(Om}Ni
z3OSq%?V?a4D@D^xD;BP-Em<j=VsKW<<z}Fwb&6(!4&;Qi)YvXpHwS5{p4hQd?p`x1
zbRm9C;nG^|$mMnE!QAoFXL<eH(D;V?&ODJ=l^2X>&R_JbzpKOBckR&=6Wbnna`*GI
z8&|*i@)ew!603LLZ)T_7B{?-bwRf)enJ+%}tslSe+B=&@ruRvQKKtNTzx|UJ|MZWW
zlDF-@{qVgfzxJJ<zVzpRnprHy>4eOh!^1FTas|hUv@z!{kl1zb&SSAtk6-F}`nd~h
zQoY%Nb~(OwFn#2j<GFRG`LpNT`uU-Y<9Dsf-v>FnzH8SfCRT3{jM>d^o_XS#jhmi-
q`O47~k388f^0t<YT5CeBP3HFyxjpgq(5v@+@968Z^`Bdv7ykonWxYrM

literal 0
HcmV?d00001

diff --git a/src/Intervention/Image/Image.php b/src/Intervention/Image/Image.php
index bda67438..d380c35a 100644
--- a/src/Intervention/Image/Image.php
+++ b/src/Intervention/Image/Image.php
@@ -1364,6 +1364,23 @@ class Image
         return $this;
     }
 
+    /**
+     * Read Exif data from the current image
+     *
+     * @param  string $key
+     * @return mixed
+     */
+    public function exif($key = null)
+    {
+        $data = exif_read_data($this->dirname .'/'. $this->basename, 'EXIF', false);
+
+        if ( ! is_null($key)) {
+            return array_key_exists($key, $data) ? $data[$key] : null;
+        }
+
+        return $data;
+    }
+
     /**
      * Convert rgba alpha (0-1) value to gd value (0-127)
      *
diff --git a/tests/ImageTest.php b/tests/ImageTest.php
index b1cf61d5..450a036f 100644
--- a/tests/ImageTest.php
+++ b/tests/ImageTest.php
@@ -1397,4 +1397,25 @@ class ImageTest extends PHPUnit_Framework_Testcase
         $encoded = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAYAAAAeP4ixAAAChklEQVRo3uXavUscQRjH8c+t2MhhcUhiKolYiDFXCIKFNkoqrYL/gyT/UV4sTZ3CgI2SIhBBsJBwWKjEYCEptLmzSpFi5ny56Hm+nLdjvt3e7t4+v52ZnWee3xTcHyMYxiAG0I8SivF8FUc4xD72sI3KfTy8cMf7y5jAOMZu+R+b2MA6th5ayCSmMXPujd+VKlaxhm/tFjKKOcyiR3s4wRcs40erN3Xd4AHzeIMpdGsf3XiBl/G4cl9CnmABb+PgfShK8aUVsYvaXYQMxlZ4rXOU0YefOL6NkLqIVzrPUBSze5WYribdKS8i6jxHb/wA1FoVstDh7tSsZQr43oqQ+Tiw80pZyBAqzYSMxi5VyrEQeCakN7/rP2QNF8zF5ss7QzFWlwmZFGbsVJiNMf8jZFr70o520BNjviCkLCSAqTETYz8VMuH+stiHpBhjPxUynqAI52PPhJXdWMJCxjCSCcvT1BnOhOQwdQYzoVCQOgOZUO1Inf5M/vOqVihl0pw/Gilmj0AEwjxSfQQ6qpmwSEmdo0yoxabOYSYUlFNnPxOq4qmzlwlr39TZzoRqxGbCIjZRqc8jGwkL2eBsYbUuzfmkGmM/FbIlmCypsRpjv1BFWRNMllQ4iTHjYqXxF54KJksKfMan+kFj0riMnQRE7MRYXdYinNVSp3Iu5B2+NhNCmFeKYuErhyxhsfHHq/yRXcEhyltBewUf3MDoqQmeXZ/gFOWBNbzHwWUnm3mIx7FlenPQMitRxJUJ7nWu7rHg2RU6OGaWYnc6aHZRKz57TfDsjgSn6KGqLjvC12nRNR57q0LqVISU/08cN+3a/XAiTHYfNXxim/HfbqppJPltTpfR0Y1nfwGRl30LQuetpgAAAABJRU5ErkJggg==';
         $this->assertEquals($data, $encoded);
     }
+
+    public function testExifRead()
+    {
+        // read all data
+        $data = Image::make('public/exif.jpg')->exif();
+        $this->assertInternalType('array', $data);
+        $this->assertEquals(count($data), 19);
+
+        // read key
+        $data = Image::make('public/exif.jpg')->exif('Artist');
+        $this->assertInternalType('string', $data);
+        $this->assertEquals($data, 'Oliver Vogel');
+
+        // read image with no exif data
+        $data = Image::make('public/test.jpg')->exif();
+        $this->assertEquals($data, null);
+
+        // read key that doesn't exist
+        $data = Image::make('public/exif.jpg')->exif('xxx');
+        $this->assertEquals($data, null);
+    }
 }