From 699effbb1bb7c4de198d2a13587ea0f36f0dc92d Mon Sep 17 00:00:00 2001
From: Per Hedbor <ph@opera.com>
Date: Tue, 12 Aug 2014 18:36:16 +0200
Subject: [PATCH] Fixed documentation syntax error
---
lib/modules/Colors.pmod | 8 ++++++++
lib/modules/Tools.pmod/AutoDoc.pmod/PikeObjects.pmod | 11 ++++++-----
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/lib/modules/Colors.pmod b/lib/modules/Colors.pmod
index f5bd4215a4..4e9c1e1893 100644
--- a/lib/modules/Colors.pmod
+++ b/lib/modules/Colors.pmod
@@ -11,10 +11,12 @@
//! @[Colors.hsv_to_rgb()]
//! @[Image.Color.Color.hsv()]
//!
+
array(int(0..255)) rgb_to_hsv(int(0..255) r, int(0..255) g, int(0..255) b)
{
return Image.Color.rgb(r,g,b)->hsv();
}
+
variant array(int(0..255)) rgb_to_hsv(array(int(0..255)) rgb)
{
return Image.Color.rgb(@rgb)->hsv();
@@ -31,10 +33,12 @@ variant array(int(0..255)) rgb_to_hsv(array(int(0..255)) rgb)
//! @[Colors.rgb_to_hsv()]
//! @[Image.Color.hsv()]
//!
+
array(int(0..255)) hsv_to_rgb(int(0..255) h, int(0..255) s, int(0..255) v)
{
return Image.Color.hsv(h,s,v)->rgb();
}
+
variant array(int(0..255)) hsv_to_rgb(array(int(0..255)) hsv)
{
return Image.Color.hsv(@hsv)->rgb();
@@ -51,10 +55,12 @@ variant array(int(0..255)) hsv_to_rgb(array(int(0..255)) hsv)
//! @[Colors.cmyk_to_rgb()]
//! @[Image.Color.Color.cmyk()]
//!
+
array(int(0..100)) rgb_to_cmyk(int(0..255) r, int(0..255) g, int(0..255) b)
{
return (array(int))map(Image.Color.rgb(r,g,b)->cmyk(), round);
}
+
variant array(int(0..100)) rgb_to_cmyk(array(int(0..255)) rgb)
{
return (array(int))map(Image.Color.rgb(@rgb)->cmyk(), round);
@@ -71,10 +77,12 @@ variant array(int(0..100)) rgb_to_cmyk(array(int(0..255)) rgb)
//! @[Colors.rgb_to_cmyk()]
//! @[Image.Color.cmyk()]
//!
+
array(int(0..255)) cmyk_to_rgb(int c, int|void m, int|void y, int|void k)
{
return Image.Color.cmyk(c,m,y,k)->rgb();
}
+
variant array(int(0..255)) cmyk_to_rgb(array(int) cmyk)
{
return Image.Color.cmyk(@cmyk)->rgb();
diff --git a/lib/modules/Tools.pmod/AutoDoc.pmod/PikeObjects.pmod b/lib/modules/Tools.pmod/AutoDoc.pmod/PikeObjects.pmod
index d6bbbf6580..eaccd09e16 100644
--- a/lib/modules/Tools.pmod/AutoDoc.pmod/PikeObjects.pmod
+++ b/lib/modules/Tools.pmod/AutoDoc.pmod/PikeObjects.pmod
@@ -773,11 +773,12 @@ class _Class_or_Module {
strlen(doc->set->text) && strlen(doc->get->text) &&
doc->set->text != doc->get->text )
{
- outdoc->text = "@dl\n"
- "@item getting\n"
- "\n"+doc->get->text+"\n\n"+
- "@item setting\n"+
- doc->get->text+"\n\n";
+ outdoc->text = "@dl\n"
+ "@item getting\n"
+ "\n"+doc->get->text+"\n\n"+
+ "@item setting\n"+
+ doc->get->text+"\n\n";
+ outdoc->text += "@enddl";
}
else
{
--
GitLab