From 093d93d73d56d695787fe8d709ee8b0cc03ffe8a Mon Sep 17 00:00:00 2001
From: Laurent Rineau <Laurent.Rineau__CGAL@normalesup.org>
Date: Thu, 24 Jan 2008 14:42:03 +0000
Subject: [PATCH] - 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.
---
 .../{src/CGALimageIO/imageio => include/CGAL}/ImageIO.h       | 0
 CGALimageIO/src/CGALimageIO/ImageIO.cpp                       | 2 +-
 CGALimageIO/src/CGALimageIO/analyze.h                         | 2 +-
 CGALimageIO/src/CGALimageIO/bmp.h                             | 2 +-
 CGALimageIO/src/CGALimageIO/convert.cpp                       | 2 +-
 CGALimageIO/src/CGALimageIO/convert.h                         | 2 +-
 CGALimageIO/src/CGALimageIO/gif.h                             | 2 +-
 CGALimageIO/src/CGALimageIO/gis.h                             | 2 +-
 CGALimageIO/src/CGALimageIO/inr.h                             | 2 +-
 CGALimageIO/src/CGALimageIO/iris.h                            | 2 +-
 CGALimageIO/src/CGALimageIO/makefile                          | 2 +-
 CGALimageIO/src/CGALimageIO/mincio.h                          | 2 +-
 CGALimageIO/src/CGALimageIO/pnm.h                             | 2 +-
 CGALimageIO/src/CGALimageIO/recbuffer.cpp                     | 4 ++--
 CGALimageIO/src/CGALimageIO/recbuffer.h                       | 4 ++--
 CGALimageIO/src/CGALimageIO/recline.cpp                       | 2 +-
 CGALimageIO/src/CGALimageIO/reech4x4.cpp                      | 4 ++--
 17 files changed, 19 insertions(+), 19 deletions(-)
 rename CGALimageIO/{src/CGALimageIO/imageio => include/CGAL}/ImageIO.h (100%)

diff --git a/CGALimageIO/src/CGALimageIO/imageio/ImageIO.h b/CGALimageIO/include/CGAL/ImageIO.h
similarity index 100%
rename from CGALimageIO/src/CGALimageIO/imageio/ImageIO.h
rename to CGALimageIO/include/CGAL/ImageIO.h
diff --git a/CGALimageIO/src/CGALimageIO/ImageIO.cpp b/CGALimageIO/src/CGALimageIO/ImageIO.cpp
index 090c5ee9154..3f69ba6a2c6 100644
--- a/CGALimageIO/src/CGALimageIO/ImageIO.cpp
+++ b/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 
 
diff --git a/CGALimageIO/src/CGALimageIO/analyze.h b/CGALimageIO/src/CGALimageIO/analyze.h
index eb8dea0006e..10b336afc8d 100644
--- a/CGALimageIO/src/CGALimageIO/analyze.h
+++ b/CGALimageIO/src/CGALimageIO/analyze.h
@@ -29,7 +29,7 @@
 
 
 
-#include "imageio/ImageIO.h"
+#include <CGAL/ImageIO.h>
 
 /* read analyse format header
 
diff --git a/CGALimageIO/src/CGALimageIO/bmp.h b/CGALimageIO/src/CGALimageIO/bmp.h
index 86796fbb503..3ee7edee401 100644
--- a/CGALimageIO/src/CGALimageIO/bmp.h
+++ b/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);
diff --git a/CGALimageIO/src/CGALimageIO/convert.cpp b/CGALimageIO/src/CGALimageIO/convert.cpp
index 62ff3b4c78e..bc3d740735a 100644
--- a/CGALimageIO/src/CGALimageIO/convert.cpp
+++ b/CGALimageIO/src/CGALimageIO/convert.cpp
@@ -42,7 +42,7 @@
  *
  */
 
-#include <convert.h>
+#include "convert.h"
 
 void ConvertBuffer( void *bufferIn,
 		    bufferType typeIn,
diff --git a/CGALimageIO/src/CGALimageIO/convert.h b/CGALimageIO/src/CGALimageIO/convert.h
index bd4aeaa64b0..8c3b0570223 100644
--- a/CGALimageIO/src/CGALimageIO/convert.h
+++ b/CGALimageIO/src/CGALimageIO/convert.h
@@ -49,7 +49,7 @@
 
 #include <stdio.h> /* memcpy */
 #include <string.h> /* memcpy */
-#include <typedefs.h>
+#include "typedefs.h"
 
 
 
diff --git a/CGALimageIO/src/CGALimageIO/gif.h b/CGALimageIO/src/CGALimageIO/gif.h
index cb90eb5842c..9b80f3d9f1d 100644
--- a/CGALimageIO/src/CGALimageIO/gif.h
+++ b/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);
diff --git a/CGALimageIO/src/CGALimageIO/gis.h b/CGALimageIO/src/CGALimageIO/gis.h
index 75ca1842ed8..b9496fa5df8 100644
--- a/CGALimageIO/src/CGALimageIO/gis.h
+++ b/CGALimageIO/src/CGALimageIO/gis.h
@@ -24,7 +24,7 @@
 #define GIS_H
 
 
