From 1b6973d757f7ebe7179924504c5a39e0ef5753be Mon Sep 17 00:00:00 2001
From: Ernie Salazar <salazare@verizon.net>
Date: Tue, 25 Jun 2019 17:43:48 -0400
Subject: [PATCH 1/2] more image resources in EPPlusTest

---
 EPPlusTest/EPPlusTest.csproj            |   4 ++++
 EPPlusTest/Resources/BitmapImage.bmp    | Bin 0 -> 19978 bytes
 EPPlusTest/Resources/BitmapImage.png    | Bin 0 -> 5743 bytes
 EPPlusTest/Resources/BitmapImage.tif    | Bin 0 -> 20708 bytes
 EPPlusTest/Resources/Vector Drawing.emf | Bin 0 -> 3980 bytes
 EPPlusTest/TestBase.cs                  |   2 +-
 6 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 EPPlusTest/Resources/BitmapImage.bmp
 create mode 100644 EPPlusTest/Resources/BitmapImage.png
 create mode 100644 EPPlusTest/Resources/BitmapImage.tif
 create mode 100644 EPPlusTest/Resources/Vector Drawing.emf

diff --git a/EPPlusTest/EPPlusTest.csproj b/EPPlusTest/EPPlusTest.csproj
index 6248deafe..a7d4ffe54 100644
--- a/EPPlusTest/EPPlusTest.csproj
+++ b/EPPlusTest/EPPlusTest.csproj
@@ -272,7 +272,11 @@
     <EmbeddedResource Include="Resources\BitmapImage.gif" />
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="Resources\BitmapImage.bmp" />
+    <EmbeddedResource Include="Resources\BitmapImage.png" />
+    <EmbeddedResource Include="Resources\BitmapImage.tif" />
     <Content Include="Resources\Test1.jpg" />
