Merge commit '5aad878400425d3af44433a47c13824385689e1d' as 'tkimg'

3 files changed, 107 insertions, 0 deletions

diff --git a/tkimg/ico/tests/all.tcl b/tkimg/ico/tests/all.tcl
new file mode 100644
index 0000000..de0116b
--- /dev/null
+++ b/tkimg/ico/tests/all.tcl
@@ -0,0 +1,24 @@
+# all.tcl -- -*- tcl -*-
+#
+# Import common functionality, then run the tests in this directory.
+#
+# Copyright (c) 2002         Andreas Kupries <andreas_kupries@users.sourceforge.net>
+# All rights reserved.
+#
+# RCS: @(#) $Id: all.tcl,v 1.1.1.1 2016/01/25 21:20:46 joye Exp $
+
+set _pwd  [pwd]
+cd  [file dirname [file join [pwd] [info script]]]
+set _here [pwd]
+cd $_pwd
+source [file join [file dirname [file dirname $_here]] tests all.tcl]
+unset _pwd _here
+
+set ::tcltest::testSingleFile false
+set ::tcltest::testsDirectory [file dirname [info script]]
+
+# We need to ensure that the testsDirectory is absolute
+::tcltest::normalizePath ::tcltest::testsDirectory
+
+run_tests
+exit
diff --git a/tkimg/ico/tests/ico.test b/tkimg/ico/tests/ico.test
new file mode 100644
index 0000000..ec8fa52
--- /dev/null
+++ b/tkimg/ico/tests/ico.test
@@ -0,0 +1,83 @@
+# This file is a Tcl script to test out ICO reading and writing.
+# It is organized in the standard fashion for Tcl tests.
+#
+
+puts "img::ico [package require img::ico]"
+
+set icodata \
+{AAABAAEAICAAAAEACACoCAAAFgAAACgAAAAgAAAAQAAAAAEACAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAD/AYCAAAH//wABAP//AQAAgAEAgAABAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAA////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+/////////wYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgb/////////BgYGBgYGBgYGBgYGBgYG
+BgYGBgYGBgYGBv////////8GBgYGBv8GBgYGBgYGBgYGBgYGBgYGBgYG/////////wMDAwMD
+/wMDAwMDAwMFBQUFBQUFBQMDAwP/////////AwMDAwP/AwMDAwMDAwUFBQUFBQUFAwMDA///
+//////8DAwMDAwH/AwMDAwMDBQUFBQUFBQUDAwMD/////////wMDAwMDAf8BAQMDAwMFBQUF
+BQUFBQMDAwP/////////AwMDAwMB/wEBAwMDAwUFBQUFBQUFAwMDA/////////8DAwMDAwEB
+/wEBAwMDAwUFBQUFBQMDAwMD/////////wMDAwMDAwH//wEBAwMDAwUFBQUDAwMDAwP/////
+////AwMDAwMDAQH//wEDAwMDAwUFAwMDAwMDA/////////8DAwMDAwMBAQH/AQEDAwMDAwMD
+AwMDAwMD/////////wMDAwMDAwMBAQH/AQMDAwMDAwMDAwMDAwP/////////AwMDBAQDAwMB
+Af8BAQMDAwMDAwMDAwMDA/////////8DAwMEBAMDAwEB//8BAwMDAwMDAwMDAwMD////////
+/wMDAwMDAwMDAQEB/wEBAwMDAwMDAwMDAwP/////////AwMDAwMDAwMDAQH//wEBAwMDAwMD
+AwMDA///////////////////////AQH/AQH///////////////////////////////////8B
+Af8BAQH//////////////////////////////////wEBAf8BAQH/////////////////////
+/////////////wEBAf8BAQH/////////////////////////////////AQEBAf8BAQH/////
+/////////////////////////////wEBAf//AQL/////////////////////////////////
+AgEBAf8BAf///////////////////////////////////wEBAf8B////////////////////
+//////////////////8BAf//////////////////////////////////////////////////
+///////////////////////////AAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AA
+AAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAH+fgfP/54DP//nAP/
+/+QD///5Af///gH////B////8f//////}
+
+test ico-1.1 {} {
+    catch {image delete i}
+    image create photo i -file [file join $tcltest::testsDirectory img.ico]
+    i data -format ico
+} $icodata
+test ico-1.2 {} {
+    catch {image delete i}
+    image create photo i -data $icodata
+    set data [i data -format ico]
+} $icodata
+test ico-1.3 {} {
+    i blank
+    i put $icodata
+    set data [i data -format ico]
+} $icodata
+test ico-1.4 {} {
+    i blank
+    i put $icodata -format ico
+    set data [i data -format ico]
+} $icodata
+
+if {[info tclversion] < 8.0} {
+    return
+}
+
+test ico-2.0 {Binary I/O with ICO images} {
+    i blank
+    set f [open [file join $tcltest::testsDirectory img.ico] r]
+    fconfigure $f -translation binary
+    set return [catch {i put [read $f]} msg]
+    close $f
+    lappend return $msg
+} {0 {}}
diff --git a/tkimg/ico/tests/img.ico b/tkimg/ico/tests/img.ico
new file mode 100644
index 0000000..9a982c6
--- /dev/null
+++ b/tkimg/ico/tests/img.ico