add consts like cv::Error::HeaderIsNull

Imgproc/constlist.txt

@@ -328,6 +328,19 @@ cv::MARKER_DIAMOND
 cv::MARKER_SQUARE
 cv::MARKER_TRIANGLE_UP
 cv::MARKER_TRIANGLE_DOWN
+cv::Subdiv2D::PTLOC_ERROR
+cv::Subdiv2D::PTLOC_OUTSIDE_RECT
+cv::Subdiv2D::PTLOC_INSIDE
+cv::Subdiv2D::PTLOC_VERTEX
+cv::Subdiv2D::PTLOC_ON_EDGE
+cv::Subdiv2D::NEXT_AROUND_ORG
+cv::Subdiv2D::NEXT_AROUND_DST
+cv::Subdiv2D::PREV_AROUND_ORG
+cv::Subdiv2D::PREV_AROUND_DST
+cv::Subdiv2D::NEXT_AROUND_LEFT
+cv::Subdiv2D::NEXT_AROUND_RIGHT
+cv::Subdiv2D::PREV_AROUND_LEFT
+cv::Subdiv2D::PREV_AROUND_RIGHT
 cv::TM_SQDIFF
 cv::TM_SQDIFF_NORMED
 cv::TM_CCORR

constlist.txt

@@ -1,3 +1,58 @@
+cv::Error::StsOk
+cv::Error::StsBackTrace
+cv::Error::StsError
+cv::Error::StsInternal
+cv::Error::StsNoMem
+cv::Error::StsBadArg
+cv::Error::StsBadFunc
+cv::Error::StsNoConv
+cv::Error::StsAutoTrace
+cv::Error::HeaderIsNull
+cv::Error::BadImageSize
+cv::Error::BadOffset
+cv::Error::BadDataPtr
+cv::Error::BadStep
+cv::Error::BadModelOrChSeq
+cv::Error::BadNumChannels
+cv::Error::BadNumChannel1U
+cv::Error::BadDepth
+cv::Error::BadAlphaChannel
+cv::Error::BadOrder
+cv::Error::BadOrigin
+cv::Error::BadAlign
+cv::Error::BadCallBack
+cv::Error::BadTileSize
+cv::Error::BadCOI
+cv::Error::BadROISize
+cv::Error::MaskIsTiled
+cv::Error::StsNullPtr
+cv::Error::StsVecLengthErr
+cv::Error::StsFilterStructContentErr
+cv::Error::StsKernelStructContentErr
+cv::Error::StsFilterOffsetErr
+cv::Error::StsBadSize
+cv::Error::StsDivByZero
+cv::Error::StsInplaceNotSupported
+cv::Error::StsObjectNotFound
+cv::Error::StsUnmatchedFormats
+cv::Error::StsBadFlag
+cv::Error::StsBadPoint
+cv::Error::StsBadMask
+cv::Error::StsUnmatchedSizes
+cv::Error::StsUnsupportedFormat
+cv::Error::StsOutOfRange
+cv::Error::StsParseError
+cv::Error::StsNotImplemented
+cv::Error::StsBadMemBlock
+cv::Error::StsAssert
+cv::Error::GpuNotSupported
+cv::Error::GpuApiCallError
+cv::Error::OpenGlNotSupported
+cv::Error::OpenGlApiCallError
+cv::Error::OpenCLApiCallError
+cv::Error::OpenCLDoubleNotSupported
+cv::Error::OpenCLInitError
+cv::Error::OpenCLNoAMDBlasFft
 cv::DECOMP_LU
 cv::DECOMP_SVD
 cv::DECOMP_EIG
@@ -44,11 +99,69 @@ cv::ACCESS_WRITE
 cv::ACCESS_RW
 cv::ACCESS_MASK
 cv::ACCESS_FAST