-#include "imageio/ImageIO.h"
+#include <CGAL/ImageIO.h>
 
 
 
diff --git a/CGALimageIO/src/CGALimageIO/inr.h b/CGALimageIO/src/CGALimageIO/inr.h
index f2bbc2543ac..4ab22e2aeaa 100644
--- a/CGALimageIO/src/CGALimageIO/inr.h
+++ b/CGALimageIO/src/CGALimageIO/inr.h
@@ -25,7 +25,7 @@
 #define INR_H
 
 
-#include "imageio/ImageIO.h"
+#include <CGAL/ImageIO.h>
 
 
 
diff --git a/CGALimageIO/src/CGALimageIO/iris.h b/CGALimageIO/src/CGALimageIO/iris.h
index cf1244d8367..52db0bf3e79 100644
--- a/CGALimageIO/src/CGALimageIO/iris.h
+++ b/CGALimageIO/src/CGALimageIO/iris.h
@@ -23,7 +23,7 @@
 #ifndef IRIS_H
 #define IRIS_H
 
-#include "imageio/ImageIO.h"
+#include <CGAL/ImageIO.h>
 
 
 
diff --git a/CGALimageIO/src/CGALimageIO/makefile b/CGALimageIO/src/CGALimageIO/makefile
index 349179ecfcb..969c84d8181 100644
--- a/CGALimageIO/src/CGALimageIO/makefile
+++ b/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)
 
 #---------------------------------------------------------------------#
diff --git a/CGALimageIO/src/CGALimageIO/mincio.h b/CGALimageIO/src/CGALimageIO/mincio.h
index 49aab50deb7..83f044ce488 100644
--- a/CGALimageIO/src/CGALimageIO/mincio.h
+++ b/CGALimageIO/src/CGALimageIO/mincio.h
@@ -25,7 +25,7 @@
 
 #ifdef MINC_FILES
 
-#include "imageio/ImageIO.h"
+#include <CGAL/ImageIO.h>
 #include <minc.h>
 
 
diff --git a/CGALimageIO/src/CGALimageIO/pnm.h b/CGALimageIO/src/CGALimageIO/pnm.h
index 4a3b89585ed..1d7448e166c 100644
--- a/CGALimageIO/src/CGALimageIO/pnm.h
+++ b/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);
diff --git a/CGALimageIO/src/CGALimageIO/recbuffer.cpp b/CGALimageIO/src/CGALimageIO/recbuffer.cpp
index dc656ee752e..32767339225 100644
--- a/CGALimageIO/src/CGALimageIO/recbuffer.cpp
+++ b/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;
 
diff --git a/CGALimageIO/src/CGALimageIO/recbuffer.h b/CGALimageIO/src/CGALimageIO/recbuffer.h
index c8c570c33b7..d4bb5c33add 100644
--- a/CGALimageIO/src/CGALimageIO/recbuffer.h
+++ b/CGALimageIO/src/CGALimageIO/recbuffer.h
@@ -50,8 +50,8 @@
 #define _recbuffer_h_
 
 
-#include <typedefs.h>
-#include <recline.h>
+#include "typedefs.h"
+#include "recline.h"
 
 
 
diff --git a/CGALimageIO/src/CGALimageIO/recline.cpp b/CGALimageIO/src/CGALimageIO/recline.cpp
index 425ff8209d1..840cf08748a 100644
--- a/CGALimageIO/src/CGALimageIO/recline.cpp
+++ b/CGALimageIO/src/CGALimageIO/recline.cpp
@@ -53,7 +53,7 @@
 
 
 
-#include <recline.h>
+#include "recline.h"
 
 static int _VERBOSE_RECLINE_ = 0;
 
diff --git a/CGALimageIO/src/CGALimageIO/reech4x4.cpp b/CGALimageIO/src/CGALimageIO/reech4x4.cpp
index 05d85cb5b58..9e5b4efead3 100644
--- a/CGALimageIO/src/CGALimageIO/reech4x4.cpp
+++ b/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)) )