Merge jv
authorJan Vrany <jan.vrany@fit.cvut.cz>
Tue, 08 Mar 2016 08:02:28 +0000
branchjv
changeset 1484 e5af485c693d
parent 1483 8e5a0f125106
child 1485 5a1aadddbc7f
Merge
RegressionTests__CompilerTests2.st
RegressionTests__ImageReaderTest.st
testData/bmpImages/README
testData/bmpImages/bmpsuite-2.4/COPYING.txt
testData/bmpImages/bmpsuite-2.4/html/bmpsuite.html
testData/bmpImages/bmpsuite-2.4/readme.txt
--- a/RegressionTests__CompilerTests2.st	Fri Mar 04 08:16:39 2016 +0000
+++ b/RegressionTests__CompilerTests2.st	Tue Mar 08 08:02:28 2016 +0000
@@ -751,7 +751,7 @@
 
      When a package is loaded from source using
 
-	Smalltalk loadPackage:'...'
+        Smalltalk loadPackage:'...'
 
      expression and a method from loaded class in namespace uses a class from the
      same package and same namespace, that is not yet loaded (i.e., it will be loaded
@@ -764,16 +764,16 @@
 
     "/First, make sure that package is not yet loaded...
     self
-	assert: (Smalltalk at: #'exept_regression_estData_CompilerTests2') isNil
-	description: 'Mock package already loaded'.
+        assert: (Smalltalk at: #'exept_regression_testData_CompilerTests2') isNil
+        description: 'Mock package already loaded'.
 
     self
-	assert: (Smalltalk loadPackage: #'exept:regression/testData/CompilerTests2')
-	description: 'Cannot load mock package!!'.
+        assert: (Smalltalk loadPackage: #'exept:regression/testData/CompilerTests2')
+        description: 'Cannot load mock package!!'.
 
 
     self assert: (Smalltalk at: #'RegressionTests::CompilerTests2Mock1') new foo class
-		    == (Smalltalk at: #'RegressionTests::CompilerTests2Mock2')
+                    == (Smalltalk at: #'RegressionTests::CompilerTests2Mock2')
 
     "Created: / 26-10-2012 / 12:26:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified (comment): / 12-02-2013 / 16:24:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
--- a/RegressionTests__ImageReaderTest.st	Fri Mar 04 08:16:39 2016 +0000
+++ b/RegressionTests__ImageReaderTest.st	Tue Mar 08 08:02:28 2016 +0000
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "{ Package: 'exept:regression' }"
 
 "{ NameSpace: RegressionTests }"
@@ -29,12 +31,12 @@
 
 !ImageReaderTest methodsFor:'tests'!
 
-test001
+test001_bmp
     |img|
 
-    img := Image 
-                fromFile:(self class packageDirectory construct:'testData/test1.bmp').
+    img := Image fromFile:(self class packageDirectory construct:'testData/bmpImages/test1.bmp').
     self assert:(img notNil).
+    self assert:(img depth == 1).
     
     "/ img inspect.
     
@@ -43,125 +45,135 @@
     self assert:((img colorAtX:0 y:18) rgbValue = 16r40FF40).
 
     "
-     self run:#test01
-     self new test01"
+     self run:#test001_bmp
+     self new test001_bmp"
 !
 
-test002
+test002_bmp
     |img|
 
-    img := Image 
-                fromFile:(self class packageDirectory construct:'testData/test4.bmp').
+    img := Image fromFile:(self class packageDirectory construct:'testData/bmpImages/test4.bmp').
     self assert:(img notNil).
+    self assert:(img depth == 4).
+
+    self assert:((img colorAtX:0 y:15) rgbValue = 16rFF0000).
+    self assert:((img colorAtX:35 y:15) rgbValue = 16r004000).
+    self assert:((img colorAtX:35 y:30) rgbValue = 16r008000).
+    self assert:((img colorAtX:35 y:45) rgbValue = 16r00C000).
+    self assert:((img colorAtX:35 y:60) rgbValue = 16r00FF00).
+    self assert:((img colorAtX:70 y:15) rgbValue = 16r0000FF).
 
     "/ img inspect.
     "
-     self run:#test02
-     self new test02"
+     self run:#test002_bmp
+     self new test002_bmp"
 !
 
-test003
+test003_bmp
     |img|
 
-    img := Image 
-                fromFile:(self class packageDirectory construct:'testData/test8.bmp').
+    img := Image fromFile:(self class packageDirectory construct:'testData/bmpImages/test8.bmp').
     self assert:(img notNil).
+    self assert:(img depth == 8).
+    self assert:((img colorAtX:30 y:0) rgbValue = 16rFF0000).
 
     "/ img inspect
     "
-     self run:#test03
-     self new test03"
+     self run:#test003_bmp
+     self new test003_bmp"
 !
 
-test004
+test004_bmp
     |img|
 
-    img := Image fromFile:(self class packageDirectory 
-                        construct:'testData/testcompress4.bmp').
+    img := Image fromFile:(self class packageDirectory construct:'testData/bmpImages/testcompress4.bmp').
     self assert:(img notNil).
+    self assert:(img depth == 4).
+    self assert:((img colorAtX:0 y:15) rgbValue = 16rFF0000).
+    self assert:((img colorAtX:35 y:15) rgbValue = 16r004000).
+    self assert:((img colorAtX:35 y:30) rgbValue = 16r008000).
+    self assert:((img colorAtX:35 y:45) rgbValue = 16r00C000).
+    self assert:((img colorAtX:35 y:60) rgbValue = 16r00FF00).
+    self assert:((img colorAtX:70 y:15) rgbValue = 16r0000FF).
 
     "/ img inspect.
     "
-     self run:#test04
-     self new test04"
+     self run:#test004_bmp
+     self new test004_bmp"
 !
 
-test005
+test005_bmp
     |img|
 
-    img := Image fromFile:(self class packageDirectory 
-                        construct:'testData/testcompress8.bmp').
+    img := Image fromFile:(self class packageDirectory construct:'testData/bmpImages/testcompress8.bmp').
+    self assert:(img notNil).
+    self assert:(img depth == 8).
+    self assert:((img colorAtX:30 y:0) rgbValue = 16rFF0000).
+
+    "/ img inspect.
+    "
+     self run:#test005_bmp
+     self new test005_bmp"
+!
+
+test006_bmp
+    |img|
+
+    img := Image fromFile:(self class packageDirectory construct:'testData/bmpImages/test8os2.bmp').
     self assert:(img notNil).
 
     "/ img inspect.
     "
-     self run:#test05
-     self new test05"
+     self run:#test006_bmp
+     self new test006_bmp"
 !
 
-test006
+test007_bmp
     |img|
 
-    img := Image 
-                fromFile:(self class packageDirectory construct:'testData/test8os2.bmp').
+    img := Image fromFile:(self class packageDirectory construct:'testData/bmpImages/test4os2v2.bmp').
     self assert:(img notNil).
 
     "/ img inspect.
     "
-     self run:#test06
-     self new test06"
+     self run:#test007_bmp
+     self new test007_bmp"
 !
 
-test007
+test008_bmp
     |img|
 
-    img := Image 
-                fromFile:(self class packageDirectory construct:'testData/test4os2v2.bmp').
+    img := Image fromFile:(self class packageDirectory construct:'testData/bmpImages/test16.bmp').
     self assert:(img notNil).
 
     "/ img inspect.
     "
-     self run:#test07
-     self new test07"
+     self run:#test008_bmp
+     self new test008_bmp"
 !
 
-test008
+test009_bmp
     |img|
 
-    img := Image 
-                fromFile:(self class packageDirectory construct:'testData/test16.bmp').
+    img := Image fromFile:(self class packageDirectory construct:'testData/bmpImages/test24.bmp').
     self assert:(img notNil).
 
     "/ img inspect.
     "
-     self run:#test08
-     self new test08"
+     self run:#test009_bmp
+     self new test009_bmp"
 !
 
-test009
+test010_bmp
     |img|
 
-    img := Image 
-                fromFile:(self class packageDirectory construct:'testData/test24.bmp').
+    img := Image fromFile:(self class packageDirectory construct:'testData/bmpImages/test32.bmp').
     self assert:(img notNil).
 
     "/ img inspect.
     "
-     self run:#test09
-     self new test09"
-!
-
-test010
-    |img|
-
-    img := Image 
-                fromFile:(self class packageDirectory construct:'testData/test32.bmp').
-    self assert:(img notNil).
-
-    "/ img inspect.
-    "
-     self run:#test10
-     self new test10"
+     self run:#test010_bmp
+     self new test010_bmp"
 !
 
 test101
@@ -233,8 +245,8 @@
     self assert:(img notNil).
     self assert:(img depth == 2).
     self assert:(img extent = (32@32)).
-    self assert:(img colorAt:(0@0)) = Color black.
-    self assert:(img colorAt:(31@31)) = (Color rgbValue:16rAAAAAA).
+    self assert:(img colorAt:(0@0)) rgbValue = 0.
+    self assert:(img colorAt:(31@31)) rgbValue = 16rAAAAAA.
 
     "/ img inspect.
     "
@@ -245,13 +257,93 @@
     "Created: / 05-02-2011 / 10:33:24 / cg"
 !
 
-test_png_01
+testPNG_003_basi0g01
     |img|
 
+    img := Image fromFile:(self class packageDirectory construct:'testData/pngImages/basi0g01.png').
+    self assert:(img notNil).
+    self assert:(img depth == 1).
+    self assert:(img extent = (32@32)).
+    self assert:(img colorAt:(0@0)) = Color white.
+    self assert:(img colorAt:(31@31)) = Color black.
+
+    "/ img inspect.
+    "
+     self run:#testPNG_003_basi0g01
+     self new testPNG_003_basi0g01
+    "
+
+    "Created: / 05-02-2011 / 10:32:32 / cg"
+!
+
+test_bmp_01
+    |img allOK|
+
+    allOK := true.
+    (self class packageDirectory construct:'testData/bmpImages') directoryContentsAsFilenamesDo:[:f |
+        (f isRegularFile and:[f hasSuffix:'bmp']) ifTrue:[
+            Error handle:[:ex |
+                img := nil.
+            ] do:[
+                img := Image fromFile:f.
+            ].
+            img isNil ifTrue:[ 
+                Transcript printf:'failed: %s\n' with:f baseName.
+                allOK := false
+            ].                
+        ].
+    ].
+    self assert:allOK.
+
+    "
+     self run:#test_bmp_01
+     self new test_bmp_01
+    "
+!
+
+test_bmp_02
+    |img allOK|
+
+    allOK := true.
+    (self class packageDirectory construct:'testData/bmpImages/bmpsuite-2.4') directoryContentsAsFilenamesDo:[:f |
+        (f isRegularFile and:[f hasSuffix:'bmp']) ifTrue:[
+            Error handle:[:ex |
+                img := nil.
+            ] do:[
+                img := Image fromFile:f.
+            ].
+            img isNil ifTrue:[ 
+                Transcript printf:'failed: %s\n' with:f baseName.
+                allOK := false
+            ].                
+        ].
+    ].
+    self assert:allOK.
+
+    "
+     self run:#test_bmp_02
+     self new test_bmp_02
+    "
+!
+
+test_png_01
+    |img allOK|
+
+    allOK := true.
     (self class packageDirectory construct:'testData/pngImages') directoryContentsAsFilenamesDo:[:f |
-        img := Image fromFile:f.
-        self assert:(img notNil).
+        (f isRegularFile and:[f hasSuffix:'png']) ifTrue:[
+            Error handle:[:ex |
+                img := nil.
+            ] do:[
+                img := Image fromFile:f.
+            ].    
+            img isNil ifTrue:[ 
+                Transcript printf:'failed: %s\n' with:f baseName.
+                allOK := false 
+            ].
+        ].
     ].
+    self assert:allOK.
 
     "
      self run:#test_png_01
@@ -292,3 +384,4 @@
 version_CVS
     ^ '$Header$'
 ! !
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/testData/bmpImages/README	Tue Mar 08 08:02:28 2016 +0000
@@ -0,0 +1,1 @@
+Various bmp test images
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/testData/bmpImages/bmpsuite-2.4/COPYING.txt	Tue Mar 08 08:02:28 2016 +0000
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/testData/bmpImages/bmpsuite-2.4/html/bmpsuite.html	Tue Mar 08 08:02:28 2016 +0000
@@ -0,0 +1,772 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+
+<title>BMP Suite Image List</title>
+
+<style>
+ .b { background:url(bkgd.png); }
+ .q { background-color:#fff0e0; }
+ .bad { background-color:#ffa0a0; }
+</style>
+
+</head>
+
+<body>
+
+<h1>BMP Suite Image List</h1>
+
+<p><i>For <a href="http://entropymine.com/jason/bmpsuite/">BMP Suite</a>
+version 2.4</i></p>
+
+<p>This document describes the images in <i>BMP Suite</i>, and shows what
+I allege to be the correct way to interpret them. PNG and JPEG images are
+used for reference.
+</p>
+
+<p>It also shows how your web browser displays the BMP images,
+but that&rsquo;s not its main purpose.
+BMP is poor image format to use on web pages, so a web browser&rsquo;s
+level of support for it is arguably not important.</p>
+
+<table border=1 cellpadding=8>
+
+ <tr>
+  <th>File</th>
+  <th>Ver.</th>
+  <th>Correct display</th>
+  <th>In your browser</th>
+  <th>Notes</th>
+ </tr>
+
+ <tr>
+  <td>g/pal1.bmp</td>
+  <td>3</td>
+  <td class=b><img src="pal1.png"></td>
+  <td class=b><img src="../g/pal1.bmp"></td>
+  <td>1 bit/pixel paletted image, in which black is the first color in
+   the palette.</td>
+ </tr>
+
+ <tr>
+  <td>g/pal1wb.bmp</td>
+  <td>3</td>
+  <td class=b><img src="pal1.png"></td>
+  <td class=b><img src="../g/pal1wb.bmp"></td>
+  <td>1 bit/pixel paletted image, in which white is the first color in
+   the palette.</td>
+ </tr>
+
+ <tr>
+  <td>g/pal1bg.bmp</td>
+  <td>3</td>
+  <td class=b><img src="pal1bg.png"></td>
+  <td class=b><img src="../g/pal1bg.bmp"></td>
+  <td>1 bit/pixel paletted image, with colors other than black and white.</td>
+ </tr>
+
+ <tr>
+  <td class=q>q/pal1p1.bmp</td>
+  <td>3</td>
+  <td class=b><img src="pal1p1.png"></td>
+  <td class=b><img src="../q/pal1p1.bmp"></td>
+  <td>1 bit/pixel paletted image, with only one color in the palette.
+   The documentation says that 1-bpp images have a palette size of 2
+   (not &ldquo;up to 2&rdquo;), but it would be silly for a viewer not to
+   support a size of 1.</td>
+ </tr>
+
+ <tr>
+  <td class=q>q/pal2.bmp</td>
+  <td>3</td>
+  <td class=b><img src="pal2.png"></td>
+  <td class=b><img src="../q/pal2.bmp"></td>
+  <td>A paletted image with 2 bits/pixel. Usually only 1, 4,
+   and 8 are allowed, but 2 is legal on Windows CE.</td>
+ </tr>
+
+ <tr>
+  <td class=q>q/pal2color.bmp</td>
+  <td>3</td>
+  <td class=b><img src="pal2color.png"></td>
+  <td class=b><img src="../q/pal2color.bmp"></td>
+  <td>Same as pal2.bmp, but with a color palette instead of grayscale
+   palette.</td>
+ </tr>
+
+ <tr>
+  <td>g/pal4.bmp</td>
+  <td>3</td>
+  <td class=b><img src="pal4.png"></td>
+  <td class=b><img src="../g/pal4.bmp"></td>
+  <td>Paletted image with 12 palette colors, and 4 bits/pixel.</td>
+ </tr>
+
+ <tr>
+  <td>g/pal4gs.bmp</td>
+  <td>3</td>
+  <td class=b><img src="pal4gs.png"></td>
+  <td class=b><img src="../g/pal4gs.bmp"></td>
+  <td>Paletted image with 12 grayscale palette colors, and 4 bits/pixel.</td>
+ </tr>
+
+ <tr>
+  <td>g/pal4rle.bmp</td>
+  <td>3</td>
+  <td class=b><img src="pal4.png"></td>
+  <td class=b><img src="../g/pal4rle.bmp"></td>
+  <td>4-bit image that uses RLE compression.</td>
+ </tr>
+
+ <tr>
+  <td class=q>q/pal4rletrns.bmp</td>
+  <td>3</td>
+  <td class=b><img src="pal4rletrns.png"><br>
+     or<br><img src="pal4rletrns-0.png"><br>
+     or<br><img src="pal4rletrns-b.png"></td>
+  <td class=b><img src="../q/pal4rletrns.bmp"></td>
+  <td>An RLE-compressed image that uses &ldquo;delta&rdquo;
+  codes to skip over some pixels, leaving them undefined. Some viewers
+  make undefined pixels transparent, others make them black, and
+  others assign them palette color 0 (purple, in this case).</td>
+ </tr>
+
+ <tr>
+  <td class=q>q/pal4rlecut.bmp</td>
+  <td>3</td>
+  <td class=b><img src="pal4rlecut.png"><br>
+     or<br><img src="pal4rlecut-0.png"><br>
+     or<br><img src="pal4rlecut-b.png"></td>
+  <td class=b><img src="../q/pal4rlecut.bmp"></td>
+  <td>An RLE-compressed image that uses &ldquo;delta&rdquo; codes,
+   and early EOL &amp; EOBMP markers, to skip over some pixels.</td>
+ </tr>
+
+ <tr>
+  <td>g/pal8.bmp</td>
+  <td>3</td>
+  <td class=b><img src="pal8.png"></td>
+  <td class=b><img src="../g/pal8.bmp"></td>
+  <td>Our standard paletted image, with 252 palette colors, and 8
+   bits/pixel.</td>
+ </tr>
+
+ <tr>
+  <td>g/pal8-0.bmp</td>
+  <td>3</td>
+  <td class=b><img src="pal8.png"></td>
+  <td class=b><img src="../g/pal8-0.bmp"></td>
+  <td>Every field that can be set to 0 is set to 0: pixels/meter=0;
+   colors used=0 (meaning the default 256); size-of-image=0.</td>
+ </tr>
+
+ <tr>
+  <td>g/pal8gs.bmp</td>
+  <td>3</td>
+  <td class=b><img src="pal8gs.png"></td>
+  <td class=b><img src="../g/pal8gs.bmp"></td>
+  <td>An 8-bit image with a palette of 252 grayscale colors.</td>
+ </tr>
+
+ <tr>
+  <td>g/pal8rle.bmp</td>
+  <td>3</td>
+  <td class=b><img src="pal8.png"></td>
+  <td class=b><img src="../g/pal8rle.bmp"></td>
+  <td>8-bit image that uses RLE compression.</td>
+ </tr>
+
+ <tr>
+  <td class=q>q/pal8rletrns.bmp</td>
+  <td>3</td>
+  <td class=b><img src="pal8rletrns.png"><br>
+     or<br><img src="pal8rletrns-0.png"><br>
+     or<br><img src="pal8rletrns-b.png"></td>
+  <td class=b><img src="../q/pal8rletrns.bmp"></td>
+  <td>8-bit version of q/pal4rletrns.bmp.</td>
+ </tr>
+
+ <tr>
+  <td class=q>q/pal8rlecut.bmp</td>
+  <td>3</td>
+  <td class=b><img src="pal8rlecut.png"><br>
+     or<br><img src="pal8rlecut-0.png"><br>
+     or<br><img src="pal8rlecut-b.png"></td>
+  <td class=b><img src="../q/pal8rlecut.bmp"></td>
+  <td>8-bit version of q/pal4rlecut.bmp.</td>
+ </tr>
+
+ <tr>
+  <td>g/pal8w126.bmp</td>
+  <td>3</td>
+  <td class=b><img src="pal8w126.png"></td>
+  <td class=b><img src="../g/pal8w126.bmp"></td>
+  <td rowspan=3>Images with different widths and heights.
+   In BMP format, rows are padded to a multiple of four bytes, so we
+   test all four possibilities.</td>
+ </tr>
+
+ <tr>
+  <td>g/pal8w125.bmp</td>
+  <td>3</td>
+  <td class=b><img src="pal8w125.png"></td>
+  <td class=b><img src="../g/pal8w125.bmp"></td>
+ </tr>
+
+ <tr>
+  <td>g/pal8w124.bmp</td>
+  <td>3</td>
+  <td class=b><img src="pal8w124.png"></td>
+  <td class=b><img src="../g/pal8w124.bmp"></td>
+ </tr>
+
+ <tr>
+  <td>g/pal8topdown.bmp</td>
+  <td>3</td>
+  <td class=b><img src="pal8.png"></td>
+  <td class=b><img src="../g/pal8topdown.bmp"></td>
+  <td>BMP images are normally stored from the bottom up, but
+   there is a way to store them from the top down.</td>
+ </tr>
+
+ <tr>
+  <td class=q>q/pal8offs.bmp</td>
+  <td>3</td>
+  <td class=b><img src="pal8.png"></td>
+  <td class=b><img src="../q/pal8offs.bmp"></td>
+  <td>A file with some unused bytes between the palette and the
+   image. This is probably valid, but I&rsquo;m not 100% sure.</td>
+ </tr>
+
+ <tr>
+  <td class=q>q/pal8oversizepal.bmp</td>
+  <td>3</td>
+  <td class=b><img src="pal8.png"></td>
+  <td class=b><img src="../q/pal8oversizepal.bmp"></td>
+  <td>An 8-bit image with 300 palette colors. This may be invalid,
+   because the documentation could
+   be interpreted to imply that 8-bit images aren&rsquo;t allowed
+   to have more than 256 colors.</td>
+ </tr>
+
+ <tr>
+  <td>g/pal8nonsquare.bmp</td>
+  <td>3</td>
+  <td class=b>
+   <img src="pal8nonsquare-v.png"><br>
+   or<br>
+   <img src="pal8nonsquare-e.png">
+  </td>
+  <td class=b><img src="../g/pal8nonsquare.bmp"></td>
+  <td>An image with non-square pixels: the X pixels/meter is twice
+   the Y pixels/meter. Image <i>editors</i> can be expected to
+   leave the image &ldquo;squashed&rdquo;; image <i>viewers</i> should
+   consider stretching it to its correct proportions.</td>
+ </tr>
+
+ <tr>
+  <td>g/pal8os2.bmp</td>
+  <td>OS/2v1</td>
+  <td class=b><img src="pal8.png"></td>
+  <td class=b><img src="../g/pal8os2.bmp"></td>
+  <td>An OS/2-style bitmap. This format can be called OS/2 BMPv1,
+   or Windows BMPv2.</td>
+ </tr>
+
+ <tr>
+  <td class=q>q/pal8os2-sz.bmp</td>
+  <td>OS/2v1</td>
+  <td class=b><img src="pal8.png"></td>
+  <td class=b><img src="../q/pal8os2-sz.bmp"></td>
+  <td>Some OS/2 BMP specifications say that the <i>size</i> field in the file
+   header should be set to the aggregate size of the file header and
+   <i>infoheader</i>, instead of the total file size.
+   For OS/2v1, that means it will always be 26.
+   BMP decoders usually ignore this field, so it shouldn&rsquo;t
+   cause a problem.</td>
+ </tr>
+
+ <tr>
+  <td class=q>q/pal8os2sp.bmp</td>
+  <td>OS/2v1</td>
+  <td class=b><img src="pal8.png"></td>
+  <td class=b><img src="../q/pal8os2sp.bmp"></td>
+  <td>An OS/2v1 with a less-than-full-sized palette.
+   Probably not valid, but such files have been seen in the wild.</td>
+ </tr>
+
+ <tr>
+  <td class=q>q/pal8os2v2.bmp</td>
+  <td>OS/2v2</td>
+  <td class=b><img src="pal8.png"></td>
+  <td class=b><img src="../q/pal8os2v2.bmp"></td>
+  <td>My attempt to make an OS/2v2 bitmap.</td>
+ </tr>
+
+ <tr>
+  <td class=q>q/pal8os2v2-16.bmp</td>
+  <td>OS/2v2</td>
+  <td class=b><img src="pal8.png"></td>
+  <td class=b><img src="../q/pal8os2v2-16.bmp"></td>
+  <td>An OS/2v2 bitmap whose header has only 16 bytes, instead of the full 64.</td>
+ </tr>
+
+ <tr>
+  <td class=q>q/pal8os2v2-sz.bmp</td>
+  <td>OS/2v2</td>
+  <td class=b><img src="pal8.png"></td>
+  <td class=b><img src="../q/pal8os2v2-sz.bmp"></td>
+  <td>An OS/2v2 bitmap. Like q/pal8os2-sz.bmp, the <i>size</i> field is set to
+   the size of the headers (78), instead of the size of the file.</td>
+ </tr>
+
+ <tr>
+  <td class=q>q/pal8os2v2-40sz.bmp</td>
+  <td>OS/2v2</td>
+  <td class=b><img src="pal8.png"></td>
+  <td class=b><img src="../q/pal8os2v2-40sz.bmp"></td>
+  <td>An OS/2v2 bitmap, with a 40-byte header. Like q/pal8os2-sz.bmp,
+   the <i>size</i> field is set to the size of the headers (54),
+   instead of the size of the file. Except for that, this file
+   cannot be distinguished from a Windows BMPv3 file.</td>
+ </tr>
+
+ <tr>
+  <td>g/pal8v4.bmp</td>
+  <td>4</td>
+  <td class=b><img src="pal8.png"></td>
+  <td class=b><img src="../g/pal8v4.bmp"></td>
+  <td>A v4 bitmap. I&rsquo;m not sure that the gamma and chromaticity values in
+   this file are sensible, because I can&rsquo;t find any detailed documentation
+   of them.</td>
+ </tr>
+
+ <tr>
+  <td>g/pal8v5.bmp</td>
+  <td>5</td>
+  <td class=b><img src="pal8.png"></td>
+  <td class=b><img src="../g/pal8v5.bmp"></td>
+  <td>A v5 bitmap. Version 5 has additional colorspace options over v4, so it
+   is easier to create, and ought to be more portable.</td>
+ </tr>
+
+ <tr>
+  <td>g/rgb16.bmp</td>
+  <td>3</td>
+  <td class=b><img src="rgb16.png"></td>
+  <td class=b><img src="../g/rgb16.bmp"></td>
+  <td>A 16-bit image with the default color format: 5 bits each for red,
+   green, and blue, and 1 unused bit.
+   The whitest colors should (I assume) be displayed as pure white:
+   <span style="background-color:rgb(255,255,255)">(255,255,255)</span>, not
+   <span style="background-color:rgb(248,248,248)">(248,248,248)</span>.</td>
+ </tr>
+
+ <tr>
+  <td>g/rgb16-565.bmp</td>
+  <td>3</td>
+  <td class=b><img src="rgb16-565.png"></td>
+  <td class=b><img src="../g/rgb16-565.bmp"></td>
+  <td>A 16-bit image with a BITFIELDS segment indicating 5 red, 6 green,
+   and 5 blue bits. This is a standard 16-bit format, even supported by
+   old versions of Windows that don&rsquo;t support any other non-default 16-bit
+   formats.
+   The whitest colors should be displayed as pure white:
+   <span style="background-color:rgb(255,255,255)">(255,255,255)</span>, not
+   <span style="background-color:rgb(248,252,248)">(248,252,248)</span>.</td>
+ </tr>
+
+ <tr>
+  <td>g/rgb16-565pal.bmp</td>
+  <td>3</td>
+  <td class=b><img src="rgb16-565.png"></td>
+  <td class=b><img src="../g/rgb16-565pal.bmp"></td>
+  <td>A 16-bit image with both a BITFIELDS segment and a palette.</td>
+ </tr>
+
+ <tr>
+  <td class=q>q/rgb16-231.bmp</td>
+  <td>3</td>
+  <td class=b><img src="rgb16-231.png"></td>
+  <td class=b><img src="../q/rgb16-231.bmp"></td>
+  <td>An unusual and silly 16-bit image, with 2 red bits, 3 green bits, and 1
+  blue bit. Most viewers do support this image, but the colors may be darkened
+  with a yellow-green shadow. That&rsquo;s because they&rsquo;re doing simple
+  bit-shifting (possibly including one round of bit replication), instead of
+  proper scaling.</td>
+ </tr>
+
+ <tr>
+  <td class=q>q/rgb16-3103.bmp</td>
+  <td>3</td>
+  <td class=b><img src="rgb16-3103.png"></td>
+  <td class=b><img src="../q/rgb16-3103.bmp"></td>
+  <td>Similar to q/rgb16-231.bmp, with 3 red bits, 10 green bits, and 3
+  blue bits.</td>
+ </tr>
+
+ <tr>
+  <td class=q>q/rgba16-4444.bmp</td>
+  <td>5</td>
+  <td class=b><img src="rgba16-4444.png"></td>
+  <td class=b><img src="../q/rgba16-4444.bmp"></td>
+  <td>A 16-bit image with an alpha channel. There are 4 bits for each color
+   channel, and 4 bits for the alpha channel.
+   It&rsquo;s not clear if this is valid, but I can&rsquo;t find anything that
+   suggests it isn&rsquo;t.
+   </td>
+ </tr>
+
+  <tr>
+  <td class=q>q/rgba16-1924.bmp</td>
+  <td>5</td>
+  <td class=b><img src="rgba16-1924.png"></td>
+  <td class=b><img src="../q/rgba16-1924.bmp"></td>
+  <td>Similar to q/rgba16-4444.bmp, with 1 red bit, 9 green bits, 2 blue bits,
+   and 4 bits for the alpha channel.
+   </td>
+ </tr>
+
+ <tr>
+  <td>g/rgb24.bmp</td>
+  <td>3</td>
+  <td class=b><img src="rgb24.png"></td>
+  <td class=b><img src="../g/rgb24.bmp"></td>
+  <td>A perfectly ordinary 24-bit (truecolor) image.</td>
+ </tr>
+
+ <tr>
+  <td>g/rgb24pal.bmp</td>
+  <td>3</td>
+  <td class=b><img src="rgb24.png"></td>
+  <td class=b><img src="../g/rgb24pal.bmp"></td>
+  <td>A 24-bit image, with a palette containing 256 colors. There is little if
+   any reason for a truecolor image to contain a palette, but it is legal.</td>
+ </tr>
+
+ <tr>
+  <td class=q>q/rgb24largepal.bmp</td>
+  <td>3</td>
+  <td class=b><img src="rgb24.png"></td>
+  <td class=b><img src="../q/rgb24largepal.bmp"></td>
+  <td>A 24-bit image, with a palette containing 300 colors.
+   The fact that the palette has more than 256 colors may cause some viewers
+   to complain, but the documentation does not mention a size limit.</td>
+ </tr>
+
+ <tr>
+  <td class=q>q/rgb24prof.bmp</td>
+  <td>5</td>
+  <td class=b><img src="rgb24.png"></td>
+  <td class=b><img src="../q/rgb24prof.bmp"></td>
+  <td>My attempt to make a BMP file with an embedded color profile.</td>
+ </tr>
+
+ <tr>
+  <td class=q>q/rgb24lprof.bmp</td>
+  <td>5</td>
+  <td class=b><img src="rgb24.png"></td>
+  <td class=b><img src="../q/rgb24lprof.bmp"></td>
+  <td>My attempt to make a BMP file with a linked color profile.</td>
+ </tr>
+
+ <tr>
+  <td class=q>q/rgb24jpeg.bmp</td>
+  <td>5</td>
+  <td class=b><img src="rgb24.jpg"></td>
+  <td class=b><img src="../q/rgb24jpeg.bmp"></td>
+  <td rowspan=2>My attempt to make BMP files with embedded JPEG and PNG images.
+   These are not likely to be supported by much of anything (they&rsquo;re
+   intended for printers).</td>
+ </tr>
+
+ <tr>
+  <td class=q>q/rgb24png.bmp</td>
+  <td>5</td>
+  <td class=b><img src="rgb24.png"></td>
+  <td class=b><img src="../q/rgb24png.bmp"></td>
+ </tr>
+
+ <tr>
+  <td>g/rgb32.bmp</td>
+  <td>3</td>
+  <td class=b><img src="rgb24.png"></td>
+  <td class=b><img src="../g/rgb32.bmp"></td>
+  <td>A 32-bit image using the default color format for 32-bit images (no
+   BITFIELDS segment). There are 8 bits per color channel, and 8 unused
+   bits. The unused bits are set to 0.</td>
+ </tr>
+
+ <tr>
+  <td>g/rgb32bf.bmp</td>
+  <td>3</td>
+  <td class=b><img src="rgb24.png"></td>
+  <td class=b><img src="../g/rgb32bf.bmp"></td>
+  <td>A 32-bit image with a BITFIELDS segment. As usual, there are 8 bits per
+   color channel, and 8 unused bits. But the color channels are in an unusual
+   order, so the viewer must read the BITFIELDS, and not just guess.</td>
+ </tr>
+
+ <tr>
+  <td class=q>q/rgb32h52.bmp</td>
+  <td>(52)</td>
+  <td class=b><img src="rgb24.png"></td>
+  <td class=b><img src="../q/rgb32h52.bmp"></td>
+  <td>Similar to g/rgb32bf.bmp, but with a 52-byte
+   &ldquo;BITMAPV2INFOHEADER&rdquo;. This is an uncommon version of BMP, and I
+   can&rsquo;t confirm that this file is correct.</td>
+ </tr>
+
+ <tr>
+  <td class=q>q/rgb32fakealpha.bmp</td>
+  <td>3</td>
+  <td class=b><img src="rgb24.png"><br>
+    or<br>
+    <img class=b src="fakealpha.png">
+</td>
+  <td class=b><img src="../q/rgb32fakealpha.bmp"></td>
+  <td>Same as g/rgb32.bmp, except that the unused bits are set to something
+   other than 0.
+   If the image becomes transparent toward the bottom, it probably means
+   the viewer uses heuristics to guess whether the undefined
+   data represents transparency.
+   Reportedly, in ICO icon format, a 32-bit image has transparency if any
+   of the could-be alpha samples are nonzero. Some BMP decoders probably
+   use the same algorithm for BMP.</td>
+ </tr>
+
+ <tr>
+  <td class=q>q/rgb32-111110.bmp</td>
+  <td>3</td>
+  <td class=b><img src="rgb24.png"></td>
+  <td class=b><img src="../q/rgb32-111110.bmp"></td>
+  <td>A 32 bits/pixel image, with all 32 bits used: 11 each for red and
+   green, and 10 for blue. As far as I know, this is valid, but it
+   is unusual.</td>
+ </tr>
+
+ <tr>
+  <td class=q>q/rgb32-7187.bmp</td>
+  <td>3</td>
+  <td class=b><img src="rgb32-7187.png"></td>
+  <td class=b><img src="../q/rgb32-7187.bmp"></td>
+  <td>A 32 bits/pixel image, with 7 bits for red, 18 for green, and 7 for
+   blue.</td>
+ </tr>
+
+ <tr>
+  <td class=q>q/rgba32.bmp</td>
+  <td>5</td>
+  <td class=b><img src="rgba32.png"></td>
+  <td class=b><img src="../q/rgba32.bmp"></td>
+  <td>A BMP with an alpha channel. Transparency is barely documented,
+   so it&rsquo;s <i>possible</i> that this file is not correctly formed.
+   The color channels are in an unusual order, to prevent viewers from
+   passing this test by making a lucky guess.</td>
+ </tr>
+
+ <tr>
+  <td class=q>q/rgba32-81284.bmp</td>
+  <td>5</td>
+  <td class=b><img src="rgba32-81284.png"></td>
+  <td class=b><img src="../q/rgba32-81284.bmp"></td>
+  <td>A 32 bits/pixel image, with 8 bits for red, 12 for green, 8 for blue,
+   and 4 for alpha.</td>
+ </tr>
+
+ <tr>
+  <td class=q>q/rgba32-61754.bmp</td>
+  <td>5</td>
+  <td class=b><img src="rgba32-61754.png"></td>
+  <td class=b><img src="../q/rgba32-61754.bmp"></td>
+  <td>A 32 bits/pixel image, with 6 bits for red, 17 for green, 5 for blue,
+   and 4 for alpha.</td>
+ </tr>
+
+ <tr>
+  <td class=q>q/rgba32abf.bmp</td>
+  <td>3</td>
+  <td class=b><img src="rgba32.png"></td>
+  <td class=b><img src="../q/rgba32abf.bmp"></td>
+  <td>An image of type BI_ALHPABITFIELDS. Supposedly, this was used on
+   Windows CE. I don&rsquo;t know whether it is constructed correctly.</td>
+ </tr>
+
+ <tr>
+  <td class=q>q/rgba32h56.bmp</td>
+  <td>(56)</td>
+  <td class=b><img src="rgba32.png"></td>
+  <td class=b><img src="../q/rgba32h56.bmp"></td>
+  <td>Similar to q/rgba32.bmp, but with a 56-byte
+   &ldquo;BITMAPV3INFOHEADER&rdquo;. This is an uncommon version of BMP, and I
+   can&rsquo;t confirm that this file is correct.</td>
+ </tr>
+
+ <tr>
+  <td class=bad>b/badbitcount.bmp</td>
+  <td>3</td>
+  <td class=b>N/A</td>
+  <td class=b><img src="../b/badbitcount.bmp"></td>
+  <td>Header indicates an absurdly large number of bits/pixel.</td>
+ </tr>
+
+ <tr>
+  <td class=bad>b/badbitssize.bmp</td>
+  <td>3</td>
+  <td class=b>N/A</td>
+  <td class=b><img src="../b/badbitssize.bmp"></td>
+  <td>Header incorrectly indicates that the bitmap is several GB in size.</td>
+ </tr>
+
+ <tr>
+  <td class=bad>b/baddens1.bmp</td>
+  <td>3</td>
+  <td class=b>N/A</td>
+  <td class=b><img src="../b/baddens1.bmp"></td>
+  <td rowspan=2>Density (pixels per meter) suggests the image is <i>much</i>
+      larger in one dimension than the other.</td>
+ </tr>
+
+ <tr>
+  <td class=bad>b/baddens2.bmp</td>
+  <td>3</td>
+  <td class=b>N/A</td>
+  <td class=b><img src="../b/baddens2.bmp"></td>
+ </tr>
+
+ <tr>
+  <td class=bad>b/badfilesize.bmp</td>
+  <td>3</td>
+  <td class=b>N/A</td>
+  <td class=b><img src="../b/badfilesize.bmp"></td>
+  <td>Header incorrectly indicates that the file is several GB in size.</td>
+ </tr>
+
+ <tr>
+  <td class=bad>b/badheadersize.bmp</td>
+  <td>?</td>
+  <td class=b>N/A</td>
+  <td class=b><img src="../b/badheadersize.bmp"></td>
+  <td>Header size is 66 bytes, which is not a valid size for any known BMP
+   version.</td>
+ </tr>
+
+ <tr>
+  <td class=bad>b/badpalettesize.bmp</td>
+  <td>3</td>
+  <td class=b>N/A</td>
+  <td class=b><img src="../b/badpalettesize.bmp"></td>
+  <td>Header incorrectly indicates that the palette contains an absurdly large
+   number of colors.</td>
+ </tr>
+
+ <tr>
+  <td class=bad>b/badplanes.bmp</td>
+  <td>3</td>
+  <td class=b>N/A</td>
+  <td class=b><img src="../b/badplanes.bmp"></td>
+  <td>The &ldquo;planes&rdquo; setting, which is required to be 1, is not 1.</td>
+ </tr>
+
+ <tr>
+  <td class=bad>b/badrle4.bmp</td>
+  <td>3</td>
+  <td class=b>N/A</td>
+  <td class=b><img src="../b/badrle4.bmp"></td>
+  <td>An invalid RLE4-compressed image that tries to cause buffer overruns.</td>
+ </tr>
+ <tr>
+  <td class=bad>b/badrle4bis.bmp</td>
+  <td>3</td>
+  <td class=b>N/A</td>
+  <td class=b><img src="../b/badrle4bis.bmp"></td>
+  <td>Another invalid RLE4-compressed image that tries to cause buffer overruns.</td>
+ </tr>
+ <tr>
+  <td class=bad>b/badrle4ter.bmp</td>
+  <td>3</td>
+  <td class=b>N/A</td>
+  <td class=b><img src="../b/badrle4ter.bmp"></td>
+  <td>Another invalid RLE4-compressed image that tries to cause buffer overruns.</td>
+ </tr>
+
+ <tr>
+  <td class=bad>b/badrle.bmp</td>
+  <td>3</td>
+  <td class=b>N/A</td>
+  <td class=b><img src="../b/badrle.bmp"></td>
+  <td>8-bit version of b/badrle4.bmp.</td>
+ </tr>
+ <tr>
+  <td class=bad>b/badrlebis.bmp</td>
+  <td>3</td>
+  <td class=b>N/A</td>
+  <td class=b><img src="../b/badrlebis.bmp"></td>
+  <td>8-bit version of b/badrle4bis.bmp.</td>
+ </tr>
+ <tr>
+  <td class=bad>b/badrleter.bmp</td>
+  <td>3</td>
+  <td class=b>N/A</td>
+  <td class=b><img src="../b/badrleter.bmp"></td>
+  <td>8-bit version of b/badrle4ter.bmp.</td>
+ </tr>
+
+ <tr>
+  <td class=bad>b/badwidth.bmp</td>
+  <td>3</td>
+  <td class=b>N/A</td>
+  <td class=b><img src="../b/badwidth.bmp"></td>
+  <td>The image claims to be a negative number of pixels in width.</td>
+ </tr>
+
+ <tr>
+  <td class=bad>b/pal8badindex.bmp</td>
+  <td>3</td>
+  <td class=b>N/A</td>
+  <td class=b><img src="../b/pal8badindex.bmp"></td>
+  <td>Many of the palette indices used in the image are not present in the
+   palette.</td>
+ </tr>
+
+ <tr>
+  <td class=bad>b/reallybig.bmp</td>
+  <td>3</td>
+  <td class=b>N/A</td>
+  <td class=b><img src="../b/reallybig.bmp"></td>
+  <td>An image with a very large reported width and height.</td>
+ </tr>
+
+ <tr>
+  <td class=bad>b/rgb16-880.bmp</td>
+  <td>3</td>
+  <td class=b><img src="rgb16-880.png"><br>(?)</td>
+  <td class=b><img src="../b/rgb16-880.bmp"></td>
+  <td>A 16-bit image with a BITFIELDS segment indicating 8 red, 8 green,
+   and 0 blue bits. The documentation doesn&rsquo;t say whether undefined
+   channels are legal, or how they should be handled.
+ </tr>
+
+ <tr>
+  <td class=bad>b/rletopdown.bmp</td>
+  <td>3</td>
+  <td class=b>N/A</td>
+  <td class=b><img src="../b/rletopdown.bmp"></td>
+  <td>An RLE-compressed image that tries to use top-down orientation,
+   which isn&rsquo;t allowed.</td>
+ </tr>
+
+ <tr>
+  <td class=bad>b/shortfile.bmp</td>
+  <td>3</td>
+  <td class=b>N/A</td>
+  <td class=b><img src="../b/shortfile.bmp"></td>
+  <td>A file that has been truncated in the middle of the bitmap.</td>
+ </tr>
+
+</table>
+
+</body>
+
+</html>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/testData/bmpImages/bmpsuite-2.4/readme.txt	Tue Mar 08 08:02:28 2016 +0000
@@ -0,0 +1,49 @@
+BMP Suite
+Version 2.4
+
+This is a set of Windows BMP image files, and a utility for generating them.
+Many different varieties of BMP files are included, and are intended to be
+useful for testing.
+
+Copyright (C) 2012-2015 Jason Summers
+<jason1@pobox.com>
+http://entropymine.com/jason/bmpsuite/
+
+Includes contributions by Matthieu Darbois.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+Image files generated by this program are not covered by this license, and are
+in the public domain.
+
+
+Files in the "g" directory I consider to be "good": 
+Your program should definitely support them if it claims to support BMP.
+
+Files in the "q" directory I consider to be "questionable":
+These may unusual or obsolete, or technically violate the documentation in some
+way, or I may be unsure about their validity.
+
+Files in the "b" directory I consider to be "bad":
+These are clearly invalid or unreasonable. Make sure your program doesn't crash
+when reading them.
+
+The individual BMP files are described in the html/bmpsuite.html file.
+
+The generation utility is written in C, and is contained in the bmpsuite.c
+file, and the files in the 'data' subdirectory. In a Unix-like environment,
+type "make bmpsuite" to build the program, or just "make" to build and run it.
+Run "make check" to verify that it writes the BMP files correctly.
+