summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--doc/photo.n7
2 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index bad593e..43d4911 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-05 Donal K. Fellows <donal.k.fellows@man.ac.uk>
+
+ * doc/photo.n: Clarified the fact that base64 support for the -data
+ option is not universal. [Bug 1731348] (matzek)
+
2007-06-03 Daniel Steffen <das@users.sourceforge.net>
* unix/Makefile.in: add datarootdir to silence autoconf-2.6x warning.
@@ -6,7 +11,7 @@
* macosx/tkMacOSXMenu.c: add error checking; whitespace cleanup.
- * macosx/tkMacOSXDraw.c: comment formatting fixes for Xcode 3.0.
+ * macosx/tkMacOSXDraw.c: comment formatting fixes for Xcode 3.0
* macosx/tkMacOSXEmbed.c:
* macosx/tkMacOSXEntry.c:
* macosx/tkMacOSXFont.c:
diff --git a/doc/photo.n b/doc/photo.n
index 09221b6..de4c6f2 100644
--- a/doc/photo.n
+++ b/doc/photo.n
@@ -9,7 +9,7 @@
'\" Department of Computer Science,
'\" Australian National University.
'\"
-'\" RCS: @(#) $Id: photo.n,v 1.19 2005/04/06 21:11:54 dkf Exp $
+'\" RCS: @(#) $Id: photo.n,v 1.20 2007/06/05 12:56:03 dkf Exp $
'\"
.so man.macros
.TH photo n 4.0 Tk "Tk Built-In Commands"
@@ -41,8 +41,9 @@ command.
Photos support the following \fIoptions\fR:
.TP
\fB\-data \fIstring\fR
-Specifies the contents of the image as a string. The string can
-contain base64 encoded data or binary data. The format of the
+Specifies the contents of the image as a string. The string should
+contain binary data or, for some formats, base64-encoded data (this is
+currently guaranteed to be supported for GIF images). The format of the
string must be one of those for which there is an image file format
handler that will accept string data. If both the \fB\-data\fR
and \fB\-file\fR options are specified, the \fB\-file\fR option takes