fixes (broken)

core/image/BlockImageAccessT.tcc

@@ -32,7 +32,7 @@ void BlockImageAccessT<P>::set(const P& value) {
   for(int y=0; y<this->height(); ++y) {
     const P* end = this->getPixelPointerYEnd(y);
     const int inc = this->columnStepsize();
-    for (P* p = this->getPixelPointerY(y); p != end; p = (void*)p + inc) {
+    for (P* p = this->getPixelPointerY(y); p != end; p += inc) {
       *p = value;
     }
   }

core/image/ColorImageT.cpp

@@ -1,4 +1,4 @@
-/*
+    /*
  * NICE-Core - efficient algebra and computer vision methods
  *  - libimage - An image library
  * See file License for license information.

core/image/ColorImageT.tcc

@@ -141,7 +141,8 @@ ColorImageT<P>::ColorImageT(const std::string& fileName,
 {
   this->m_columnStepsize = this->channels() * sizeof(P);
   this->allocPixel(0, 0, _memoryLayout);
-  this->read(ImageFile(fileName));
+  //this->read(ImageFile(fileName));
+  this->read(fileName);
 }
 
 

core/image/GrayColorImageCommonImplementationT.h

@@ -1,6 +1,4 @@
 /*
- * LImUn - Library for ImageT Understanding
- *  - libimage - An ImageT library
  * See file License for license information.
  */
 #ifndef _LIMUN_IMAGET_H
@@ -14,8 +12,10 @@ namespace NICE {
 #include "core/image/ippwrapper.h"
 #include "core/image/pointerArithmetic.h"
 #include "core/image/ImageException.h"
+// this is a cyclic dependency we need to resolve!
+//#include "core/image/ImageFile.h"
 #include "core/image/GrayColorImageCommonImplementation.h"
-#include <core/image/RectT.h>
+#include "core/image/RectT.h"
 
 namespace NICE {
 

core/imagedisplay/ArrayPlot.cpp

@@ -16,13 +16,8 @@
 #include <core/basics/numerictools.h>
 
 #ifdef NICE_USELIB_GLUT
-#ifdef __APPLE__
-#include <OpenGL/gl.h>
-#include <OpenGL/glu.h>
-#else
 #include <GL/glut.h>
 #endif
-#endif
 
 namespace NICE {
 

core/imagedisplay/EpipolarGeometryDisplay.cpp

@@ -14,13 +14,8 @@
 #include <QGridLayout>
 
 #ifdef NICE_USELIB_GLUT
-#ifdef __APPLE__
-#include <OpenGL/gl.h>
-#include <OpenGL/glu.h>
-#else
 #include <GL/glut.h>
 #endif
-#endif
 
 namespace NICE {
 

core/imagedisplay/ImageDisplay.cpp

@@ -8,13 +8,8 @@
 #include <iostream>
 
 #ifdef NICE_USELIB_GLUT
-#ifdef __APPLE__
-#include <OpenGL/gl.h>
-#include <OpenGL/glu.h>
-#else
 #include <GL/glut.h>
 #endif
-#endif
 
 #include <qcursor.h>
 #include <q3filedialog.h>

core/imagedisplay/QtFramework.cpp

@@ -7,13 +7,8 @@
 #include "core/imagedisplay/DefaultMainWindow.h"
 
 #ifdef NICE_USELIB_GLUT
-#ifdef __APPLE__
-#include <OpenGL/gl.h>
-#include <OpenGL/glu.h>
-#else
 #include <GL/glut.h>
 #endif
-#endif
 
 
 namespace NICE {

libtests/test-glut.cpp

@@ -1,7 +1,2 @@
-#ifdef __APPLE__
-#include <OpenGL/gl.h>
-#include <OpenGL/glu.h>
-#else
 #include <GL/glut.h>
-#endif
 int main(){}