Merge pull request #242 from sovanta/fix_imdecode_imencode_typings

Fixed imdecode, imencode and Mat Buffer typings

Author: justadudewhohacks

lib/typings/Mat.d.ts

@@ -32,7 +32,7 @@ export class Mat {
   constructor(dataArray: number[][][], type: number);
   constructor(dataArray: number[][][], type: number);
   constructor(dataArray: number[][][], type: number);
-  constructor(data: number[], rows: number, cols: number, type?: number);
+  constructor(data: Buffer, rows: number, cols: number, type?: number);
   abs(): Mat;
   absdiff(otherMat: Mat): Mat;
   adaptiveThreshold(maxVal: number, adaptiveMethod: number, thresholdType: number, blockSize: number, C: number): Mat;
@@ -156,8 +156,8 @@ export class Mat {
   floodFillAsync(seedPoint: Point2, newVal: Vec3, mask?: Mat, loDiff?: Vec3, upDiff?: Vec3, flags?: number): Promise<{ returnValue: number, rect: Rect }>;
   gaussianBlur(kSize: Size, sigmaX: number, sigmaY?: number, borderType?: number): Mat;
   gaussianBlurAsync(kSize: Size, sigmaX: number, sigmaY?: number, borderType?: number): Promise<Mat>;
-  getData(): number[];
-  getDataAsync(): Promise<number[]>;
+  getData(): Buffer;
+  getDataAsync(): Promise<Buffer>;
   getDataAsArray(): number[][];
   getDataAsArray(): number[][][];
   getDataAsArray(): number[][][];

lib/typings/cv.d.ts

@@ -64,10 +64,10 @@ export function getRotationMatrix2D(center: Point2, angle: number, scale?: numbe
 export function getStructuringElement(shape: number, kernelSize: Size, anchor?: Point2): Mat;
 export function getValidDisparityROI(roi1: Rect[], roi2: Rect[], minDisparity: number, numberOfDisparities: number, SADWindowSize: number): Rect;
 export function getValidDisparityROIAsync(roi1: Rect[], roi2: Rect[], minDisparity: number, numberOfDisparities: number, SADWindowSize: number): Promise<Rect>;
-export function imdecode(buffer: number[], flags?: number): Mat;
-export function imdecodeAsync(buffer: number[], flags?: number): Promise<Mat>;
-export function imencode(fileExt: string, img: Mat, flags?: number[]): number[];
-export function imencodeAsync(fileExt: string, img: Mat, flags?: number[]): Promise<number[]>;
+export function imdecode(buffer: Buffer, flags?: number): Mat;
+export function imdecodeAsync(buffer: Buffer, flags?: number): Promise<Mat>;
+export function imencode(fileExt: string, img: Mat, flags?: number[]): Buffer;
+export function imencodeAsync(fileExt: string, img: Mat, flags?: number[]): Promise<Buffer>;
 export function imread(filePath: string, flags?: number): Mat;
 export function imreadAsync(filePath: string, flags?: number): Promise<Mat>;
 export function imshow(winName: string, img: Mat): void;

package-lock.json

@@ -42,5 +42,8 @@
     "nan": "^2.7.0",
     "native-node-utils": "0.0.4",
     "opencv-build": "0.0.11"
+  },
+  "optionalDependencies": {
+    "@types/node": ">6"
   }
 }