+cv::_InputArray::KIND_SHIFT
+cv::_InputArray::FIXED_TYPE
+cv::_InputArray::FIXED_SIZE
+cv::_InputArray::KIND_MASK
+cv::_InputArray::NONE
+cv::_InputArray::MAT
+cv::_InputArray::MATX
+cv::_InputArray::STD_VECTOR
+cv::_InputArray::STD_VECTOR_VECTOR
+cv::_InputArray::STD_VECTOR_MAT
+cv::_InputArray::EXPR
+cv::_InputArray::OPENGL_BUFFER
+cv::_InputArray::CUDA_HOST_MEM
+cv::_InputArray::CUDA_GPU_MAT
+cv::_InputArray::UMAT
+cv::_InputArray::STD_VECTOR_UMAT
+cv::_InputArray::STD_BOOL_VECTOR
+cv::_InputArray::STD_VECTOR_CUDA_GPU_MAT
+cv::_InputArray::STD_ARRAY
+cv::_InputArray::STD_ARRAY_MAT
+cv::_OutputArray::DEPTH_MASK_8U
+cv::_OutputArray::DEPTH_MASK_8S
+cv::_OutputArray::DEPTH_MASK_16U
+cv::_OutputArray::DEPTH_MASK_16S
+cv::_OutputArray::DEPTH_MASK_32S
+cv::_OutputArray::DEPTH_MASK_32F
+cv::_OutputArray::DEPTH_MASK_64F
+cv::_OutputArray::DEPTH_MASK_16F
+cv::_OutputArray::DEPTH_MASK_ALL
+cv::_OutputArray::DEPTH_MASK_ALL_BUT_8S
+cv::_OutputArray::DEPTH_MASK_ALL_16F
+cv::_OutputArray::DEPTH_MASK_FLT
 cv::USAGE_DEFAULT
 cv::USAGE_ALLOCATE_HOST_MEMORY
 cv::USAGE_ALLOCATE_DEVICE_MEMORY
 cv::USAGE_ALLOCATE_SHARED_MEMORY
 cv::__UMAT_USAGE_FLAGS_32BIT
+cv::UMatData::COPY_ON_MAP
+cv::UMatData::HOST_COPY_OBSOLETE
+cv::UMatData::DEVICE_COPY_OBSOLETE
+cv::UMatData::TEMP_UMAT
+cv::UMatData::TEMP_COPIED_UMAT
+cv::UMatData::USER_ALLOCATED
+cv::UMatData::DEVICE_MEM_MAPPED
+cv::UMatData::ASYNC_CLEANUP
+cv::Mat::MAGIC_VAL
+cv::Mat::AUTO_STEP
+cv::Mat::CONTINUOUS_FLAG
+cv::Mat::SUBMATRIX_FLAG
+cv::Mat::MAGIC_MASK
+cv::Mat::TYPE_MASK
+cv::Mat::DEPTH_MASK
+cv::UMat::MAGIC_VAL
+cv::UMat::AUTO_STEP
+cv::UMat::CONTINUOUS_FLAG
+cv::UMat::SUBMATRIX_FLAG
+cv::UMat::MAGIC_MASK
+cv::UMat::TYPE_MASK
+cv::UMat::DEPTH_MASK
+cv::SparseMat::MAGIC_VAL
+cv::SparseMat::MAX_DIM
+cv::SparseMat::HASH_SCALE
+cv::SparseMat::HASH_BIT
 cv::SORT_EVERY_ROW
 cv::SORT_EVERY_COLUMN
 cv::SORT_ASCENDING
@@ -69,6 +182,32 @@ cv::REDUCE_MIN
 cv::ROTATE_90_CLOCKWISE
 cv::ROTATE_180
 cv::ROTATE_90_COUNTERCLOCKWISE
