[opengtl-commits] [270] fix compilation now that images are in GTLCore

[subversion@xxxxxxxxxxxxx]

Revision: 270
Author:   cyrille
Date:     2008-06-30 21:59:42 +0200 (Mon, 30 Jun 2008)

Log Message:
-----------
fix compilation now that images are in GTLCore

Modified Paths:
--------------
    trunk/QtShiva/QtGTL.h
    trunk/QtShiva/QtShiva.cpp


Modified: trunk/QtShiva/QtGTL.h
===================================================================
--- trunk/QtShiva/QtGTL.h	2008-06-30 19:58:13 UTC (rev 269)
+++ trunk/QtShiva/QtGTL.h	2008-06-30 19:59:42 UTC (rev 270)
@@ -4,6 +4,7 @@
 
 #include <QImage>
 #include <GTLCore/Buffer.h>
+#include <GTLCore/BufferImage.h>
 
 class QImageBuffer : public GTLCore::Buffer {
   public:
@@ -17,7 +18,7 @@
     QImage m_image;
 };
 
-class QImageImage : public OpenShiva::BufferImage {
+class QImageImage : public GTLCore::BufferImage {
   public:
     QImageImage(const QImage& img) : BufferImage( img.width(), img.height(), new QImageBuffer( img ), imageToPixelDescription( img ) )
     {

Modified: trunk/QtShiva/QtShiva.cpp
===================================================================
--- trunk/QtShiva/QtShiva.cpp	2008-06-30 19:58:13 UTC (rev 269)
+++ trunk/QtShiva/QtShiva.cpp	2008-06-30 19:59:42 UTC (rev 270)
@@ -28,7 +28,6 @@
 #include "ui_MainWindow.h"
 
 #include <OpenShiva/Kernel.h>
-#include <OpenShiva/Image.h>
 #include <GTLCore/PixelDescription.h>
 #include <GTLCore/Region.h>
 #include <GTLCore/RegionF.h>
@@ -89,7 +88,7 @@
   if(p.isCompiled())
   {
 //     OpenShiva::Image image(1000, 1000, pixel );
-    std::list<OpenShiva::AbstractImage*> inputImages;
+    std::list<GTLCore::AbstractImage*> inputImages;
     for( int k = 0; k < m_mainWindow->listImages->count(); ++k)
     {
       QString fileName = m_mainWindow->listImages->item( k )->data( Qt::UserRole ).toString();
@@ -100,7 +99,7 @@
                               .arg(fileName));
         return;
       }
-      OpenShiva::AbstractImage* iImage = new QImageImage( img );
+      GTLCore::AbstractImage* iImage = new QImageImage( img );
       inputImages.push_back( iImage );
     }
     // -
@@ -121,7 +120,7 @@
       }
     }
 #endif
-    for( std::list<OpenShiva::AbstractImage*>::iterator it = inputImages.begin();
+    for( std::list<GTLCore::AbstractImage*>::iterator it = inputImages.begin();
          it != inputImages.end(); ++it)
     {
       delete *it;