From 047c35a75d3e44ff9d0bf704d666d68680ed78a3 Mon Sep 17 00:00:00 2001 From: dkf Date: Tue, 5 Jun 2007 12:58:17 +0000 Subject: Fix [Bug 1731348] --- ChangeLog | 5 +++++ doc/photo.n | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6f2d89e..310fc56 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-06-05 Donal K. Fellows + + * doc/photo.n: Clarified the fact that base64 support for the -data + option is not universal. [Bug 1731348] (matzek) + 2007-06-04 Daniel Steffen * macosx/tkMacOSXMenu.c: add error checking; whitespace cleanup. diff --git a/doc/photo.n b/doc/photo.n index 48c99ae..17f6f47 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.14.2.4 2004/10/28 12:25:22 dkf Exp $ +'\" RCS: @(#) $Id: photo.n,v 1.14.2.5 2007/06/05 12:58:18 dkf Exp $ '\" .so man.macros .TH photo n 4.0 Tk "Tk Built-In Commands" @@ -43,8 +43,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 -- cgit v0.12