move Image2D into Basic/

PDLPorters · Dec 2, 2024 · a3fb4f7 · a3fb4f7
1 parent 86feb83
commit a3fb4f7
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 28 deletions.
diff --git a/Basic/.gitignore b/Basic/.gitignore
@@ -15,6 +15,9 @@ lib/PDL/IO/Misc.xs
 lib/PDL/IO/Pnm.c
 lib/PDL/IO/Pnm.pm
 lib/PDL/IO/Pnm.xs
+lib/PDL/Image2D.c
+lib/PDL/Image2D.pm
+lib/PDL/Image2D.xs
 lib/PDL/ImageND.c
 lib/PDL/ImageND.pm
 lib/PDL/ImageND.xs

diff --git a/Libtmp/Image2D/image2d.pd → Basic/lib/PDL/Image2D.pd b/Libtmp/Image2D/image2d.pd → Basic/lib/PDL/Image2D.pd
@@ -2,6 +2,12 @@ use strict;
 use warnings;
 use PDL::Types qw(ppdefs_all);
 my $A = [ppdefs_all];
+
+{ no warnings 'once'; # pass info back to Makefile.PL
+$PDL::Core::Dev::EXTRAS{$::PDLMOD}{OBJECT} .= join '', map " $::PDLBASE/$_\$(OBJ_EXT)", qw(rotate resample select misc);
+$PDL::Core::Dev::EXTRAS{$::PDLMOD}{INC} .= qq{ "-I$::PDLBASE"};
+}
+
 pp_addpm({At=>'Top'},<<'EOD');
 use strict;
 use warnings;

diff --git a/Libtmp/Image2D/misc.c → Basic/lib/PDL/Image2D/misc.c b/Libtmp/Image2D/misc.c → Basic/lib/PDL/Image2D/misc.c
diff --git a/Libtmp/Image2D/resample.c → Basic/lib/PDL/Image2D/resample.c b/Libtmp/Image2D/resample.c → Basic/lib/PDL/Image2D/resample.c
diff --git a/Libtmp/Image2D/resample.h → Basic/lib/PDL/Image2D/resample.h b/Libtmp/Image2D/resample.h → Basic/lib/PDL/Image2D/resample.h
diff --git a/Libtmp/Image2D/rotate.c → Basic/lib/PDL/Image2D/rotate.c b/Libtmp/Image2D/rotate.c → Basic/lib/PDL/Image2D/rotate.c
diff --git a/Libtmp/Image2D/select.c → Basic/lib/PDL/Image2D/select.c b/Libtmp/Image2D/select.c → Basic/lib/PDL/Image2D/select.c
diff --git a/Libtmp/Image2D/t/image2d.t → Basic/t/image2d.t b/Libtmp/Image2D/t/image2d.t → Basic/t/image2d.t
@@ -9,7 +9,7 @@ use Test::PDL;
 
 # compare fft convolutions with direct method
 {
-my $pa = rfits("../../Basic/lib/PDL/Demos/m51.fits");
+my $pa = rfits("lib/PDL/Demos/m51.fits");
 {
 my $pk = ones(5,5);
 my $pb = conv2d($pa,$pk);

diff --git a/Libtmp/Image2D/.gitignore b/Libtmp/Image2D/.gitignore
diff --git a/Libtmp/Image2D/Makefile.PL b/Libtmp/Image2D/Makefile.PL
diff --git a/MANIFEST b/MANIFEST
@@ -65,6 +65,12 @@ Basic/lib/PDL/FFT.pd
 Basic/lib/PDL/FFT/fftn.c
 Basic/lib/PDL/FFT/fftn.h
 Basic/lib/PDL/Graphics.pod
+Basic/lib/PDL/Image2D.pd
+Basic/lib/PDL/Image2D/misc.c
+Basic/lib/PDL/Image2D/resample.c
+Basic/lib/PDL/Image2D/resample.h
+Basic/lib/PDL/Image2D/rotate.c
+Basic/lib/PDL/Image2D/select.c
 Basic/lib/PDL/ImageND.pd
 Basic/lib/PDL/ImageRGB.pd
 Basic/lib/PDL/ImageRGB/pdlppm.h
@@ -183,6 +189,7 @@ Basic/t/flexraw-iotypes.t
 Basic/t/flexraw.t
 Basic/t/flexraw_fortran.t
 Basic/t/func.pdl
+Basic/t/image2d.t
 Basic/t/imagend.t
 Basic/t/imagergb.t
 Basic/t/inline-with.t
@@ -374,14 +381,6 @@ Libtmp/GSL/t/gsl_rng.t
 Libtmp/GSL/t/gsl_sf.t
 Libtmp/GSL/t/stats_distr.t
 Libtmp/GSL/typemap
-Libtmp/Image2D/image2d.pd
-Libtmp/Image2D/Makefile.PL
-Libtmp/Image2D/misc.c
-Libtmp/Image2D/resample.c
-Libtmp/Image2D/resample.h
-Libtmp/Image2D/rotate.c
-Libtmp/Image2D/select.c
-Libtmp/Image2D/t/image2d.t
 Libtmp/Makefile.PL
 Libtmp/Simplex/Demo.pm
 Libtmp/Simplex/Makefile.PL

diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP
@@ -44,6 +44,7 @@ RCS
 ^Basic/lib/PDL/FFT(\.(pm|xs|c)$|-pp-)
 ^Basic/lib/PDL/IO/Misc(\.(pm|xs|c)$|-pp-)
 ^Basic/lib/PDL/IO/Pnm(\.(pm|xs|c)$|-pp-)
+^Basic/lib/PDL/Image2D(\.(pm|xs|c)$|-pp-)
 ^Basic/lib/PDL/ImageND(\.(pm|xs|c)$|-pp-)
 ^Basic/lib/PDL/ImageRGB(\.(pm|xs|c)$|-pp-)
 ^Basic/lib/PDL/Math(\.(pm|xs|c)$|-pp-)
@@ -77,7 +78,6 @@ RCS
 ^Libtmp/GSL/lib/PDL/GSL/RNG(\.(pm|xs|c)$|-pp-)
 ^Libtmp/GSL/lib/PDL/GSL/SF(\.(pm|xs|c)$|-pp-)
 ^Libtmp/GSL/lib/PDL/Stats/Distr(\.(pm|xs|c)$|-pp-)
-^Libtmp/Image2D/Image2D\..*
 ^Libtmp/Slatec/Slatec..*
 ^Libtmp/Slatec/slatec/.*\.c$
 ^Libtmp/Transform-Proj4/Proj4\..*