Update of /cvsroot/boost/boost/boost/gil/extension/io
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv28572/extension/io
Modified Files:
dynamic_io.hpp io_error.hpp jpeg_dynamic_io.hpp jpeg_io.hpp
jpeg_io_private.hpp png_dynamic_io.hpp png_io.hpp
png_io_private.hpp tiff_dynamic_io.hpp tiff_io.hpp
Log Message:
Fixed headers to refer to the Boost license. Fixed min/max issues and removed
tabs.
Index: dynamic_io.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/gil/extension/io/dynamic_io.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- dynamic_io.hpp 23 Apr 2007 23:15:01 -0000 1.1
+++ dynamic_io.hpp 7 May 2007 07:32:02 -0000 1.2
@@ -1,9 +1,12 @@
/*
- Copyright 2005-2007 Adobe Systems Incorporated
- Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt
- or a copy at http://opensource.adobe.com/licenses.html)
-*/
+ Copyright 2005-2007 Adobe Systems Incorporated
+
+ Use, modification and distribution are subject to the Boost Software
License,
+ Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+ http://www.boost.org/LICENSE_1_0.txt).
+ See http://opensource.adobe.com/gil for most recent version including
documentation.
+*/
/*************************************************************************************************/
#ifndef GIL_DYNAMIC_IO_H
Index: io_error.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/gil/extension/io/io_error.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- io_error.hpp 23 Apr 2007 23:15:01 -0000 1.1
+++ io_error.hpp 7 May 2007 07:32:02 -0000 1.2
@@ -1,9 +1,12 @@
/*
- Copyright 2005-2007 Adobe Systems Incorporated
- Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt
- or a copy at http://opensource.adobe.com/licenses.html)
-*/
+ Copyright 2005-2007 Adobe Systems Incorporated
+
+ Use, modification and distribution are subject to the Boost Software
License,
+ Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+ http://www.boost.org/LICENSE_1_0.txt).
+ See http://opensource.adobe.com/gil for most recent version including
documentation.
+*/
/*************************************************************************************************/
#ifndef GIL_IO_ERROR_H
Index: jpeg_dynamic_io.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/gil/extension/io/jpeg_dynamic_io.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- jpeg_dynamic_io.hpp 23 Apr 2007 23:15:01 -0000 1.1
+++ jpeg_dynamic_io.hpp 7 May 2007 07:32:02 -0000 1.2
@@ -1,7 +1,11 @@
/*
- Copyright 2005-2007 Adobe Systems Incorporated
- Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt
- or a copy at http://opensource.adobe.com/licenses.html)
+ Copyright 2005-2007 Adobe Systems Incorporated
+
+ Use, modification and distribution are subject to the Boost Software
License,
+ Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+ http://www.boost.org/LICENSE_1_0.txt).
+
+ See http://opensource.adobe.com/gil for most recent version including
documentation.
*/
/*************************************************************************************************/
Index: jpeg_io.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/gil/extension/io/jpeg_io.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- jpeg_io.hpp 23 Apr 2007 23:15:01 -0000 1.1
+++ jpeg_io.hpp 7 May 2007 07:32:02 -0000 1.2
@@ -1,7 +1,11 @@
/*
- Copyright 2005-2007 Adobe Systems Incorporated
- Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt
- or a copy at http://opensource.adobe.com/licenses.html)
+ Copyright 2005-2007 Adobe Systems Incorporated
+
+ Use, modification and distribution are subject to the Boost Software
License,
+ Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+ http://www.boost.org/LICENSE_1_0.txt).
+
+ See http://opensource.adobe.com/gil for most recent version including
documentation.
*/
/*************************************************************************************************/
Index: jpeg_io_private.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/gil/extension/io/jpeg_io_private.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- jpeg_io_private.hpp 23 Apr 2007 23:15:01 -0000 1.1
+++ jpeg_io_private.hpp 7 May 2007 07:32:02 -0000 1.2
@@ -1,7 +1,11 @@
/*
- Copyright 2005-2007 Adobe Systems Incorporated
- Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt
- or a copy at http://opensource.adobe.com/licenses.html)
+ Copyright 2005-2007 Adobe Systems Incorporated
+
+ Use, modification and distribution are subject to the Boost Software
License,
+ Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+ http://www.boost.org/LICENSE_1_0.txt).
+
+ See http://opensource.adobe.com/gil for most recent version including
documentation.
*/
/*************************************************************************************************/
Index: png_dynamic_io.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/gil/extension/io/png_dynamic_io.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- png_dynamic_io.hpp 23 Apr 2007 23:15:01 -0000 1.1
+++ png_dynamic_io.hpp 7 May 2007 07:32:02 -0000 1.2
@@ -1,7 +1,11 @@
/*
- Copyright 2005-2007 Adobe Systems Incorporated
- Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt
- or a copy at http://opensource.adobe.com/licenses.html)
+ Copyright 2005-2007 Adobe Systems Incorporated
+
+ Use, modification and distribution are subject to the Boost Software
License,
+ Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+ http://www.boost.org/LICENSE_1_0.txt).
+
+ See http://opensource.adobe.com/gil for most recent version including
documentation.
*/
/*************************************************************************************************/
Index: png_io.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/gil/extension/io/png_io.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- png_io.hpp 23 Apr 2007 23:15:01 -0000 1.1
+++ png_io.hpp 7 May 2007 07:32:02 -0000 1.2
@@ -1,7 +1,11 @@
/*
- Copyright 2005-2007 Adobe Systems Incorporated
- Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt
- or a copy at http://opensource.adobe.com/licenses.html)
+ Copyright 2005-2007 Adobe Systems Incorporated
+
+ Use, modification and distribution are subject to the Boost Software
License,
+ Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+ http://www.boost.org/LICENSE_1_0.txt).
+
+ See http://opensource.adobe.com/gil for most recent version including
documentation.
*/
/*************************************************************************************************/
Index: png_io_private.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/gil/extension/io/png_io_private.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- png_io_private.hpp 23 Apr 2007 23:15:01 -0000 1.1
+++ png_io_private.hpp 7 May 2007 07:32:02 -0000 1.2
@@ -1,9 +1,12 @@
/*
- Copyright 2005-2007 Adobe Systems Incorporated
- Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt
- or a copy at http://opensource.adobe.com/licenses.html)
-*/
+ Copyright 2005-2007 Adobe Systems Incorporated
+
+ Use, modification and distribution are subject to the Boost Software
License,
+ Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+ http://www.boost.org/LICENSE_1_0.txt).
+ See http://opensource.adobe.com/gil for most recent version including
documentation.
+*/
/*************************************************************************************************/
#ifndef GIL_PNG_IO_PRIVATE_H
Index: tiff_dynamic_io.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/gil/extension/io/tiff_dynamic_io.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- tiff_dynamic_io.hpp 23 Apr 2007 23:15:01 -0000 1.1
+++ tiff_dynamic_io.hpp 7 May 2007 07:32:02 -0000 1.2
@@ -1,7 +1,11 @@
/*
- Copyright 2005-2007 Adobe Systems Incorporated
- Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt
- or a copy at http://opensource.adobe.com/licenses.html)
+ Copyright 2005-2007 Adobe Systems Incorporated
+
+ Use, modification and distribution are subject to the Boost Software
License,
+ Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+ http://www.boost.org/LICENSE_1_0.txt).
+
+ See http://opensource.adobe.com/gil for most recent version including
documentation.
*/
/*************************************************************************************************/
Index: tiff_io.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/gil/extension/io/tiff_io.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- tiff_io.hpp 23 Apr 2007 23:15:01 -0000 1.1
+++ tiff_io.hpp 7 May 2007 07:32:02 -0000 1.2
@@ -1,7 +1,11 @@
/*
- Copyright 2005-2007 Adobe Systems Incorporated
- Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt
- or a copy at http://opensource.adobe.com/licenses.html)
+ Copyright 2005-2007 Adobe Systems Incorporated
+
+ Use, modification and distribution are subject to the Boost Software
License,
+ Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+ http://www.boost.org/LICENSE_1_0.txt).
+
+ See http://opensource.adobe.com/gil for most recent version including
documentation.
*/
/*************************************************************************************************/
@@ -138,8 +142,8 @@
"tiff_read_view: input view type is incompatible with the
image type");
std::size_t element_size=sizeof(pixel<typename
channel_type<View>::type,
layout<typename
color_space_type<View>::type> >);
- std::size_t size_to_allocate = std::max((std::size_t)view.width(),
-
(std::size_t)(TIFFScanlineSize(_tp)+element_size-1)/element_size);
+ std::size_t size_to_allocate = (std::max)((std::size_t)view.width(),
+
(std::size_t)(TIFFScanlineSize(_tp)+element_size-1)/element_size);
std::vector<pixel<typename channel_type<View>::type,
layout<typename color_space_type<View>::type> > >
row(size_to_allocate);
for (int y=0;y<view.height();++y) {
@@ -184,8 +188,8 @@
switch (bps) {
case 8: {
std::size_t element_size=sizeof(gray8_pixel_t);
- std::size_t size_to_allocate =
std::max((std::size_t)view.width(),
-
(std::size_t)(TIFFScanlineSize(_tp)+element_size-1)/element_size);
+ std::size_t size_to_allocate =
(std::max)((std::size_t)view.width(),
+
(std::size_t)(TIFFScanlineSize(_tp)+element_size-1)/element_size);
std::vector<gray8_pixel_t> row(size_to_allocate);
for (int y=0;y<view.height();++y) {
io_error_if(TIFFReadScanline(_tp,&row.front(), y)!=1);
@@ -196,8 +200,8 @@
}
case 16: {
std::size_t element_size=sizeof(gray16_pixel_t);
- std::size_t size_to_allocate =
std::max((std::size_t)view.width(),
-
(std::size_t)(TIFFScanlineSize(_tp)+element_size-1)/element_size);
+ std::size_t size_to_allocate =
(std::max)((std::size_t)view.width(),
+
(std::size_t)(TIFFScanlineSize(_tp)+element_size-1)/element_size);
std::vector<gray16_pixel_t> row(size_to_allocate);
for (int y=0;y<view.height();++y) {
io_error_if(TIFFReadScanline(_tp,&row.front(), y)!=1);
@@ -208,8 +212,8 @@
}
case 32: {
std::size_t element_size=sizeof(gray32f_pixel_t);
- std::size_t size_to_allocate =
std::max((std::size_t)view.width(),
-
(std::size_t)(TIFFScanlineSize(_tp)+element_size-1)/element_size);
+ std::size_t size_to_allocate =
(std::max)((std::size_t)view.width(),
+
(std::size_t)(TIFFScanlineSize(_tp)+element_size-1)/element_size);
std::vector<gray32f_pixel_t> row(size_to_allocate);
for (int y=0;y<view.height();++y) {
io_error_if(TIFFReadScanline(_tp,&row.front(), y)!=1);
@@ -227,8 +231,8 @@
switch (bps) {
case 8: {
std::size_t element_size=sizeof(rgb8_pixel_t);
- std::size_t size_to_allocate =
std::max((std::size_t)view.width(),
-
(std::size_t)(TIFFScanlineSize(_tp)+element_size-1)/element_size);
+ std::size_t size_to_allocate =
(std::max)((std::size_t)view.width(),
+
(std::size_t)(TIFFScanlineSize(_tp)+element_size-1)/element_size);
std::vector<rgb8_pixel_t> row(size_to_allocate);
for (int y=0;y<view.height();++y) {
io_error_if(TIFFReadScanline(_tp,&row.front(), y)!=1);
@@ -239,8 +243,8 @@
}
case 16: {
std::size_t element_size=sizeof(rgb16_pixel_t);
- std::size_t size_to_allocate =
std::max((std::size_t)view.width(),
-
(std::size_t)(TIFFScanlineSize(_tp)+element_size-1)/element_size);
+ std::size_t size_to_allocate =
(std::max)((std::size_t)view.width(),
+
(std::size_t)(TIFFScanlineSize(_tp)+element_size-1)/element_size);
std::vector<rgb16_pixel_t> row(size_to_allocate);
for (int y=0;y<view.height();++y) {
io_error_if(TIFFReadScanline(_tp,&row.front(), y)!=1);
@@ -251,8 +255,8 @@
}
case 32: {
std::size_t element_size=sizeof(rgb32f_pixel_t);
- std::size_t size_to_allocate =
std::max((std::size_t)view.width(),
-
(std::size_t)(TIFFScanlineSize(_tp)+element_size-1)/element_size);
+ std::size_t size_to_allocate =
(std::max)((std::size_t)view.width(),
+
(std::size_t)(TIFFScanlineSize(_tp)+element_size-1)/element_size);
std::vector<rgb32f_pixel_t> row(size_to_allocate);
for (int y=0;y<view.height();++y) {
io_error_if(TIFFReadScanline(_tp,&row.front(), y)!=1);
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
