Merge pull request #3 from saratovsource/master

Some changes for developing in forks
This commit is contained in:
Bert Chang 2014-01-14 06:06:41 -08:00
commit 32560d5c5b
5 changed files with 25 additions and 12 deletions

1
go-opencv.go Normal file
View file

@ -0,0 +1 @@
package opencv

View file

@ -7,12 +7,16 @@ package main
import (
"fmt"
"os"
"path"
"runtime"
"github.com/lazywei/go-opencv/opencv"
//"github.com/lazywei/go-opencv/opencv"
"../opencv" // can be used in forks, comment in real application
)
func main() {
filename := "../images/lena.jpg"
_, currentfile, _, _ := runtime.Caller(0)
filename := path.Join(path.Dir(currentfile), "../images/lena.jpg")
if len(os.Args) == 2 {
filename = os.Args[1]
}

View file

@ -7,12 +7,16 @@ package main
import (
"fmt"
"os"
"path"
"runtime"
"github.com/lazywei/go-opencv/opencv"
//"github.com/lazywei/go-opencv/opencv"
"../opencv" // can be used in forks, comment in real application
)
func main() {
filename := "../images/lena.jpg"
_, currentfile, _, _ := runtime.Caller(0)
filename := path.Join(path.Dir(currentfile), "../images/lena.jpg")
if len(os.Args) == 2 {
filename = os.Args[1]
}

View file

@ -7,12 +7,16 @@ package main
import (
"fmt"
"os"
"path"
"runtime"
"github.com/lazywei/go-opencv/opencv"
//"github.com/lazywei/go-opencv/opencv"
"../opencv" // can be used in forks, comment in real application
)
func main() {
filename := "../images/fruits.jpg"
_, currentfile, _, _ := runtime.Caller(0)
filename := path.Join(path.Dir(currentfile), "../images/fruits.jpg")
if len(os.Args) == 2 {
filename = os.Args[1]
}

View file

@ -7,8 +7,11 @@ package main
import (
"fmt"
"os"
"path"
"runtime"
"github.com/lazywei/go-opencv/opencv"
//"github.com/lazywei/go-opencv/opencv"
"../opencv" // can be used in forks, comment in real application
)
func main() {
@ -70,8 +73,5 @@ func main() {
}
}
opencv.WaitKey(0)
}