aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcathook <b01902109@csie.ntu.edu.tw>2014-06-23 18:32:38 +0800
committercathook <b01902109@csie.ntu.edu.tw>2014-06-23 18:32:38 +0800
commit68b7b48845f0648a80feb8e5edef87ee335cfd95 (patch)
treec46c34c50e3111bf7d4acfe6606afd5c00c8d6fe
parentbafcb16a9048268c78210c65577ce7ec7b2577d0 (diff)
downloadmeow-68b7b48845f0648a80feb8e5edef87ee335cfd95.tar
meow-68b7b48845f0648a80feb8e5edef87ee335cfd95.tar.gz
meow-68b7b48845f0648a80feb8e5edef87ee335cfd95.tar.bz2
meow-68b7b48845f0648a80feb8e5edef87ee335cfd95.tar.lz
meow-68b7b48845f0648a80feb8e5edef87ee335cfd95.tar.xz
meow-68b7b48845f0648a80feb8e5edef87ee335cfd95.tar.zst
meow-68b7b48845f0648a80feb8e5edef87ee335cfd95.zip
clean space
Diffstat
-rw-r--r--LaTex/source.tex28
-rw-r--r--Makefile9
-rw-r--r--README.asciidoc140
-rw-r--r--README.html287
-rw-r--r--asciidoc/example.txt8
-rw-r--r--cppMakefile/!readme.asciidoc2
-rw-r--r--cppMakefile/GNUmakefile4
-rw-r--r--[-rwxr-xr-x]cppMakefile/GNUmakefile.dependency.sh0
-rw-r--r--doxygen/!readme.asciidoc6
-rw-r--r--doxygen/custom.css2
-rw-r--r--doxygen/stylesheet.css44
-rw-r--r--doxygen/testbin0 -> 10627 bytes
-rw-r--r--[-rwxr-xr-x]meowpp.test/GNUmakefile.dependency.sh0
-rw-r--r--meowpp.test/GNUmakefile.targets7
-rw-r--r--meowpp.test/inc/autostitch.h8
-rw-r--r--meowpp.test/points.txt68
-rw-r--r--meowpp.test/pointsC0.txt9
-rw-r--r--meowpp.test/src/autostitch.cpp26
-rw-r--r--meowpp.test/src/autostitch_RansacCheck.cpp29
-rw-r--r--meowpp.test/src/features.cpp29
20 files changed, 278 insertions, 428 deletions
diff --git a/LaTex/source.tex b/LaTex/source.tex
index cb189ec..00b6e0e 100644
--- a/LaTex/source.tex
+++ b/LaTex/source.tex
@@ -1,20 +1,20 @@
-\documentclass{article}
+\documentclass{article}
%%%%%%%%%%%%%%%%% **# chinese setting #** %%%%%%%%%%%%%%%%%%
-\usepackage{fontspec}
+\usepackage{fontspec}
\usepackage{xeCJK} %讓中英文字體分開設置
\defaultCJKfontfeatures{AutoFakeBold=6,AutoFakeSlant=.4} %以後不用再設定粗斜
-\XeTeXlinebreaklocale "zh" %這兩行一定要加
+\XeTeXlinebreaklocale "zh" %這兩行一定要加
\XeTeXlinebreakskip = 0pt plus 1pt %中文才能自動換
\newCJKfontfamily{\Kai}{標楷體}
\newCJKfontfamily{\Hei}{微軟正黑體}
-\newCJKfontfamily{\Wen}{文泉驛等寬正黑}
-\setCJKmainfont{文泉驛等寬正黑}
+\newCJKfontfamily{\Wen}{文泉驛等寬正黑}
+\setCJKmainfont{文泉驛等寬正黑}
%%%%%%%%%%%%%%%%%% **# border, indent #** %%%%%%%%%%%%%%%%%%
-\usepackage{geometry}
+\usepackage{geometry}
\geometry{a4paper}
-\geometry{left=1.7cm, right=1.7cm, top=2cm, bottom=2cm}
+\geometry{left=1.7cm, right=1.7cm, top=2cm, bottom=2cm}
\linespread{1}
\setlength{\parskip }{0.5em}
\setlength{\parindent }{ 2em}
@@ -51,7 +51,7 @@
\renewcommand{\cftsecleader }{\cftdotfill{\cftdotsep}}
%%%%%%%%%%%%%%%%%%%% **# mathematics #** %%%%%%%%%%%%%%%%%%%
-\usepackage{amsmath, amsthm, amssymb}
+\usepackage{amsmath, amsthm, amssymb}
\theoremstyle{definition}
\newtheorem*{defi}{Definition}
@@ -115,7 +115,7 @@ hi!
啦啦\textbf{啦}
\Indent{0em}{5em}
-啦啦\textbf{啦}aaaaaaaaaaaaa b c xxx
+啦啦\textbf{啦}aaaaaaaaaaaaa b c xxx
xxxxxxxxxxxx xxxx xxxx xxxx xxxx xxxx xxxx xxxx xxxx xxxx
xxxxxxxxxxxx xxxx xxxx xxxx xxxx xxxx xxxx xxxx xxxx xxxx
xxxxxxxxxxxx xxxx xxxx xxxx xxxx xxxx xxxx xxxx xxxx xxxx
@@ -138,9 +138,9 @@ xxxxxxxxxxxx xxxx xxxx xxxx xxxx xxxx xxxx xxxx xxxx xxxx
-啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦 啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦 啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦 啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦 啦啦啦啦啦啦啦啦啦啦啦啦啦啦
+啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦 啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦 啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦 啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦 啦啦啦啦啦啦啦啦啦啦啦啦啦啦
-啦啦\textbf{啦}aaaaaaaaaaaaa b c xxx
+啦啦\textbf{啦}aaaaaaaaaaaaa b c xxx
xxxxxxxxxxxx xxxx xxxx xxxx xxxx xxxx xxxx xxxx xxxx xxxx
xxxxxxxxxxxx xxxx xxxx xxxx xxxx xxxx xxxx xxxx xxxx xxxx
xxxxxxxxxxxx xxxx xxxx xxxx xxxx xxxx xxxx xxxx xxxx xxxx
@@ -221,11 +221,11 @@ x
% \State ${ans} \gets -1$
% \While{ $left < right$ }
% \State $mid \gets ??$
-% \If{$arr[mid] = value$}
+% \If{$arr[mid] = value$}
% \State $ans \gets mid, left \gets mid+1$
-% \ElsIf{$arr[mid] > value$}
+% \ElsIf{$arr[mid] > value$}
% \State{$right \gets mid$}
-% \ElsIf{$arr[mid] < value$}
+% \ElsIf{$arr[mid] < value$}
% \State{$left \gets mid+1$}
% \EndIf
% \EndWhile
diff --git a/Makefile b/Makefile
index 3775649..fdc2989 100644
--- a/Makefile
+++ b/Makefile
@@ -12,6 +12,8 @@ README_HTML = README.html
CURRENT_DIR = $(shell pwd)
+TEMPLATE_DIRS = meowpp asciidoc cppMakefile doxygen LaTex
+
.PHONY: all clean
all: readme doc;
@@ -19,6 +21,13 @@ all: readme doc;
readme: $(README_HTML);
doc: document;
+
+clean_space:
+ find $(TEMPLATE_DIRS) -type f | while read -r f; do \
+ cat "$$f" | sed -e 's/ *$$//g' > tmp_file.$$$$; \
+ cat tmp_file.$$$$ > "$$f"; \
+ done; \
+ rm tmp_file.$$$$
clean:
-rm -f $(README) $(README_HTML)
diff --git a/README.asciidoc b/README.asciidoc
index 09f1af8..270f3de 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -89,7 +89,7 @@ $(ASCIIDOC_OUTPUT): $(ASCIIDOC_SOURCE)
關於 'OBJS=' 與 'LIBS=' 參考下面說明
* `make add NAME=<name> [OBJS=<OBJ_FILES> LIBS=<LIBRARIES>]` +
-針對target為 '<name>' 的目標新增需要的 '<OBJ_FILES>' , 與 '<LIBRARIES>'.
+針對target為 '<name>' 的目標新增需要的 '<OBJ_FILES>' , 與 '<LIBRARIES>'.
'<LIBRARIES>' 的部份會用 `pkg-config` 去解讀, 例如 '<LIBRARIES>' 為
'opencv lapackpp' 則link時會被以下指令展開 +
`pkg-config --libs opencv lapackpp` +
@@ -235,161 +235,175 @@ CALLER_GRAPH = YES
[source,css]
----------------------------------------------
body, table, div, p, dl {
- font: 400 14px/19px Roboto,sans-serif,monospace;
+ font: 400 14px/19px Roboto,sans-serif,monospace;
}
.title {
- line-height: 100%;
- font-size: 200%;
- margin : 0px;
- padding: 0px;
- border : 0px;
+ line-height: 100%;
+ font-size: 200%;
+ margin : 0px;
+ padding: 0px;
+ border : 0px;
}
dt {
- color: #999999;
- font-style:italic;
+ color: #999999;
+ font-style:italic;
}
div.qindex, div.navtab{
- background-color: #2B3F26;
+ background-color: #2B3F26;
}
a {
- color: #5D77AC;
+ color: #5D77AC;
}
.contents a:visited {
- color: #7695D2;
+ color: #7695D2;
}
a.code, a.code:visited {
- color: #7695D2;
+ color: #7695D2;
}
a.codeRef, a.codeRef:visited {
- color: #7695D2;
+ color: #7695D2;
}
pre.fragment {
- background-color: #0B0C0D;
- border-radius: 4px;
- -moz-border-radius: 4px;
- -webkit-border-top-left-radius: 4px;
+ background-color: #0B0C0D;
+ border-radius: 4px;
+ -moz-border-radius: 4px;
+ -webkit-border-top-left-radius: 4px;
}
div.fragment {
- background-color: #0B0C0D;
- border-radius: 4px;
- -moz-border-radius: 4px;
- -webkit-border-top-left-radius: 4px;
+ background-color: #0B0C0D;
+ border-radius: 4px;
+ -moz-border-radius: 4px;
+ -webkit-border-top-left-radius: 4px;
}
div.line {
- font-family: 'courier new', monospace, fixed;
- color: #CCCCCC;
- font-size: 14px;
- min-height: 14px;
+ font-family: 'courier new', monospace, fixed;
+ color: #CCCCCC;
+ font-size: 14px;
+ min-height: 14px;
}
span.lineno {
- background-color: #181818;
+ background-color: #181818;
}
span.lineno a {
- background-color: #3B3838;
+ background-color: #3B3838;
}
span.lineno a:hover {
- background-color: #6B6868;
+ background-color: #6B6868;
}
body {
- background-color: #212131;
- color: #DDFFDD;
+ background-color: #212131;
+ color: #DDFFDD;
}
span.keyword {
- color: #00A000
+ color: #00A000
}
span.keywordtype {
- color: #907050
+ color: #907050
}
span.comment {
- color: #808080
+ color: #808080
+}
+
+div.center img {
+ padding: 7px;
+ background-color: #5F5572;
+ border-radius: 4px;
+ -moz-border-radius: 4px;
+ -webkit-border-top-left-radius: 4px;
}
table.memberdecls {
- border-top-color: #111111;
+ border-top-color: #111111;
}
.memTemplItemLeft, .memTemplItemRight, .memTemplParams {
- background-color: #192322;
+ background-color: #192322;
}
.mdescLeft, .mdescRight {
- color: #CCCCCC;
+ color: #CCCCCC;
}
.memTemplParams {
- color: #7695D2;
+ color: #7695D2;
}
.memtemplate {
- color: #7695D2;
+ color: #7695D2;
}
.memproto, dl.reflist dt {
- color: #758575;
- text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.95);
- /* background-image:url('nav_f.png'); */
- background-color: #181C28;
+ color: #758575;
+ text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.95);
+ /* background-image:url('nav_f.png'); */
+ background-color: #181C28;
}
.memdoc, dl.reflist dd {
- /* background-image:url('nav_g.png'); */
- background-color: #131923;
+ /* background-image:url('nav_g.png'); */
+ background-color: #212A31;
}
.params .paramdir {
- color:#A0AA00;
+ color:#A0AA00;
}
.directory tr.even {
- background-color: #272838;
+ background-color: #272838;
}
.directory .levels span {
- color: #5D77AC;
+ color: #5D77AC;
+}
+
+.fieldtable th {
+ /* background-image:url('nav_f.png'); */
+ /* background-repeat:repeat-x; */
+ background-color: #888E99;
}
div.header
{
- /* background-image:url('nav_h.png'); */
- /* background-repeat:repeat-x; */
- background-color: #290A1C;
- padding: 0px;
- margin : 0px;
- border : 0px;
- margin-top: 10px;
- border-bottom: 1px solid #AA0000;/*#C4CFE5;*/
+ /* background-image:url('nav_h.png'); */
+ /* background-repeat:repeat-x; */
+ background-color: #290A1C;
+ padding: 0px;
+ margin : 0px;
+ border : 0px;
+ margin-top: 10px;
+ border-bottom: 1px solid #AA0000;/*#C4CFE5;*/
}
div.headertitle
{
- padding: 5px;
- margin : 0px;
- border : 0px;
+ padding: 5px;
+ margin : 0px;
+ border : 0px;
}
-
+
#projectname
{
- font: 400% Tahoma, Arial,sans-serif,monospace;
+ font: 400% Tahoma, Arial,sans-serif,monospace;
}
div.toc h3 {
- color: #7695D2;
+ color: #7695D2;
}
----------------------------------------------
@@ -623,7 +637,7 @@ Channel分別是
===== Transformation.h
-各種轉換的 Base Class, 這裡所謂的 *Transformation* 形式上不一定要是 Linear,
+各種轉換的 Base Class, 這裡所謂的 *Transformation* 形式上不一定要是 Linear,
但原則上都是 *input a vector, output a vector* 其中input/output的dimension可以
不同.
diff --git a/README.html b/README.html
index dcd24a5..c0e966d 100644
--- a/README.html
+++ b/README.html
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta name="generator" content="AsciiDoc 8.6.7">
+<meta name="generator" content="AsciiDoc 8.6.9">
<title>meow</title>
<style type="text/css">
/*
@@ -61,13 +61,6 @@ h1, h2, h3, h4, h5, h6 {
letter-spacing:+0.15em;
}
-h1 { font-size: 7ex; }
-h2 { font-size: 5ex; }
-h3 { font-size: 4ex; }
-h4 { font-size: 3ex; }
-h5 { font-size: 2ex; }
-h6 { font-size: 2ex; }
-
h1, h2, h3 { border-bottom: 2px solid #ccd; }
h2 { padding-top: 0.5em; }
h3 { float: left; }
@@ -90,11 +83,6 @@ ul, ol, li > p {
margin-top: 0;
}
-ul {
- margin-left: 1em;
- padding-left: 1em;
-}
-
pre {
padding: 0;
margin: 0;
@@ -151,7 +139,6 @@ div.title, caption.title {
text-align: left;
margin-top: 1.0em;
margin-bottom: 0.5em;
- margin-left: 1em;
}
div.title + * {
margin-top: 0;
@@ -177,7 +164,6 @@ div.listingblock > div.content {
border: 1px solid silver;
background: #f4f4f4;
padding: 0.5em;
- margin-left: 2em;
}
div.quoteblock {
@@ -339,9 +325,9 @@ div.hdlist.compact tr {
div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { margin-top: 0; margin-bottom: 0; }
div.toclevel1 { margin-top: 0.3em; margin-left: 0; font-size: 1.0em; }
-div.toclevel2 { margin-top: 0.25em; margin-left: 1em; font-size: 0.9em; }
-div.toclevel3 { margin-left: 2em; font-size: 0.8em; }
-div.toclevel4 { margin-left: 3em; font-size: 0.8em; }
+div.toclevel2 { margin-top: 0.25em; margin-left: 2em; font-size: 0.9em; }
+div.toclevel3 { margin-left: 4em; font-size: 0.8em; }
+div.toclevel4 { margin-left: 6em; font-size: 0.8em; }
body {
margin: 1em 5%;
@@ -353,32 +339,27 @@ body {
.monospaced, tt, div.listingblock > div.content {
font-family: Consolas, "Andale Mono", "Courier New", monospace;
color: #004400;
- background: #e4e4e4;
+ background: #f4f4f4;
max-width: 80em;
line-height: 1.2em;
- border-radius: 4px;
- -moz-border-radius: 4px;
- -webkit-border-radius: 4px;
}
.paragraph p {
line-height: 1.5em;
margin-top: 1em;
- margin-left: 2em;
}
-.paragraph p, li, dd, .content { max-width: 100%; }
-.admonitionblock { max-width: 95%; }
+.paragraph p, li, dd, .content { max-width: 45em; }
+.admonitionblock { max-width: 35em; }
div.sectionbody div.ulist > ul > li {
list-style-type: square;
color: #aaa;
}
-
-div.sectionbody div.ulist > ul > li > * {
- color: black;
- /*font-size: 50%;*/
-}
+ div.sectionbody div.ulist > ul > li > * {
+ color: black;
+ /*font-size: 50%;*/
+ }
div.sectionbody div.ulist > ul > li div.ulist > ul > li {
@@ -404,7 +385,6 @@ em {
table.tableblock {
margin-top: 1.0em;
margin-bottom: 1.5em;
- margin-left: 2em;
}
thead, p.tableblock.header {
font-weight: bold;
@@ -460,6 +440,8 @@ th.tableblock.valign-bottom, td.tableblock.valign-bottom {
}
+
+
@media screen {
body {
max-width: 50em; /* approximately 80 characters wide */
@@ -800,11 +782,7 @@ ASCIIDOC_OUTPUT: 輸出的檔名, 預設為 <em>output.html</em>
</ul></div>
<div class="paragraph"><p>另外還有一個target:</p></div>
<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 3.1.6
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #009900">$(ASCIIDOC_OUTPUT)</span><span style="color: #990000">:</span> <span style="color: #009900">$(ASCIIDOC_SOURCE)</span></tt></pre></div></div>
+<div class="content"></div></div>
</div>
</div>
<div class="sect2">
@@ -933,77 +911,7 @@ DOXYGEN_CONFIG: 指定config檔放在哪裡, 預設為 <span class="monospaced">
<h5 id="_config">config</h5>
<div class="paragraph"><p>設置, 以下幾點個人覺得比較重要的</p></div>
<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 3.1.6
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>
-<span style="font-style: italic"><span style="color: #9A1900">#---------------------------------------------------------------------------</span></span>
-<span style="font-style: italic"><span style="color: #9A1900"># Project related configuration options</span></span>
-<span style="font-style: italic"><span style="color: #9A1900">#---------------------------------------------------------------------------</span></span>
-<span style="color: #009900">DOXYFILE_ENCODING </span><span style="color: #990000">=</span> UTF<span style="color: #990000">-</span><span style="color: #993399">8</span>
-<span style="color: #009900">PROJECT_NAME </span><span style="color: #990000">=</span> <span style="color: #FF0000">"Templates -- Meow"</span>
-<span style="color: #009900">PROJECT_NUMBER </span><span style="color: #990000">=</span> <span style="color: #993399">1.1</span><span style="color: #990000">.</span><span style="color: #993399">2</span>
-<span style="color: #009900">PROJECT_BRIEF </span><span style="color: #990000">=</span> 不能<span style="color: #990000">,</span> 也不應該先編譯成obj<span style="color: #990000">-</span>file的templates
-<span style="color: #009900">PROJECT_LOGO </span><span style="color: #990000">=</span> <span style="color: #009900">$(config_path)</span><span style="color: #990000">/</span>logo<span style="color: #990000">.</span>png
-<span style="color: #009900">OUTPUT_DIRECTORY </span><span style="color: #990000">=</span> doc
-<span style="color: #009900">CREATE_SUBDIRS </span><span style="color: #990000">=</span> NO
-<span style="color: #009900">OUTPUT_LANGUAGE </span><span style="color: #990000">=</span> English
-<span style="color: #009900">TAB_SIZE </span><span style="color: #990000">=</span> <span style="color: #993399">2</span>
-
-<span style="font-style: italic"><span style="color: #9A1900">#---------------------------------------------------------------------------</span></span>
-<span style="font-style: italic"><span style="color: #9A1900"># Build related configuration options</span></span>
-<span style="font-style: italic"><span style="color: #9A1900">#---------------------------------------------------------------------------</span></span>
-<span style="color: #009900">EXTRACT_ALL </span><span style="color: #990000">=</span> YES
-<span style="color: #009900">EXTRACT_STATIC </span><span style="color: #990000">=</span> YES
-<span style="color: #009900">EXTRACT_LOCAL_CLASSES </span><span style="color: #990000">=</span> NO
-<span style="color: #009900">EXTRACT_LOCAL_CLASSES </span><span style="color: #990000">=</span> YES
-<span style="color: #009900">FORCE_LOCAL_INCLUDES </span><span style="color: #990000">=</span> YES
-
-<span style="font-style: italic"><span style="color: #9A1900">#---------------------------------------------------------------------------</span></span>
-<span style="font-style: italic"><span style="color: #9A1900"># configuration options related to the input files</span></span>
-<span style="font-style: italic"><span style="color: #9A1900">#---------------------------------------------------------------------------</span></span>
-<span style="color: #009900">INPUT </span><span style="color: #990000">=</span> meowpp
-<span style="color: #009900">INPUT_ENCODING </span><span style="color: #990000">=</span> UTF<span style="color: #990000">-</span><span style="color: #993399">8</span>
-<span style="color: #009900">FILE_PATTERNS </span><span style="color: #990000">=</span>
-<span style="color: #009900">RECURSIVE </span><span style="color: #990000">=</span> YES
-
-<span style="font-style: italic"><span style="color: #9A1900">#---------------------------------------------------------------------------</span></span>
-<span style="font-style: italic"><span style="color: #9A1900"># configuration options related to the HTML output</span></span>
-<span style="font-style: italic"><span style="color: #9A1900">#---------------------------------------------------------------------------</span></span>
-<span style="color: #009900">GENERATE_HTML </span><span style="color: #990000">=</span> YES
-<span style="color: #009900">HTML_OUTPUT </span><span style="color: #990000">=</span> html
-<span style="color: #009900">HTML_FILE_EXTENSION </span><span style="color: #990000">=</span> <span style="color: #990000">.</span>html
-<span style="color: #009900">HTML_HEADER </span><span style="color: #990000">=</span> <span style="color: #009900">$(config_path)</span><span style="color: #990000">/</span>header<span style="color: #990000">.</span>html
-<span style="color: #009900">HTML_FOOTER </span><span style="color: #990000">=</span> <span style="color: #009900">$(config_path)</span><span style="color: #990000">/</span>footer<span style="color: #990000">.</span>html
-<span style="color: #009900">HTML_STYLESHEET </span><span style="color: #990000">=</span> <span style="color: #009900">$(config_path)</span><span style="color: #990000">/</span>stylesheet<span style="color: #990000">.</span>css
-<span style="color: #009900">HTML_EXTRA_STYLESHEET </span><span style="color: #990000">=</span> <span style="color: #009900">$(config_path)</span><span style="color: #990000">/</span>custom<span style="color: #990000">.</span>css
-<span style="color: #009900">HTML_EXTRA_FILES </span><span style="color: #990000">=</span>
-<span style="color: #009900">HTML_COLORSTYLE_HUE </span><span style="color: #990000">=</span> <span style="color: #993399">120</span>
-<span style="color: #009900">HTML_COLORSTYLE_SAT </span><span style="color: #990000">=</span> <span style="color: #993399">36</span>
-<span style="color: #009900">HTML_COLORSTYLE_GAMMA </span><span style="color: #990000">=</span> <span style="color: #993399">166</span>
-<span style="color: #009900">DISABLE_INDEX </span><span style="color: #990000">=</span> YES
-<span style="color: #009900">GENERATE_TREEVIEW </span><span style="color: #990000">=</span> YES
-<span style="color: #009900">FORMULA_FONTSIZE </span><span style="color: #990000">=</span> <span style="color: #993399">11</span>
-<span style="color: #009900">SEARCHENGINE </span><span style="color: #990000">=</span> NO
-
-<span style="font-style: italic"><span style="color: #9A1900">#---------------------------------------------------------------------------</span></span>
-<span style="font-style: italic"><span style="color: #9A1900"># configuration options related to the LaTeX output</span></span>
-<span style="font-style: italic"><span style="color: #9A1900">#---------------------------------------------------------------------------</span></span>
-<span style="color: #009900">GENERATE_LATEX </span><span style="color: #990000">=</span> YES
-<span style="color: #009900">LATEX_CMD_NAME </span><span style="color: #990000">=</span> xelatex
-<span style="color: #009900">PAPER_TYPE </span><span style="color: #990000">=</span> letter
-<span style="color: #009900">HIDE_UNDOC_RELATIONS </span><span style="color: #990000">=</span> NO
-<span style="color: #009900">UML_LOOK </span><span style="color: #990000">=</span> YES
-<span style="color: #009900">EXTRA_PACKAGES </span><span style="color: #990000">=</span>
-<span style="color: #009900">LATEX_HEADER </span><span style="color: #990000">=</span> <span style="color: #009900">$(config_path)</span><span style="color: #990000">/</span>header<span style="color: #990000">.</span>tex
-<span style="color: #009900">LATEX_FOOTER </span><span style="color: #990000">=</span> <span style="color: #009900">$(config_path)</span><span style="color: #990000">/</span>footer<span style="color: #990000">.</span>tex
-
-<span style="font-style: italic"><span style="color: #9A1900">#---------------------------------------------------------------------------</span></span>
-<span style="font-style: italic"><span style="color: #9A1900"># Configuration options related to the dot tool</span></span>
-<span style="font-style: italic"><span style="color: #9A1900">#---------------------------------------------------------------------------</span></span>
-<span style="color: #009900">CALL_GRAPH </span><span style="color: #990000">=</span> YES
-<span style="color: #009900">CALLER_GRAPH </span><span style="color: #990000">=</span> YES</tt></pre></div></div>
+<div class="content"></div></div>
<div class="admonitionblock">
<table><tr>
<td class="icon">
@@ -1033,168 +941,7 @@ http://www.gnu.org/software/src-highlite -->
<div class="paragraph"><p><strong>HTML</strong> output 的css樣式, 我把他改成暗色系了</p></div>
<div class="paragraph"><p>以下是更動的地方:</p></div>
<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 3.1.6
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>body<span style="color: #990000">,</span> table<span style="color: #990000">,</span> div<span style="color: #990000">,</span> p<span style="color: #990000">,</span> dl <span style="color: #FF0000">{</span>
- <span style="color: #0000FF">font:</span> <span style="font-style: italic"><span style="color: #009900">400</span></span> <span style="font-style: italic"><span style="color: #009900">14px</span></span>/<span style="font-style: italic"><span style="color: #009900">19px</span></span> <span style="font-style: italic"><span style="color: #009900">Roboto</span></span>,<span style="font-style: italic"><span style="color: #009900">sans-serif</span></span>,<span style="font-style: italic"><span style="color: #009900">monospace</span></span>;
-<span style="color: #FF0000">}</span>
-
-<span style="color: #993399">.title</span> <span style="color: #FF0000">{</span>
- <span style="color: #0000FF">line-height:</span> <span style="font-style: italic"><span style="color: #009900">100%</span></span>;
- <span style="color: #0000FF">font-size:</span> <span style="font-style: italic"><span style="color: #009900">200%</span></span>;
- <span style="color: #0000FF">margin :</span> <span style="font-style: italic"><span style="color: #009900">0px</span></span>;
- <span style="color: #0000FF">padding:</span> <span style="font-style: italic"><span style="color: #009900">0px</span></span>;
- <span style="color: #0000FF">border :</span> <span style="font-style: italic"><span style="color: #009900">0px</span></span>;
-<span style="color: #FF0000">}</span>
-
-dt <span style="color: #FF0000">{</span>
- <span style="color: #0000FF">color:</span> <span style="color: #FF0000">#999999</span>;
- <span style="color: #0000FF">font-style:</span><span style="font-style: italic"><span style="color: #009900">italic</span></span>;
-<span style="color: #FF0000">}</span>
-
-div<span style="color: #993399">.qindex</span><span style="color: #990000">,</span> div<span style="color: #993399">.navtab</span><span style="color: #FF0000">{</span>
- <span style="color: #0000FF">background-color:</span> <span style="color: #FF0000">#2B3F26</span>;
-<span style="color: #FF0000">}</span>
-
-a <span style="color: #FF0000">{</span>
- <span style="color: #0000FF">color:</span> <span style="color: #FF0000">#5D77AC</span>;
-<span style="color: #FF0000">}</span>
-
-<span style="color: #993399">.contents</span> a<span style="color: #990000">:</span>visited <span style="color: #FF0000">{</span>
- <span style="color: #0000FF">color:</span> <span style="color: #FF0000">#7695D2</span>;
-<span style="color: #FF0000">}</span>
-
-a<span style="color: #993399">.code</span><span style="color: #990000">,</span> a<span style="color: #993399">.code</span><span style="color: #990000">:</span>visited <span style="color: #FF0000">{</span>
- <span style="color: #0000FF">color:</span> <span style="color: #FF0000">#7695D2</span>;
-<span style="color: #FF0000">}</span>
-
-a<span style="color: #993399">.codeRef</span><span style="color: #990000">,</span> a<span style="color: #993399">.codeRef</span><span style="color: #990000">:</span>visited <span style="color: #FF0000">{</span>
- <span style="color: #0000FF">color:</span> <span style="color: #FF0000">#7695D2</span>;
-<span style="color: #FF0000">}</span>
-
-pre<span style="color: #993399">.fragment</span> <span style="color: #FF0000">{</span>
- <span style="color: #0000FF">background-color:</span> <span style="color: #FF0000">#0B0C0D</span>;
- <span style="color: #0000FF">border-radius:</span> <span style="font-style: italic"><span style="color: #009900">4px</span></span>;
- <span style="color: #0000FF">-moz-border-radius:</span> <span style="font-style: italic"><span style="color: #009900">4px</span></span>;
- <span style="color: #0000FF">-webkit-border-top-left-radius:</span> <span style="font-style: italic"><span style="color: #009900">4px</span></span>;
-<span style="color: #FF0000">}</span>
-
-div<span style="color: #993399">.fragment</span> <span style="color: #FF0000">{</span>
- <span style="color: #0000FF">background-color:</span> <span style="color: #FF0000">#0B0C0D</span>;
- <span style="color: #0000FF">border-radius:</span> <span style="font-style: italic"><span style="color: #009900">4px</span></span>;
- <span style="color: #0000FF">-moz-border-radius:</span> <span style="font-style: italic"><span style="color: #009900">4px</span></span>;
- <span style="color: #0000FF">-webkit-border-top-left-radius:</span> <span style="font-style: italic"><span style="color: #009900">4px</span></span>;
-<span style="color: #FF0000">}</span>
-
-div<span style="color: #993399">.line</span> <span style="color: #FF0000">{</span>
- <span style="color: #0000FF">font-family:</span> '<span style="font-style: italic"><span style="color: #009900">courier</span></span> <span style="font-style: italic"><span style="color: #009900">new</span></span>', <span style="font-style: italic"><span style="color: #009900">monospace</span></span>, <span style="font-style: italic"><span style="color: #009900">fixed</span></span>;
- <span style="color: #0000FF">color:</span> <span style="color: #FF0000">#CCCCCC</span>;
- <span style="color: #0000FF">font-size:</span> <span style="font-style: italic"><span style="color: #009900">14px</span></span>;
- <span style="color: #0000FF">min-height:</span> <span style="font-style: italic"><span style="color: #009900">14px</span></span>;
-<span style="color: #FF0000">}</span>
-
-span<span style="color: #993399">.lineno</span> <span style="color: #FF0000">{</span>
- <span style="color: #0000FF">background-color:</span> <span style="color: #FF0000">#181818</span>;
-<span style="color: #FF0000">}</span>
-span<span style="color: #993399">.lineno</span> a <span style="color: #FF0000">{</span>
- <span style="color: #0000FF">background-color:</span> <span style="color: #FF0000">#3B3838</span>;
-<span style="color: #FF0000">}</span>
-
-span<span style="color: #993399">.lineno</span> a<span style="color: #990000">:</span>hover <span style="color: #FF0000">{</span>
- <span style="color: #0000FF">background-color:</span> <span style="color: #FF0000">#6B6868</span>;
-<span style="color: #FF0000">}</span>
-
-body <span style="color: #FF0000">{</span>
- <span style="color: #0000FF">background-color:</span> <span style="color: #FF0000">#212131</span>;
- <span style="color: #0000FF">color:</span> <span style="color: #FF0000">#DDFFDD</span>;
-<span style="color: #FF0000">}</span>
-
-span<span style="color: #993399">.keyword</span> <span style="color: #FF0000">{</span>
- <span style="color: #0000FF">color:</span> <span style="color: #FF0000">#00A000</span>
-<span style="color: #FF0000">}</span>
-
-span<span style="color: #993399">.keywordtype</span> <span style="color: #FF0000">{</span>
- <span style="color: #0000FF">color:</span> <span style="color: #FF0000">#907050</span>
-<span style="color: #FF0000">}</span>
-
-span<span style="color: #993399">.comment</span> <span style="color: #FF0000">{</span>
- <span style="color: #0000FF">color:</span> <span style="color: #FF0000">#808080</span>
-<span style="color: #FF0000">}</span>
-
-table<span style="color: #993399">.memberdecls</span> <span style="color: #FF0000">{</span>
- <span style="color: #0000FF">border-top-color:</span> <span style="color: #FF0000">#111111</span>;
-<span style="color: #FF0000">}</span>
-
-<span style="color: #993399">.memTemplItemLeft</span><span style="color: #990000">,</span> <span style="color: #993399">.memTemplItemRight</span><span style="color: #990000">,</span> <span style="color: #993399">.memTemplParams</span> <span style="color: #FF0000">{</span>
- <span style="color: #0000FF">background-color:</span> <span style="color: #FF0000">#192322</span>;
-<span style="color: #FF0000">}</span>
-
-<span style="color: #993399">.mdescLeft</span><span style="color: #990000">,</span> <span style="color: #993399">.mdescRight</span> <span style="color: #FF0000">{</span>
- <span style="color: #0000FF">color:</span> <span style="color: #FF0000">#CCCCCC</span>;
-<span style="color: #FF0000">}</span>
-
-<span style="color: #993399">.memTemplParams</span> <span style="color: #FF0000">{</span>
- <span style="color: #0000FF">color:</span> <span style="color: #FF0000">#7695D2</span>;
-<span style="color: #FF0000">}</span>
-
-<span style="color: #993399">.memtemplate</span> <span style="color: #FF0000">{</span>
- <span style="color: #0000FF">color:</span> <span style="color: #FF0000">#7695D2</span>;
-<span style="color: #FF0000">}</span>
-
-<span style="color: #993399">.memproto</span><span style="color: #990000">,</span> dl<span style="color: #993399">.reflist</span> dt <span style="color: #FF0000">{</span>
- <span style="color: #0000FF">color:</span> <span style="color: #FF0000">#758575</span>;
- <span style="color: #0000FF">text-shadow:</span> <span style="font-style: italic"><span style="color: #009900">0px</span></span> <span style="font-style: italic"><span style="color: #009900">1px</span></span> <span style="font-style: italic"><span style="color: #009900">1px</span></span> <span style="font-style: italic"><span style="color: #009900">rgba</span></span>(<span style="font-style: italic"><span style="color: #009900">0</span></span>, <span style="font-style: italic"><span style="color: #009900">0</span></span>, <span style="font-style: italic"><span style="color: #009900">0</span></span>, <span style="font-style: italic"><span style="color: #009900">0.95</span></span>);
- <span style="font-style: italic"><span style="color: #9A1900">/* background-image:url('nav_f.png'); */</span></span>
- <span style="color: #0000FF">background-color:</span> <span style="color: #FF0000">#181C28</span>;
-<span style="color: #FF0000">}</span>
-
-<span style="color: #993399">.memdoc</span><span style="color: #990000">,</span> dl<span style="color: #993399">.reflist</span> dd <span style="color: #FF0000">{</span>
- <span style="font-style: italic"><span style="color: #9A1900">/* background-image:url('nav_g.png'); */</span></span>
- <span style="color: #0000FF">background-color:</span> <span style="color: #FF0000">#131923</span>;
-<span style="color: #FF0000">}</span>
-
-<span style="color: #993399">.params</span> <span style="color: #993399">.paramdir</span> <span style="color: #FF0000">{</span>
- <span style="color: #0000FF">color:</span><span style="color: #FF0000">#A0AA00</span>;
-<span style="color: #FF0000">}</span>
-
-<span style="color: #993399">.directory</span> tr<span style="color: #993399">.even</span> <span style="color: #FF0000">{</span>
- <span style="color: #0000FF">background-color:</span> <span style="color: #FF0000">#272838</span>;
-<span style="color: #FF0000">}</span>
-
-<span style="color: #993399">.directory</span> <span style="color: #993399">.levels</span> span <span style="color: #FF0000">{</span>
- <span style="color: #0000FF">color:</span> <span style="color: #FF0000">#5D77AC</span>;
-<span style="color: #FF0000">}</span>
-
-div<span style="color: #993399">.header</span>
-<span style="color: #FF0000">{</span>
- <span style="font-style: italic"><span style="color: #9A1900">/* background-image:url('nav_h.png'); */</span></span>
- <span style="font-style: italic"><span style="color: #9A1900">/* background-repeat:repeat-x; */</span></span>
- <span style="color: #0000FF">background-color:</span> <span style="color: #FF0000">#290A1C</span>;
- <span style="color: #0000FF">padding:</span> <span style="font-style: italic"><span style="color: #009900">0px</span></span>;
- <span style="color: #0000FF">margin :</span> <span style="font-style: italic"><span style="color: #009900">0px</span></span>;
- <span style="color: #0000FF">border :</span> <span style="font-style: italic"><span style="color: #009900">0px</span></span>;
- <span style="color: #0000FF">margin-top:</span> <span style="font-style: italic"><span style="color: #009900">10px</span></span>;
- <span style="color: #0000FF">border-bottom:</span> <span style="font-style: italic"><span style="color: #009900">1px</span></span> <span style="font-style: italic"><span style="color: #009900">solid</span></span> <span style="color: #FF0000">#AA0000</span>;<span style="font-style: italic"><span style="color: #9A1900">/*#C4CFE5;*/</span></span>
-<span style="color: #FF0000">}</span>
-
-div<span style="color: #993399">.headertitle</span>
-<span style="color: #FF0000">{</span>
- <span style="color: #0000FF">padding:</span> <span style="font-style: italic"><span style="color: #009900">5px</span></span>;
- <span style="color: #0000FF">margin :</span> <span style="font-style: italic"><span style="color: #009900">0px</span></span>;
- <span style="color: #0000FF">border :</span> <span style="font-style: italic"><span style="color: #009900">0px</span></span>;
-<span style="color: #FF0000">}</span>
-
-<span style="color: #993399">#projectname</span>
-<span style="color: #FF0000">{</span>
- <span style="color: #0000FF">font:</span> <span style="font-style: italic"><span style="color: #009900">400%</span></span> <span style="font-style: italic"><span style="color: #009900">Tahoma</span></span>, <span style="font-style: italic"><span style="color: #009900">Arial</span></span>,<span style="font-style: italic"><span style="color: #009900">sans-serif</span></span>,<span style="font-style: italic"><span style="color: #009900">monospace</span></span>;
-<span style="color: #FF0000">}</span>
-
-div<span style="color: #993399">.toc</span> h3 <span style="color: #FF0000">{</span>
- <span style="color: #0000FF">color:</span> <span style="color: #FF0000">#7695D2</span>;
-<span style="color: #FF0000">}</span>
-</tt></pre></div></div>
+<div class="content"></div></div>
</div>
<div class="sect4">
<h5 id="_custom_css">custom.css</h5>
@@ -1872,7 +1619,7 @@ GitHub
<div id="footnotes"><hr></div>
<div id="footer">
<div id="footer-text">
-Last updated 2014-06-05 15:02:19 CST
+Last updated 2014-06-23 17:42:26 CST
</div>
</div>
</body>
diff --git a/asciidoc/example.txt b/asciidoc/example.txt
index 9fe787e..964449e 100644
--- a/asciidoc/example.txt
+++ b/asciidoc/example.txt
@@ -52,10 +52,10 @@ dla
[options="header",width="70%",cols="1<,2^,1>",grid="rows"]
|================================
-| header1 | header2 | header3
-| (0, 0) | (0, 1) | (0, 2)
-| (1, 0) | (1, 1) | (1, 2)
-| (2, 0) | (2, 1) | (2, 2)
+| header1 | header2 | header3
+| (0, 0) | (0, 1) | (0, 2)
+| (1, 0) | (1, 1) | (1, 2)
+| (2, 0) | (2, 1) | (2, 2)
|================================
[NOTE]
diff --git a/cppMakefile/!readme.asciidoc b/cppMakefile/!readme.asciidoc
index da89fc4..350430f 100644
--- a/cppMakefile/!readme.asciidoc
+++ b/cppMakefile/!readme.asciidoc
@@ -25,7 +25,7 @@
關於 'OBJS=' 與 'LIBS=' 參考下面說明
* `make add NAME=<name> [OBJS=<OBJ_FILES> LIBS=<LIBRARIES>]` +
-針對target為 '<name>' 的目標新增需要的 '<OBJ_FILES>' , 與 '<LIBRARIES>'.
+針對target為 '<name>' 的目標新增需要的 '<OBJ_FILES>' , 與 '<LIBRARIES>'.
'<LIBRARIES>' 的部份會用 `pkg-config` 去解讀, 例如 '<LIBRARIES>' 為
'opencv lapackpp' 則link時會被以下指令展開 +
`pkg-config --libs opencv lapackpp` +
diff --git a/cppMakefile/GNUmakefile b/cppMakefile/GNUmakefile
index 839be8e..4031623 100644
--- a/cppMakefile/GNUmakefile
+++ b/cppMakefile/GNUmakefile
@@ -4,7 +4,7 @@ OBJ := obj
BIN := bin
DEP := dep
-LIB_INCS :=
+LIB_INCS :=
CXX := g++
CXXFLAGS := -Wall -O2 -I$(INC) $(LIB_INCS) -g -pedantic -lstdc++ -lm
CXX_OBJ := $(CXX) -c
@@ -16,7 +16,7 @@ OBJECTS := $(patsubst $(SRC)/%.cpp,$(OBJ)/%.o,$(wildcard $(SRC)/*.cpp))
DEPENDENCYS := $(patsubst $(SRC)/%.cpp,$(DEP)/%.d,$(wildcard $(SRC)/*.cpp))
TARGET_FILE := GNUmakefile.targets
-TARGETS :=
+TARGETS :=
NAME := empty
diff --git a/cppMakefile/GNUmakefile.dependency.sh b/cppMakefile/GNUmakefile.dependency.sh
index 0d2b65a..0d2b65a 100755..100644
--- a/cppMakefile/GNUmakefile.dependency.sh
+++ b/cppMakefile/GNUmakefile.dependency.sh
diff --git a/doxygen/!readme.asciidoc b/doxygen/!readme.asciidoc
index 71b0975..7d12206 100644
--- a/doxygen/!readme.asciidoc
+++ b/doxygen/!readme.asciidoc
@@ -142,11 +142,11 @@ a {
}
a.code, a.code:visited {
- color: #7695D2;
+ color: #7695D2;
}
a.codeRef, a.codeRef:visited {
- color: #7695D2;
+ color: #7695D2;
}
pre.fragment {
@@ -274,7 +274,7 @@ div.headertitle
margin : 0px;
border : 0px;
}
-
+
#projectname
{
font: 400% Tahoma, Arial,sans-serif,monospace;
diff --git a/doxygen/custom.css b/doxygen/custom.css
index 3d18656..c69dffa 100644
--- a/doxygen/custom.css
+++ b/doxygen/custom.css
@@ -68,7 +68,7 @@
#nav-tree {
padding: 0px 0px;
- background-color: #2A2A2F;
+ background-color: #2A2A2F;
font-size:14px;
overflow:auto;
background-image:url('nav_h.png');
diff --git a/doxygen/stylesheet.css b/doxygen/stylesheet.css
index 0a627d7..b54730d 100644
--- a/doxygen/stylesheet.css
+++ b/doxygen/stylesheet.css
@@ -146,11 +146,11 @@ a.elRef {
}
a.code, a.code:visited {
- color: #7695D2;
+ color: #7695D2;
}
a.codeRef, a.codeRef:visited {
- color: #7695D2;
+ color: #7695D2;
}
/* @end */
@@ -364,20 +364,20 @@ span.charliteral {
color: #008080
}
-span.vhdldigit {
- color: #ff00ff
+span.vhdldigit {
+ color: #ff00ff
}
-span.vhdlchar {
- color: #000000
+span.vhdlchar {
+ color: #000000
}
-span.vhdlkeyword {
- color: #700070
+span.vhdlkeyword {
+ color: #700070
}
-span.vhdllogic {
- color: #ff0000
+span.vhdllogic {
+ color: #ff0000
}
blockquote {
@@ -573,9 +573,9 @@ table.memberdecls {
}
.memdoc, dl.reflist dd {
- border-bottom: 1px solid #A8B8D9;
- border-left: 1px solid #A8B8D9;
- border-right: 1px solid #A8B8D9;
+ border-bottom: 1px solid #A8B8D9;
+ border-left: 1px solid #A8B8D9;
+ border-right: 1px solid #A8B8D9;
padding: 6px 10px 2px 10px;
/* background-color: #FBFCFD; */
border-top-width: 0;
@@ -627,7 +627,7 @@ dl.reflist dd {
.params, .retval, .exception, .tparams {
margin-left: 0px;
padding-left: 0px;
-}
+}
.params .paramname, .retval .paramname {
font-weight: bold;
@@ -637,7 +637,7 @@ dl.reflist dd {
.params .paramtype {
font-style: italic;
vertical-align: top;
-}
+}
.params .paramdir {
font-family: "courier new",courier,monospace;
@@ -816,7 +816,7 @@ table.fieldtable {
.fieldtable td.fielddoc p:first-child {
margin-top: 2px;
-}
+}
.fieldtable td.fielddoc p:last-child {
margin-bottom: 2px;
@@ -920,7 +920,7 @@ div.summary
padding-right: 5px;
width: 50%;
text-align: right;
-}
+}
div.summary a
{
@@ -1037,19 +1037,19 @@ dl.section dd {
vertical-align: bottom;
border-collapse: separate;
}
-
+
#projectlogo img
-{
+{
border: 0px none;
}
-
+
#projectname
{
font: 400% Tahoma, Arial,sans-serif,monospace;
margin: 0px;
padding: 2px 0px;
}
-
+
#projectbrief
{
font: 120% Tahoma, Arial,sans-serif;
@@ -1149,7 +1149,7 @@ div.toc ul {
list-style: none outside none;
border: medium none;
padding: 0px;
-}
+}
div.toc li.level1 {
margin-left: 0px;
diff --git a/doxygen/test b/doxygen/test
new file mode 100644
index 0000000..79d0142
--- /dev/null
+++ b/doxygen/test
Binary files differ
diff --git a/meowpp.test/GNUmakefile.dependency.sh b/meowpp.test/GNUmakefile.dependency.sh
index 0d2b65a..0d2b65a 100755..100644
--- a/meowpp.test/GNUmakefile.dependency.sh
+++ b/meowpp.test/GNUmakefile.dependency.sh
diff --git a/meowpp.test/GNUmakefile.targets b/meowpp.test/GNUmakefile.targets
index 35486b6..5671807 100644
--- a/meowpp.test/GNUmakefile.targets
+++ b/meowpp.test/GNUmakefile.targets
@@ -27,3 +27,10 @@ $(BIN)/rot_bundle: $(OBJ)/rot_bundle.o $(rot_bundle_OBJS)
@echo Target: $@...
@$(CXX) $^ $(CXXFLAGS) `pkg-config --cflags --libs $(rot_bundle_LIBS) 2>/dev/null` -o $@
+TARGETS := $(TARGETS) $(BIN)/features
+features_OBJS :=
+features_LIBS := opencv
+$(BIN)/features: $(OBJ)/features.o $(features_OBJS)
+ @echo Target: $@...
+ @$(CXX) $^ $(CXXFLAGS) `pkg-config --cflags --libs $(features_LIBS) 2>/dev/null` -o $@
+
diff --git a/meowpp.test/inc/autostitch.h b/meowpp.test/inc/autostitch.h
index 469889f..68df9c9 100644
--- a/meowpp.test/inc/autostitch.h
+++ b/meowpp.test/inc/autostitch.h
@@ -51,20 +51,24 @@ private:
std::vector<meow::Vector<double> > const* _from;
std::vector<meow::Vector<double> > const* _to ;
double a_, b_, c_, d_, e_, f_, A_, B_;
+ double _w, _h;
+ double r_, ang;
public:
static meow::Usage usage();
static bool usage(meow::Usage const& usg);
MyRansacCheck();
MyRansacCheck(MyRansacCheck const& __rc);
MyRansacCheck(std::vector<meow::Vector<double> > const* __from,
- std::vector<meow::Vector<double> > const* __to);
+ std::vector<meow::Vector<double> > const* __to,
+ double, double, double, double);
~MyRansacCheck();
meow::Vector<double> vCalc(std::vector<meow::FeaturePointIndexPair> const& __sample) const;
void rememberVCalc(std::vector<meow::FeaturePointIndexPair> const& __sample);
bool ok(meow::FeaturePointIndexPair const& __m) const;
double operator()(std::vector<meow::FeaturePointIndexPair> const& __sample,
std::vector<meow::FeaturePointIndexPair> const& __data) const;
- bool check(double, double);
+ bool check();
+ void print() const;
meow::Vector2D<double> to(meow::Vector2D<double> const& __v) const;
};
diff --git a/meowpp.test/points.txt b/meowpp.test/points.txt
index a51f6ac..a3d8002 100644
--- a/meowpp.test/points.txt
+++ b/meowpp.test/points.txt
@@ -2,7 +2,7 @@
input/parrington/prtn16.jpg
512 384 86 10.0000000000 13.0000000000 230.0000000000 14.0000000000 87.0000000000 16.0000000000 73.0000000000 25.0000000000 88.0000000000 39.0000000000 111.0000000000 43.0000000000 122.0000000000 43.0000000000 10.0000000000 47.0000000000 95.0000000000 49.0000000000 169.0000000000 56.0000000000 96.0000000000 58.0000000000 266.0000000000 62.0000000000 11.0000000000 63.0000000000 293.0000000000 67.0000000000 59.0000000000 70.0000000000 249.0000000000 78.0000000000 123.0000000000 80.0000000000 338.0000000000 80.0000000000 128.0000000000 92.0000000000 373.0000000000 92.0000000000 189.0000000000 100.0000000000 357.0000000000 103.0000000000 97.0000000000 113.0000000000 62.0000000000 114.0000000000 303.0000000000 118.0000000000 47.0000000000 121.0000000000 121.0000000000 123.0000000000 68.0000000000 129.0000000000 334.0000000000 136.0000000000 175.0000000000 144.0000000000 316.0000000000 145.0000000000 166.0000000000 155.0000000000 199.0000000000 155.0000000000 213.0000000000 166.0000000000 132.0000000000 168.0000000000 306.0000000000 168.0000000000 145.0000000000 174.0000000000 221.0000000000 185.0000000000 133.0000000000 189.0000000000 67.0000000000 192.0000000000 236.0000000000 192.0000000000 363.0000000000 194.0000000000 294.0000000000 197.0000000000 318.0000000000 198.0000000000 372.0000000000 200.0000000000 149.0000000000 204.0000000000 303.0000000000 205.0000000000 312.0000000000 206.0000000000 15.0000000000 211.0000000000 311.0000000000 212.0000000000 162.0000000000 217.0000000000 366.0000000000 217.0000000000 221.0000000000 220.0000000000 123.0000000000 222.0000000000 286.0000000000 223.0000000000 292.0000000000 232.0000000000 260.0000000000 234.0000000000 301.0000000000 236.0000000000 329.0000000000 241.0000000000 60.0000000000 243.0000000000 223.0000000000 246.0000000000 168.0000000000 247.0000000000 211.0000000000 248.0000000000 62.0000000000 252.0000000000 198.0000000000 252.0000000000 360.0000000000 253.0000000000 146.0000000000 256.0000000000 235.0000000000 256.0000000000 47.0000000000 259.0000000000 157.0000000000 261.0000000000 365.0000000000 281.0000000000 147.0000000000 284.0000000000 158.0000000000 296.0000000000 147.0000000000 297.0000000000 115.0000000000 299.0000000000 366.0000000000 301.0000000000 15.0000000000 303.0000000000 31.0000000000 305.0000000000 314.0000000000 305.0000000000 132.0000000000 307.0000000000 158.0000000000 309.0000000000 173.0000000000 309.0000000000 319.0000000000 309.0000000000 334.0000000000 318.0000000000 149.0000000000 320.0000000000 307.0000000000 325.0000000000
0
-15 0 17 1 22 0 51 1 65 0 56 1 74 0 11 1 13 0 13 1 15 0 21 1 27 0 24 1 31 0 28 1 38 0 46 1 62 0 54 1 69 0 55 1 73 0 57 1 76 0 65 1 85 0 75 1 97 0 83 1 105
+15 0 56 1 74 0 11 1 13 0 75 1 97 0 54 1 69 0 13 1 15 0 17 1 22 0 21 1 27 0 24 1 31 0 28 1 38 0 46 1 62 0 51 1 65 0 55 1 73 0 57 1 76 0 65 1 85 0 83 1 105
0
0
0
@@ -18,12 +18,12 @@ input/parrington/prtn16.jpg
0
0
0
-11 0 77 17 48 0 14 17 23 0 59 17 41 0 5 17 13 0 8 17 17 0 22 17 28 0 23 17 29 0 27 17 32 0 39 17 39 0 68 17 45 0 76 17 47
+11 0 14 17 23 0 77 17 48 0 59 17 41 0 22 17 28 0 5 17 13 0 8 17 17 0 23 17 29 0 27 17 32 0 39 17 39 0 68 17 45 0 76 17 47
input/parrington/prtn15.jpg
512 384 109 240.0000000000 11.0000000000 269.0000000000 12.0000000000 225.0000000000 13.0000000000 18.0000000000 14.0000000000 213.0000000000 14.0000000000 254.0000000000 17.0000000000 288.0000000000 20.0000000000 317.0000000000 27.0000000000 245.0000000000 29.0000000000 356.0000000000 35.0000000000 193.0000000000 38.0000000000 249.0000000000 43.0000000000 333.0000000000 49.0000000000 22.0000000000 54.0000000000 140.0000000000 56.0000000000 48.0000000000 62.0000000000 373.0000000000 63.0000000000 318.0000000000 64.0000000000 237.0000000000 69.0000000000 369.0000000000 75.0000000000 14.0000000000 76.0000000000 199.0000000000 76.0000000000 94.0000000000 77.0000000000 138.0000000000 93.0000000000 263.0000000000 94.0000000000 274.0000000000 95.0000000000 248.0000000000 100.0000000000 112.0000000000 102.0000000000 196.0000000000 105.0000000000 163.0000000000 107.0000000000 176.0000000000 108.0000000000 59.0000000000 114.0000000000 147.0000000000 115.0000000000 212.0000000000 115.0000000000 200.0000000000 123.0000000000 163.0000000000 125.0000000000 195.0000000000 125.0000000000 363.0000000000 129.0000000000 89.0000000000 132.0000000000 152.0000000000 132.0000000000 241.0000000000 134.0000000000 331.0000000000 134.0000000000 74.0000000000 138.0000000000 75.0000000000 148.0000000000 239.0000000000 151.0000000000 204.0000000000 152.0000000000 260.0000000000 153.0000000000 57.0000000000 155.0000000000 233.0000000000 159.0000000000 223.0000000000 170.0000000000 232.0000000000 171.0000000000 184.0000000000 173.0000000000 281.0000000000 176.0000000000 256.0000000000 186.0000000000 318.0000000000 190.0000000000 356.0000000000 191.0000000000 235.0000000000 192.0000000000 182.0000000000 193.0000000000 373.0000000000 194.0000000000 149.0000000000 198.0000000000 159.0000000000 199.0000000000 337.0000000000 200.0000000000 57.0000000000 201.0000000000 175.0000000000 205.0000000000 68.0000000000 208.0000000000 119.0000000000 213.0000000000 293.0000000000 213.0000000000 345.0000000000 215.0000000000 130.0000000000 216.0000000000 40.0000000000 217.0000000000 81.0000000000 221.0000000000 220.0000000000 222.0000000000 239.0000000000 225.0000000000 45.0000000000 227.0000000000 13.0000000000 228.0000000000 211.0000000000 231.0000000000 55.0000000000 232.0000000000 137.0000000000 233.0000000000 214.0000000000 235.0000000000 138.0000000000 239.0000000000 254.0000000000 241.0000000000 302.0000000000 243.0000000000 373.0000000000 243.0000000000 288.0000000000 245.0000000000 168.0000000000 248.0000000000 112.0000000000 249.0000000000 146.0000000000 249.0000000000 160.0000000000 251.0000000000 198.0000000000 254.0000000000 231.0000000000 256.0000000000 288.0000000000 269.0000000000 278.0000000000 272.0000000000 146.0000000000 275.0000000000 118.0000000000 277.0000000000 373.0000000000 277.0000000000 292.0000000000 287.0000000000 313.0000000000 289.0000000000 119.0000000000 296.0000000000 289.0000000000 296.0000000000 249.0000000000 298.0000000000 227.0000000000 299.0000000000 225.0000000000 308.0000000000 311.0000000000 310.0000000000 330.0000000000 310.0000000000 342.0000000000 311.0000000000 87.0000000000 313.0000000000 180.0000000000 317.0000000000 153.0000000000 318.0000000000 60.0000000000 321.0000000000
-15 1 65 0 51 1 13 0 11 1 74 0 56 1 22 0 17 1 15 0 13 1 27 0 21 1 31 0 24 1 38 0 28 1 62 0 46 1 69 0 54 1 73 0 55 1 76 0 57 1 85 0 65 1 93 0 70 1 105 0 83
+15 1 74 0 56 1 69 0 54 1 105 0 83 1 13 0 11 1 15 0 13 1 22 0 17 1 27 0 21 1 31 0 24 1 38 0 28 1 62 0 46 1 65 0 51 1 73 0 55 1 76 0 57 1 85 0 65 1 93 0 70
0
-16 1 9 2 1 1 6 2 0 1 98 2 108 1 104 2 118 1 12 2 2 1 37 2 27 1 41 2 31 1 46 2 43 1 52 2 57 1 54 2 64 1 55 2 66 1 66 2 79 1 83 2 91 1 90 2 101 1 96 2 105 1 102 2 117
+16 1 55 2 66 1 90 2 101 1 6 2 0 1 9 2 1 1 12 2 2 1 37 2 27 1 41 2 31 1 46 2 43 1 52 2 57 1 54 2 64 1 66 2 79 1 83 2 91 1 96 2 105 1 98 2 108 1 102 2 117 1 104 2 118
0
0
0
@@ -42,9 +42,9 @@ input/parrington/prtn15.jpg
input/parrington/prtn14.jpg
512 384 122 43.0000000000 13.0000000000 110.0000000000 34.0000000000 88.0000000000 47.0000000000 31.0000000000 48.0000000000 273.0000000000 55.0000000000 218.0000000000 59.0000000000 22.0000000000 66.0000000000 35.0000000000 67.0000000000 129.0000000000 67.0000000000 278.0000000000 69.0000000000 180.0000000000 71.0000000000 121.0000000000 74.0000000000 323.0000000000 75.0000000000 338.0000000000 76.0000000000 136.0000000000 78.0000000000 368.0000000000 80.0000000000 194.0000000000 88.0000000000 285.0000000000 89.0000000000 355.0000000000 96.0000000000 140.0000000000 98.0000000000 151.0000000000 100.0000000000 323.0000000000 103.0000000000 195.0000000000 107.0000000000 277.0000000000 109.0000000000 204.0000000000 111.0000000000 317.0000000000 113.0000000000 150.0000000000 118.0000000000 114.0000000000 126.0000000000 158.0000000000 126.0000000000 235.0000000000 126.0000000000 316.0000000000 128.0000000000 84.0000000000 131.0000000000 249.0000000000 134.0000000000 320.0000000000 135.0000000000 371.0000000000 135.0000000000 188.0000000000 136.0000000000 238.0000000000 136.0000000000 255.0000000000 137.0000000000 190.0000000000 139.0000000000 212.0000000000 139.0000000000 202.0000000000 141.0000000000 154.0000000000 144.0000000000 345.0000000000 144.0000000000 11.0000000000 146.0000000000 162.0000000000 148.0000000000 372.0000000000 148.0000000000 266.0000000000 149.0000000000 322.0000000000 150.0000000000 202.0000000000 152.0000000000 48.0000000000 154.0000000000 308.0000000000 154.0000000000 319.0000000000 155.0000000000 207.0000000000 163.0000000000 164.0000000000 164.0000000000 214.0000000000 167.0000000000 181.0000000000 170.0000000000 285.0000000000 170.0000000000 33.0000000000 171.0000000000 313.0000000000 172.0000000000 155.0000000000 176.0000000000 264.0000000000 180.0000000000 192.0000000000 182.0000000000 157.0000000000 183.0000000000 267.0000000000 185.0000000000 69.0000000000 186.0000000000 10.0000000000 188.0000000000 107.0000000000 188.0000000000 137.0000000000 188.0000000000 168.0000000000 188.0000000000 213.0000000000 190.0000000000 87.0000000000 191.0000000000 127.0000000000 191.0000000000 224.0000000000 192.0000000000 58.0000000000 196.0000000000 150.0000000000 197.0000000000 203.0000000000 197.0000000000 169.0000000000 203.0000000000 218.0000000000 207.0000000000 54.0000000000 208.0000000000 44.0000000000 209.0000000000 287.0000000000 209.0000000000 288.0000000000 223.0000000000 200.0000000000 224.0000000000 158.0000000000 225.0000000000 181.0000000000 229.0000000000 249.0000000000 229.0000000000 17.0000000000 236.0000000000 204.0000000000 237.0000000000 124.0000000000 240.0000000000 359.0000000000 240.0000000000 373.0000000000 240.0000000000 39.0000000000 241.0000000000 158.0000000000 241.0000000000 28.0000000000 244.0000000000 48.0000000000 244.0000000000 129.0000000000 254.0000000000 142.0000000000 257.0000000000 317.0000000000 257.0000000000 154.0000000000 258.0000000000 292.0000000000 261.0000000000 361.0000000000 262.0000000000 39.0000000000 265.0000000000 207.0000000000 276.0000000000 146.0000000000 278.0000000000 41.0000000000 284.0000000000 64.0000000000 284.0000000000 197.0000000000 288.0000000000 345.0000000000 290.0000000000 39.0000000000 292.0000000000 233.0000000000 293.0000000000 330.0000000000 293.0000000000 356.0000000000 294.0000000000 355.0000000000 295.0000000000 224.0000000000 296.0000000000 219.0000000000 300.0000000000 201.0000000000 302.0000000000 164.0000000000 304.0000000000 62.0000000000 306.0000000000 92.0000000000 306.0000000000 134.0000000000 307.0000000000 154.0000000000 307.0000000000 172.0000000000 307.0000000000
0
-14 2 27 1 37 2 118 1 104 2 0 1 6 2 91 1 83 2 1 1 9 2 2 1 12 2 43 1 46 2 57 1 52 2 66 1 55 2 79 1 66 2 101 1 90 2 105 1 96 2 108 1 98 2 117 1 102
+14 2 0 1 6 2 105 1 96 2 66 1 55 2 118 1 104 2 1 1 9 2 2 1 12 2 27 1 37 2 43 1 46 2 57 1 52 2 79 1 66 2 91 1 83 2 101 1 90 2 108 1 98 2 117 1 102
0
-22 2 81 3 58 2 4 3 8 2 89 3 61 2 21 3 22 2 9 3 12 2 13 3 14 2 17 3 17 2 18 3 21 2 23 3 23 2 25 3 24 2 30 3 28 2 42 3 35 2 47 3 38 2 50 3 39 2 56 3 42 2 58 3 44 2 60 3 46 2 63 3 49 2 80 3 54 2 99 3 69 2 107 3 76 2 110 3 79
+22 2 50 3 39 2 63 3 49 2 110 3 79 2 23 3 23 2 4 3 8 2 9 3 12 2 13 3 14 2 17 3 17 2 18 3 21 2 21 3 22 2 25 3 24 2 30 3 28 2 42 3 35 2 47 3 38 2 56 3 42 2 58 3 44 2 60 3 46 2 80 3 54 2 81 3 58 2 89 3 61 2 99 3 69 2 107 3 76
0
0
0
@@ -63,9 +63,9 @@ input/parrington/prtn13.jpg
512 384 85 265.0000000000 10.0000000000 336.0000000000 19.0000000000 274.0000000000 27.0000000000 336.0000000000 34.0000000000 75.0000000000 35.0000000000 349.0000000000 45.0000000000 298.0000000000 46.0000000000 337.0000000000 47.0000000000 21.0000000000 48.0000000000 320.0000000000 50.0000000000 368.0000000000 55.0000000000 337.0000000000 60.0000000000 27.0000000000 63.0000000000 368.0000000000 70.0000000000 87.0000000000 73.0000000000 292.0000000000 76.0000000000 317.0000000000 78.0000000000 33.0000000000 82.0000000000 353.0000000000 83.0000000000 67.0000000000 84.0000000000 336.0000000000 92.0000000000 102.0000000000 94.0000000000 71.0000000000 99.0000000000 24.0000000000 102.0000000000 64.0000000000 108.0000000000 10.0000000000 110.0000000000 270.0000000000 110.0000000000 350.0000000000 119.0000000000 63.0000000000 123.0000000000 122.0000000000 126.0000000000 337.0000000000 129.0000000000 324.0000000000 130.0000000000 118.0000000000 133.0000000000 127.0000000000 135.0000000000 49.0000000000 139.0000000000 92.0000000000 141.0000000000 118.0000000000 145.0000000000 232.0000000000 145.0000000000 69.0000000000 146.0000000000 55.0000000000 149.0000000000 16.0000000000 157.0000000000 293.0000000000 163.0000000000 33.0000000000 164.0000000000 66.0000000000 165.0000000000 60.0000000000 168.0000000000 270.0000000000 168.0000000000 10.0000000000 173.0000000000 268.0000000000 173.0000000000 175.0000000000 175.0000000000 13.0000000000 179.0000000000 185.0000000000 184.0000000000 350.0000000000 193.0000000000 334.0000000000 201.0000000000 219.0000000000 203.0000000000 32.0000000000 205.0000000000 177.0000000000 205.0000000000 273.0000000000 209.0000000000 261.0000000000 216.0000000000 34.0000000000 218.0000000000 184.0000000000 227.0000000000 210.0000000000 231.0000000000 105.0000000000 236.0000000000 118.0000000000 236.0000000000 198.0000000000 239.0000000000 334.0000000000 243.0000000000 257.0000000000 246.0000000000 62.0000000000 252.0000000000 351.0000000000 252.0000000000 368.0000000000 254.0000000000 37.0000000000 256.0000000000 202.0000000000 261.0000000000 214.0000000000 262.0000000000 75.0000000000 263.0000000000 35.0000000000 265.0000000000 226.0000000000 267.0000000000 305.0000000000 280.0000000000 91.0000000000 285.0000000000 293.0000000000 286.0000000000 120.0000000000 288.0000000000 76.0000000000 290.0000000000 190.0000000000 290.0000000000 338.0000000000 321.0000000000 332.0000000000 330.0000000000 351.0000000000 362.0000000000 336.0000000000 363.0000000000
0
0
-21 3 17 2 17 3 22 2 21 3 46 2 60 3 79 2 110 3 8 2 4 3 12 2 9 3 14 2 13 3 21 2 18 3 23 2 23 3 24 2 25 3 28 2 30 3 35 2 42 3 38 2 47 3 39 2 50 3 42 2 56 3 54 2 80 3 58 2 81 3 61 2 89 3 66 2 97 3 69 2 99 3 76 2 107
+21 3 46 2 60 3 17 2 17 3 61 2 89 3 35 2 42 3 8 2 4 3 12 2 9 3 14 2 13 3 21 2 18 3 22 2 21 3 23 2 23 3 24 2 25 3 28 2 30 3 38 2 47 3 39 2 50 3 42 2 56 3 54 2 80 3 58 2 81 3 66 2 97 3 69 2 99 3 76 2 107 3 79 2 110
0
-23 3 81 4 75 3 3 4 10 3 6 4 13 3 82 4 76 3 1 4 4 3 5 4 15 3 7 4 16 3 9 4 18 3 15 4 23 3 16 4 25 3 20 4 33 3 26 4 36 3 27 4 40 3 31 4 44 3 41 4 53 3 47 4 56 3 52 4 59 3 57 4 62 3 65 4 67 3 67 4 69 3 77 4 74 3 83 4 77 3 84 4 78
+23 3 3 4 10 3 26 4 36 3 82 4 76 3 65 4 67 3 1 4 4 3 5 4 15 3 6 4 13 3 7 4 16 3 9 4 18 3 15 4 23 3 16 4 25 3 20 4 33 3 27 4 40 3 31 4 44 3 41 4 53 3 47 4 56 3 52 4 59 3 57 4 62 3 67 4 69 3 77 4 74 3 81 4 75 3 83 4 77 3 84 4 78
0
0
0
@@ -84,9 +84,9 @@ input/parrington/prtn12.jpg
0
0
0
-22 4 75 3 81 4 74 3 77 4 23 3 15 4 15 3 5 4 4 3 1 4 10 3 3 4 13 3 6 4 16 3 7 4 18 3 9 4 25 3 16 4 33 3 20 4 36 3 26 4 44 3 31 4 53 3 41 4 56 3 47 4 59 3 52 4 62 3 57 4 67 3 65 4 69 3 67 4 76 3 82 4 77 3 83 4 78 3 84
-0
+22 4 15 3 5 4 62 3 57 4 76 3 82 4 23 3 15 4 4 3 1 4 10 3 3 4 13 3 6 4 16 3 7 4 18 3 9 4 25 3 16 4 33 3 20 4 36 3 26 4 44 3 31 4 53 3 41 4 56 3 47 4 59 3 52 4 67 3 65 4 69 3 67 4 74 3 77 4 75 3 81 4 77 3 83 4 78 3 84
0
+7 4 37 5 43 4 43 5 50 4 28 5 31 4 64 5 86 4 24 5 26 4 39 5 47 4 58 5 78
0
0
0
@@ -105,9 +105,9 @@ input/parrington/prtn11.jpg
0
0
0
-9 5 86 4 64 5 60 4 52 5 31 4 28 5 26 4 24 5 43 4 37 5 47 4 39 5 50 4 43 5 66 4 54 5 78 4 58
+9 5 66 4 54 5 43 4 37 5 31 4 28 5 60 4 52 5 26 4 24 5 47 4 39 5 50 4 43 5 78 4 58 5 86 4 64
0
-24 5 10 6 8 5 37 6 46 5 58 6 73 5 61 6 76 5 13 6 9 5 14 6 11 5 15 6 12 5 19 6 20 5 28 6 36 5 30 6 39 5 33 6 43 5 34 6 42 5 35 6 44 5 36 6 45 5 40 6 48 5 45 6 56 5 46 6 59 5 52 6 66 5 53 6 65 5 57 6 75 5 62 6 79 5 75 6 88 5 82 6 94 5 83 6 99
+24 5 10 6 8 5 82 6 94 5 36 6 45 5 75 6 88 5 13 6 9 5 14 6 11 5 15 6 12 5 19 6 20 5 28 6 36 5 30 6 39 5 33 6 43 5 34 6 42 5 35 6 44 5 37 6 46 5 40 6 48 5 45 6 56 5 46 6 59 5 52 6 66 5 53 6 65 5 57 6 75 5 58 6 73 5 61 6 76 5 62 6 79 5 83 6 99
0
0
0
@@ -126,9 +126,9 @@ input/parrington/prtn10.jpg
0
0
0
-24 6 11 5 14 6 73 5 58 6 99 5 83 6 12 5 15 6 8 5 10 6 9 5 13 6 20 5 19 6 34 5 27 6 36 5 28 6 39 5 30 6 42 5 34 6 43 5 33 6 44 5 35 6 45 5 36 6 46 5 37 6 48 5 40 6 56 5 45 6 59 5 46 6 65 5 53 6 66 5 52 6 75 5 57 6 76 5 61 6 79 5 62 6 88 5 75
+25 6 20 5 19 6 46 5 37 6 34 5 27 6 76 5 61 6 8 5 10 6 9 5 13 6 11 5 14 6 12 5 15 6 36 5 28 6 39 5 30 6 42 5 34 6 43 5 33 6 44 5 35 6 45 5 36 6 48 5 40 6 56 5 45 6 59 5 46 6 65 5 53 6 66 5 52 6 73 5 58 6 75 5 57 6 79 5 62 6 79 5 64 6 88 5 75 6 99 5 83
0
-18 6 84 7 45 6 60 7 25 6 32 7 13 6 71 7 36 6 15 7 6 6 19 7 5 6 23 7 8 6 24 7 9 6 26 7 10 6 31 7 12 6 47 7 21 6 55 7 24 6 58 7 27 6 64 7 29 6 70 7 32 6 82 7 44 6 83 7 43 6 98 7 48
+18 6 32 7 13 6 24 7 9 6 60 7 25 6 84 7 45 6 15 7 6 6 19 7 5 6 23 7 8 6 26 7 10 6 31 7 12 6 47 7 21 6 55 7 24 6 58 7 27 6 64 7 29 6 70 7 32 6 71 7 36 6 82 7 44 6 83 7 43 6 98 7 48
0
0
0
@@ -147,9 +147,9 @@ input/parrington/prtn09.jpg
0
0
0
-18 7 8 6 23 7 36 6 71 7 43 6 83 7 6 6 15 7 5 6 19 7 9 6 24 7 10 6 26 7 12 6 31 7 13 6 32 7 19 6 41 7 21 6 47 7 24 6 55 7 25 6 60 7 29 6 64 7 32 6 70 7 44 6 82 7 45 6 84 7 48 6 98
+18 7 13 6 32 7 9 6 24 7 48 6 98 7 25 6 60 7 5 6 19 7 6 6 15 7 8 6 23 7 10 6 26 7 12 6 31 7 19 6 41 7 21 6 47 7 24 6 55 7 29 6 64 7 32 6 70 7 36 6 71 7 43 6 83 7 44 6 82 7 45 6 84
0
-11 7 35 8 38 7 34 8 37 7 49 8 51 7 38 8 42 7 18 8 15 7 28 8 31 7 30 8 34 7 31 8 35 7 37 8 39 7 40 8 44 7 50 8 54
+11 7 49 8 51 7 50 8 54 7 28 8 31 7 18 8 15 7 30 8 34 7 31 8 35 7 34 8 37 7 35 8 38 7 37 8 39 7 38 8 42 7 40 8 44
0
0
0
@@ -168,9 +168,9 @@ input/parrington/prtn08.jpg
0
0
0
-11 8 42 7 38 8 31 7 28 8 54 7 50 8 15 7 18 8 34 7 30 8 35 7 31 8 37 7 34 8 38 7 35 8 39 7 37 8 44 7 40 8 51 7 49
+11 8 31 7 28 8 15 7 18 8 51 7 49 8 54 7 50 8 34 7 30 8 35 7 31 8 37 7 34 8 38 7 35 8 39 7 37 8 42 7 38 8 44 7 40
0
-14 8 6 9 6 8 50 9 65 8 43 9 48 8 17 9 24 8 3 9 3 8 5 9 0 8 23 9 34 8 24 9 35 8 26 9 36 8 30 9 41 8 45 9 49 8 46 9 55 8 47 9 57 8 48 9 60
+14 8 6 9 6 8 3 9 3 8 23 9 34 8 17 9 24 8 5 9 0 8 24 9 35 8 26 9 36 8 30 9 41 8 43 9 48 8 45 9 49 8 46 9 55 8 47 9 57 8 48 9 60 8 50 9 65
0
0
0
@@ -189,9 +189,9 @@ input/parrington/prtn07.jpg
0
0
0
-13 9 6 8 6 9 65 8 50 9 24 8 17 9 48 8 43 9 0 8 5 9 3 8 3 9 34 8 23 9 35 8 24 9 36 8 26 9 41 8 30 9 49 8 45 9 55 8 46 9 57 8 47
+13 9 65 8 50 9 0 8 5 9 34 8 23 9 48 8 43 9 3 8 3 9 6 8 6 9 24 8 17 9 35 8 24 9 36 8 26 9 41 8 30 9 49 8 45 9 55 8 46 9 57 8 47
0
-21 9 58 10 56 9 79 10 72 9 39 10 39 9 11 10 7 9 4 10 0 9 13 10 10 9 14 10 9 9 23 10 22 9 28 10 24 9 30 10 26 9 31 10 25 9 33 10 28 9 37 10 36 9 50 10 53 9 51 10 54 9 52 10 52 9 61 10 58 9 64 10 61 9 68 10 67 9 69 10 68 9 72 10 70
+21 9 11 10 7 9 79 10 72 9 50 10 53 9 39 10 39 9 4 10 0 9 13 10 10 9 14 10 9 9 23 10 22 9 28 10 24 9 30 10 26 9 31 10 25 9 33 10 28 9 37 10 36 9 51 10 54 9 52 10 52 9 58 10 56 9 61 10 58 9 64 10 61 9 68 10 67 9 69 10 68 9 72 10 70
0
0
0
@@ -210,7 +210,7 @@ input/parrington/prtn06.jpg
0
0
0
-20 10 58 9 61 10 39 9 39 10 9 9 14 10 22 9 23 10 0 9 4 10 7 9 11 10 10 9 13 10 24 9 28 10 26 9 30 10 28 9 33 10 36 9 37 10 52 9 52 10 53 9 50 10 54 9 51 10 56 9 58 10 61 9 64 10 67 9 68 10 68 9 69 10 70 9 72 10 72 9 79
+20 10 39 9 39 10 22 9 23 10 58 9 61 10 67 9 68 10 0 9 4 10 7 9 11 10 9 9 14 10 10 9 13 10 24 9 28 10 26 9 30 10 28 9 33 10 36 9 37 10 52 9 52 10 53 9 50 10 54 9 51 10 56 9 58 10 61 9 64 10 68 9 69 10 70 9 72 10 72 9 79
0
0
0
@@ -231,9 +231,9 @@ input/parrington/prtn05.jpg
0
0
0
-8 11 24 10 44 11 33 10 55 11 6 10 14 11 49 10 71 11 20 10 33 11 22 10 34 11 23 10 43 11 25 10 41
+8 11 33 10 55 11 24 10 44 11 49 10 71 11 6 10 14 11 20 10 33 11 22 10 34 11 23 10 43 11 25 10 41
0
-9 11 51 12 52 11 47 12 40 11 39 12 31 11 46 12 39 11 14 12 7 11 31 12 20 11 32 12 24 11 44 12 35 11 50 12 50
+9 11 31 12 20 11 50 12 50 11 32 12 24 11 14 12 7 11 39 12 31 11 44 12 35 11 46 12 39 11 47 12 40 11 51 12 52
0
0
0
@@ -252,9 +252,9 @@ input/parrington/prtn04.jpg
0
0
0
-9 12 40 11 47 12 7 11 14 12 50 11 50 12 24 11 32 12 20 11 31 12 31 11 39 12 35 11 44 12 39 11 46 12 52 11 51
+9 12 40 11 47 12 35 11 44 12 10 11 17 12 24 11 32 12 20 11 31 12 31 11 39 12 39 11 46 12 50 11 50 12 52 11 51
0
-11 12 11 13 11 12 51 13 43 12 49 13 42 12 59 13 50 12 1 13 1 12 32 13 21 12 33 13 23 12 44 13 39 12 45 13 38 12 46 13 41 12 58 13 49
+11 12 46 13 41 12 1 13 1 12 58 13 49 12 11 13 11 12 32 13 21 12 33 13 23 12 44 13 39 12 45 13 38 12 49 13 42 12 51 13 43 12 59 13 50
0
0
0
@@ -273,9 +273,9 @@ input/parrington/prtn03.jpg
0
0
0
-13 13 1 12 1 13 49 12 58 13 41 12 46 13 0 12 4 13 10 12 12 13 11 12 11 13 21 12 32 13 23 12 33 13 38 12 45 13 39 12 44 13 42 12 49 13 43 12 51 13 50 12 59
+13 13 11 12 11 13 43 12 51 13 50 12 59 13 42 12 49 13 0 12 4 13 1 12 1 13 10 12 12 13 21 12 32 13 23 12 33 13 38 12 45 13 39 12 44 13 41 12 46 13 49 12 58
0
-11 13 51 14 73 13 30 14 48 13 4 14 0 13 44 14 66 13 28 14 46 13 31 14 50 13 47 14 71 13 48 14 72 13 54 14 75 13 55 14 77 13 56 14 81
+11 13 28 14 46 13 55 14 77 13 44 14 66 13 30 14 48 13 4 14 0 13 31 14 50 13 47 14 71 13 48 14 72 13 51 14 73 13 54 14 75 13 56 14 81
0
0
0
@@ -294,9 +294,9 @@ input/parrington/prtn02.jpg
0
0
0
-11 14 77 13 55 14 66 13 44 14 0 13 4 14 46 13 28 14 48 13 30 14 50 13 31 14 71 13 47 14 72 13 48 14 73 13 51 14 75 13 54 14 81 13 56
+11 14 66 13 44 14 46 13 28 14 77 13 55 14 0 13 4 14 48 13 30 14 50 13 31 14 71 13 47 14 72 13 48 14 73 13 51 14 75 13 54 14 81 13 56
0
-20 14 40 15 17 14 63 15 42 14 89 15 60 14 85 15 55 14 22 15 0 14 27 15 5 14 30 15 8 14 33 15 9 14 34 15 12 14 35 15 10 14 45 15 19 14 47 15 21 14 53 15 26 14 60 15 38 14 62 15 41 14 65 15 45 14 70 15 53 14 87 15 56 14 88 15 57 14 91 15 62
+20 14 63 15 42 14 88 15 57 14 85 15 55 14 45 15 19 14 22 15 0 14 27 15 5 14 30 15 8 14 33 15 9 14 34 15 12 14 35 15 10 14 40 15 17 14 47 15 21 14 53 15 26 14 60 15 38 14 62 15 41 14 65 15 45 14 70 15 53 14 87 15 56 14 89 15 60 14 91 15 62
0
0
input/parrington/prtn01.jpg
@@ -315,7 +315,7 @@ input/parrington/prtn01.jpg
0
0
0
-19 15 26 14 53 15 60 14 89 15 45 14 65 15 56 14 87 15 0 14 22 15 5 14 27 15 8 14 30 15 9 14 33 15 10 14 35 15 12 14 34 15 17 14 40 15 19 14 45 15 21 14 47 15 41 14 62 15 42 14 63 15 53 14 70 15 55 14 85 15 57 14 88 15 62 14 91
+19 15 5 14 27 15 19 14 45 15 60 14 89 15 45 14 65 15 0 14 22 15 8 14 30 15 9 14 33 15 10 14 35 15 12 14 34 15 17 14 40 15 21 14 47 15 26 14 53 15 41 14 62 15 42 14 63 15 53 14 70 15 55 14 85 15 56 14 87 15 57 14 88 15 62 14 91
0
0
0
@@ -336,12 +336,12 @@ input/parrington/prtn00.jpg
0
0
0
-8 16 28 15 22 16 33 15 35 16 17 15 14 16 38 15 63 16 18 15 15 16 25 15 20 16 32 15 31 16 37 15 52
+8 16 25 15 20 16 17 15 14 16 33 15 35 16 38 15 63 16 18 15 15 16 28 15 22 16 32 15 31 16 37 15 52
0
-9 16 20 17 34 16 0 17 6 16 13 17 26 16 7 17 15 16 2 17 7 16 4 17 9 16 6 17 18 16 8 17 21 16 19 17 31
+9 16 7 17 15 16 4 17 9 16 13 17 26 16 20 17 34 16 0 17 6 16 2 17 7 16 6 17 18 16 8 17 21 16 19 17 31
input/parrington/prtn17.jpg
512 384 50 140.0000000000 10.0000000000 152.0000000000 10.0000000000 296.0000000000 10.0000000000 307.0000000000 10.0000000000 344.0000000000 10.0000000000 371.0000000000 12.0000000000 73.0000000000 14.0000000000 100.0000000000 20.0000000000 370.0000000000 27.0000000000 92.0000000000 32.0000000000 371.0000000000 32.0000000000 325.0000000000 41.0000000000 337.0000000000 42.0000000000 366.0000000000 44.0000000000 332.0000000000 47.0000000000 10.0000000000 52.0000000000 25.0000000000 53.0000000000 349.0000000000 53.0000000000 120.0000000000 56.0000000000 285.0000000000 58.0000000000 352.0000000000 59.0000000000 112.0000000000 66.0000000000 132.0000000000 73.0000000000 313.0000000000 75.0000000000 51.0000000000 77.0000000000 28.0000000000 89.0000000000 64.0000000000 99.0000000000 21.0000000000 103.0000000000 352.0000000000 115.0000000000 318.0000000000 118.0000000000 361.0000000000 124.0000000000 42.0000000000 126.0000000000 324.0000000000 133.0000000000 266.0000000000 135.0000000000 61.0000000000 136.0000000000 84.0000000000 142.0000000000 200.0000000000 144.0000000000 129.0000000000 146.0000000000 217.0000000000 148.0000000000 322.0000000000 195.0000000000 283.0000000000 217.0000000000 316.0000000000 248.0000000000 277.0000000000 258.0000000000 297.0000000000 262.0000000000 333.0000000000 263.0000000000 305.0000000000 264.0000000000 373.0000000000 305.0000000000 273.0000000000 306.0000000000 288.0000000000 309.0000000000 202.0000000000 356.0000000000
-12 17 23 0 14 17 28 0 22 17 41 0 59 17 48 0 77 17 13 0 5 17 17 0 8 17 20 0 10 17 29 0 23 17 32 0 27 17 39 0 39 17 45 0 68 17 47 0 76
+12 17 28 0 22 17 48 0 77 17 23 0 14 17 41 0 59 17 13 0 5 17 17 0 8 17 20 0 10 17 29 0 23 17 32 0 27 17 39 0 39 17 45 0 68 17 47 0 76
0
0
0
@@ -357,5 +357,5 @@ input/parrington/prtn17.jpg
0
0
0
-8 17 26 16 13 17 6 16 0 17 15 16 7 17 34 16 20 17 7 16 2 17 9 16 4 17 21 16 8 17 31 16 19
+8 17 6 16 0 17 26 16 13 17 15 16 7 17 34 16 20 17 7 16 2 17 9 16 4 17 21 16 8 17 31 16 19
0
diff --git a/meowpp.test/pointsC0.txt b/meowpp.test/pointsC0.txt
new file mode 100644
index 0000000..7d5c921
--- /dev/null
+++ b/meowpp.test/pointsC0.txt
@@ -0,0 +1,9 @@
+2
+input/cve0/DSCF3661.JPG
+778 1037 130 1012.0000000000 6.0000000000 833.0000000000 8.0000000000 775.0000000000 17.0000000000 749.0000000000 20.0000000000 763.0000000000 31.0000000000 1030.0000000000 78.0000000000 5.0000000000 83.0000000000 1027.0000000000 144.0000000000 117.0000000000 187.0000000000 234.0000000000 205.0000000000 1025.0000000000 208.0000000000 795.0000000000 216.0000000000 860.0000000000 216.0000000000 523.0000000000 233.0000000000 837.0000000000 236.0000000000 569.0000000000 237.0000000000 859.0000000000 239.0000000000 770.0000000000 241.0000000000 625.0000000000 244.0000000000 900.0000000000 246.0000000000 943.0000000000 329.0000000000 696.0000000000 436.0000000000 712.0000000000 437.0000000000 706.0000000000 446.0000000000 782.0000000000 458.0000000000 827.0000000000 470.0000000000 581.0000000000 591.0000000000 582.0000000000 610.0000000000 668.0000000000 618.0000000000 571.0000000000 625.0000000000 685.0000000000 626.0000000000 574.0000000000 627.0000000000 687.0000000000 627.0000000000 695.0000000000 631.0000000000 776.0000000000 633.0000000000 548.0000000000 635.0000000000 747.0000000000 637.0000000000 713.0000000000 640.0000000000 557.0000000000 641.0000000000 596.0000000000 642.0000000000 839.0000000000 642.0000000000 802.0000000000 643.0000000000 564.0000000000 647.0000000000 693.0000000000 649.0000000000 825.0000000000 652.0000000000 535.0000000000 655.0000000000 832.0000000000 655.0000000000 750.0000000000 657.0000000000 498.0000000000 660.0000000000 582.0000000000 661.0000000000 608.0000000000 661.0000000000 677.0000000000 664.0000000000 896.0000000000 664.0000000000 369.0000000000 671.0000000000 922.0000000000 673.0000000000 374.0000000000 675.0000000000 603.0000000000 675.0000000000 700.0000000000 677.0000000000 895.0000000000 680.0000000000 803.0000000000 682.0000000000 970.0000000000 682.0000000000 911.0000000000 685.0000000000 528.0000000000 690.0000000000 770.0000000000 690.0000000000 873.0000000000 691.0000000000 478.0000000000 693.0000000000 480.0000000000 695.0000000000 679.0000000000 695.0000000000 683.0000000000 697.0000000000 635.0000000000 698.0000000000 789.0000000000 699.0000000000 637.0000000000 700.0000000000 740.0000000000 700.0000000000 587.0000000000 701.0000000000 795.0000000000 702.0000000000 695.0000000000 706.0000000000 1010.0000000000 706.0000000000 803.0000000000 707.0000000000 728.0000000000 708.0000000000 548.0000000000 709.0000000000 913.0000000000 709.0000000000 969.0000000000 710.0000000000 652.0000000000 711.0000000000 921.0000000000 711.0000000000 496.0000000000 713.0000000000 737.0000000000 713.0000000000 12.0000000000 714.0000000000 766.0000000000 715.0000000000 716.0000000000 718.0000000000 745.0000000000 719.0000000000 609.0000000000 720.0000000000 724.0000000000 725.0000000000 786.0000000000 726.0000000000 952.0000000000 726.0000000000 569.0000000000 729.0000000000 849.0000000000 729.0000000000 903.0000000000 729.0000000000 400.0000000000 732.0000000000 739.0000000000 733.0000000000 683.0000000000 734.0000000000 513.0000000000 735.0000000000 347.0000000000 737.0000000000 403.0000000000 741.0000000000 290.0000000000 744.0000000000 643.0000000000 744.0000000000 935.0000000000 744.0000000000 878.0000000000 745.0000000000 468.0000000000 746.0000000000 758.0000000000 747.0000000000 829.0000000000 750.0000000000 406.0000000000 752.0000000000 588.0000000000 753.0000000000 896.0000000000 754.0000000000 1017.0000000000 754.0000000000 805.0000000000 755.0000000000 810.0000000000 757.0000000000 874.0000000000 757.0000000000 717.0000000000 758.0000000000 815.0000000000 760.0000000000 847.0000000000 761.0000000000 354.0000000000 763.0000000000 347.0000000000 764.0000000000 541.0000000000 764.0000000000 824.0000000000 766.0000000000 685.0000000000 767.0000000000 987.0000000000 767.0000000000 675.0000000000 770.0000000000 486.0000000000 772.0000000000 802.0000000000 772.0000000000 995.0000000000 772.0000000000
+0
+59 0 39 1 43 0 18 1 146 0 92 1 18 0 111 1 15 0 26 1 18 0 28 1 18 0 29 1 18 0 30 1 18 0 32 1 18 0 36 1 18 0 37 1 18 0 38 1 18 0 42 1 18 0 44 1 18 0 45 1 18 0 48 1 18 0 49 1 18 0 51 1 18 0 52 1 18 0 53 1 18 0 56 1 18 0 57 1 18 0 59 1 18 0 60 1 18 0 61 1 18 0 64 1 18 0 65 1 18 0 66 1 18 0 70 1 18 0 74 1 18 0 77 1 18 0 78 1 18 0 79 1 18 0 80 1 18 0 81 1 18 0 82 1 18 0 83 1 18 0 85 1 18 0 87 1 18 0 90 1 18 0 91 1 18 0 93 1 18 0 94 1 18 0 95 1 18 0 96 1 18 0 97 1 18 0 98 1 18 0 104 1 18 0 105 1 18 0 106 1 18 0 109 1 18 0 113 1 18 0 114 1 18 0 115 1 18 0 118 1 18 0 120 1 18 0 123 1 18 0 124 1 18 0 126 1 18
+input/cve0/DSCF3662.JPG
+778 1037 163 263.0000000000 136.0000000000 355.0000000000 215.0000000000 1031.0000000000 215.0000000000 1027.0000000000 217.0000000000 453.0000000000 223.0000000000 735.0000000000 227.0000000000 788.0000000000 228.0000000000 852.0000000000 231.0000000000 941.0000000000 441.0000000000 962.0000000000 442.0000000000 954.0000000000 452.0000000000 234.0000000000 490.0000000000 645.0000000000 551.0000000000 687.0000000000 551.0000000000 538.0000000000 564.0000000000 416.0000000000 566.0000000000 414.0000000000 570.0000000000 411.0000000000 577.0000000000 406.0000000000 588.0000000000 579.0000000000 591.0000000000 584.0000000000 599.0000000000 805.0000000000 606.0000000000 398.0000000000 607.0000000000 590.0000000000 609.0000000000 51.0000000000 615.0000000000 561.0000000000 615.0000000000 758.0000000000 616.0000000000 359.0000000000 618.0000000000 393.0000000000 618.0000000000 865.0000000000 621.0000000000 106.0000000000 623.0000000000 355.0000000000 625.0000000000 601.0000000000 626.0000000000 531.0000000000 627.0000000000 807.0000000000 627.0000000000 778.0000000000 630.0000000000 9.0000000000 633.0000000000 79.0000000000 637.0000000000 824.0000000000 637.0000000000 347.0000000000 638.0000000000 934.0000000000 638.0000000000 384.0000000000 639.0000000000 609.0000000000 640.0000000000 1012.0000000000 641.0000000000 795.0000000000 642.0000000000 908.0000000000 643.0000000000 799.0000000000 645.0000000000 986.0000000000 645.0000000000 951.0000000000 646.0000000000 99.0000000000 649.0000000000 595.0000000000 649.0000000000 995.0000000000 649.0000000000 53.0000000000 651.0000000000 770.0000000000 651.0000000000 578.0000000000 652.0000000000 655.0000000000 653.0000000000 1004.0000000000 653.0000000000 5.0000000000 654.0000000000 173.0000000000 654.0000000000 46.0000000000 655.0000000000 657.0000000000 655.0000000000 969.0000000000 655.0000000000 661.0000000000 658.0000000000 779.0000000000 658.0000000000 1016.0000000000 658.0000000000 1026.0000000000 662.0000000000 824.0000000000 663.0000000000 603.0000000000 664.0000000000 26.0000000000 665.0000000000 787.0000000000 665.0000000000 1031.0000000000 665.0000000000 69.0000000000 666.0000000000 157.0000000000 667.0000000000 790.0000000000 667.0000000000 584.0000000000 670.0000000000 755.0000000000 670.0000000000 17.0000000000 671.0000000000 714.0000000000 671.0000000000 674.0000000000 674.0000000000 966.0000000000 674.0000000000 609.0000000000 676.0000000000 929.0000000000 676.0000000000 5.0000000000 677.0000000000 610.0000000000 677.0000000000 94.0000000000 679.0000000000 1026.0000000000 682.0000000000 40.0000000000 683.0000000000 899.0000000000 683.0000000000 319.0000000000 685.0000000000 837.0000000000 685.0000000000 591.0000000000 686.0000000000 613.0000000000 686.0000000000 272.0000000000 687.0000000000 686.0000000000 689.0000000000 911.0000000000 691.0000000000 596.0000000000 693.0000000000 597.0000000000 694.0000000000 1007.0000000000 694.0000000000 69.0000000000 696.0000000000 920.0000000000 696.0000000000 898.0000000000 697.0000000000 62.0000000000 701.0000000000 973.0000000000 701.0000000000 57.0000000000 704.0000000000 695.0000000000 704.0000000000 106.0000000000 705.0000000000 748.0000000000 707.0000000000 1031.0000000000 707.0000000000 255.0000000000 709.0000000000 98.0000000000 711.0000000000 251.0000000000 711.0000000000 605.0000000000 713.0000000000 38.0000000000 717.0000000000 658.0000000000 718.0000000000 608.0000000000 720.0000000000 31.0000000000 722.0000000000 964.0000000000 723.0000000000 813.0000000000 725.0000000000 968.0000000000 725.0000000000 712.0000000000 726.0000000000 22.0000000000 728.0000000000 75.0000000000 728.0000000000 768.0000000000 728.0000000000 869.0000000000 728.0000000000 240.0000000000 730.0000000000 292.0000000000 730.0000000000 183.0000000000 731.0000000000 125.0000000000 732.0000000000 561.0000000000 732.0000000000 1029.0000000000 732.0000000000 14.0000000000 733.0000000000 668.0000000000 733.0000000000 926.0000000000 733.0000000000 929.0000000000 735.0000000000 287.0000000000 736.0000000000 673.0000000000 741.0000000000 967.0000000000 742.0000000000 995.0000000000 743.0000000000 563.0000000000 744.0000000000 891.0000000000 746.0000000000 943.0000000000 746.0000000000 840.0000000000 749.0000000000 732.0000000000 751.0000000000 1009.0000000000 751.0000000000 792.0000000000 753.0000000000 620.0000000000 754.0000000000 42.0000000000 755.0000000000 565.0000000000 756.0000000000 649.0000000000 756.0000000000 989.0000000000 756.0000000000 98.0000000000 757.0000000000 219.0000000000 757.0000000000 34.0000000000 759.0000000000 158.0000000000 759.0000000000 684.0000000000 759.0000000000 966.0000000000 760.0000000000 568.0000000000 762.0000000000 271.0000000000 764.0000000000 976.0000000000 768.0000000000 690.0000000000 770.0000000000 570.0000000000 772.0000000000 982.0000000000 772.0000000000 1012.0000000000 772.0000000000
+142 1 155 0 47 1 94 0 30 1 99 0 33 1 29 0 56 1 14 0 32 1 14 0 30 1 15 0 32 1 15 0 30 1 16 0 30 1 16 0 32 1 18 0 30 1 18 0 32 1 19 0 30 1 19 0 32 1 20 0 32 1 20 0 30 1 21 0 30 1 21 0 32 1 22 0 30 1 22 0 32 1 23 0 30 1 23 0 32 1 25 0 30 1 25 0 32 1 26 0 32 1 26 0 30 1 27 0 30 1 27 0 32 1 28 0 30 1 30 0 30 1 31 0 30 1 31 0 32 1 32 0 30 1 32 0 32 1 33 0 30 1 33 0 32 1 34 0 30 1 34 0 32 1 35 0 30 1 35 0 32 1 38 0 32 1 38 0 30 1 39 0 30 1 39 0 32 1 40 0 32 1 40 0 30 1 42 0 32 1 42 0 30 1 45 0 32 1 45 0 30 1 47 0 32 1 47 0 30 1 48 0 30 1 48 0 32 1 51 0 32 1 51 0 30 1 53 0 32 1 53 0 30 1 55 0 32 1 55 0 30 1 56 0 32 1 56 0 30 1 60 0 30 1 60 0 32 1 61 0 32 1 61 0 30 1 62 0 32 1 62 0 30 1 63 0 30 1 63 0 32 1 64 0 32 1 64 0 30 1 65 0 30 1 65 0 32 1 69 0 32 1 69 0 30 1 70 0 30 1 73 0 32 1 73 0 30 1 74 0 32 1 74 0 30 1 75 0 32 1 75 0 30 1 77 0 32 1 77 0 30 1 78 0 32 1 78 0 30 1 79 0 32 1 79 0 30 1 81 0 32 1 81 0 30 1 85 0 30 1 85 0 32 1 87 0 32 1 87 0 30 1 88 0 30 1 88 0 32 1 89 0 32 1 89 0 30 1 90 0 32 1 90 0 30 1 92 0 32 1 92 0 30 1 94 0 32 1 95 0 32 1 95 0 30 1 96 0 32 1 96 0 30 1 97 0 32 1 97 0 30 1 102 0 32 1 113 0 32 1 113 0 30 1 116 0 30 1 116 0 32 1 118 0 30 1 118 0 32 1 122 0 32 1 122 0 30 1 123 0 32 1 123 0 30 1 124 0 30 1 125 0 32 1 125 0 30 1 129 0 32 1 129 0 30 1 137 0 32 1 137 0 30 1 138 0 32 1 139 0 32 1 139 0 30 1 141 0 30 1 141 0 32 1 143 0 32 1 144 0 32 1 144 0 30 1 145 0 30 1 147 0 32 1 147 0 30 1 156 0 30 1 156 0 32 1 160 0 32
+0
diff --git a/meowpp.test/src/autostitch.cpp b/meowpp.test/src/autostitch.cpp
index b62d13b..e6b473b 100644
--- a/meowpp.test/src/autostitch.cpp
+++ b/meowpp.test/src/autostitch.cpp
@@ -250,6 +250,8 @@ bool kmatch() {
//////////////////////////// **# RANSAC #** //////////////////////////
bool ransac() {
messagePrintf( 1, "RANSAC");
+ aspect_t = inRange(0.000001, 9999.0, atof(usg.optionValue("match-aspect", 0).c_str()));
+ angle_t = inRange(0.1,999.0, atof(usg.optionValue("match-angle", 0).c_str()))/180 * PI;
MyRansacCheck::usage(usg);
// tmp output
p0 = inRange(0.00001, 0.9999, atof(usg.optionValue("ransac-p0", 0).c_str()));
@@ -258,7 +260,9 @@ bool ransac() {
for (size_t j = 0, J = input_bitmap.size(); j < J; j++) {
size_t num = 4u; // !!!!!!!!!!!!!!!!!!!
messagePrintf( 1, "ransac %lu --- %lu", i, j);
- MyRansacCheck chk(&(fpsv[i]), &(fpsv[j]));
+ MyRansacCheck chk(&(fpsv[i]), &(fpsv[j]),
+ input_bitmap[i].width(), input_bitmap[i].height(),
+ aspect_t, angle_t);
FeaturePointIndexPairs ret = ransac(pairs[i][j], chk, num, p0, P);
if (!ret.empty()) {
chk.rememberVCalc(ret);
@@ -288,6 +292,8 @@ bool ransac() {
return true;
}
+
+
//////////////////// **# checking match again #** ////////////////////
bool match_check() {
q = inRange(0.00001, 0.99999, atof(usg.optionValue("prob-p1", 0).c_str()));
@@ -306,9 +312,15 @@ bool match_check() {
continue;
}
double ni = pairs[i][j].size(), nf = 0;
- MyRansacCheck chk(&(fpsv[i]), &(fpsv[j]));
+ size_t num = 4u;
+ MyRansacCheck chk(&(fpsv[i]), &(fpsv[j]),
+ input_bitmap[i].width(), input_bitmap[i].height(),
+ aspect_t, angle_t);
+ FeaturePointIndexPairs ret = ransac(pairs[i][j], chk, num, p0, P);
+
chk.rememberVCalc(pairs[i][j]);
- if (chk.check(aspect_t, angle_t)) {
+ if (chk.check()) {
+ chk.print();
for (size_t k = 0, K = fpsv[i].size(); k < K; k++) {
Vector2D<double> to(chk.to(Vector2D<double>(fpsv[i][k](0),
fpsv[i][k](1))));
@@ -370,7 +382,9 @@ bool pair_output(){
for(size_t i = 0, I = input_bitmap.size(); i < I; i++){
for(size_t j = 0, J = input_bitmap.size(); j < J; j++){
if(pairs[i][j].empty()) continue;
- MyRansacCheck chk(&(fpsv[i]), &(fpsv[j]));
+ MyRansacCheck chk(&(fpsv[i]), &(fpsv[j]),
+ (double)input_bitmap[i].width(), (double)input_bitmap[i].height(),
+ aspect_t, angle_t);
chk.rememberVCalc(pairs[i][j]);
size_t index = output_bitmap.size();
output_bitmap.push_back(input_bitmap[i]);
@@ -378,8 +392,8 @@ bool pair_output(){
for(ssize_t y = 0, Y = input_bitmap[i].height(); y < Y; y++) {
Vector2D<double> to(chk.to(Vector2D<double>(x, y)));
ssize_t x2 = to.x(), y2 = to.y();
- if (0 <= x2 && x2 <= (ssize_t)input_bitmap[j].width() &&
- 0 <= y2 && y2 <= (ssize_t)input_bitmap[j].height()) {
+ if (0 <= x2 && x2 < (ssize_t)input_bitmap[j].width() &&
+ 0 <= y2 && y2 < (ssize_t)input_bitmap[j].height()) {
output_bitmap[index].pixel(y, x, (input_bitmap[i].pixel(y, x) +
input_bitmap[j].pixel(y2,x2)) / 2
);
diff --git a/meowpp.test/src/autostitch_RansacCheck.cpp b/meowpp.test/src/autostitch_RansacCheck.cpp
index becc7da..e728958 100644
--- a/meowpp.test/src/autostitch_RansacCheck.cpp
+++ b/meowpp.test/src/autostitch_RansacCheck.cpp
@@ -4,6 +4,7 @@
#include "meowpp/math/Vector.h"
#include <utility>
#include <cmath>
+#include <cstdio>
#include <algorithm>
@@ -37,9 +38,14 @@ _to(__rc._to){
MyRansacCheck::MyRansacCheck(std::vector<Vector<double> > const* __from,
- std::vector<Vector<double> > const* __to):
+ std::vector<Vector<double> > const* __to,
+ double w_max, double h_max,
+ double rr, double aa):
_from(__from),
-_to(__to){
+_to(__to),
+_w(w_max),
+_h(h_max),
+r_(rr), ang(aa) {
}
@@ -122,6 +128,7 @@ double MyRansacCheck::operator()(std::vector<FeaturePointIndexPair>
}
}
((MyRansacCheck*)this)->rememberVCalc(__sample);
+ if (!((MyRansacCheck*)this)->check()) return -999;
size_t ret = 0;
for (size_t i = 0, I = __data.size(); i < I; i++) {
if (ok(__data[i])) {
@@ -131,21 +138,31 @@ double MyRansacCheck::operator()(std::vector<FeaturePointIndexPair>
return 0.001 + ret;
}
-bool MyRansacCheck::check(double r, double a) {
+bool MyRansacCheck::check() {
return true;
Vector2D<double> v_x(a_, b_);
Vector2D<double> v_y(c_, d_);
- double len1 = v_x.length() * r;
- double len2 = v_x.length() / r;
+ double xx[2] = {0, _w}, yy[2] = {0, _h};
+ for (size_t i = 0; i < 2; ++i) {
+ for (size_t j = 0; j < 2; ++j) {
+ if (A_ * xx[i] + B_ * yy[j] + 1 <= 0) return false;
+ }
+ }
+ double len1 = v_x.length() * r_;
+ double len2 = v_x.length() / r_;
double len = v_y.length();
if (len1 > len2) std::swap(len1, len2);
if (len < len1 || len2 < len) return false;
- double sn = fabs(sin(a));
+ double sn = fabs(sin(ang));
double msn = fabs(v_x.cross(v_y) / v_x.length() / v_y.length());
if (msn < sn) return false;
return true;
}
+void MyRansacCheck::print() const {
+ printf("%f %f %f %f %f %f %f %f 1\n", a_, b_, c_, d_, e_, f_, A_, B_);
+}
+
Vector2D<double> MyRansacCheck::to(Vector2D<double> const& v) const {
return Vector2D<double>(
(v.x() * a_ + v.y() * b_ + c_) / (A_ * v.x() + B_ * v.y() + 1),
diff --git a/meowpp.test/src/features.cpp b/meowpp.test/src/features.cpp
new file mode 100644
index 0000000..382dffa
--- /dev/null
+++ b/meowpp.test/src/features.cpp
@@ -0,0 +1,29 @@
+#include <cstdio>
+
+#include "meowpp/Usage.h"
+
+using namespace meow;
+
+Usage usg("features");
+
+int setup(int argc, char** argv) {
+ usg.optionAdd("h" , "Display this help document");
+ usg.optionAdd("help", "Display this help document");
+ usg.optionAdd("i",
+ "Specify the input images are in a directory instead of"
+ " process arguments",
+ "pathname",
+ "",
+ false);
+ usg.optionAdd("o",
+ "Output images with denoting feature points",
+ return 1;
+}
+
+int main(int argc, char** argv) {
+ int ret;
+ if ((ret = setup(argc, argv)) <= 0) return -1;
+ return 0;
+}
+
+
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-16 18:20:36 +0800