+    <EmbeddedResource Include="Resources\Vector Drawing.emf" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\EPPlus\EPPlus.csproj">
diff --git a/EPPlusTest/Resources/BitmapImage.bmp b/EPPlusTest/Resources/BitmapImage.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..b6e8129ce46f5178403fe84580708b5df4c28bbe
GIT binary patch
literal 19978
zcmeI3cUaX&*2j+pMG;Uscm?TPq$o%e0U?MKML<FNqR7Td35f<|5jzSA>brtbiV|Zi
zS=?8_6*n3Z5;to}Tw~otUECEF7Tcr5mfZI{zgvHo3y2XP{&?qk5~lsmeD0Yu<;;u$
z(}so<7u*LD*&$Yp|JLEZex%OjpAX^wi2v7566gM^)1dxDgZmAnA!<Y#YU(s_fDUO6
z9YC7u8l<jfO#Ri&NM8f-LAEq_uodZO=#!zACJj&*(r}H@G+5n<1S2%bSR47;W~4pT
zjr6o^Xt<^WnduED%^?#}K8mdLHEF1ZCt2(1lDVEC>N=3#a3{1inN0OeNn@BljnH-@
zTchD5&=HcQ{wT6Fgv{Y?G+cWk35^WNTp#Ug`O{F%5Hc9<O*RIWq&+NxMrehQK+lE7
zm>83(t_Rr}o6|Uf0cmK>Aag?}vNm)iBi%`4Vc<&k#<pZ_EF=S+AaWcznzS|J!RASN
zBc_qjh^aJEH;DAL;>gt$vh*jRt~+UK%_TjZ7#cPrnVd$AAxmQ)axt?acXI(b3&xVM
zZVVafN6;973%;`_YooVFS0|aw3`5Dz#D_dAMv;%DF*yi4NMH~Nz04v{b4xNeh#-Rz
zX<$nxPfJs>G72RF{W$U(4c!h;Crgtc($RUF>`lGN&&r$xhVkS&dOSId@~25Q0ul<Q
zkeP8beoH2eHT5HNqj>VLbfSsYHl(M&fX0rVNcuYOgVUR=M@EyW!2+6K=|;ZRj`WtT
zHR<ZVLw2Jg$a!=iy(Kgw6T^k%U=~XDf@m6R7DDF6bIIMxlg69BMcy{}ZI*syYVvz>
zGK(M`{XDW3Bva5B3liurgPs;rki8wbTTUkXQOOiwH;#-9@@VQ9D>5;9j|}uy(*$cj
za<!OBo)%$bCrBf2t3dL#^&$uJnfN`vBpjVU;f^+BA;_RWp(llm8B69SOUc<hfhLb}
zr4Yw4<Yf~K9eoJy3>s;?g2r1UkgHV;`Pl~JH~5pU5V|)mq)2BWO&K$R!W>=5!zPjf
z#`sW>qZ>_icBDurXY#U+At#HuG}7n;nrItAlZC<LXugQXTh1jr(;S-SJf2*wQ^>^v
zzsn(zX1X{~sFM$ck98v>lg*GDKr_d=&|71sl7;Ci5*TfxNp`UmXdg*a974&<HidkI
z@nku2GjzI=%uS2Q#<Yl>E%GSDIhYdN?aALEnjEc`l84p16y@qgqeuObCJATL1e<hn
zv&kf(`5MSiAWysbXfKL<?B>xF$C(uCK9(FTms7ZlKNy!#l7|Bs3o0qhIh-ci&!srm
zi8RGIg8UqkD9+8DrjMIKGhO{C$=!vLJsn9T60!gKM)>vDzQMsLe(gIjK<P7z=|e0G
z<@M|3)g<-`$}0|rKE%?;P+qNXU$Gmy_^gkqr3=zGS;Vx`M|!9ap|FMM|JBmb4*QN)
zME~kDEJsfN3otTe-Fx=p`Qy7!+uLM0Zzdve2+l0vSY++}`pdJQUtIrhQ%iHREU)(?
z>KeKN&&bRzDp;VHrk0kL-e(ZEpav9Uhv0<FZHz_UDyJ8)+-+*QE6?pF_UKVJ6}l=O
z02FOwp<8g`>W(Zgn8C2nl?27IN9P}%S4_Wj97hlR2Mipnp`mN);2D{?dNcH*`0+E?
zE~l55X89iBzyU=WFBKP`feaX^&Wr_WiOk%*`^ahjr)(TOzT48$#Lw<Lb%2HPjh$3T
z%uGyFQ6whmKY;a+uCb{@aBw1qkur<u#q&!r-78mANKlnkUjCQA94If(&6X5qW@aij
zo{*TB5Ul*2<XotK{{d=)HMGTQ;mk$3;)Cm#E?&5Dxj{L<lXULJa)ga5=FChJ`T9pD
zBqk&(v>hCYppfQ-NKj}%e>HV=ZCzu5gD1KOrrV*3v!~8AUT8RYutS0BjCr{mH<oYA
z&5oTB5*i+n5}6notkAZY#ew&!6a@!i%vg*~VJ%=O*v+fOCF%~>HvYBY;5vRu!Rms7
zg5^tCX6l^mdGn;D0Sg$+#ue|UCeIHIk4b?Rg59KrB2h3DrKA@r3Wku_ScFgu%w@9*
zmg<Vyn!h%bteh{Gh*)A`=AuO@Z-+<6rzNM(Sr8UBEr6A~1cc37k(-+fmUprirpKhr
z<*7v!oCtg236i5o?AFGCsYNBrl4TV;Ybq;CvUn`09ho>cB_$#}dU{;))YMq8c)2(`
zOIfnltk27Ocf*pmQzCgSi(tyU3>iv)^blva4sK8jSPFRcxI}pRvZB(`%C%V`yfThG
zAtfaSFhR*P0+?dFyu1P=dfC2aeOXCSMgH=oystVWq$rr=I22PM(+YZW(P|Yee$hFM
zr7&x{J5LgWi3E&TGrxys!logFarW}j_D^?|9je+{y@&TrhlC7;B$FIE2wLexEh2A@
zrK+$ne!P+>)=eqUOjOeJxOZSP*$WoTn+I#bFaparCk{2%)_tz@4L>PEk=m^dGh4A*
zR`aWJDet6rp_kIiRT=ReN-=RQTAH#XJtr$~@gLsLhS6d?v+%$B{(SQ9SDG%K>+p#}
zhKz*zbH<`;%#9%S6IEIZJ`K%SRfSMlq##Bf#n4_}ylmCSoBp`(e?G#TTmF{=2fix*
zVc(6DZOs>&F3Kx*h{;jF!i{F3kn5j>xhjo?6Hr)H+1S`vQ`$kAEMr$q!<T>F_rp(L
z9l*MH{`}3Kez^azwY|Bei+#obTmVP|=37kt&<baQa}zUHtLh+eYYh!xX{?bo-7#{m
z;lwxB?)>!C_varydUXD#=+3p<t<6tW@4qm}wbchIp!DxQkgd%&916N8vtV<_7Nj|c
z8XB4!yX^aO7cQT?@#EEh-W0Q3z4P!E)Y9^_!^Si-G1610tD!bPsuTRhXjbQTPZ&Nx
zQ8k#QB=~!|`ND;+x?c38rM>kb6m#=D_EG0=UPTu%wKTUY2w~AgEC51d4Ry8tGQD63
zv5lNSJlS?f0vXNCEnRNwp0qT#-F|rg2Pg(8|3nwHHMcx{+N|U~Bql@#yO}~Q3Mj0D
zw2f`Bc}l?O>D*9czX}TPlI1Q~T5n&w!+Hs(D`9DFZ<R@45pJEd(bX6{P-eNXmBEsI
zT(`X=k%eE`<sS2H3p}XX=%uSS5w8CD@K)PXrk2}^ENm9@6bclqMKZ4lFqWZ|m(U3(
zuKj5j;}bRDKS41M?=#K(1arC7*8H@&{gyIHumgHXZY`XxU>n!joUiz~Jl@vaHOtfH
z=5`6p)vI?HOFJ@d-;hhdhz<616B;wMNJbI29%9eWHgWQb-NstGF&J2PJA=7#|IVE|
z_pd#?-PYFLcI)Ba?tCN`?daj}=?N6{5Y!?b&=Re9V&Bwl`-&CN|6LldsJ)%j%)f73
z`|<w$hqrIFwzYx`>q72|Ia4OPPw@433wCp`G1k_=JjcO^Cw?J(RmFy0Cf*$j`b5%A
z*KRy~c>8v1YwO8x{stE8!c&t&LZblVAT)zoq$q5|Vk~@_ww3F&ws+%Cx3x9HT-#c2
z-3AFmY5nHUpKix?GkZ<yJM-hC!~Ol;OwF{_)dp~C;X25ezX?}vv(t22*E5Vr1kGT2
zgVD6!Vk9R|GL{v&E3n;sZ)H|eRJezSogP@!`r&?@L+P}w?h4wPyEYh6D<&ZX*l>GW
zTU+ailiz&0CVRz-?Cd|RFI$<FkreIc=QvVJOT8ZgVYcnA!QWKg$|fPWn3&`)Up{f-
z<c<&5yq}$&z2?ImWgo9ym64P*!B&67kU@h6_3Njm*1IU^B@Fy0PwqBdfSY;wMA?q@
zv9Ymp=6tw*(<kdn3RlI)j~{Pjq&ajb!_iXlt5@^AT@^KYlGTn~<)w2MFE%wb9NJ&D
zY4OylQ&LmcZz@~&amm`Otmz>k2G%+{!-r{Vj!+?$c}~HeDhggP>&nHiPo4Vu+_{U5
z4F^AYCpj=MaOUsI@_>SnmKNmXWMVSPWR!um@;08Wn`}Q3{E7oh74E^t!*vL?@On$u
z%?_I66cm)UawQ`vS(z3$X|k)Ug|mf~Q&32JPJaH@t#a>)?ftQgD|oxA#P=j`$NtKS
zUDaZkl9h2mW9{wTr)L$eT?>?zag%}K4A(Mna@_pFqKfML;^MbsBK*++=WFo~0eaG`
zs=Dx73v)J9SAUM<fU3%pv=IC8<0phJ%ve>J1(f8;fvzsjE-q7NB<GbB7VWI4*pQwc
z74A3A!{0w5C1Ec1S*nDp%=>ix36=S>%=hOko;@okJ--^7sjaD6n>EYb$J;L|Iw>O~
zYkt~npfIht%t)TSvZS)Abms>j<Rm49qDpv741B(n6q%%MA^~&etl!b~8BA=z)Jd~K
z)AJe3;hGw_z46|@zP{m6NegGqj}xOfy9NSfEl^5Ji&kZ1%$hYlJ}Estzj*obx4R*b
z7kkBGqWGk%!zmY>GfcuF$P}~da4lF?EsXZ{@b~rg4xJtn1Y>c9*)nU+DlDulEv+hC
zo0W!;wW?^@uIlP)d0XAZTmoV-Q<PM7TF=DF+1Yhch);CXl6;P(s;Vd_Dm=#Df1J0E
z`@~5cipf~(km(s2tKb#GpjPG~tShOk*;!kAxVBTt9SWQSVq;U^TUS`op@hpAqNy{=
z%EHwtWPEfKI%yZIx2C4FXc<;#J3B{P_pwf{&aPG_2KM89LX&cqeE<i&vSeLZ*``nS
zA7Y;1#l}X}f>q{vK{1Q-vWisdvfrSg!wgKUteisLN)oeRj;XErU|E!}hnbzDp*dr5
zwi;tUenM1K`i2b^6-+OAWt+-A*$+pssR^rw%2ripx&#Eo{ysS^V?%L=a>B|xWGEEl
z<TP=5Qq+=SjOx0t0aF1MJ2O3fLn8wx^wFe=?mkg5G0Thdt2b1XR+jAl<i!4i4LAX4
z!rh0GE7hS9UIt_NU0ha9{&L=l5w~~k2gM9GFmZAUnVythT)d~g4og98?M}v`r>8Z7
zu}q#E7ZM+}<n5(P_io)<UClbXfq^{1ati;7?@IAnR*{$%n>u6mtfcfMOBczus1mmr
zEJKDFj1o`o#e4SDpFMTz6j*Yi{Ves=wT2j3Pn;ANmz9x|zje!>5RM)d%fEE#`t|2H
z<9~AZX^-?Gnihsmnjas9i3uwQ=W|KDV%ABTIwnp*^D~y^1Eu~9U=A}DZ%ZvLEqz1#
ziD_wT3vp(4^a#S~(_e5bFT~*iyK(4n44^_A3Rw%nQfJ1+C&fg-)8U*hxi88(NoNeE
z4y-eK>W|f*Idke%U2SPmlD8xJNZ;0HdSPMJ;kq;5{p0j$Tngb@=$Smcc=6yBU}9&)
z%?ibi-i`A`nFA=%3|KUECdQ=|mR11eSbaULw^qzDQg5Us4*ho4)|~~)y?giA9ilkg
zyZ6g49MaG1UP$3rzeIEaIw{1*&x5%arV>|248vILL*{2y?X0Um_St90q$~@Qye;j_
zJi_yLf#k)1(C|GOiHwNx;Fd}Sz`O-v0bVNdS=O8>ffL=m$9Xsig{I5}l%5#$?<W!&
zVtY`z^DxKq*&eo5*H)Fjo8;~5@1L@K>lv5^Ly-dT|AOX4$0p|i1uQNdOIS|q)WAvh
zwvKi}p-^B7*BIUo^Nss+wS6**N)Ok4UjNx=+?d7kh?zGhJtksl!QOAbV<69-{laIE
zrG9zVu|a^~06W0TxnmJ>0s>qDo$N<DTAG<cF~+)L7%_=R6rEF1QCC-A50tI>)fGFj
z3e=QVY$#s7<xi*oAtt#eYg{>^qP+kXygKP3XDr38R%6X=E$vJhj6fIOvDyHsnD7l1
zyMV%2mV>3D2CG1A#jZU^kDtDG4=VYkGo>h8hf8IN|GFUXb7Uzi3oOM}qwEd!?U-VO
z0s-qLiKpWq5rakXa|ugveg*6W0gA%lQPu)4EtB7a$gok^7g$)B7#Qh~WGrF>*4E}k
z1mk7^lRu_8PA|(ba6odd_SC5}|LJJ3+?z%Ys0ZyUR247978X#<Xeb8f<(_VCOgRGX
zZX+^f>GG{xF|%Mu!(h0L=DBm1uAjy5;dhQiCQuZl_b7@Lhb_exfH5$#wKNmoBCs<!
z79u0(E?v5GD`u9X2w42KVpN|xb^X%y=PzFHSbEf`%F1|IFW#fTWUNfAM>~4BvEx22
zz~RFYF>Waew(MmjVA;DD)7@DP<vCw3Dy8=%ldZ;JVap$OlFn9`?_yGLfv|1cw$0mc
z@3?w3t{+zyY{B~bEdob#^vv0_*V!rzy~quwC#|Zi%TUCMVJt2#fkD%gM4~Nh#TAF$
z+qM;KF4)3Yj(+>ycT6=$kDfX6T$x3s^qypjNu(?m@U?!oZY>0G3-0NE;SU3Xim)#^
zejF&AVi*fhE<Jz#;Kk1p#q^|ARduB#VwT}1&QnttZ`$AZ^^1RCy%h)WaO&B8<jC<a
z!15jIBr(h5$Ji;cPQnbMN_vm-<S2j{G-SAm%arvyzHGSoTsk;79I<K`&=<$0dO3FH
z?Db2JAG2*6XE8l$R%K;A3s+^wmzOVGdY~|A07njUob}K#%rW)#U;)hI=WJN36yC#3
zMHb1YUtYd)_c?4pHnB6+uwFtR9XWm!DD`{xV1fb5xhFWM0?u_+dy^iL;8DIT$Ukjv
zdW<fTv2Z9H3t(U;SOwsbBGi42BP#9{PY<_j@}_t(DT+d7OUvEI55OXx*cr(^u8VfF
z4gOxBe7>uqV%diL{9U!@m=kuT`AQG>)e4O%MkOqYS<pIXjf{nnAaGjQwgnT+UhL>9
zc47;~&ORz?8@W@&6Wtt^C`#`l&av>yF)rB1z?|_5hl2S<h60vjpC7KR#1TVIdin;i
zG#t8&gWmN#38K}!*E#&ME>d9Omtv31v7nQ%jh0MwM|SVtwgoE!oUr=3+P@wuDap!V
zUUO;Xq5WUt`1=nZDhR<NCFN%)3Z-2{l}O;#U=RI(xmei0N)&=MX-mPDf`V<kj~xB>
z%;Cm{{rf*IDT2jp*jag~Y{wrz-Iu*U)&zIgs`xrbR?_1Lw83CFn(w|ivIWZ`Lc!|I
zAQ20@)OcwB{(~i}mgVPfC@TE8Y&}r2!vZ8Ny~guOJpE&y3>VJSZ(X_w2ceO3al2ix
zP5!ek|NZX=8)|k|=P&!9aNVX)_ifKzF)u*8na6D_&Q4#CT0{~S?2%5@RWFHP0Jyiz
zEZ8DP!FBfKD-Df@tE)E@t<77%X8T9Ex%0xrduWMT6f6IRIP~%y56f_lRGJgriJa!<
zD_0uN)$OV%TD$4P?RasqF?Ycfu5NHb!rVlqmqMKgd8zCN*U#ZC*P)WESw5ZA$4v>&
zRk#DV9c$R@kMfP#v0Pm|Qjr~(bn<ZzvoTW2^73W}Su1@f*-hh-B7$Vz-(FshSBT}g
zYn1A~wq#!3dy5y(4CKp`xftRXw$dv>pnQLz{G)yR%C9f=&WzO5)G5j?9S4J_$IqWY
zGx8@McoFmcS3msi^|h`fX$o$sln)~~6byQHl!7M(vM=!PgRy)m%XrNZuYhSdjo=Fv
zv;2yIcAY)7kQZ{VEpGJeY*7Anw=oyS62`A4XL)|NMFB;GM<{r0(fX8M{k5f>1MrSc
zNt%R(J)GyCN&<yFLXjG?(r2$B8K#UP{)Zm`0?QL#13%rla}AFzq@$cy)=LSAUYNl=
z<~8vnduxGv|JSqA<caPqA!Wfx;#YZy_YLd~O7C?NzdfX+EHD^;*{xf6Q~;LVGG2ab
zTuRCUgTXr?g{M;NNdXsBeAG)>a+aS(BFr!{Mc}a#Q1INMml{?fR?Z?4VTNI^4!L*y
z>=Fbhw{HJi#YerAC1v5nvn2^@H5=Sm5x93<53lu7!yU!)P|!*2U&C-L=&yD>F}rsE
zPREaWDM!L0la8fYx`|<L60iMu=c=r%w<BT}g;rp^Qs4C!dwBQLO@+c<jdnmmYx04^
zy#YMms{jhZITnSqQWS3^&%Y@a?$AN0eO?mpS0C{*dMzP79PCOwdu043VA#<R`lu@u
zk?75^v@jNQQXgPx=UAR~gTm>hw>zn|x#<aaPSv$q-bg3m(dc8GZ9h|SVaTUr2Gh%m
zVek9613Z4q9aC?B<tfMVGRMiiuNOQ@hhET29W|kp)BB3SVKR=kaZ;t!vWjG{E9S}F
z|FUEDKEd)BBn*b{6RFV38yMBsf$;>Y;rogzS$cmRz(1FL{NI=RXT-g3Fx(TPzQe-)
Nt@q1#sK0Gg{~x=G;GX~h

literal 0
HcmV?d00001

diff --git a/EPPlusTest/Resources/BitmapImage.png b/EPPlusTest/Resources/BitmapImage.png
new file mode 100644
index 0000000000000000000000000000000000000000..248456639143fd4ec1e332523cb3ae8a0a220639
GIT binary patch
literal 5743
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

literal 0
HcmV?d00001

diff --git a/EPPlusTest/Resources/BitmapImage.tif b/EPPlusTest/Resources/BitmapImage.tif
new file mode 100644
index 0000000000000000000000000000000000000000..dec9713a69c4f3d8486e1e6db22334c1a8940a3c
GIT binary patch
literal 20708
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
F{{Scme3t+K

literal 0
HcmV?d00001

diff --git a/EPPlusTest/Resources/Vector Drawing.emf b/EPPlusTest/Resources/Vector Drawing.emf
new file mode 100644
index 0000000000000000000000000000000000000000..5374da80a0ab8a2f1853def48f96228ac926236f
GIT binary patch
literal 3980
zcmdT{Z%mbC6hHUg*8n5I0u^&|LFE!Pt}9^|DtwCnAhMA#5Sxj(XzLH5YZ9h6DO=){
zP5M%7(TDut7*d;K`6Zk<Yl{!%)|lnyhb!?RTeY^nxNg7S^S;l$@4d}rm7AUIch7mw
zbDs13Ip;a=b3G#RA`o>bTp?1p4ho0b-x6tR5b;+x)rffHScXU^`h3Q~;d23z;m1Vg
z&|c|D?A+1llb%XT;6NS$`~ciN>`@+B1344$W=?+xCX<#8+NRSFK--PVtL@MY3U4k_
zBI_ZoViRr6lH^B~c#Qve|LZj}mR_@%@f(!AHhWHyT;-E=$5FnrV)9y*7L)T-N=$ao
zG3gyIH*0XqOO=GpJ{W?8qf0Aq^f!FnkcWY(Ko`LIX~QuD$hG&l>_x{0z*%qD$nX<x
zgMK5B9P=eHU2{$J0AX90u_+j9WSHu8J8MvA8&XE#8u9_Ifu0ys=Eqk6W9mL1xO43z
zE-%KWKqbcMzl>Y*x}s}8s~-R2!)gn2I%g{;KFl@7sS!Z8K4YG#A7IP~=DMNeyJp()
z*v8L+>o9ZkTsgPf*V3eR3);PykaPC_5siYyXqZZnC02f=?85zj0lC$OUy+-KL>ivC
zbg$eH8EgBb?QO?a(lS5ZzvA4Ht$L*WGx=$8v#Tj@6b$~t@k3XxT)Q?eG8(i_v41FN
zjgbG?{?QHgGxtb_tM0Ddv3a03_Q&7-K--HxVUe;7d;T;%+TI(*q2P#4)amWm(}*QM
zr~O*z_E(l^k4rgz@LRn;mpxCx`1@g?X@LD^%deh0tnHs$ZI3tlu;cIa!KVkhU(+Fv
z-8I^*02m+Eru!Y4dbXXM@os}00oJb+IRK;WsGqyDPzRw)rW`1?Bq{Bi8I6Xa-zGhX
z-CprKzkB5sc}e!5-G}JDEZw^8mwnLf$8RylTmZfSb^xOQYr2s;9NlGbg@s=Nr*06K
z1~`r|{p>pooChX=BfuWO)QV+D-a@pwcewjYO&Ei61h`#IF!{fjny?s~J6Si}HQttY
zRewMGWmT#Y-x$t-7lPkBd`>l8zj&;U!p`5%)RPxIf1$qg?6YU)3NP2c9~r45U#Kmp
zCqKXJ&3g7P)SjxRJvqmdUtN8()^4Xy(C+%h^a+k5ryr+3Nc+;WSBu5t(`2(j$x;$#
zU9o_fzN%;*cq-5ZnE1Ks6J863SiNjw4kMj)zBAsWs=gV`O-@k%0APGR4w>^j2yp&F
zcncx%OP%&?tKDu#dlO*D+=F|dSl$uJnd<D%o$3q*raI?~mv;n8W?KU##s_@{N<{w7
zN2EMZQW2Ujt_TGK6`}szNO>ryup*T6B>Z!IPdJ>L<$caTa&N`tKjG3h+?Ti~vsak8
zzLjBxwnK55XI2A@17iU1LaOq3xz|F#ypM(<YwE3``BRil--(uBG*x+h+}{>QpF#tW
z$&-`sjGBDWd4xRBc}33raQcI^*ZE<mhh)3nUyL0eGmIV2WHI@$6Lukh`y?kBF8Lm*
zv{e#pIpIh)GiS(gMqYyRL^|m46G$Q-&j0glk@s-^+%IE(v?WjyX`U~RGzSBb=KkEH
zEuoy*)=-Y|0lQngW#Tb`iGn*#oS$*vo++FC^SjGH{01xl|2%F!-x$W<t#u(AZ(mav
z?uPjP-|B@zY*zs@$Wi8N8NU0>*E^Aq`Iv`!%G$`>+z0dkxBI@rL{pKn?=;toJFr=^
zB)LE(zPT;5IVb7gzJIx9Q}^uqWLaE`zI)F9MEw8E+@#|F!Sc|b3UoPk%u%j`IZHy#
z&^57Jx9p!o{2r`}E6n@*Avqma-eUhQg9I`8?AM@|Yv4Y-Dt<=zY)BSBVn5|S0acAh
Ar2qf`

literal 0
HcmV?d00001

diff --git a/EPPlusTest/TestBase.cs b/EPPlusTest/TestBase.cs
index 3e062cfbb..428b3fc98 100644
--- a/EPPlusTest/TestBase.cs
+++ b/EPPlusTest/TestBase.cs
@@ -30,7 +30,7 @@ public void InitBase()
             var asm = Assembly.GetExecutingAssembly();
             var validExtensions = new[]
                 {
-                    ".gif", ".wmf"
+                    ".gif", ".wmf", ".jpg", "emf", "png", "tif", "bmp"
                 };
 
             foreach (var name in asm.GetManifestResourceNames())

From e6ab1023603584aaf41a07f96993e661f3b0e564 Mon Sep 17 00:00:00 2001
From: Ernie Salazar <salazare@verizon.net>
Date: Tue, 25 Jun 2019 17:45:01 -0400
Subject: [PATCH 2/2] ExcelPicture retraverses stream instead of convert

---
 EPPlus/Drawing/ExcelPicture.cs | 26 +++++-----
 EPPlusTest/DrawingTest.cs      | 86 +++++++++++++++++++++++++++++++++-
 EPPlusTest/EPPlusTest.csproj   |  1 +
 3 files changed, 98 insertions(+), 15 deletions(-)

diff --git a/EPPlus/Drawing/ExcelPicture.cs b/EPPlus/Drawing/ExcelPicture.cs
index e413ae025..d3a0ee41d 100644
--- a/EPPlus/Drawing/ExcelPicture.cs
+++ b/EPPlus/Drawing/ExcelPicture.cs
@@ -38,6 +38,7 @@
 using System.Drawing;
 using System.Drawing.Imaging;
 using System.Diagnostics;
+using System.Linq;
 using OfficeOpenXml.Utils;
 using OfficeOpenXml.Compatibility;
 
@@ -61,14 +62,15 @@ internal ExcelPicture(ExcelDrawings drawings, XmlNode node) :
                 Part = drawings.Part.Package.GetPart(UriPic);
                 FileInfo f = new FileInfo(UriPic.OriginalString);
                 ContentType = GetContentType(f.Extension);
-                _image = Image.FromStream(Part.GetStream());
 
-#if (Core)
-                byte[] iby = ImageCompat.GetImageAsByteArray(_image);
-#else
-                ImageConverter ic =new ImageConverter();
-                var iby=(byte[])ic.ConvertTo(_image, typeof(byte[]));
-#endif
+                //Re-traverse the stream to avoid Image.Save call which converts emf/wmf to png
+                var ms = Part.GetStream();
+                _image = Image.FromStream(ms);
+
+                var iby = new byte[ms.Length];
+                ms.Position = 0;
+                ms.Read(iby, 0, iby.Length);
+
                 var ii = _drawings._package.LoadImage(iby, UriPic, Part);
                 ImageHash = ii.Hash;
 
@@ -128,12 +130,10 @@ internal ExcelPicture(ExcelDrawings drawings, XmlNode node, FileInfo imageFile,
             var imagestream = new FileStream(imageFile.FullName, FileMode.Open, FileAccess.Read);
             _image = Image.FromStream(imagestream);
 
-#if (Core)
-            var img=ImageCompat.GetImageAsByteArray(_image);
-#else
-            ImageConverter ic = new ImageConverter();
-            var img = (byte[])ic.ConvertTo(_image, typeof(byte[]));
-#endif
+            //Re-traverse the stream to avoid Image.Save call which converts emf/wmf to png
+            var img = new byte[imagestream.Length];
+            imagestream.Position = 0;
+            imagestream.Read(img, 0, img.Length);
 
             imagestream.Close();
             UriPic = GetNewUri(package, "/xl/media/{0}" + imageFile.Name);
diff --git a/EPPlusTest/DrawingTest.cs b/EPPlusTest/DrawingTest.cs
index f027c444e..3e715c1b3 100644
--- a/EPPlusTest/DrawingTest.cs
+++ b/EPPlusTest/DrawingTest.cs
@@ -8,8 +8,8 @@
 using OfficeOpenXml.Drawing;
 using OfficeOpenXml.Drawing.Chart;
 using OfficeOpenXml.Style;
-using System.Diagnostics;
-using System.Reflection;
+using System.Drawing.Imaging;
+using System.IO.Compression;
 
 namespace EPPlusTest
 {
@@ -977,5 +977,87 @@ public void DrawingWidthAdjust()
             //    p.SaveAs(new FileInfo(@"c:\temp\colwidthAdjust.xlsx"));
             //}
         }
+
+        #region ImageFormat Test
+
+        [TestMethod]
+        public void AddPicture_Bmp_StoresFormat()
+        {
+            AddPicture_Assert("BitmapImage.bmp", ImageFormat.Bmp);
+        }
+
+        [TestMethod]
+        public void AddPicture_Gif_StoresFormat()
+        {
+            AddPicture_Assert("BitmapImage.gif", ImageFormat.Gif);
+        }
+
+        [TestMethod]
+        public void AddPicture_Png_StoresFormat()
+        {
+            AddPicture_Assert("BitmapImage.png", ImageFormat.Png);
+        }
+
+        [TestMethod]
+        public void AddPicture_Tif_StoresFormat()
+        {
+            AddPicture_Assert("BitmapImage.tif", ImageFormat.Tiff);
+        }
+
+        [TestMethod]
+        public void AddPicture_Jpg_StoresFormat()
+        {
+            AddPicture_Assert("Test1.jpg", ImageFormat.Jpeg);
+        }
+
+        [TestMethod]
+        public void AddPicture_Emf_StoresFormat()
+        {
+            AddPicture_Assert("Vector Drawing.emf", ImageFormat.Emf);
+        }
+
+        [TestMethod]
+        public void AddPicture_Wmf_StoresFormat()
+        {
+            AddPicture_Assert("Vector Drawing.wmf", ImageFormat.Wmf);
+        }
+
+        public void AddPicture_Assert(string fileName, ImageFormat format)
+        {
+            using (var pck = new ExcelPackage())
+            {
+                var workbook = pck.Workbook;
+                var ws = workbook.Worksheets.Add("Sheet1");
+
+                var pic = ws.Drawings.AddPicture("Pic4", new FileInfo(Path.Combine(_clipartPath, fileName)));
+                pic.From.Row = 0;
+                pic.From.Column = 0;
+
+                pic.To.Row = 30;
+                pic.To.Column = 23;
+
+                using (var zip = new ZipArchive(new MemoryStream(pck.GetAsByteArray()), ZipArchiveMode.Read))
+                {
+                    var found = false;
+
+                    foreach (var entry in zip.Entries)
+                    {
+                        if (entry.Name != $"1{fileName}")
+                            continue;
+
+                        found = true;
+                        var stream = entry.Open();
+                        var drawing = Image.FromStream(stream);
+
+                        Assert.AreEqual(format, drawing.RawFormat);
+                    }
+
+                    Assert.IsTrue(found, "Image was not found in zip.");
+                }
+            }
+
+        }
+
+        #endregion
     }
 }
diff --git a/EPPlusTest/EPPlusTest.csproj b/EPPlusTest/EPPlusTest.csproj
index a7d4ffe54..98d67a88a 100644
--- a/EPPlusTest/EPPlusTest.csproj
+++ b/EPPlusTest/EPPlusTest.csproj
@@ -85,6 +85,7 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Design" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.IO.Compression" />
     <Reference Include="System.Security" />
     <Reference Include="System.Xml" />
     <Reference Include="WindowsBase">