X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fvtk%2Fsrc%2FbbvtkUnMosaic.cxx;h=b449f144623ebf411a0d06d133fd4e625e494116;hb=0c2a59d5ac18086c50a0b5e7351b18cad876b905;hp=93f896ed726e2614104f074eedfc9540f5713fa3;hpb=f04aa0e401db270c7e536d104fad8ef35d46f9a6;p=bbtk.git

diff --git a/packages/vtk/src/bbvtkUnMosaic.cxx b/packages/vtk/src/bbvtkUnMosaic.cxx
index 93f896e..b449f14 100644
--- a/packages/vtk/src/bbvtkUnMosaic.cxx
+++ b/packages/vtk/src/bbvtkUnMosaic.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbvtkUnMosaic.cxx,v $
   Language:  C++
-  Date:      $Date: 2010/10/06 16:37:36 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2011/05/31 09:39:11 $
+  Version:   $Revision: 1.3 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -129,18 +129,18 @@ vtkImageData * UnMosaic::unMosaic(vtkImageData *imageIn, int nbImagesPerRow, int
     unsigned short *output =(unsigned short *)(vtkImageOut->GetScalarPointer());
 
     unsigned short *dest = output;
-    int lgrLigne = outputdims[0];
-    int lgrImage = lgrLigne*outputdims[1]; //*sizeof(unsigned short);
+    int dimXImageElem = outputdims[0];
+    int dimYImageElem = outputdims[1];
+    int lgrImage = dimXImageElem*dimYImageElem;
     int debImage;
     for (int i=0; i<numberOfImagesInMosaic; i++)
     {
-       //debImage=(i%nbImagesPerRow) * lgrImage*nbImagesPerRow + (i%nbImagesPerRow)*lgrLigne;
-       debImage=(i/nbImagesPerRow) * lgrImage*nbImagesPerRow + (i%nbImagesPerRow)*lgrLigne;
-       for(int j=0; j<outputdims[1]; j++)
+       debImage=(i/nbImagesPerRow) * lgrImage*nbImagesPerRow + (i%nbImagesPerRow)*dimXImageElem;
+       for(int j=0; j<dimYImageElem; j++)
        {
-          memcpy(dest, input+debImage, lgrLigne*sizeof(unsigned short));
-          debImage += lgrLigne*nbImagesPerRow;
-          dest += lgrLigne;
+          memcpy(dest, input+debImage, dimXImageElem*sizeof(unsigned short));
+          debImage += dimXImageElem*nbImagesPerRow;
+          dest += dimXImageElem;
        }
     }
     return  vtkImageOut;