X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcpInstances%2FImage.d;h=b9a2444ca3ed26fe25db0bb9a302cd3e47a74022;hb=a52d42076db836c8af9106109b7f899d928de397;hp=165a06a4cdb9328d008c34a532eb530f3f789288;hpb=24d5c00294fc95f6f0d858a35799b77d97055745;p=cpPlugins.git

diff --git a/lib/cpInstances/Image.d b/lib/cpInstances/Image.d
index 165a06a..b9a2444 100644
--- a/lib/cpInstances/Image.d
+++ b/lib/cpInstances/Image.d
@@ -1,26 +1,27 @@
 define all_ints=#int_types#;unsigned #int_types#
+define color_pixels=RGBPixel;RGBAPixel
 
-ProcessDims itk::ImageBase< #process_dims# >
-VisualDims itk::ImageBase< #visual_dims# >
+ProcessDims itk::ImageBase< #pdims# >
+VisualDims itk::ImageBase< #vdims# >
 
 IntPixels|d itk::Image< #all_ints#, d >
 RealPixels|d itk::Image< #real_types#, d >
-ScalarPixels|d itk::Image< #scalar_pixels#, d >
+ScalarPixels|d itk::Image< #scalar_types#, d >
 ComplexPixels|d itk::Image< std::complex< #real_types# >, d >
-ColorPixels|d itk::Image< itk::#color_pixels#< #scalar_pixels# >, d >
+ColorPixels|d itk::Image< itk::#color_pixels#< #scalar_types# >, d >
 VectorPixels|d itk::Image< itk::#vectors#< #real_types#, d >, d >
 DiffTensors3D itk::Image< itk::#diff_tensors#< #real_types# >, 3 >
 
-IntPixels_AllDims itk::Image< #all_ints#, #process_dims# >
-IntPixels_VisualDims itk::Image< #all_ints#, #process_dims# >
-RealPixels_AllDims itk::Image< #real_types#, #process_dims# >
-RealPixels_VisualDims itk::Image< #real_types#, #process_dims# >
-ScalarPixels_AllDims itk::Image< #scalar_pixels#, #process_dims# >
-ScalarPixels_VisualDims itk::Image< #scalar_pixels#, #visual_dims# >
-ColorPixels_AllDims itk::Image< itk::#color_pixels#< #scalar_pixels# >, #process_dims# >
-ColorPixels_VisualDims itk::Image< itk::#color_pixels#< #scalar_pixels# >, #visual_dims# >
-VectorPixels_AllDims itk::Image< itk::#vectors#< #real_types#, #process_dims# >, #process_dims# >
-VectorPixels_VisualDims itk::Image< itk::#vectors#< #real_types#, #visual_dims# >, #visual_dims# >
-CovariantVectorPixels_AllDims itk::Image< itk::CovariantVector< #real_types#, #process_dims# >, #process_dims# >
+IntPixels_AllDims itk::Image< #all_ints#, #pdims# >
+IntPixels_VisualDims itk::Image< #all_ints#, #pdims# >
+RealPixels_AllDims itk::Image< #real_types#, #pdims# >
+RealPixels_VisualDims itk::Image< #real_types#, #pdims# >
+ScalarPixels_AllDims itk::Image< #scalar_types#, #pdims# >
+ScalarPixels_VisualDims itk::Image< #scalar_types#, #vdims# >
+ColorPixels_AllDims itk::Image< itk::#color_pixels#< #scalar_types# >, #pdims# >
+ColorPixels_VisualDims itk::Image< itk::#color_pixels#< #scalar_types# >, #vdims# >
+VectorPixels_AllDims itk::Image< itk::#vectors#< #real_types#, #pdims# >, #pdims# >
+VectorPixels_VisualDims itk::Image< itk::#vectors#< #real_types#, #vdims# >, #vdims# >
+CovariantVectorPixels_AllDims itk::Image< itk::CovariantVector< #real_types#, #pdims# >, #pdims# >
 
 ** eof - $RCSfile$