X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaImageIOVtkImageReader.cpp;h=5745728bdb3b48da9f7645dabb631dd1e7f53653;hb=1813f80def50d02057c58a83245739066f37f9f0;hp=60ef13a8bfa0e087e95669378881d07a1309df4a;hpb=239bc68ced8df17fbab55fa97c826e2cb20aec76;p=creaImageIO.git

diff --git a/src/creaImageIOVtkImageReader.cpp b/src/creaImageIOVtkImageReader.cpp
index 60ef13a..5745728 100644
--- a/src/creaImageIOVtkImageReader.cpp
+++ b/src/creaImageIOVtkImageReader.cpp
@@ -26,6 +26,8 @@
 */
 
 
+#include <vtkVersionMacros.h>
+
 #include <creaImageIOVtkImageReader.h>
 #include <vtkImageReader2.h>
 
@@ -43,7 +45,7 @@ namespace creaImageIO{
   {
 	  
 	//EED 21 mars 2012  FLIP probleme  ..PLOP..
-	mReader->FileLowerLeftOn();
+	mReader->FileLowerLeftOff();
 	  
     if (name.size() == 0) 
       {
@@ -98,13 +100,50 @@ namespace creaImageIO{
     vtkImageData* im = 0;
     try
       {
-	
-	mReader->SetFileName(filename.c_str());
+	mReader->SetFileName( filename.c_str() );
 	mReader->Update();
 	im = vtkImageData::New();
-        mReader->FileLowerLeftOff();
+
 	im->ShallowCopy(mReader->GetOutput());
-printf("EED VtkImageReader::ReadImage GetFileLowerLeft %d\n" , mReader->GetFileLowerLeft() );
+
+printf("EED VtkImageReader::ReadImage line 108   Missing FlipImage for JPEG, PNG, etc\n");
+/*
+        im=FlipImageY(im);          
+
+	if ( (GetName()=="JPEG") || (GetName()=="PNG") )
+	{
+
+		im->Update();
+		int inputdims[3];
+		im->GetDimensions (inputdims);
+
+                int nbScalComp	= im->GetNumberOfScalarComponents();
+		int scalarSize	= im->GetScalarSize();
+		int lineSize	= inputdims[0]*scalarSize*nbScalComp;	   
+		int planeSize	= inputdims[1]*lineSize;
+                int volumeSize  = inputdims[2]*planeSize;
+		char *pixelsIn	= (char *)im->GetScalarPointer();
+		char *pixelsOut = (char *)mImageOut->GetScalarPointer();
+	
+		char *lineIn;
+		char *lineOut;
+		char *debPlanIn;
+		char *debPlanOut;
+		int i,j,k;
+
+            	for(k=0; k<inputdims[2]; k++)  // iterate  planes
+			{  
+				debPlanIn	= pixelsIn+k*planeSize;
+				debPlanOut	= pixelsOut+k*planeSize;
+				for(j=0; j<inputdims[1]; j++)  // iterates  rows
+				{ 
+					lineIn = debPlanIn+j*lineSize;
+					lineOut = debPlanOut+(inputdims[1]-1-j)*lineSize;
+					memcpy(lineOut,  lineIn, lineSize);
+				}	// for j
+			} // for k
+	} // FLIP : JPEG PNG
+*/
       }
     catch (...)
       {