+cv::PCA::DATA_AS_ROW
+cv::PCA::DATA_AS_COL
+cv::PCA::USE_AVG
+cv::SVD::MODIFY_A
+cv::SVD::NO_UV
+cv::SVD::FULL_UV
+cv::RNG::UNIFORM
+cv::RNG::NORMAL
+cv::Formatter::FMT_DEFAULT
+cv::Formatter::FMT_MATLAB
+cv::Formatter::FMT_CSV
+cv::Formatter::FMT_PYTHON
+cv::Formatter::FMT_NUMPY
+cv::Formatter::FMT_C
+cv::Param::INT
+cv::Param::BOOLEAN
+cv::Param::REAL
+cv::Param::STRING
+cv::Param::MAT
+cv::Param::MAT_VECTOR
+cv::Param::ALGORITHM
+cv::Param::FLOAT
+cv::Param::UNSIGNED_INT
+cv::Param::UINT64
+cv::Param::UCHAR
+cv::Param::SCALAR
 CV_8UC1
 CV_8UC2
 CV_8UC3

genpp.pl

@@ -244,19 +244,25 @@ sub genconsts {
   my ($last) = @_;
   return if !-f 'constlist.txt';
   open my $consts, '<', 'constlist.txt' or die "constlist.txt: $!";
-  my $xslines = '';
+  my %pkgsuff2defs;
   while (!eof $consts) {
     chomp(my $line = <$consts>);
     $line =~ s/^cv:://;
     my ($text, $args) = split /\|/, $line;
-    pp_add_exported($text);
-    $xslines .= "\nint cw_const_$text(@{[$args || '']})\n";
+    pp_add_exported($text) if $text !~ /(.*)::/;
+    my $pkgsuff = $1 || '';
+    $text =~ s/::/_/g;
+    $pkgsuff2defs{$pkgsuff} //= '';
+    $pkgsuff2defs{$pkgsuff} .= "\nint cw_const_$text(@{[$args || '']})\n";
   }
-  my $pkg = "PDL::OpenCV$last";
-  pp_addxs(<<EOF);
-MODULE = ${main::PDLMOD} PACKAGE = $pkg PREFIX=cw_const_
-$xslines
+  for my $key (sort keys %pkgsuff2defs) {
+    my $pkg = join '::', grep length, "PDL::OpenCV$last", $key;
+    my $pref = join '_', (grep length, "cw_const", $key), '';
+    pp_addxs(<<EOF);
+MODULE = ${main::PDLMOD} PACKAGE = $pkg PREFIX=$pref
+$pkgsuff2defs{$key}
 EOF
+  }
 }
 
 sub genpp_readfile {

genwrap.pl

@@ -176,6 +176,7 @@ sub gen_wrapper {
 sub gen_const {
   my ($text, $args) = @_;
   (my $funcname = $text) =~ s#cv::##;
+  $funcname =~ s#::#_#g;
   my $t = "int cw_const_$funcname(@{[$args || '']})";
   ("$t;\n", "$t { return (int)$text@{[$args ? '('.join(',',map +(split ' ')[-1], split /\s*,\s*/, $args).')' : '']}; }\n");
 }

maint/genlists

@@ -44,7 +44,6 @@ print "enum: $name\n";
       for my $t (@$tuples) {
         my ($ename) = @$t;
         die "badly-formatted enum name $ename\n" if !(my ($pname) = $ename =~ /^const\s+(cv\..+)/);
-        print(" skipping\n"), last if $pname =~ /\..*\./;
         $pname =~ s#\.#::#g;
         push @{$dest2enums{$dest}}, $pname;
 print " val: $pname\n";

t/opencv_basic.t

@@ -15,5 +15,6 @@ is_deeply [map $_->sclr, $slice->minMaxIdx], [0,74],'minMaxIdx';
 is PDL::OpenCV::CV_8UC3(), 16, 'depth constant';
 is COLOR_GRAY2RGB, 8, 'colour-conversion constant exported';
 is PDL::OpenCV::Imgproc::COLOR_GRAY2RGB, 8, 'constant in module space';
+is PDL::OpenCV::Error::StsNullPtr, -27, 'deep namespace constant';
 
 done_testing();