From 5b7d51a9ac42a4c75a1562963b928d954cd9743e Mon Sep 17 00:00:00 2001 From: RandomErrorMessage Date: Fri, 27 Sep 2019 02:31:01 -0700 Subject: [PATCH] updated go modules, removed goost base64 dependency --- go.mod | 12 +++++------- go.sum | 30 ++++++++++++++++-------------- handlers/socket_amd64.go | 2 +- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/go.mod b/go.mod index c33e9e6..0df45ef 100644 --- a/go.mod +++ b/go.mod @@ -3,13 +3,11 @@ module github.com/gen2brain/cam2ip require ( github.com/abbot/go-http-auth v0.4.0 github.com/antonini/golibjpegturbo v0.0.0-20141208033414-c03a2fa1e89a - github.com/disintegration/imaging v1.5.0 + github.com/disintegration/imaging v1.6.1 github.com/gen2brain/go-opencv v0.0.0-20181117131054-351d3b510a27 github.com/korandiz/v4l v0.0.0-20180520170035-995f703bfc89 - gocv.io/x/gocv v0.17.0 - golang.org/x/crypto v0.0.0-20181112202954-3d3f9f413869 // indirect - golang.org/x/image v0.0.0-20181116024801-cd38e8056d9b // indirect - golang.org/x/net v0.0.0-20181114220301-adae6a3d119a - golang.org/x/sys v0.0.0-20181116161606-93218def8b18 // indirect - goost.org/encoding/base64 v0.0.0-20181026150205-e357e2d7c666 + gocv.io/x/gocv v0.20.0 + golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392 // indirect + golang.org/x/image v0.0.0-20190910094157-69e4b8554b2a // indirect + golang.org/x/net v0.0.0-20190926025831-c00fd9afed17 ) diff --git a/go.sum b/go.sum index 678fb5e..4e08765 100644 --- a/go.sum +++ b/go.sum @@ -2,21 +2,23 @@ github.com/abbot/go-http-auth v0.4.0 h1:QjmvZ5gSC7jm3Zg54DqWE/T5m1t2AfDu6QlXJT0E github.com/abbot/go-http-auth v0.4.0/go.mod h1:Cz6ARTIzApMJDzh5bRMSUou6UMSp0IEXg9km/ci7TJM= github.com/antonini/golibjpegturbo v0.0.0-20141208033414-c03a2fa1e89a h1:+Q4qlzO9KeavJSvWgRKckT3ViTSQ8rR6GroSiXPRXhs= github.com/antonini/golibjpegturbo v0.0.0-20141208033414-c03a2fa1e89a/go.mod h1:UOX4aiVZ5WVUBY3D/31H4m6Z8UHgBj5Qr/oldRBBUMY= -github.com/disintegration/imaging v1.5.0 h1:uYqUhwNmLU4K1FN44vhqS4TZJRAA4RhBINgbQlKyGi0= -github.com/disintegration/imaging v1.5.0/go.mod h1:9B/deIUIrliYkyMTuXJd6OUFLcrZ2tf+3Qlwnaf/CjU= +github.com/disintegration/imaging v1.6.1 h1:JnBbK6ECIZb1NsWIikP9pd8gIlTIRx7fuDNpU9fsxOE= +github.com/disintegration/imaging v1.6.1/go.mod h1:xuIt+sRxDFrHS0drzXUlCJthkJ8k7lkkUojDSR247MQ= github.com/gen2brain/go-opencv v0.0.0-20181117131054-351d3b510a27 h1:Bo/MmigIPPEr9tHT45BUU/2HpySV0jhINoLCJBzGbbw= github.com/gen2brain/go-opencv v0.0.0-20181117131054-351d3b510a27/go.mod h1:pOLh42huXUuMoJWvD2K+EeXzvQ9GZ5HN6gdFk5ZwIuU= github.com/korandiz/v4l v0.0.0-20180520170035-995f703bfc89 h1:BSg+wmA2aXiD7joWbYpkkLvPPZzdhpp2LAgoh8SMcyE= github.com/korandiz/v4l v0.0.0-20180520170035-995f703bfc89/go.mod h1:jGGdTcTvrj/K3Qvlch8Qzb8PJjeMeJ/XmPbQxc37rJ8= -gocv.io/x/gocv v0.17.0 h1:qPHPbSZeFrQEnYR/crxwVCwfoUSPS8Wcn/PGv1Gk/tM= -gocv.io/x/gocv v0.17.0/go.mod h1:3qacsKAMRS0sZmeLySWcbFeVEU3t86igWaQleAgiuBg= -golang.org/x/crypto v0.0.0-20181112202954-3d3f9f413869 h1:kkXA53yGe04D0adEYJwEVQjeBppL01Exg+fnMjfUraU= -golang.org/x/crypto v0.0.0-20181112202954-3d3f9f413869/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/image v0.0.0-20181116024801-cd38e8056d9b h1:VHyIDlv3XkfCa5/a81uzaoDkHH4rr81Z62g+xlnO8uM= -golang.org/x/image v0.0.0-20181116024801-cd38e8056d9b/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs= -golang.org/x/net v0.0.0-20181114220301-adae6a3d119a h1:gOpx8G595UYyvj8UK4+OFyY4rx037g3fmfhe5SasG3U= -golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/sys v0.0.0-20181116161606-93218def8b18 h1:Wh+XCfg3kNpjhdq2LXrsiOProjtQZKme5XUx7VcxwAw= -golang.org/x/sys v0.0.0-20181116161606-93218def8b18/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -goost.org/encoding/base64 v0.0.0-20181026150205-e357e2d7c666 h1:o9Q+qyP1iwu28dvp8ximMGp4+fldEbTnl5a0ubPIKR4= -goost.org/encoding/base64 v0.0.0-20181026150205-e357e2d7c666/go.mod h1:pBZSqyNgDwqnkoXcbBD1wSOStfw5WgjBx9Zcda9RvLA= +gocv.io/x/gocv v0.20.0 h1:2q75zQ8Zel2tB69G6qrmf/E7EdvaCs90qvkHzdSBOAg= +gocv.io/x/gocv v0.20.0/go.mod h1:vZETJRwLnl11muQ6iL3q4ju+0oJRrdmYdv5xJTH7WYA= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392 h1:ACG4HJsFiNMf47Y4PeRoebLNy/2lXT9EtprMuTFWt1M= +golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= +golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs= +golang.org/x/image v0.0.0-20190910094157-69e4b8554b2a h1:gHevYm0pO4QUbwy8Dmdr01R5r1BuKtfYqRqF0h/Cbh0= +golang.org/x/image v0.0.0-20190910094157-69e4b8554b2a/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190926025831-c00fd9afed17 h1:qPnAdmjNA41t3QBTx2mFGf/SD1IoslhYu7AmdsVzCcs= +golang.org/x/net v0.0.0-20190926025831-c00fd9afed17/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/handlers/socket_amd64.go b/handlers/socket_amd64.go index b1e4376..91f5ed6 100644 --- a/handlers/socket_amd64.go +++ b/handlers/socket_amd64.go @@ -5,8 +5,8 @@ import ( "log" "time" + "encoding/base64" "golang.org/x/net/websocket" - "goost.org/encoding/base64" "github.com/gen2brain/cam2ip/image" "github.com/gen2brain/cam2ip/reader"