Upgrade to webpack 2 and babel 6

This commit is contained in:
Christoph Oberhofer
2016-03-29 12:08:57 +02:00
parent ce81e9169c
commit da08ae3eaf
27 changed files with 268 additions and 196 deletions
+1 -3
View File
@@ -1,6 +1,4 @@
const merge = require('lodash/object/merge');
const pick = require('lodash/object/pick');
const mapKeys = require('lodash/object/mapKeys');
import {merge, pick} from 'lodash';
var streamRef,
loadedDataHandler;
+9 -5
View File
@@ -1,13 +1,17 @@
import CVUtils from '../common/cv_utils';
import {
imageRef,
grayAndHalfSampleFromCanvasData,
computeGray
} from '../common/cv_utils';
var FrameGrabber = {};
FrameGrabber.create = function(inputStream, canvas) {
var _that = {},
_streamConfig = inputStream.getConfig(),
_video_size = CVUtils.imageRef(inputStream.getRealWidth(), inputStream.getRealHeight()),
_video_size = imageRef(inputStream.getRealWidth(), inputStream.getRealHeight()),
_canvasSize = inputStream.getCanvasSize(),
_size = CVUtils.imageRef(inputStream.getWidth(), inputStream.getHeight()),
_size = imageRef(inputStream.getWidth(), inputStream.getHeight()),
topRight = inputStream.getTopRight(),
_sx = topRight.x,
_sy = topRight.y,
@@ -55,9 +59,9 @@ FrameGrabber.create = function(inputStream, canvas) {
_ctx.drawImage(frame, 0, 0, _canvasSize.x, _canvasSize.y);
ctxData = _ctx.getImageData(_sx, _sy, _size.x, _size.y).data;
if (doHalfSample){
CVUtils.grayAndHalfSampleFromCanvasData(ctxData, _size, _data);
grayAndHalfSampleFromCanvasData(ctxData, _size, _data);
} else {
CVUtils.computeGray(ctxData, _data, _streamConfig);
computeGray(ctxData, _data, _streamConfig);
}
return true;
} else {