Merge commit '5aad878400425d3af44433a47c13824385689e1d' as 'tkimg'

3 files changed, 55 insertions, 0 deletions

diff --git a/tkimg/xbm/tests/all.tcl b/tkimg/xbm/tests/all.tcl
new file mode 100644
index 0000000..672eef7
--- /dev/null
+++ b/tkimg/xbm/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:47 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/xbm/tests/folder.xbm b/tkimg/xbm/tests/folder.xbm
new file mode 100644
index 0000000..6a519f6
--- /dev/null
+++ b/tkimg/xbm/tests/folder.xbm
@@ -0,0 +1,5 @@
+#define folder_width 16
+#define folder_height 12
+static char folder_bits[] = {
+ 0x78,0x00,0x86,0x55,0x02,0x01,0xff,0x5f,0x01,0x30,0x01,0x50,0x01,0x10,0x01,
+ 0x50,0x01,0x10,0x01,0x50,0x01,0x30,0xff,0x1f};
diff --git a/tkimg/xbm/tests/xbm.test b/tkimg/xbm/tests/xbm.test
new file mode 100644
index 0000000..8c1375e
--- /dev/null
+++ b/tkimg/xbm/tests/xbm.test
@@ -0,0 +1,26 @@
+# This file is a Tcl script to test out XBM reading and writing.
+# It is organized in the standard fashion for Tcl tests.
+#
+
+puts "img::xbm [package require img::xbm]"
+
+test xbm-1.1 {} {
+    catch {image delete i}
+    image create photo i -file [file join $tcltest::testsDirectory folder.xbm]
+    i data -format xbm
+} {#define InlineData_width 16
+#define InlineData_height 12
+static char InlineData_bits[] = {
+  0x78, 0x00,
+  0x86, 0x55,
+  0x02, 0x01,
+  0xff, 0x5f,
+  0x01, 0x30,
+  0x01, 0x50,
+  0x01, 0x10,
+  0x01, 0x50,
+  0x01, 0x10,
+  0x01, 0x50,
+  0x01, 0x30,
+  0xff, 0x1f};
+}