Merge pull request #925 from wiredfool/hopper4

Merge of PR #919, Replacing Lena with Hopper, part IV

.travis.yml

@@ -5,15 +5,18 @@ notifications:
 
 env: MAX_CONCURRENCY=4
 
+# Run slow PyPy* first, to give them a headstart and reduce waiting time.
+# Run latest 3.x and 2.x next, to get quick compatibility results.
+# Then run the remainder.
 python:
   - "pypy"
   - "pypy3"
-  - 2.6
+  - 3.4
   - 2.7
+  - 2.6
   - "2.7_with_system_site_packages" # For PyQt4
   - 3.2
   - 3.3
-  - 3.4
 
 install:
   - "travis_retry sudo apt-get -qq install libfreetype6-dev liblcms2-dev python-qt4 ghostscript libffi-dev libjpeg-turbo-progs cmake imagemagick"

Tests/helper.py

@@ -182,7 +182,6 @@ def tostring(im, format, **options):
     return out.getvalue()
 
 
-# Note: hopper() should be used in place of lena(), which will be removed.
 def hopper(mode="RGB", cache={}):
     from PIL import Image
     im = None
@@ -203,27 +202,6 @@ def hopper(mode="RGB", cache={}):
     return im
 
 
-# Note: hopper() should be used instead lena(), which will be removed.
-def lena(mode="RGB", cache={}):
-    from PIL import Image
-    im = None
-    # FIXME: Implement caching to reduce reading from disk but so an original
-    # copy is returned each time and the cached image isn't modified by tests
-    # (for fast, isolated, repeatable tests).
-    # im = cache.get(mode)
-    if im is None:
-        if mode == "RGB":
-            im = Image.open("Tests/images/lena.ppm")
-        elif mode == "F":
-            im = lena("L").convert(mode)
-        elif mode[:4] == "I;16":
-            im = lena("I").convert(mode)
-        else:
-            im = lena("RGB").convert(mode)
-    # cache[mode] = im
-    return im
-
-
 def command_succeeds(cmd):
     """
     Runs the command, which must be a list of strings. Returns True if the

Tests/images/hopper.xpm

@@ -0,0 +1,178 @@
+/* XPM */
+static char *hopper[] = {
+/* columns rows colors chars-per-pixel */
+"128 128 44 1 ",
+"  c #110E13",
+". c #2A1110",
+"X c #13122C",
+"o c #25192A",
+"O c #312831",
+"+ c #302219",
+"@ c #5F241A",
+"# c #6F4832",
+"$ c #17174A",
+"% c #26264F",
+"& c #65595D",
+"* c #4B3C54",
+"= c #8E1F1A",
+"- c #914E33",
+"; c #A75335",
+": c #AC6736",
+"> c #B26F4E",
+", c #9B6657",
+"< c #CA7652",
+"1 c #CC7866",
+"2 c #C25135",
+"3 c #B0896D",
+"4 c #D28859",
+"5 c #D28E6D",
+"6 c #E79371",
+"7 c #E5A36E",
+"8 c #D58932",
+"9 c #3E65AE",
+"0 c #4970B5",
+"q c #606D95",
+"w c #557CC1",
+"e c #91778A",
+"r c #6A86B9",
+"t c #5C83C3",
+"y c #6D8FCA",
+"u c #7799E3",
+"i c #A89A9D",
+"p c #CFAA90",
+"a c #F4B08F",
+"s c #D6A799",
+"d c #ECCCAB",
+"f c #F9F4F4",
+"g c #E3D8D5",
+"h c #AAAECA",
+/* pixels */
+"$XX$$XXX$%$$$$$$$$$$$$$$$$$$$egip3dr %% @p# Oqgffgfgfgo%q999q9999999999999999999099999099099990999999909909990w999000wwww00w00w0",
+"$$X$X$XX$$$$$$$$9$$$$XX$$$$$$ws&7+O&%$Xo@3#XXX&ihffggg%%9q*9*%q99qq9q99999999999999090900909909909099999999999999999000wwwwww0ww",
+"X$X$$XXX$$$$$$$$$$$$$$$$$$$$$eq@i#+$$$%X#pOX$%$%*dfffgiX%%OX%XO*%**990909999999009090990900999999099990999w999990990000wwwwwwwww",
+"$XX$$$XX$$$$$$$$$$$$XX$$$$$$$*O*7#XX%$%X@p*XX$%Xohfi3hOXOoX*r3*OOO%O99099999q0q990990009090909000999090999999099909999ww0w0000w0",
+"$XX$$XXX$$$$$$$$$9$$$$$$$$$$o$.&3++X$$$o#p+X$$%$OhgOX oo+ii*if&+ri&OO%q0990099009090090990909009990999099w999990999090w0000w0ww0",
+"X$X$$XXX$$$$$$$$$$$$$$$$$$$$$oX#p#OO%$$o#7O%X$$XOg&O o.&fffgifirfffiOO*&qq990990000000009909099000990990999990999w90099000000000",
+"XX$$$XXX$$$$$$$$$$$$$$$$$$$$$oo*3+o$$%$.#7+X$%XOOhii+X,fgifffffffddfgOOrhi0qq000090000090099990909909009w9w9909990999099900000w0",
+"X$X$$$XX$$$$$%$$$$$$X$X$$$$$X$X#7@X$$$$o:3+XX$OqgffrXOe&&#*&iggi&&3&*&OOfffgrq900009000099099090000909009999990999900900000000w0",
+"X$q$XXXX$$$X%$$$$$$$X$$$$$$$$$X*p+O$%$$o-3oOX%gffff&o++3pgg3fddd3fdg&+OOhffffgt0099090090009090990909990999990999000099090090000",
+"X$g&$XXX%$X$%$$$$$$$$$X$$$$$$$o*p+X%$%$X,5+ *gfffff& ++&pddffffffgdd#OOOiffffffhq9qt009w990090900999w9w9900999w90999909009900000",
+"X$ggO  %$$$X$%$$$$$$$$$$$$$$$Xo*3#$$%%$X,3+&ffffffg#+.+Odddgggggggpd*+OOifffffffgtqt09t909090990090909099990099w0990090909090000",
+"X%hfr&h&$$$$%q$X$$$$XXX$$$$$Xoo*p@o$$$$X:3OffffgppdO. ++,ddfffffffd3+ ++&ffffffffgq900909090900999099090w9w990990009009090009900",
+"Xohfffh&X$o$$h&$$$$$$$X$$$$$Xo$*7# %%$$ 35dffg73&#++++ +pd3gfffffg3d,++++3ddffffffhq90009099990999909090990909w99990099900900000",
+"oegffgiO$$$$$gh$$%&qXXXX$%XX$X.*3# X%X$+#pgfd3&+.  +  ++3iddgfffddpd&+O++++#pgfffffrq9900900q99090909990099009990009990999090000",
+"hffffg&X$%$X$gg*&hg*XXXX%i%$$Xo*5#XX$$$o,dfg&+.. .#&++ +&ddd3gfgdddd#++++&+++#3dfgghq009099090000909090990999090909000099000000w",
+"hgffffp*X$X%Ogggfgh$XXX$%g*XXooO5#o$%$$+&df3...&#++3 O#+#pd7di&,ppdd&+++#3+&&..#iffgqq009009009909900990090009990009999009990000",
+"o%qffgh&o%o*iffgfg%%X$XX*gi OqO*p#+$%$XO&h3 . +pdpp3pdgdd3#+++++++#ppggpp3ddp+##+ifghqrq09090090090090900909999009009w900009w0w9",
+"Xo*fh**%$%igfgfgg&%$$X$X&ggih3o+p# X%X$XX     .+33+pdppdddfp,#+O&dfggdddd3pdddd+++dh&%%&q0090909009909090090000900w000w99w0900ww",
+"X%&fq%oX$%&hgfffgi%oXXX &fgshOoO3#+X%%XX+      . +#&++7dp3&#O&O&#&33dd3#3&.+#ppiiO#+  X%9909000909099090090900009w9w009ww9ww9w00",
+"X$%g*o$XX%Xo*gffffq$X%&egfhp&oXO7# XXX          +   #++.+++ +..O+ ++O++#ppp+++&3++  o XXq9000900009000090009000009w909w09w00w00w",
+"$$*i$$oX$XoX%hfeegg%$%&idggh+X$O4#+XOX             + .    + ..o + + ++ +&3gg#.         X999909000000000000009000000000w09w0www0w",
+"$$%%$$$X$$o$$hh*$$q&$o o3ggd,ooo3#+                    ++          +++ ++*++           X%0q9q900000ww000000000000ww99w00w9w99ww0",
+"$$$$%%X$$$X$%g0$$%%%oX .&fshg*Xo3: X                      +          +                 X*0000000000w000000000w00000ww0www90wwww0",
+"$%$$%$$XX$$X%h$%$%$$XXX qg*XiqXo3:+                                                     %0q0000000w00000w0ww000w0ww990009w0w99ww",
+"$$$%%%$$$XX$$%%$%$$$XXXXihXXX%X.,:                                                      %t000t90w0w0000090w00w00009w000wwww9www9",
+"$$$$$%X$X$$$$%$$$$$$XXXXq*XXXXXo3:                                    .                 %0q0000t0w0ww00ww00ww00ww0w9w0w0w99ww9ww",
+"$$$$$$$XX$X$$$$$$$$$$XXX*$$XXXX :>                                                      %q0t0t00w0w0w0w00ww0w0w0w00w0w0www90w09w",
+"$$$$$$XX$$XX$$$$%$$$$XXX$$$$XXX.:3.            .     .  ....   .. . .......            X%qw000t00www0wwwwwww0ww0www0w00w00w09w9w",
+"$$$$%%$$$XX$$$$$$$$$XXXX$$$$XXX -3           . ....+@@@@@@.@@....@@@@#####*@..          %ttt9ttt0t0tw0www0ww0ww00w9ww0w09w9www0w",
+"$$$%$%$$X$$$$$$$%%9$XXXX$$$$XXX :3           ...#->1>>1,>>,,--;,--,,,1531>13>#@.        X09q9r00t0t0wwwww0w0wwwwwwww0wwwwww0w00w",
+"$$$$$$XXX$$$$$$$$$$$XX X$$$$$XX.::           .#11ss65assa56a511155557a775555p5,,.       Xqttr0trt0wtwwwwww0ww0wwwwww0wwwww0ww0ww",
+"$$$$$$$X$$$$9$9$$$$$XXXXX$$$XX$ >;.      ...#,pps55paaaaasadasaaaaaaaaa777a77p53,*...   Xt0tq9t0ttwww0wwwwwwww0wwww0wwww0wwwwwww",
+"*o$%$%$XX$$$$$$$%$$$$XXXX$$$$XXX,>      +#*-,5pp7apasaadddaaaaddadaaadddaaa6pp733,##.   Xqrtttttt0t0rt0tt000t0t0t0t00t0t0ttt0ttt",
+"go%$$*%$XXX$$$$$$$$$$X XX$$$$XX :>     .&,#,5p77p7aaaaadaaadaddaaadaaaasaapp7775534#@   Xr90tq0ttt0tt0ttt0ttttt00tttt0tt0t0tttt0",
+"fio%whXXX%$$$$$$$$$$$XXX$$$$X$X.,8.   o###-155pppadaasasaaadaaaaaaaaa51>3355455535>>#+  %t0r0r0rttt00tt0ttttttt0tttttt0ttttttttt",
+"gg&gf&X *qo$$$$$$$$$$X X$$$$$XX 3:    OO##,135565431>113sadaaaddsss611>1>>55s5355333,*+ %rr0r0ttt0tttttrtt0ttqttt0ttttttttt0tttt",
+"gffghOXX*g*$$$%$$$$$XXXX$$$$XXX ->    +###,>3575p5<><355saaaaaaaap615>;;-;>5a7p335333#+ %rrtttt0t0trtttttttttttttttttttttttttttt",
+"fgfg&oo &giO$qi%X$$$XX XX$$$XX .::+  +#,,,3355p55>>;;;,>16s777aaas61>;=--@#@@@@##&##&&+X*rrtttttttt0tttttttttttttttttttttttttttt",
+"gggg&o  &gg,sfe$X$$$$X XX$$$XXX ::   +&#-,,35333>>,-,-,>>15apaadap1>>;@@@#;-##@+,&@##&O+&rttttt0ttttttt0tttttttttttttttttttttttt",
+"gffgg*oX&gfggh%X$X$$XX  X%%XXX  3:+ ++3:-####@@.@..@++@@->6aaaaaa74>=@,3,11335d&+@+O*&##qrrttttytttttttrtttttttttttttttttttttttt",
+"sggggho*dgggg&O$$$$$ *+Oii$X X .::+++&,-##+@+@@:ss1,1i1--=:4a77764::a1,@@@@=,,4d#+##*&,-eqyrwyrwttttttttttttttytytttytytttyttttt",
+"id**qi&Ogggdd+X$$$$$o*&eh*X XXX.::.O#,>-#@...+,,,-@@@@-5><<<76748:2<>-@#.@@@@=-@##@@+#,isiryywyyrttrttttyttytytttttytttttttttytu",
+",hO%X$Xo&gggg&O$$$$XoO,e&OXXXXX.3:.@33;#+@@@.-,>-@.@..@=::;<4<4<:28<2@#@.@@@@==-,-##-,1,eheywyywyttttyytytyttttttyttttttttytyttt",
+"i&o$$X  Ogggfg%X$$$$oO,&+ XX  X :3+@3,,;##@#@##,@@@..@-;==;426a76<<<;>;--#==;;::4>4>:;:==1ryewywttyrtytttytyytyyttyttuytyttyttyt",
+"**%$$$XX+hiO&h&%$$$XX*,,& XXX X ::+#1-#-;,,>,#-==#=#;-;<4444;6ad7<661<<11>2;2<<<445<>:<<@,ryytytyytyyttyyttytyttytyttyttyttyuytt",
+"%X$$$$X Og*o%$*X$$$$X*&&i* XXXX :3.#,=;>,-35:-#===:4s51446a6;6aaa6661<66aaa6<664445>:15<-,ewyytyytytyyytyyytytytytyyytyyttuttttu",
+"X$$$$XXXOi$$$$$X$$$XXX.o&qXo X .>>.#-@>;-:<6:<;==2<66a6<<6a<<aaaa7<a76167661<665655326a1-1ityytyyytytyyyyyyyyytyyttuyyyyytutyyyt",
+"$XX$$XX %%$$$$$X$%$$X   ooX$XXX -8.@,=11>-:44:<82<<11<<<aa621addad167aa4<8<2<<7545511:66;eqrryytytyyyytyyttyytytyytttyttyytyttyy",
+"X$$$$XXXXX$$$$$$$$X$X  XXXXXXXX :3.+>=54;;<<<<1<;2<<<1aada6:7adadd74aaadaa6446764444;=>s,eitryyyyyyyyyyyyttyyyyyyyytyyttyttutytu",
+"XX$$$XXXX$$$$XX$$$$$XXXXXX$X$X .::.@,;6<-;<<1<4::46aadddaa46aadddad66aaaaaa7a76564>4<-;51eryyttyyyttryytyyyyyryrtuyytyyyyyyttytt",
+"X$$$$XX XX$$$$X$$$XXXXX XXXXXXX :8+ia>44;;<<<44<;87dadddda<aaadddaaa1saadaa676444>>5a221eiiwtyyyyyyyyyyyyyyyyyyytyytytyytttytuyy",
+"$X$X$X XX$X$$X$$$$$XX XX$XX$XX  #73pda6<>56>2<44<26addaa6>:6adaaadda2;16666a7a6<4>47a1<1ieyyyyytyyytyyyyyyryyyyyyyyytutyyuyyytyy",
+"X$$$XX  XX$$$XX$$$$XXXX XXXXXX  :75ps565577>:<:46<<1aa11;;6aaadddaada<2>2;<6676<<435a1>5eiyytyyyyyyyyyyyyytyyyyyyyyyyyyyyytyyuty",
+"XX$$$XX XX$$$$$$$$X$XXXXXXXXX X3773sdp565p742<:<61<2;2;2=<66aaaaadaaa1>6a66a665<5>456>15ewyyyyyyyytyyyyyyyyyyyyytyytyyyyytuyyttu",
+"$$$XXX  X$$$$$X$$$XXXXXXXXXX  &pp73dd357577<<:>481611612;661a1saas6111;21aa664444>56<163iyyytyyyyyyyyyyyyyyyyryyutyyyyyyyyyyyyyy",
+"$X$$XX  XX$$X$$$$XXXXXXXXXX  *ip773ss345775<<<848111aa1;=;-=><1511;;====116166165>4>6615rtyyyyyyyyyyyyyyyyyyyyyyyyyyyyytyyyyytuy",
+"X$$X$X  XX$$$XX$X$XXXXX X XX*ipp773dd33783::<<<4<<6664;=6<@===-==#;=;1;@21<<646655>>>>6iryyyryyyyyyyyyyyyyyyyyywyryyyyyyyyyyyutu",
+"XXX$XX  X$$$$$$X$XXXX  XXXX&iipp783pp33735771<<46<644<=<66641,-@@:41112==2<4<44545a775piiyyyyyryyyyyyyyyyyyywyyyyyywyyyytyyyutyy",
+"XX$*XX XX$$$$$$$$XXXXXXX oriipsp784dp333a7p761446<442=2661666611<6161<1<@=;2<46555aa5ppqryyyyrryryyyyyyyyyyyyyryywyywyywuytyyyyy",
+"*oe*XX  XXXXX$XXX$XXX  Xoiihhisp774ppp837a7dp>4464<<2=<16666666666116661===;<1<445a77p3iryyyyyyyyyyyyyyyyyryyyyyyyyyyyyytyyyyyyy",
+"iiiXXXX  XXXXX$XX$X X o@iihishpp788dpp#:7p7a,3447842=;166aaa6aaaaaa16666<;=;<<4643ap33iirryyyryyryyyyyyyyyyryyyyyyyyyyyytyyttyyy",
+"di&o o  %*%XXXX$XXXX  Oeiishippp773dd3:#:57>.-47664;@8<61a6a1aaaaaa676a11<=<<6548->53iirrryyyyyyyyyyyyyyyyyyyryyyrryyywyyyyyutuy",
+"ppO.oX *q&XXXXXX$XXX..@,eshsipdp783pp3:##:,@.#:4474<:<<11<>1<1661<21<<<6<6;166643##,7irrryyyyyyyyyyyyyryyyyyywyyyryrywtyyyyyyyty",
+"di*+X. *&OoXXXXXXX$ .o@&,sshsiip377pd3,##:3,@@4466718<<<2=====22=2===-=;2<6676158##333iryyyyytyyyyyyyyyyyyyyyyyyyyyyyyyyytytyyyy",
+"gge.   *OoXXXXXXXXXX..@@,3shsipp778dp3,-@@@@+@-46667<22==;22,22=2111<6<<<<8677453##33iriyyyyyyyyyyyyyyyyyyyyyyyryyyyytyyyyyyyyyy",
+"esi*   &*XXXXXXXXXX .@@=;ppssppp77377:-:@+.+++-446774<<<1116666aa16a61<66<6766558#,3ihrryyyyyyyyyyyyyyyyyyyrryyyyyyyyyytytyyyyyy",
+"&.&eo oi& XXX$XXXXXX.@@@=ishhpsp873p3,:28@@.@+=4<4774868<1116aa6a611<88668664453##&3iryyyyyyyyhyyyyyyyyyyyyyyyyyyyryyyyyytyyyyyy",
+"oXXo XX&eXXXXX XXXXX..=@@1ssipsp875p3::888:@.@@;44464<68<<2112;;;22<<6664<16443>##3iiryhuyyyyyyyyyyyyryyryyyyrryyyyyyryyyyyyyyyy",
+"XXXXX  X&OXXXXXXXX  .@@===6ssis577377>::88882@@-:<<68<66611<2;;;2=;:<<<<644<<<5-#3&3iyhyyyyyyyyyyyyyyyyyyyyyyyyyryyyyyryyyyyyyyy",
+"XXXX X  %OoXXXXXXXX..@=@=@1ssis578377:::82822;@;:4<8244<8<1<46a56144<<<656<6<<1#&eerryryyyyyyuyyyyyyyyyyyyyyyyyyyyyyyyyytytytyty",
+"XXXXX    XXXXXXXXX..@=@====sspp578877:8228282;=;<<><46666666aaaaaa66777a5<4<1,i-&3riryyyyyyyyyuyyyyyyyyyyyyyyyyyyyyyyyryyyyyyyyy",
+"X$XXX    XXXXXX  ..@@==@===1ppp5878p8222828282==<:<<6<<<84667aaaa6aa777744<;113,eiryyyyyyyyyyuyuyhyyyiyyyyyyyyyyyyyyyyyyyytyyyyy",
+"XXXXX   XXXXXX X .@===@=====1ap387838:8:282822=@>4:>44>44644666a66aaa744>>:::>3,erryyuuyyyyyyyyhyyyyyyuyyyyyyyyyyyyyyytyyyyyyuty",
+"XXXX     XXXXXXXo@@@===@@===11s>87888:8:828828@-p4;::<:<44<4446455656548>#---33Oirryyuyyyyyyuyyuyyyyyyyyhyyyyhyyyuyyyyuyyytuyyyy",
+"XXXXX   XXXXXX .@@==========;1s187882;8:28888=+sp1,-=;-:<<444<<><141<<:;=@@=>p,XOrryuuuyyyyyyyyyhyyyyyyyyyyyyyyyyyyyyyyyyyytyyyy",
+"XXXX X   XXXX .@@======@===@=1118788:;8:8288;.+d151-@@@@;:>2:---;,,-;--#@@@:333 ++qyyyyuyyyyyyyyyyuyyyuyyyyyyyyyuyyyyyyyyyyyutuy",
+"XXXXX  XXXXX..@@=======@==@==>5<8788:;8:8:8:..&d,35>-@@@@-@@@@@@@@@@@@==@@,55p,   Xqyyyyyyyyyhyyyyyyyyyyyyyyyyyyyyyuyyyyyyuttyyy",
+"$XXX     o...@@=========@====262888:;-82::-.. ip#513:=@@@@@..@......@@---;1>53,    Xqhyyhyyyyuyyyyyhyuyhhuuyhyyyyyyyyyyyyyyyyuyy",
+"XXXXX   oXoO@@@=======@=@=====s;878:=-:-;@..  hp@74>:---##@@......@@#-,--,<51p3     +Oryyuhuyyyyyyyyyyyyyyuyyyyyyyyyyuyyyyuyyyyy",
+"XXXX X  .o**==========@@@=@===1;878:;-:#..    gd@54>3:-:--@@@.....@@-;--;<>13d&  +   +O&ryyyyhyuyuyyyuyyyyyyyyyyyuyyyyyuyyyyyyyu",
+"XXXXX   .&h1@=========@@@=====2;778:@@.       hd@343<;;;,--@@@@O@@@#;;-->1>5pg&X        X%qyyyyyyyyyuyyyuyyyyyyyyyuyuyyyyyyyyyyy",
+"XXXXX  Xisi1;===@======@@=====>>88#+          gg#,5>:>:-;---@@@@@@=-;;-;<>53df&          X X&ryyyyyyyyuhyuyhyhyyyyhyyyuyyyyyyyyy",
+"XXXX   &idi31=========@@@=@==@=. +            dg+-51<:;;;-#==#@#---->;-:>>5dff&           XXXX*rhyyhuyyyyyyuyyyuyyyyyuyyhyyyyyyy",
+"X XX  +iipi3s2==@======@@@=@@..               df@#55<>:>,---#=#-;=-;;;:>>35gggO          X XXX$XOqrhyyyyhuyuyyyyyyyuuyuyyyyyyyuy",
+"X X  X+pssiiss2======@.......                 igs@>1<>::>;-----;;;;;>;>>3>dffg .            XX XO %qyyyyyyyhhyyuuyyyuyyuyyyyhyyy",
+"XXX   .iissshss===@@... ..                    egf,-1<:<:>:----;>;;;>:;;>>5ggfs             X  XO+OX O*qiyyyyyyyyyyuyuyyuyyyyyyyy",
+"XXXX  .ppssssdg,......                        &gfd@>4::>>>----;;;;;>>;>>,gfggq             X+    X XXXOOO9rryyyyhyyyyyyyuyyyyyyy",
+"XXX X .iphhshhsO                             X&gff,#><>:>;;---;>;2;>::--pgfgf*           o   ++ + X XXX++O++%&ryyyhyyuyyyyyyyyyy",
+"XXXX  +3pdphi3                                *ggfg#-><;:>:-;=;-;;;>;-#3gfgfg                X+XX +X  XXXXXXXXX%qyhyyyyyyuyyyyyy",
+"XXX    iphi++                                 %ggffd-><><3---@----;>:@,gfffgi.              +XX X+X X+ XXXoXXXXXX%qyyrhryyuyyyyy",
+"XXXX.  pdi+      .                            Ogffffg;>1<>:-;@---=2,-,gffffgO            XXXX X  +X++X+X+  X+X XXX%%riryyyuyyyyy",
+" X X  .ih&                                     hgffffd-56>::-=--#->,-dfffffg                X XXX  X  + X+o  X+XOXXXX%ryyyyyyyyy",
+" o X   ii +                                    *ggffffp:553>;-,--,>#gffffffr               XX  X XX+X+ Xo o+   OXo XXX%yyyyyyyyy",
+"O o    i&                                      +ggfffff3,555>,3>,1,gfffffffO               o+XXXX XXX  X o XoXX   +XXX$ryuyyuyyy",
+",.     3+.                                      qgffffff3>531>1>13gfffffffh   .         X     X++XX +X+XX X X X + +  X$*yyyuyyyy",
+"iO     &                                       o&gfffffff35pddddsiffffffff&                X X XXXX X X  o X X X    X XXrhyyytyy",
+"si  .  O                                        ogfffffffffgfdhpO Ogfffffg ++  +        X  X+XX+  +X X+  X X XX   X    Xrryuyyry",
+"si#  ...                                        Xifffffffe**O+o ++ OgffffqX      +X   OX +X X  X+X XX  X+ X        X   X&yyyyyyy",
+"ssi@                                             &ffffffq+ +   +  o OgffgOX  +  X++ X++  OX+    XX+XXXXXXXX XX X   X   X$yyyyyyy",
+"sip&....                                         &gffff&    +o  +    %gfr  +  +    X  X X  X+XX+X X +X+ +X X     X     X$yyyyyyy",
+"pisi+. .                                         +hfff&X     +    +   &gO     X  X+  X+XO+X +   X X  X XX o  XX X X     Xqryryuy",
+"ppp3#.                                           +eff& o             + *+ + + + +  XX    X OXXX  X +X X+ X XX   X        Xhyyyyu",
+"ppi3,.                                           X*fq               X + + O    + ++ X++XX+X X  X+XXXX+ Xo X  X X        XXrrhyyy",
+"p5pi,..                                           O&              +  +XX X   +    X   X  X O+X  X  X  X  X  X X  XX      X*yryyu",
+"p5pi3o                                            o     +   X  o+OO   X X +X+  X+  + +X X o o     X  X+ XX   X  X        XXryyuy",
+"spp3,.                                            X        riggggghy+    +  + +  X+ X  Xo  XXo+X X   X X+  X X X  X       Xqyyyu",
+"ppi3, .                                          X   O+   &gfffffffg&+       +  +X      X X +X o +X    X+ X                qiyyu",
+"6pp3,.                                             X     +hgfffffffgqX o  +XX  +    X  X  ooX   X X   X X X  X   X         %yyyu",
+"pp5i,                                              X+ +X &gffffffffgO  X  X  + ++ +   X  oX X         X      XX            Xyhyy",
+"ppi3# .                                             +X  Ohgfffffffgi+ +  ++ X X  X  +X +X  o X   XX      XX           X    Xryyu",
+"p5ii#                                                  Oigffffffffg*  X  X+X ++XX+ + +XXXoX     XX  X X  X                 Xryyu",
+"5pp1*.                                          X +XX Oiggfffffffhh OO  X+ +    + X+XX +.X X   o+  X   XX    X             X&uyy",
+"5pp3@               X                             +XX ihffffffffgh#oX   X+O  +  X     X o o       X  X XX             X    X*uuu",
+"p3pi.                 +                             X+eggffffffgiqO  +X++X        oo o +  . ooo + X                      X X%uuu",
+"p53p.             &ii&&&&#O+ +                   +   O*hgfffffgi&O   X o O   ++  oo     .o.o$OO% .  X   X                 X $hyu",
+"p5i3.             3hfffi3rihhhii3r&&               X  oihffffgi&&XXoX+X X  O+ X  ooooo+*@*=#=*=*&,   X .               XX  X$hyu",
+"p5i3             .idffg&iiiiphhddhip&              Xo  &hgffgi&&* o X  oX X X X oXX o.Oe,22,,2112s%oXX .                 X  Xryy",
+"5ii,.            Oihgggiiiihhphhhiihi*          X X  XXOhdggh&ii XX O XXX+X+X+X+ oo .ooe,=222e22eso.o$...  .               XXryy",
+"p3p#             Opgghfiiihgggdgghhhhi*              oX ehgheid*XXoXXX X+ XX+X+ X ..&ieeq*1ee,eeee&,e=2=#--&*             X Xquh",
+"pppO             *rpggiqqiiiiihiphpphiio           OX o.&gsieii.     X+ XX+X +   .@&ifseeeheeeeehq,de122=17i*. .            X*yu",
+"p3p. .           O&&q&&iiiiiihihihiiiii          X X   + hp&&3O X    + X+  + + +.@=,sgh1e,heeesqhe,s11222221&%    +      X+ X%uu",
+"ppi.                .   +oO*&&e&i,iiiiiX           XX X  &i**&    +  X + XX X  +@-,2212eeieqee,,ee*,22222222@o       X X    X%hu",
+"ii,.                               .XoO                  +&OO+     XX   ++ +..+@>6a5=2,eih*ihf*&hie=22222==1o       +   X  XXOyy",
+"5p,.                                                X     +**         X +X  ..*-375522=eigqeig&,ie,222222=2<oo   X   X     X Xyh",
+"5i#                                                     +  O+    +     XX  oo.@O##O@@@@O**oo+*+OOO..@@....@.       X  XXX  XXXuy",
+"ip#                                                          X        o     .oo....+..ooo.XooX Xoo..oo..+..            X  +  Xrh",
+"p3@                                                           +    X oXoX     .oo .oXo .oo  .oo o .oo  X  + +    X X X X    XXqy",
+"pi@                                                    X        XX +o+     X  X  XXX XX.. XOoX X oo   X X      +      X X   XX&y"
+};

Tests/images/lena.xpm

@@ -1,175 +0,0 @@
-/* XPM */
-static char * lena_xpm[] = {
-"128 128 44 1",
-" 	c None",
-".	c #CC9966",
-"+	c #663333",
-"@	c #996666",
-"#	c #CC6666",
-"$	c #CC9999",
-"%	c #FFCC99",
-"&	c #996633",
-"*	c #FF9966",
-"=	c #663366",
-"-	c #FFCCCC",
-";	c #CCCC99",
-">	c #FF9999",
-",	c #993333",
-"'	c #333333",
-")	c #CCCCCC",
-"!	c #996699",
-"~	c #CC6633",
-"{	c #666666",
-"]	c #999999",
-"^	c #666699",
-"/	c #330000",
-"(	c #663300",
-"_	c #330033",
-":	c #999966",
-"<	c #FFFFCC",
-"[	c #333366",
-"}	c #660033",
-"|	c #CC99CC",
-"1	c #9999CC",
-"2	c #660000",
-"3	c #FFFFFF",
-"4	c #CCCC66",
-"5	c #FFCC66",
-"6	c #666633",
-"7	c #993366",
-"8	c #FFFF99",
-"9	c #993300",
-"0	c #333300",
-"a	c #FF99CC",
-"b	c #CCCCFF",
-"c	c #CC9933",
-"d	c #CC6699",
-"e	c #000000",
-".....*...*.%*..#&@#&@&#&#&#.&#.#.#.#.#.#..#.*.#...#..#.#.#.#..#..#..#..#..#.#.#@#.>..>...*..*...*....%%%%.&&.@.#.@.#..&#.~.#&#$.",
-">%*..*.*..*%.*.&#@&#@#&#&#&#*&.#.#.#.#.*#..#&.~.#.#.#.&.#.#.#.#.#.#&.#..#&.@.@&#&#.>.*.*...*..*..*...%%%%%&&~@#&#.@&##.&#.#.@.>@",
-"...>...*.*.>.%*&#,&#&#&@&#.&#.#.#.#.~.#.#.~.>.#.#..~.#*.~.&*.#.*&*.#..#&.#.##.#@&#.$.>.>.*..*..*.....%%;%%@&@.#.@.#..&#..&#.#@+(",
-".*...*...%*.*.>&&@@#@&##&#.#&#.~.#.#.#.#.##.#&*.~.#..#.#.#.#.#.#.#.#~.#.#.#&.#&@#&#.>.....*..*..*.*...%%%%%&.&@.#&#.#.#.#$.$&+++",
-"..>.*.*.*.%.>.~&#&#&#.@&#&#&.#.#.#..#.~.~.*.~>&>.#.#*.#.#.~.~.#.#.~.#.*&*.#.#.#.#&#..>.>*..>..*.......%%<%%$&#.#&$&#.&#.&>@,++2+",
-".*.%...%*.*..*.#&@#@&##&#&#&#&#.&.#*.#.#.#.#*.~*#.~.#~.~*#.#*#.*.#.#.#.#&.#.#.#&@.##.*..%*..*..*>.*.....%%%%&&&.#~.#.#.#.$&+++++",
-"..>.*.*.%*.*..*#&,&#@&#&#&#.#.~#.~.&>.~.~#*&#~#.~>#.~$~$&.~..#.#~.~.~.#.#.#.#&$#&#&$.>.>..%*.>....*.....%%%-.@#&.#&#.#.$$,++++++",
-"..*.*%.*%.*.>..#&@#&##&#&#&#&.#.#.#.~.#.*.#.*.~.~.#.#.~.##&#.~.#.##.#*&*~.#.#&#.@#&>.>%.*>.%..*.>..*.*..%%%%%&&&.#.&#&#.@++++'=+",
-".*...*.*.*.*.*.~#@&#@&#&#&.#~.#&*&*&#.~#.~*#~#.#*#.~.#&>..#.#.#...#.#.#.#.#..#.#&#.#..>...*.*..%*..>...>.%<%-%@.&#.#.$@@++++++=+",
-".%.*%.%*.%.*.*.&&,&#&#@&#&#.#&.#&*#.~.*.#..#.*~.#.##..#&..&*&#.##.~.#~.#~.#~#.#.@#@.#..>.>..*.*..>.*.*....%%%%.&&#.#&$,++++=+='+",
-"*>.*.*..**..*>.#,@#@#&#&##&#&#*&>&*#.#~.#~.#.#.#*#.&#&.#@#.@..#..@.#..#.#~..#.#&#&#.>.>...*.$..*.*...*.*.>%%%-%&&@&$#@++/++'++=+",
-"..%*.%*...*.*.*&,&#&@#&#&&#.#.#.#&.~#.#.#.~.#.#..#$#$.$...$&@.@.#.@.##.#.##.##.#.@#.#..*.>.%*.>...>.#.#....%%<-.&#.@&+++=+=+=+=+",
-"*.*.*.*.*%*.*.*&#,@#&##&##&~#&*&*#*&*&*&*@.#.~.#$..$.$.-$%$-%$.@.@.&..#*#.#*&#&##&#.#.>...*....*>.*.*.*.~..%%%%%@@.@++++++=+=++=",
-"%..%*..*.*.*..*&&&,@#&##&#.#.#.#.#.#.#.#.#.#.#..@>@.$$$;$%$.$-$%$.#@.#..#.##.##.#@&#$.>.>.>.*>.....*.~.*....%<%<.$+++/+=+=++=/++",
-"*.*..~.~.%*.*.*#    #&,&#&#&#~.#~.~#.#*&*#..@.#.$.$$.$.$;$;$%$%$-.$.&@#.#~.##.#&##.#.#....*...*.>*.#..#.~....<%%-&+++++'=+[++=++",
-".%*.*.&*.*%*.*.      @#&#&#.#&#.##.~.#.#..>.#.$&#$@.$$:$$;$;$;$;-;-$.@&#$#.#&###&@.#..#.>..>.>..~..*#*.*.~...%%<-@+++=++=++=++=+",
-"*.%*&,&*.*.*.*        @#&##&#.~&*&>~.#.>@#&.@#.@$.@$.$.$.$;$;%-;.)%-%$&@.##.#.@.##&#.>.*.#.#.*&*.*.*.#.#..*...-%-+++/+{++_++=+}+",
-"*.>.~&~..%*.*.        &#&#&#&#.##&.#~#&*&##.@.#&$#.@.$.$;$.%).;-;$;$)%$&@&@#.##,@@.#..>.>..>.>.~.*.#.#>.>.#.*.-$+/+=+=+=++=+=+_+",
-".*.&#(#.**.%*.        @#&#&##.#&*#.#..##.#&#@.$.$@>$$.$.$%]%;$;;-;)%)%--&@&@&#&#&##.#..*.#.#..>..~.*..#.*...#..++='+++=++=+'+++@",
-"%.#&~&~..*c*.*        #@&#&#&#.#&*&#*#.&#.#.#@##.&.@.$$.$%$$;$%]%)$;$;-<-%@&@$&##@&#.>.>.#.#&#.*.*.*.>*.~.*..>++++=+=++'=+++=++$",
-"*.~&,&#.*%.*.*.      &#@#&#.#&#.#.#.#&#&#&@.#..@$#.#.@.$.]%;-;-;$;$;-;)--<$@#&,@&##.*.*.>.#&#&$..*.#.*.#.*$.$&++/+++='=+}+=++@$$",
-".#@&,&#.*.*%*.*&    @&#&#@&#.#.#.~&*.#&#.##&@@.#.@.#.$.$.$.$%$;$)-3))-;;-;-&@@@#@#&#.>.*.#.@(,$#...*#.**.*..@++++!'+}+=+=+@+@@$.",
-".&,&#&&>.*..*.#&#@,&#@&#&#&#&#&#.#.##&#&#.#.#&$.#.$.@.$.$$-$;$$%)%-;-;3;)<-)&@&@&,#.~.*>.>#&,+.@**.*.~>.#.>.+++'+++=+=+=++@@@.$.",
-"&#&#&,#..*%*.*.,&,@@#@#&##&#.#&#&#.&~#.##&#&#.#$.#.>.#.$.;.$$;-;-)-);)-)<)%3-++@@&@#.*.*..>@,+@@..#*.*~**.>+++_+='++=+=+=++@.$..",
-"&,@,&@&>.*.%.>.#&+&#&@&#&#&#&#.#.#.#&#~.#.#.$&#.#..#.$.$.$$.-;--)%)););););-<-&+,@~@*.**>.#&+2+@>*.*#.*.#>&2+++=++=++_+++@@$$...",
-"&#&@,#&>.%**.*.&,@,&@#&@@#&#.#&#.~#.#&#&#&#&#.@.#.$.@.@.$.$;-$-;-;-)-;-);-);-)-$+@&#.*..*.>@++++@.#.**.>*$,+/=+=++'=+'+=+@$$.$..",
-"@,#&@&#.*..%.>.#&@@,@##&#&##&#.#.#&#&#&#.##.#.$.$.#..#.@$.--;%)$-)%));)<))<)-<)%@+@.#.**.>.#++++#@.>&#.>.@++++=+'+++=+++@$.@..-.",
-"@&@,&,&>..**.*.#&,&#&@&@#&#&#.#&>&#&#.#&#.#.#.#.#.>@.@.$%).-$;-;$-;-%)-)%)-;)%)-$+@&.*..*.#@+++++.@...$.#++}=+=+=+=+++++$$$.$...",
-",#@,@&#..*...>&#@+&@,@#&#&#.#&#&%#&.#&##.#.#.#.#...#&$.-.-;$;$-;)-))-;-;-;)-;3;3-@@&$.*.*.>&++++/@.-%%$$+++++++=+'+=+++$.$..$.$.",
-"@,&#@,&#%.%*.*.&,@,&#&#&#&#&#.#.>&#&#.#&#&#.#.@.#@@..$%$%$.-;$;-;-;-;--)--;)-;);-$(#..*.>.>@++/++--;-<<)/'+[+=+++=++'+@$&$.$%.$.",
-"@,@&,&..*.*%..>&,&@@,@#@#&#&#&#%>&#&#.#.#.#.#.#..&@.$%$%]%).-;$;-;$)%$;-%)-;))<)3-@@...*..#@++=@-)%)%)-<{+[++{+=+='}+@:$.$..$.>.",
-"@&#@#,&#.%.*.*.&,@,@&&#&@#&#.#&%>&#&#&#&#.#.#.@>&#.$%$.-.$;$;-;$;$;-)--)-;-)%);)))%@..*.*..@++]-]$<);<)-]'='=++++=@++$.$..$..$.$",
-"#&,&#&#.**%.%*#&,&&##&#&#&##&&#%.#&#&#&>&#&.#..#&-*$.$.-$-.)$.-$;$-.;-;.-)%;);-;-)).$...*>&&+$)$))--;)%)$+'+=+=++'}'$$$.$.%$....",
-"#&@#,~&*...*..*&@,@&&#&##&#.#&.%*&#&#.#.#.#.&#.&.>%.$.$.;-$%$).-$;-$;--);$);-);)-))-$.>..~@.%;;-;));-;3-{+'+++=+=++@@$$..$...$$.",
-"@&#&##&*.*5.%*.#,&@,&#&#&##&#&>%#&#~@#&#@.##.@.>..#.$%$-$.).$;$;%$;-.;-%)%$;-;-;);-;%$....%--$3)-;-));-)++=+[+/++/+@$.$$..$%>..>",
-"~@#&,&#*.%*.*.*&@,&#&#&#&#&#@&%.#&#&~.#&#.&#.#..>.$.%$.%$.-;$.$$%$.-;$.$;$;$;-;-)$)-%$.$-%-;%;-;-)-;-3%)'+'++=+=++@$$$.%$..$..$.",
-"@&###&#.*.5.%.>&,@@&#&#,&#@~&#%..~#&#&#&#$&#..>..#.>$.$.$%$.-;%.-.$%$%)%$;-)%$);%).]%-%%$.-;-);-)%)%;-3-+'=+_++++@$$.$.$..$.>..$",
-"~@&#~#&*..%**.*.,(#,&#&##&#&#&%.>.*&#&#.#.#.#.#..#...$.-.$.$..$.%;$.%$.-;$%)$;$$;$;-;$)%-;-$%)-;-;-)-;-]++'+'=+++@.$$.$.>...$.>.",
-"#&#&,&#.*..%.*.#@@&@&#&#&##&#&-%..#.#&#&#.#.$..#.$.>.$.$.-;%$%.-..$;.).$%$-.-$;$;$;$;$;-);-;)-;-)%$%)%-{+_=+=+'+@$$..$.%$.>..$.$",
-",@&##,~*.5*%*.*&,@,##&,&#&#@&~%.**.~&#&#&#.#.#..>.$.$%$.$.$.$.$.$%$.$%$%$;$:-$-.$%$;-;-;$)-)%)-;-$:$.)-+'+'=+++@@.$.$.$...$.>.>.",
-"&#,&#&#.*..%.*.#,&@&#&#&#&#&#&%..*&*#&#&>$.#$.#..$.#.$.-$.-.-..-..$%$.-$;-$$%]$;-;%)%))););$)%)%-.$@;$$++=++=++@$.$.$..$%.$..$.$",
-"@&#&#&#..*.*.*.&@,@#&#&,#&#&&#%.*.*.&#.#.#.#&$.#.>.$.$.$.$$.$$$.$$$%$$%$.$;$$.$$;$%$;)%)-);-;-;-.).$$-'+'+='+'@@.$..-.>.$...$...",
-"&#@,#~#*.%5%.%*#+,&@,#&#&##&#.%*.*.*~&#.>@#.>..#&$.#$$$$$.$$@@$$$.$$$$:$$-.$;-;-%;)%)$;);-)-;--$;@.@;-++=+=+++@$.$.$..$..>$..$>.",
-",&#&#&&*.*.*.*.~@@,&#&#&#&#&,.%%..*..#.#.#.#.>.#.$#..$&@@@@@$$@$-$$]-$$+.{$%-$;-%$;-;-;-)-;--;-.$@:@-$/++_+=++@$.$..$.$.$..$..$.",
-"@&#,##~.*.%.%*>&,@@,&#,&#&#&,.*.*.**.&#.#$#$.#.@*@.$>@$$@@@+$)@!]+@@@++{+$;$:-%]%)%$;-);;--;-%$@&+@%-+'+=++++@$$.$.>.%.$.$..$..$",
-"&#&&#&#*..5*..*&,@,@&#&#,#&#&&%%%*.*.#.#&#.#.$.#.$#.@$@@@{!@!@!+=$=@'+++@$$-$%-;)-;).)%-%)%$.@&@&$%)+++'+==++.$.$%$.$$.$.%$.$...",
-"#&#@~#..*.*%%*.#@+#@#&#&&#&,&~%%5*.~.~&#.$#$&#..#.$#$@$@!@={=!!@[@[@=e+)$;-;);$%;$-;-);$<$&@6+@&]$-(++++=++++$$.$.$%.$..$....$..",
-"&#&#&##*.%..*..~#+&#&,###&#&#(%%%...>&@#.#.#.#.@>.@#$@@+@+=+!{=!!=+!++)@-]%$%)%$;)$;$%)%@]&@&@.$.)+++'++=+=+@$.$%.$.$.-.$.$$..$.",
-"@#&##&#.**%.%*.#&,@,@&#&,#&#&#.%5....#@>#$&#.$#.$$@$@=!==+=]!_+=@[+{+$$)%$);$;;-$-;---@@@@.:%.-$-++++=+=+++@$.#.$.%.$.$.$.$.$$.$",
-"&&#&#~#...5*%*.&,@,@#@#&#&#&&,&%%%%..@.$.,.#@&$@,$@+}@='=/={+=]!_!/!$]%$;).-$;$;)-$;.@{@@$-$..%%+/'++=+'=++@$$.%..$.%..$%$.$.$.$",
-"#&#&#&#**.*..**#@,&@,@#@#&##.#&%%%..#$##&#.&$.$$+@+!@=+!={=+={=@@_]$@-;$%$;$;$;$;-.$(+@${@:%.--+++++=+=++++@..$.$%.$.$%$.$.$.$$.",
-"#&###&#.%.%*%...,@,#&#&,#&,&#&#&%%%.&..#$#.>@#@@@@=@=+=!+_'+=+='!!{@)$--;$;$;$%;$)%]&@@@$@$$%.(+++++'+_+=+@$.$%..$%.$..$.%$.$..$",
-"#&@&#,&**.%.*%*&,@&@,#@&#&#&#&&9%%.>.#@..@.@.@@@@@@=_=+=@_+=@@!+!]@$).;$.-.$;$;-;-%-.@@@@@:-@++++++=@+'+++@@@.$.%$..$..$.$.$.$.$",
-"#&##&###..*%.*.~@,+#@&###~#&#.#&.%%.&.,.#&#$@$@+=+@=+=^@[+++=++!@]@)$%).).)$.).-;$;%.+@@@$@.6+/++++++=+=+@$&$%..$.$.-.$..$..$...",
-"&#&#&,&*.%.%*%*#&,@&#,@&@&#&#~&#&-%#.#&#&>.@@@}+=+={!==@!+'+'+@+$1$)$%$.$$.-;-%;-%-%$@++=@]$+/+=+{=+=/+++@$$.$.%.%..$.%$.%$..$.$",
-"#&@##&#.*%*.....,@,@@&##,#&#&>&#&%%&#&.@.@>@@+!+='+==+![$!+++@@$]$-$;$;$%$.$;$%-;-%%%$++@+$]+++=+++++'+++$@$.$.$.$$%.$.$.$%.$...",
-"&#&#&,&#..%.%*>&,@(##@#&#&#&#.#&#->.&#&>&@++!+=+=+=+[=+=@++/@$$$$]$).$..$;$-%-;%-%;%.$@+}{$$+'+=+={+=+++@@$.$..$...$..%.$.$..$.$",
-"&#&##&#*.*%*...#&@,@&#@#&##.#~&#..-&#..#$@@++++^+==+^=@!'=/@$$$-$$$-;-.$.$%$%$%-%--%%#@+}@]$@++=++=+++++$@.$.$..$.$.$.$;..;.$...",
-"@&#@#,&...%.%*.#&@,@#&#&#&#~$~#.##%#.@.$@++!_=@={+=+=='=+@{@.$;$)&$%$.$.-$%$%-;%)%%%-%@+++@${+={=++=+++@$$.$..:.$.$:$.$.$$.$.$$.",
-"&@&#&,#*.*%*%*.&,@@&@#@##&#&#.&#&$@.@.#@+!++@'+=+'=+=+=@'@$:$.$%-:-$.$.%>%$-.-%%-;-%%>@@+/@$++=+={++'++@@$$.$%$.;..$..$..$.$:..$",
-"#&#@#&@....%.%>&#(@#@&#&#&#&##*#@&#.#$@@+@_!_=+{=+={==+/+@@$.$;$$$..$%>.$>%$%-;.-%%)%-$+}+@)@++={+=++++$..$;$...$$..$:@.$:$.$$$.",
-"@&#&#~##..*%.*.&@@,&#@#@##~#.&#.>++&$.@+=+=@=+=++++='+^+]@-;-..-%$@&&#.>%>-.$%-;-)%%%$#++++-@+@+=+[+++@$@.$..$;..$.$.$.@.$$.@.$$",
-"&#@,@,&*.%..%%>~@(@@&#&#&@&##.*.#+2$@@@+!=^!'={+_+=@!@_+@:-.).;-.$.$.,(#.>$%$%%%$;-%.@@++++%@+=+{+=+++@$$.$....$;.$:.$.$.$.$$@.@",
-"@&&#&#@#.*%.*..&#@,@#&#&#~#&#&>.$@(@@@+@++=!+=+'@/=/@+'$@)$%$.-&@$$$.$&,&#.>.$;%%$@@&@#@+++]$++=+=+'++.@.$%$.$..$%.$.$.$:$$$:$@$",
-"##&#@9&..*%*%%*.,+#&#&#&#&@&>..>.$@++!=^!!/^+^+=1'+=++@:-.;-$%@@@+++++$.#.>.%%-;-$@+++@++++$@@++=+=++@$@.$.$..$..$$.$.$.$.$.@$:$",
-"&#&#&#,>...%.*..&,@,&#&&#&#..$..$+@+=@!@^]=@=+'+_!'+0+$.$;-%-+(+,++@@2+#.#*>.%-;@+++++}+++{$@@+++'+++@..$.$.$..$...$.$.$.$$$$$@$",
-"&,@,@(&.**%*.%*&,@,@&#,.,&#-.$.@$++^+^_=!@_'+==/^+_++@:.-.-%+@,++@++--(@~.#.>%%$++@@a+++=++$]@=+==+++.@$.$.$.$.$.>$.$.$$.@.:@@.@",
-"#&#&#,,...*%.*..@,&##&#&#@+,$$$(+/@=+=!+^1+[+'+='=+'+@$$.%-&@&,&@+@@$-#@#&#..)%6@+@@$7++++@@$@@++=+++$..$.$.$..$..$.$.$.$.@.$:$.",
-"@&#@,&@#.%.%*%.~#,&#&@.,+&@--%+++{!'=!=^+!+==+=+=+'+$..$;-&&$$@@&$.--%.$~#*.>%-@.$#$$,@+++!{$@@+=+'+@:$.$.$.$.$.$..$.$.@$:$.@..;",
-"#@#&@,&#.*5.%*..&@#&##.+#$$$@++@@'}'={=!!!'/'=+'=+++@-$%-&@...*$#$@&@$-.#.#.$%;$.$.@,+@}++@@|{++++++@$.$.$..$....$.@.$.@.@.;.%%%",
-"#&@,@,&#.*%*%.*.,,&#&#$#$$+@=+'+1$!==^={$1+=++=++/+$]$.-&&*#>.$.$.$.-.#.>.#*$-%-$.##@#@++++@$@+=+=+@.@...$.$.$.$.$.$.@.$.$.$%;.%",
-",@#&,+,.>.%*%.*.&#&#.@&$@!+!+==@!{^'==!!!!{+='/='+@@$--#&#...>.>.$.$.$%#*#.*$%-.$.$.#$,@+++@$@@++++@$.-$..$.$.$....$.:@&$%%%%%.%",
-"@&+@,&+...%.*%.#,#,@##$#$$|={={^{!+_=]={@$!+++=+++@$$%$&@.#*>.>%$%%$%$..>.#.>%--.*>##@@+}+{+|$+++++@....$..$...$.$.@.@.;%.;%.;5%",
-"@,&,@+,#.*%*%.*.&,&#.$@$+=+='=!+!{[='==!^/@!'++/+@]$--(,#.~.*..>.>.%$%>.*#*#$%-%$...>##+++++$]+++++$@.$..$.$$.$.@:$...$.-%.%%.;%",
-"@,@+,&+...*%*%.~#&,@@#$+!@^=!'!1'_+==+=+++]@+=+++$$$)++&#&>~>.>%%%$%..$.*.#..---..>.#$#+++++-$++++@.$...$...$.@...@.@.%;%%;%%%%%",
-"@+@@,+,@>%..%*..,#&#&@@$!{=!==!{=='+[+{=++$@@'/+$&--@+/@~#*~.>.$>%.%>.>.>*#~$%%-.>.#.#@,++++$$++++@$.$..$.$.$.:$.$.:..%%.%;.;%;%",
-",@(+,+&#..*%.%*&,@#@@$$+@!]={^@!{+=='_++++$@$@+/@$-)+/@@#.~**.>..>%$%..*#.~.#$-%...>$#++7+++1$++++@.$.%..$.@.$.@.$&$.;%%4%%%%;%%",
-"+,@@+,+&>.%*.*..&@&#$$+!@^===!1]|'+=+}{@+@$$+++]@%$+++/&###~#..>...>.>..#*#..%--.>..>@,+++++$$++++$.$.$...$.$.:$.@...%.%.%4;%%;-",
-"@@+,+,+..*.%*%*#,,@@@$@+!{={1{=$=/'+=+@+]@+@/'/$@%@'++@@~*~**>.$*>%..$*.~.#*@.-<..$#.@+++!+/$$@++@$....$...$.$.@.@.$%%454%%%;-%)",
-",@+@,++#$%*%.%..,@.#@@@=@!==!=^][+='/=@$@.++++$@:$+/+/@+@#*#*.*$..>.>..##*.#..--...>@,}++@+/$$$+(@@$.$..$.$.$.$.$@..%%%%4%;%;%)%",
-"@,@++(,....*%*..#,@@@$+@!{=@^+!!{|+={++=+@+/+@;$-@+'++@,#&*#.#.>*>.%>*#.*#.#.$%-.>.@$+++=++++$$/+.$.$.$..$.$:$...@.%%.4%%%;%%;%;",
-",@,@,@+.>.%..%*&&&,@@@@!@=_!='!!]1+={}'+!++++$-$]+/+++@@&#*~*>.>.>.>.$*.#&#&#&>.*..#@+=++++++$$+&$..$.$.$.$.@.$.$..;%%%4;%%;%-%%",
-"@,@,+&@...%*%*.>#+#@$@+!+=]=!=]!|!'+!@/++/@@@$6-++=+/+#@~#.#*~>*.#*.*.>.*..#.$%$.>$@+}+=@++++-@+@.$.>.$..@..$:@.@..%%4%%%;%;%;;%",
-"@+@@+,@.$*.%.%..&+&#@$+{!@=_{=!!{!!'@^++!@$$@@$+'+++++#@$~#*#.#.>.>>.>.#.>.%%-%$..#@++++!+@+($$@#.$.$..$.$.$..$..$.%%%;%;%%;-;-;",
-",@,+@+#..%.*%*.##,@@$@!+!{==={={=1@={@/+]$$$@@@+++=@++@&#.~*~**.#...*..>..>-.%>.>$.++=++@+++/$.@...$.$..$..@.$.@..%%.%5%;%;-%<%;",
-"++@+,+@.>.%.*%..&@@#@$+@!+!'==!!^!1+@'+@@$-@@]+++@++++#+##.#.#*.*.>.>.*.>..%$%%$.$@/+=+7@@++($@@$.$...$.@.:$.:.@..%%%;%<%%<;%-;%",
-"+,@+@,&$..*%.*.#&,@@@!+!+[=@^@[+^={|++.)$-+@$++{+=+!+++&#.~***#.#*.~.#..*$*>%$.$#@+++++=+@,++@:....$.$..$.$.@.$.@.%%%5;%;;%;%;-<",
-"++,++@,.>%.%%%.#&@#@$@=+!'===!{=^!!{@)@-%@@@+/+@}++++++@##.#~.**.#&#.~#.#&.#.,&@>$++++++}@++(@@@.$....$...$..@....%%%%%%%%;-<%;%",
-"+++@+@&$..*%*%*.@$,@@@@=+={^'|!{!!{+@$&3$&]$++=+++=+=+,+&#~.#*#.*>*~#.~~>&#.>$.$$}+}'+=+@@+@+&$.$..$..$.@.$:$.]@&%%;%4%;%;%<-;%<",
-"@++++@&>..%*.%.#&$+$@@'=+_=@=]=!^!={]$$;@$$++'/=+++@+++@@&#~.~.#.#.*#*#.*>%-*#$>@+++++++}@2@+&$.$..$..$:.$..$..$&%%%%%<%<%;%%;%%",
-"++7+,+@..>.%%*..#+@@d+@='='=^@[@^^@!$]$$@-+++++++=++=+@,,@~@~#*~.*>.~.#*#.>.>.>@+_+=+++@+@+@2+$..$..$..$.$:@:$@:@;%;8%;%;%-;%;%;",
-"=++++@&#.%.*%>..,@$@@+!+=$[@b{!{=^!]@$$$-+@+}{=+++++@++@,@#&#.#.#.#*#*#.#~##$#$,+=++{++@7@}@++.$..$..$.$.$.$.$.@.%%%%;%<%;%)%%%%",
-"+++++#@..*%.%*..@,$@@+!'_=='|^@1!+1@@{$-@++=++++++=+{+@++&#&#&>.#*.>..#.>..>.>@@/=+++++@+@+@++.$...$..$.$.$@:$@:@;%<%%<%%<%%;%;%",
-"+=++@@@#..*%.%>.@+@@+@@='@[=$^!]!^+1$+]$+++++=+=++++=+++++,#&##.#.#.>*.>.>$%$.++=+[+{++@+#+#++$.$..$.$.$:$.$$$.@&;<%;%;;%-<%%%%%",
-"+++++@..>.%*%..#@,@@=+^+=^+^]='1|]=]$@@+=+=++'+++++=+'+++&+,,&#.#....>.>%$.>$#(++=+++++@@+7@@(-.$.$..@.$.$@:@$@].-%;<%<%;%%)%;%%",
-"+=}++@@...%.*%*.@+@+++!+'='_!]={!!]!!{!+'=+=+='@+++++=@+++(+(,#&#.#>..%.>%$.$@+++'={'++@+@+@@+.$..$:$.@$.$.$.@:@:%<%;%%<%;%%%%..",
-"+++++#@#.*.%*%.#+@$@=@==+='=]|={!^|{|$1@_+'}{@}@_+'+=+++@+#+,+,(#&&#.#>.%$.$.@++=++++++@!@+#++%$&@.@.$.]$$@$]@$&.;%%4%;%%%-$$+++",
-"++++++&$>.>..*..@-+$+'@={=+{!]=={!^!]!{)!'=++=+@+=+++=+=++++&#.#.#.>...$*.$%$.@+'='@{=+@+!+@@($.@.@&$@.@.@.$.@]@%%<%%%%;%;.(++++",
-"++++}@,&$%*%*$*.-++===+=+=+_{|]=[!$^@^!+]@'=@++=+++=+'+@++,@#@#$#.#.>.*.$..$%$;-@+'++++!@@@+@($.&@.@.@@@.]@@.@&$;%%4%8%%%.@++++@",
-"@@+++++#.>.%.%>.+@]++_{='!{+[@^@|]^!^@^|]!++='+@=+'=++=++++@@#.#.#.#.#..>.$.-%----]/'++++7@+@+.$.$&$&@&@@&@@@@@&%;%%%%%;$&(++@@@",
-"@!@@+@+&..**%*..@++='+=@_+^@='|^!!{^@1@^$+1+@+=+++++=++=@++,@#.#.#.>..>...%.-.-;-)--+++@+@@+,@.@.$.@.$@.@@&@&$&@%;%;%;%.&+(@,+@,",
-"$]@@@++,.$%..%>.$@++_+|{=]+^+={={==!{!]!{={{=++=+=+'=++++@+@&#$##.#.#.~.>.$.%%$%%)%3;@'+++@++@$.@.$.$.@.@@@&@&@&%4%%%%$(+(@&@,@@",
-"@$$$@@2@.*.*%*..$@+=+_+=@_@'!{=$={'!^$!]=$_$+'/@=+=++'=++@+,@.#..#.*.>..*.%%$%.;$%;-%-$+{+@++.$.$.@.@.@$&$@&$.@&%%<;%%@(@@@+&@&@",
-"{$]$@@+@$%.%*.>.@)/'={=+='=+=+[{==!{!{1@1+)=+=+{+'+=@+++@@++#.##.#.#..#..>...$%%;%-;%<)@++@++$$.$.:$.$.$@.@@&$&%;%%%;.@(@&#@#@,@",
-"+@|$$@(,..>%*%..@@+/=+='=+{='=+={[+=!!]|]!+{$+/=+=++=++@@@#(@#&$*.#.*#.*..%.%.%-%;%;-%--{++++$.$.$@.@$@.$#.@.&$%%%;%%@(@@,@.@&&&",
-"'@]$$@++...%.%*.$@+=/!+=+=@=+_{==@^{+^!@|{=|)=++{+=+{+}+@@@(,.#.#.*>.*.>.>..-..%$%-;%<;--+@++.@$..:$..$.@.@.#..%%%%%.&,@&@#@,@#@",
-"++]$$$+&.*%*%*.$$+'=+[='_'$'='_@^{!!!{!]|'=@-+/!+=++=+++#@#2@.#.#.#.~>.*..>..%$%;%;%-;-%)++++$..$..@$@.@$.@&..%%%<%%$&@&#@@&@&&@",
-"''$]$@++$%.%.%*.$++'=+=+=@!'+=+='=+{!'!1!@={|'+@{=+++++@@@&2&#.#*~.*..#.>.%$..%.%$;%%;-<-)++($.@.$...$@.@.@.$%%%%%%.&&,@&##@#@@@",
-"++!$$$(+..*%*...@+_@_+[+[@@_{='=+[={!=@^$^@!{+_+++=++++#&#@(#.#..#*#.*.*.>..%$.-.%-;-%)-;3/0@@...@.$@.$@.@..%%%;%%%$&#&#@&@,@@#&",
-"''])$@(+..%.%*..@'+'+[+=@[++=+=+='+=]=!]|]!@^++=++@++++@#.#,~.*#*..#*#.#..>.$%.%$;%-%;-<--@+@.$..$...@.@$&@%<%%%%%%&&&#&#@,@&@@@",
-"/+@]$$+($.%*%%*.@@==/='=+]='+'='=+^='!{|=]|$@{++=+++},@#.@(&##..~**..#*.>.>.>.$%.-;%)%--;-)(]..@..@$.$.@.@:%;%4%%%$&#&&#.&#@@@+@",
-"''!)$]+,..%..*..$++'+=+[+!@_!+_+='!+=@!1$_'[+=]$@=+++@@#.>,&&*#.#.~*#.*#.>.$.%$.-.-;-;-;-<$+&]..$..@.@:@.@.%%%%<%*.&&#&#@,&@,@@@",
-"++{$$$@($.*%*%.>@'+=+'=+'='+'=+'=+^'^^@^@1+=+++@+@@++&#@.#(##.#*.*$*.#.*#*.*$..%.%%%-;-;-;-(@.$..@.$:$$.@...%%8%%.#.&&#&@@#@@@,@",
-"_/!]$]@+.>%.%*..$++=++{=++=+=+=+{=+^+^]1+^@'/={++++2+#&#@#+&#.*.#.~.**#*.>.*..$..$;%%-<-%)-:$.@.$..$@.@:@...%.%%%.~#&#&@,@@@+@@@",
-"+'+$]$+&&.*%*%.>$@+'+=+'={={+=+=+[+^='!^+^@|'++=++++@&#..#&#.#*.*.#*#.*.#*.>.%.%.%.-;%);-<--:@.@&$.$$].$&.....%%%.&#&@,&@,@#@@+@",
-"_+{$$]@+$..%.*..$@}'++='+=+='='+!'_$!'={[@^@=++/++++#@##@2&#.#*#.*.*.~>~.*..>..$..%$%-%-)%-<@&@&@&@.@$@.$....4%%.#&,&@,@&@@+@@@+",
-"+/=]$$&&&>%*.%..@@+=+'}=+{=++=+_=@!{!={=={!+'_{+=+++#&$*@(#.#.>.*#.#.*.#.#*...%.%.%.;-;-;-;-.@&+(@@@@@@$...&.%%%.@&@,&@@@@@&@@++",
-"+'+]$)@+...*%*..@++'=+'='=+[+='+'_+^$|{!]='=++=+/++@#.##2&#.#.*#*.*.*#.**.*.>*.$.$%$%;-%<--<$6@&@&+({(@+&$..%%%..,+&@,@@,@@@@@++",
-"+++$$).(..%*%.%.@=+++=++='={+=+==+=={|!^@=+^/=+/+++#@#&,(#.#.*#.*#.*#*.#.#*...*.%..%$%;-;-%--&@@@@@++++(+%%.%%%.@(@+@&@@@+@@@+++",
-"{@{]$]$+&..*%*.&$@_'+'='+=+='=++='=+_{$^!{='=/+=++@#$#&2#.#.>.~*.*.*.#*#*.#.>.>..$%.%-%-;3;-%{&@&@@@@++(,%>.%<.&++,@+@@(@@@@@+@+",
-"@@@$$;$&@%%.%%.&$+++=+=+='=@=+[/=+='=!_@!{_++[+++@#@~,(,.#.#.*.~*#.**..*.*.*...*..$%.;-;-%-;-$@&@@&@@++(+.%-.>&(+@+@@@@+@@@@@@++",
-"+{@]$]$&&.*.*%%&@=+=+'='+='='=@='!+=+^@^+='=+/+++@@#(2,~#.#.#*#.*.~.#*~.#*#.#*.$*.$%$.%-;)%-<-6@@@@6@@+@&>%%$&+(+@+@@+@+@@@@{+@+",
-"@@@$$.]&@.%.%...@++'=+=+=+=++={}+!'!'=@1+=++++}+@(,(#~..~#.*.**~*.**.*>.*.~.*.>..>.%.-;%-;-%--+@&@@@@&@&#.>.&,&+@+@@@@+@@&@@++++",
-"+@{@)$$&..*%*%..{++=+{='='=^+!@='!+=]={!{='=++++,(#&&#~#.*##.#*.#.#*.*.~.#*.#.**...$%.$;%)%);-:@@@&@@@&@&..,@(@&+@@@@++@@@@@@+++",
-"+'@@$)$&@..%%%.#++_+=+=+!+=@[+=@={!_+={!@++++/+,@&.#*.*~#..~.#****.~.#*.*..*.*#.>>.%$%%$%)%----+6@@@&@@.##&~@#@+@@@+@+@@]@@++{++",
-"+++{$-)$..%*.%.@++++'+{='='@={=$=+!'^$_+^+_+++@$&#&~&~*.~#*#*.~.~.*.*.#*.#*#.*.*..>..$;%;-;;-;-+@&@@&$&#&&#&#&@@@@+@+@@.@@@+++++",
-"++'@)-.$&$.%%%%&+'=+==+=+=={=@={@[@='={!$@+++,@,.&.#*&~~.*&.#*#*#*~.*.*.*..*>.*>.>.%.%$;%)%--;-@&@&@@.@.#&#.#&@@+@+@@@@@@@++++!@",
-"++++-))$...>.%.@++_++{={'=@_+=+={=]+_@[/^@+@+@#@#.~.~*.~*#*#*.~.*.*.**.*.#*.*#.*.>.$..$;$%);--)$6@&@&#.@*&#.#@,@+@@+@@$@@@++++@@"};

Tests/test_file_libtiff.py

@@ -36,7 +36,7 @@ class TestFileLibTiff(LibTiffTestCase):
     def test_g4_tiff(self):
         """Test the ordinary file path load path"""
 
-        file = "Tests/images/lena_g4_500.tif"
+        file = "Tests/images/hopper_g4_500.tif"
         im = Image.open(file)
 
         self.assertEqual(im.size, (500, 500))
@@ -50,7 +50,7 @@ class TestFileLibTiff(LibTiffTestCase):
     def test_g4_tiff_file(self):
         """Testing the string load path"""
 
-        file = "Tests/images/lena_g4_500.tif"
+        file = "Tests/images/hopper_g4_500.tif"
         with open(file, 'rb') as f:
             im = Image.open(f)
 
@@ -60,7 +60,7 @@ class TestFileLibTiff(LibTiffTestCase):
     def test_g4_tiff_bytesio(self):
         """Testing the stringio loading code path"""
         from io import BytesIO
-        file = "Tests/images/lena_g4_500.tif"
+        file = "Tests/images/hopper_g4_500.tif"
         s = BytesIO()
         with open(file, 'rb') as f:
             s.write(f.read())
@@ -72,8 +72,8 @@ class TestFileLibTiff(LibTiffTestCase):
 
     def test_g4_eq_png(self):
         """ Checking that we're actually getting the data that we expect"""
