- CGALimageIO now has a header <CGAL/ImageIO.h>,

- all files and headers have a copyright header,
- CGALimageIO no longer need the cpp flag -I. (use #include "..." instead
  of #include <...>.

Checked: local compilation of libCGALimageIO works. I assume the
install_cgal will be able to compile it as well.

CGALimageIO/src/CGALimageIO/ImageIO.cpp

@@ -32,7 +32,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "imageio/ImageIO.h"
+#include <CGAL/ImageIO.h>
 
 /* formats actuellement lus 
 

CGALimageIO/src/CGALimageIO/analyze.h

@@ -29,7 +29,7 @@
 
 
 
-#include "imageio/ImageIO.h"
+#include <CGAL/ImageIO.h>
 
 /* read analyse format header
 

CGALimageIO/src/CGALimageIO/bmp.h

@@ -49,7 +49,7 @@
 #include <sys/stat.h> /* open, close */
 #include <sys/types.h> /* open, close */
 #include <string.h>
-#include "imageio/ImageIO.h"
+#include <CGAL/ImageIO.h>
 extern int readBmpImage(const char *name, _image *im);
 extern void *_readBmpImage( const char *name, int *dimx, int *dimy, int *dimz );
 int testBmpHeader(char *magic,const char *name);

CGALimageIO/src/CGALimageIO/convert.cpp

@@ -42,7 +42,7 @@
  *
  */
 
-#include <convert.h>
+#include "convert.h"
 
 void ConvertBuffer( void *bufferIn,
 		    bufferType typeIn,

CGALimageIO/src/CGALimageIO/convert.h

@@ -49,7 +49,7 @@
 
 #include <stdio.h> /* memcpy */
 #include <string.h> /* memcpy */
-#include <typedefs.h>
+#include "typedefs.h"
 
 
 

CGALimageIO/src/CGALimageIO/gif.h

@@ -25,7 +25,7 @@
 
 
 #include <stdio.h>
-#include "imageio/ImageIO.h"
+#include <CGAL/ImageIO.h>
 int readGifImage(const char *name,_image *im);
 
 int testGifHeader(char *magic,const char *name);

CGALimageIO/src/CGALimageIO/gis.h

@@ -24,7 +24,7 @@
 #define GIS_H
 
 
-#include "imageio/ImageIO.h"
+#include <CGAL/ImageIO.h>
 
 
 

CGALimageIO/src/CGALimageIO/inr.h

@@ -25,7 +25,7 @@
 #define INR_H
 
 
-#include "imageio/ImageIO.h"
+#include <CGAL/ImageIO.h>
 
 
 

CGALimageIO/src/CGALimageIO/iris.h

@@ -23,7 +23,7 @@
 #ifndef IRIS_H
 #define IRIS_H
 
-#include "imageio/ImageIO.h"
+#include <CGAL/ImageIO.h>
 
 
 

CGALimageIO/src/CGALimageIO/makefile

@@ -49,7 +49,7 @@ SOMAJOR=2
 
 LIB_NAME_BASE = CGALimageIO
 
-ADDITIONAL_CXXFLAGS = -I. $(ALL_ZLIB_CXXFLAGS)
+ADDITIONAL_CXXFLAGS = -I../../include $(ALL_ZLIB_CXXFLAGS)
 SHARED_LIB_ADDITIONAL_LDFLAGS = $(ZLIB_LIBPATHFLAGS) $(ZLIB_LDFLAGS)
 
 #---------------------------------------------------------------------#

CGALimageIO/src/CGALimageIO/mincio.h

@@ -25,7 +25,7 @@
 
 #ifdef MINC_FILES
 
-#include "imageio/ImageIO.h"
+#include <CGAL/ImageIO.h>
 #include <minc.h>
 
 

CGALimageIO/src/CGALimageIO/pnm.h

@@ -25,7 +25,7 @@
 
 #include <stdio.h>
 
-#include "imageio/ImageIO.h"
+#include <CGAL/ImageIO.h>
 
 
 int readPpmImage(const char *name,_image *im);

CGALimageIO/src/CGALimageIO/recbuffer.cpp

@@ -54,8 +54,8 @@
 
 
 
-#include <convert.h>
-#include <recbuffer.h>
+#include "convert.h"
+#include "recbuffer.h"
 
 static int _VERBOSE_ = 0;
 

CGALimageIO/src/CGALimageIO/recbuffer.h

@@ -50,8 +50,8 @@
 #define _recbuffer_h_
 
 
-#include <typedefs.h>
-#include <recline.h>
+#include "typedefs.h"
+#include "recline.h"
 
 
 

CGALimageIO/src/CGALimageIO/recline.cpp

@@ -53,7 +53,7 @@
 
 
 
-#include <recline.h>
+#include "recline.h"
 
 static int _VERBOSE_RECLINE_ = 0;
 

CGALimageIO/src/CGALimageIO/reech4x4.cpp

@@ -46,9 +46,9 @@
    UNLESS YOU HAVE A VERY GOOD REASON 
  */
 
-#include <reech4x4.h>
+#include "reech4x4.h"
 #include <stdio.h>
-#include <typedefs.h>
+#include "typedefs.h"
 
 #define _CONVERTR_(R) ( R )
 #define _CONVERTI_(R) ( (R) >= 0.0 ? ((int)((R)+0.5)) : ((int)((R)-0.5)) )