gimp r27759 - in branches/gimp-2-6: . app/pdb libgimp tools/pdbgen/pdb

[neo svn gnome org]

Author: neo
Date: Thu Dec  4 11:10:14 2008
New Revision: 27759
URL: http://svn.gnome.org/viewvc/gimp?rev=27759&view=rev

Log:
2008-12-04  Sven Neumann  <sven gimp org>

	Merged from trunk:

	* tools/pdbgen/pdb/convert.pdb: fixed an error in the 
documentation
	of the gimp-image-convert-rgb procedure.

	* app/pdb/convert-cmds.c
	* libgimp/gimpconvert_pdb.c: regenerated.



Modified:
   branches/gimp-2-6/ChangeLog
   branches/gimp-2-6/app/pdb/convert-cmds.c
   branches/gimp-2-6/libgimp/gimpconvert_pdb.c
   branches/gimp-2-6/tools/pdbgen/pdb/convert.pdb

Modified: branches/gimp-2-6/app/pdb/convert-cmds.c
==============================================================================
--- branches/gimp-2-6/app/pdb/convert-cmds.c	(original)
+++ branches/gimp-2-6/app/pdb/convert-cmds.c	Thu Dec  4 11:10:14 2008
@@ -216,7 +216,7 @@
   gimp_procedure_set_static_strings (procedure,
                                      "gimp-image-convert-rgb",
                                      "Convert specified image to RGB color",
-                                     "This procedure converts the specified image to RGB color. This process requires an image in RGB or Indexed color mode. No image content is lost in this process aside from the colormap for an indexed image.",
+                                     "This procedure converts the specified image to RGB color. This process requires an image in Grayscale or Indexed color mode. No image content is lost in this process aside from the colormap for an indexed image.",
                                      "Spencer Kimball & Peter Mattis",
                                      "Spencer Kimball & Peter Mattis",
                                      "1995-1996",

Modified: branches/gimp-2-6/libgimp/gimpconvert_pdb.c
==============================================================================
--- branches/gimp-2-6/libgimp/gimpconvert_pdb.c	(original)
+++ branches/gimp-2-6/libgimp/gimpconvert_pdb.c	Thu Dec  4 11:10:14 2008
@@ -32,8 +32,8 @@
  * Convert specified image to RGB color
  *
  * This procedure converts the specified image to RGB color. This
- * process requires an image in RGB or Indexed color mode. No image
- * content is lost in this process aside from the colormap for an
+ * process requires an image in Grayscale or Indexed color mode. No
+ * image content is lost in this process aside from the colormap for an
  * indexed image.
  *
  * Returns: TRUE on success.

Modified: branches/gimp-2-6/tools/pdbgen/pdb/convert.pdb
==============================================================================
--- branches/gimp-2-6/tools/pdbgen/pdb/convert.pdb	(original)
+++ branches/gimp-2-6/tools/pdbgen/pdb/convert.pdb	Thu Dec  4 11:10:14 2008
@@ -22,8 +22,8 @@
 
     $help = <<'HELP';
 This procedure converts the specified image to RGB color. This process
-requires an image in RGB or Indexed color mode. No image content is lost
-in this process aside from the colormap for an indexed image.
+requires an image in Grayscale or Indexed color mode. No image content is
+lost in this process aside from the colormap for an indexed image.
 HELP
 
     &std_pdb_misc;