imgproc: applyColorMap supports cv version < 3.4 && update ts types

Author: oyyd

cc/modules/imgproc/imgprocBindings.h

@@ -46,8 +46,13 @@ namespace ImgprocBindings {
     int colormap;
     bool useUserColor = 0;
 
-    // TODO(oyyd) Need better polymorphism support.
     bool unwrapRequiredArgs(Nan::NAN_METHOD_ARGS_TYPE info) {
+#if CV_VERSION_MINOR < 4
+      return (Mat::Converter::arg(0, &src, info) ||
+              IntConverter::optArg(1, &colormap, info));
+#endif
+
+#if CV_VERSION_MINOR >= 4
       if (info[1]->IsNumber()) {
         return (Mat::Converter::arg(0, &src, info) ||
                 IntConverter::optArg(1, &colormap, info));
@@ -57,15 +62,23 @@ namespace ImgprocBindings {
 
       return (Mat::Converter::arg(0, &src, info) ||
               Mat::Converter::arg(1, &userColor, info));
+#endif
     }
 
     std::string executeCatchCvExceptionWorker() {
+#if CV_VERSION_MINOR < 4
+      cv::applyColorMap(src, dst, colormap);
+      return "";
+#endif
+
+#if CV_VERSION_MINOR >= 4
       if (useUserColor) {
         cv::applyColorMap(src, dst, userColor);
       } else {
         cv::applyColorMap(src, dst, colormap);
       }
       return "";
+#endif
     }
 
     v8::Local<v8::Value> getReturnValue() { return Mat::Converter::wrap(dst); }

lib/typings/constants.d.ts

@@ -352,6 +352,19 @@ export const COLOR_YUV420sp2GRAY: number;
 export const COLOR_YUV420sp2RGB: number;
 export const COLOR_YUV420sp2RGBA: number;
 export const COLOR_mRGBA2RGBA: number;
+export const COLORMAP_AUTUMN: number;
+export const COLORMAP_BONE: number;
+export const COLORMAP_JET: number;
+export const COLORMAP_WINTER: number;
+export const COLORMAP_RAINBOW: number;
+export const COLORMAP_OCEAN: number;
+export const COLORMAP_SUMMER: number;
+export const COLORMAP_SPRING: number;
+export const COLORMAP_COOL: number;
+export const COLORMAP_HSV: number;
+export const COLORMAP_PINK: number;
+export const COLORMAP_HOT: number;
+export const COLORMAP_PARULA: number;
 export const CV_CONTOURS_MATCH_I1: number;
 export const CV_CONTOURS_MATCH_I2: number;
 export const CV_CONTOURS_MATCH_I3: number;

lib/typings/cv.d.ts

@@ -18,6 +18,7 @@ export interface HistAxes {
   ranges: number[];
 }
 
+export function applyColorMap(src: Mat, colormap: number | Mat): Mat;
 export function blobFromImage(image: Mat, scaleFactor?: number, size?: Size, mean?: Vec3, swapRB?: boolean): Mat;
 export function blobFromImageAsync(image: Mat, scaleFactor?: number, size?: Size, mean?: Vec3, swapRB?: boolean): Promise<Mat>;
 export function blobFromImages(image: Mat[], scaleFactor?: number, size?: Size, mean?: Vec3, swapRB?: boolean): Mat;
@@ -162,4 +163,4 @@ export function drawTextBox(img: Mat, upperLeft: { x: number, y: number }, textL
 export function isCustomMatAllocatorEnabled(): boolean;
 export function dangerousEnableCustomMatAllocator(): boolean;
 export function dangerousDisableCustomMatAllocator(): boolean;
-export function getMemMetrics(): { TotalAlloc: number, TotalKnownByJS: number, NumAllocations: number, NumDeAllocations: number };
+export function getMemMetrics(): { TotalAlloc: number, TotalKnownByJS: number, NumAllocations: number, NumDeAllocations: number };