Implement a more general version of the merge command

Also, add tests for this command.

This fixes #71.
This commit is contained in:
Martin Baeuml
2014-04-15 23:21:05 +02:00
parent d6a66eb0e6
commit ad05875f0b
3 changed files with 164 additions and 56 deletions
+5 -5
View File
@@ -1,31 +1,31 @@
[
{
"type": "image",
"class": "image",
"annotations": [
{
"height": 60.0,
"width": 46.0,
"y": 105.0,
"x": 346.0,
"type": "rect"
"class": "rect"
},
{
"height": 58.0,
"width": 56.0,
"y": 119.0,
"x": 636.0,
"type": "rect"
"class": "rect"
}
],
"filename": "image1.jpg"
},
{
"type": "image",
"class": "image",
"annotations": [
{
"y": 155.0,
"x": 409.0,
"type": "point"
"class": "point"
}
],
"filename": "image2.jpg"