-        png = Image.open('Tests/images/lena_bw_500.png')
+        png = Image.open('Tests/images/hopper_bw_500.png')
-        g4 = Image.open('Tests/images/lena_g4_500.tif')
+        g4 = Image.open('Tests/images/hopper_g4_500.tif')
 
         self.assert_image_equal(g4, png)
 
@@ -87,7 +87,7 @@ class TestFileLibTiff(LibTiffTestCase):
 
     def test_g4_write(self):
         """Checking to see that the saved image is the same as what we wrote"""
-        file = "Tests/images/lena_g4_500.tif"
+        file = "Tests/images/hopper_g4_500.tif"
         orig = Image.open(file)
 
         out = self.tempfile("temp.tif")
@@ -117,7 +117,7 @@ class TestFileLibTiff(LibTiffTestCase):
 
     def test_write_metadata(self):
         """ Test metadata writing through libtiff """
-        img = Image.open('Tests/images/lena_g4.tif')
+        img = Image.open('Tests/images/hopper_g4.tif')
         f = self.tempfile('temp.tiff')
 
         img.save(f, tiffinfo=img.tag)
@@ -156,7 +156,7 @@ class TestFileLibTiff(LibTiffTestCase):
                         value, reloaded[tag], "%s didn't roundtrip" % tag)
 
     def test_g3_compression(self):
