top-level global wrapper has all top-level classes

Changes

@@ -1,2 +1,2 @@
 0.001 TBC
-- This is a basic working perl/PDL OpencCV binding release.
+- This is a basic working perl/PDL OpenCV binding

Makefile.PL

@@ -82,7 +82,7 @@ sub MY::postamble {
   my $const = -f 'constlist.txt' ? 'wraplocal.h : constlist.txt' : '';
   join "\n", pdlpp_postamble($package),
     genwrap_from('opencv_wrapper', 0, ','),
-    genwrap_from('wraplocal', 0, ','),
+    genwrap_from('wraplocal', 0, ',', 'nocons'),
     $const,
     cpp_build($self, qw(opencv_wrapper wraplocal));
 }

genwrap.pl

@@ -376,13 +376,13 @@ sub readclasses {
 }
 
 my $filegen = $ARGV[0] || die "No file given";
+my @cvheaders = grep length, split /,/, $ARGV[1]||'';
+my $cons_arg = $ARGV[2] // '';
 my $extras = $filegen eq 'opencv_wrapper' ? [$HBODY_GLOBAL,gen_gettype().$CBODY_GLOBAL] : [qq{#include "opencv_wrapper.h"\n},""];
 my $localclasses = readclasses();
-my $globalclasses = +{ map +($_=>[$GLOBALTYPES{$_}, undef, "cv::$_", $extra_cons_args{$_}]), keys %GLOBALTYPES };
-$globalclasses->{$_} = delete $localclasses->{$_} for grep exists $localclasses->{$_}, keys %$globalclasses;
-my $typespec = $filegen eq 'opencv_wrapper' ? $globalclasses : $localclasses;
+my $globalclasses = +{ (map +($_=>[$GLOBALTYPES{$_}, undef, "cv::$_", $extra_cons_args{$_}]), keys %GLOBALTYPES), %$localclasses };
+my $typespec = $filegen eq 'opencv_wrapper' ? $globalclasses : $cons_arg eq 'nocons' ? +{} : $localclasses;
 my $vectorspecs = $filegen eq 'opencv_wrapper' ? \%VECTORTYPES : +{};
-my @cvheaders = grep length, split /,/, $ARGV[1]||'';
 my $funclist = $filegen eq 'opencv_wrapper' ? [] : \@funclist;
 my $consts = $filegen eq 'opencv_wrapper' ? [] : -f 'constlist.txt' ? gen_consts() : [];
 make_chfiles($filegen, $extras, $typespec, $vectorspecs, \@cvheaders, $funclist, $consts);

typemap

@@ -6,6 +6,10 @@ vector_KeyPointWrapper* T_OPENCV_VECTOR
 vector_MatWrapper* T_OPENCV_VECTOR
 vector_StringWrapper* T_OPENCV_VECTOR
 vector_vector_Point2fWrapper* T_OPENCV_VECTOR
+KeyPointWrapper* T_PTROBJ_SPECIAL
+DMatchWrapper* T_PTROBJ_SPECIAL
+FileStorageWrapper* T_PTROBJ_SPECIAL
+FileNodeWrapper* T_PTROBJ_SPECIAL
 
 INPUT
 T_PTROBJ_SPECIAL