-        i = Image.open('Tests/images/lena_g4_500.tif')
+        i = Image.open('Tests/images/hopper_g4_500.tif')
         out = self.tempfile("temp.tif")
         i.save(out, compression='group3')
 
@@ -213,7 +213,7 @@ class TestFileLibTiff(LibTiffTestCase):
 
     def test_g4_string_info(self):
         """Tests String data in info directory"""
-        file = "Tests/images/lena_g4_500.tif"
+        file = "Tests/images/hopper_g4_500.tif"
         orig = Image.open(file)
 
         out = self.tempfile("temp.tif")
@@ -302,7 +302,7 @@ class TestFileLibTiff(LibTiffTestCase):
         self.assertRaises(IOError, lambda: im.save(out, compression='group4'))
 
     def test_fp_leak(self):
-        im = Image.open("Tests/images/lena_g4_500.tif")
+        im = Image.open("Tests/images/hopper_g4_500.tif")
         fn = im.fp.fileno()
 
         os.fstat(fn)

Tests/test_file_libtiff_small.py

@@ -15,20 +15,20 @@ class TestFileLibTiffSmall(LibTiffTestCase):
         file just before reading in libtiff. These tests remain
         to ensure that it stays fixed. """
 
-    def test_g4_lena_file(self):
+    def test_g4_hopper_file(self):
         """Testing the open file load path"""
 
-        file = "Tests/images/lena_g4.tif"
+        file = "Tests/images/hopper_g4.tif"
         with open(file, 'rb') as f:
             im = Image.open(f)
 
             self.assertEqual(im.size, (128, 128))
             self._assert_noerr(im)
 
-    def test_g4_lena_bytesio(self):
+    def test_g4_hopper_bytesio(self):
         """Testing the bytesio loading code path"""
         from io import BytesIO
-        file = "Tests/images/lena_g4.tif"
+        file = "Tests/images/hopper_g4.tif"
         s = BytesIO()
         with open(file, 'rb') as f:
             s.write(f.read())
@@ -38,10 +38,10 @@ class TestFileLibTiffSmall(LibTiffTestCase):
         self.assertEqual(im.size, (128, 128))
         self._assert_noerr(im)
 
-    def test_g4_lena(self):
+    def test_g4_hopper(self):
-        """The 128x128 lena image fails for some reason. Investigating"""
+        """The 128x128 lena image failed for some reason."""
 
-        file = "Tests/images/lena_g4.tif"
+        file = "Tests/images/hopper_g4.tif"
         im = Image.open(file)
 
         self.assertEqual(im.size, (128, 128))

Tests/test_file_psd.py

@@ -3,7 +3,7 @@ from helper import unittest, PillowTestCase
 from PIL import Image
 
 # sample ppm stream
-file = "Tests/images/lena.psd"
+file = "Tests/images/hopper.psd"
 data = open(file, "rb").read()
 
 

Tests/test_file_tiff_metadata.py

@@ -31,27 +31,25 @@ class TestFileTiffMetadata(PillowTestCase):
         self.assertEqual(loaded.tag[50839], textdata)
 
     def test_read_metadata(self):
-        img = Image.open('Tests/images/lena_g4.tif')
+        img = Image.open('Tests/images/hopper_g4.tif')
 
-        known = {'YResolution': ((1207959552, 16777216),),
+        known = {'YResolution': ((4294967295, 113653537),),
                  'PlanarConfiguration': (1,),
                  'BitsPerSample': (1,),
                  'ImageLength': (128,),
                  'Compression': (4,),
                  'FillOrder': (1,),
-                 'DocumentName': 'lena.g4.tif',
                  'RowsPerStrip': (128,),
-                 'ResolutionUnit': (1,),
+                 'ResolutionUnit': (3,),
                  'PhotometricInterpretation': (0,),
                  'PageNumber': (0, 1),
-                 'XResolution': ((1207959552, 16777216),),
+                 'XResolution': ((4294967295, 113653537),),
                  'ImageWidth': (128,),
                  'Orientation': (1,),
-                 'StripByteCounts': (1796,),
+                 'StripByteCounts': (1968,),
                  'SamplesPerPixel': (1,),
                  'StripOffsets': (8,),
-                 'Software': 'ImageMagick 6.5.7-8 2012-08-17 Q16' +
+                 }
-                             ' http://www.imagemagick.org'}
 
         # self.assertEqual is equivalent,
         # but less helpful in telling what's wrong.

Tests/test_file_webp.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, lena
+from helper import unittest, PillowTestCase, hopper
 
 from PIL import Image
 
@@ -23,7 +23,7 @@ class TestFileWebp(PillowTestCase):
 
     def test_read_rgb(self):
 
-        file_path = "Tests/images/lena.webp"
+        file_path = "Tests/images/hopper.webp"
         image = Image.open(file_path)
 
         self.assertEqual(image.mode, "RGB")
@@ -33,8 +33,8 @@ class TestFileWebp(PillowTestCase):
         image.getdata()
 
         # generated with:
-        # dwebp -ppm ../../Tests/images/lena.webp -o lena_webp_bits.ppm
+        # dwebp -ppm ../../Tests/images/hopper.webp -o hopper_webp_bits.ppm
-        target = Image.open('Tests/images/lena_webp_bits.ppm')
+        target = Image.open('Tests/images/hopper_webp_bits.ppm')
         self.assert_image_similar(image, target, 20.0)
 
     def test_write_rgb(self):
@@ -45,7 +45,7 @@ class TestFileWebp(PillowTestCase):
 
         temp_file = self.tempfile("temp.webp")
 
-        lena("RGB").save(temp_file)
+        hopper("RGB").save(temp_file)
 
         image = Image.open(temp_file)
         image.load()
@@ -60,17 +60,17 @@ class TestFileWebp(PillowTestCase):
         # but it doesn't if the WebP is generated on Ubuntu and tested on
         # Fedora.
 
-        # generated with: dwebp -ppm temp.webp -o lena_webp_write.ppm
+        # generated with: dwebp -ppm temp.webp -o hopper_webp_write.ppm
-        # target = Image.open('Tests/images/lena_webp_write.ppm')
+        # target = Image.open('Tests/images/hopper_webp_write.ppm')
         # self.assert_image_equal(image, target)
 
         # This test asserts that the images are similar. If the average pixel
         # difference between the two images is less than the epsilon value,
         # then we're going to accept that it's a reasonable lossy version of
-        # the image. The included lena images for WebP are showing ~16 on
+        # the image. The old lena images for WebP are showing ~16 on
         # Ubuntu, the jpegs are showing ~18.
-        target = lena("RGB")
+        target = hopper("RGB")
-        self.assert_image_similar(image, target, 20.0)
+        self.assert_image_similar(image, target, 12)
 
 
 if __name__ == '__main__':

Tests/test_file_xpm.py

@@ -1,9 +1,9 @@
-from helper import unittest, PillowTestCase, lena
+from helper import unittest, PillowTestCase, hopper
 
 from PIL import Image
 
 # sample ppm stream
-TEST_FILE = "Tests/images/lena.xpm"
+TEST_FILE = "Tests/images/hopper.xpm"
 
 
 class TestFileXpm(PillowTestCase):
@@ -15,8 +15,8 @@ class TestFileXpm(PillowTestCase):
         self.assertEqual(im.size, (128, 128))
         self.assertEqual(im.format, "XPM")
 
-        # large error due to quantization->44 colors.
+        #large error due to quantization->44 colors.
-        self.assert_image_similar(im.convert('RGB'), lena('RGB'), 60)
+        self.assert_image_similar(im.convert('RGB'), hopper('RGB'), 60)
 
     def test_load_read(self):
         # Arrange

Tests/test_imagecms.py

@@ -1,4 +1,4 @@
-from helper import unittest, PillowTestCase, hopper, lena
+from helper import unittest, PillowTestCase, hopper
 
 from PIL import Image
 
@@ -167,6 +167,7 @@ class TestImageCms(PillowTestCase):
 
     def test_simple_lab(self):
         i = Image.new('RGB', (10, 10), (128, 128, 128))
+
         psRGB = ImageCms.createProfile("sRGB")
         pLab = ImageCms.createProfile("LAB")
         t = ImageCms.buildTransform(psRGB, pLab, "RGB", "LAB")
@@ -179,11 +180,11 @@ class TestImageCms(PillowTestCase):
         # not a linear luminance map. so L != 128:
         self.assertEqual(k, (137, 128, 128))
 
-        L = i_lab.getdata(0)
+        l = i_lab.getdata(0)
         a = i_lab.getdata(1)
         b = i_lab.getdata(2)
 
-        self.assertEqual(list(L), [137] * 100)
+        self.assertEqual(list(l), [137] * 100)
         self.assertEqual(list(a), [128] * 100)
         self.assertEqual(list(b), [128] * 100)
 
@@ -191,15 +192,16 @@ class TestImageCms(PillowTestCase):
         psRGB = ImageCms.createProfile("sRGB")
         pLab = ImageCms.createProfile("LAB")
         t = ImageCms.buildTransform(psRGB, pLab, "RGB", "LAB")
+
         # Need to add a type mapping for some PIL type to TYPE_Lab_8 in
         # findLCMSType, and have that mapping work back to a PIL mode
         # (likely RGB).
-        i = ImageCms.applyTransform(lena(), t)
+        i = ImageCms.applyTransform(hopper(), t)
         self.assert_image(i, "LAB", (128, 128))
 
         # i.save('temp.lab.tif')  # visually verified vs PS.
 
-        target = Image.open('Tests/images/lena.Lab.tif')
+        target = Image.open('Tests/images/hopper.Lab.tif')
 
         self.assert_image_similar(i, target, 30)
 
@@ -208,13 +210,13 @@ class TestImageCms(PillowTestCase):
         pLab = ImageCms.createProfile("LAB")
         t = ImageCms.buildTransform(pLab, psRGB, "LAB", "RGB")
 
-        img = Image.open('Tests/images/lena.Lab.tif')
+        img = Image.open('Tests/images/hopper.Lab.tif')
 
         img_srgb = ImageCms.applyTransform(img, t)
 
         # img_srgb.save('temp.srgb.tif') # visually verified vs ps.
 
-        self.assert_image_similar(lena(), img_srgb, 30)
+        self.assert_image_similar(hopper(), img_srgb, 30)
         self.assertTrue(img_srgb.info['icc_profile'])
 
         profile = ImageCmsProfile(BytesIO(img_srgb.info['icc_profile']))