[Boost-commit] svn:boost r84883 - trunk/boost/gil/extension/io/formats/png

Subject: [Boost-commit] svn:boost r84883 - trunk/boost/gil/extension/io/formats/png
From: chhenning_at_[hidden]
Date: 2013-06-22 16:34:18

Author: chhenning
Date: 2013-06-22 16:34:18 EDT (Sat, 22 Jun 2013)
New Revision: 84883
URL: http://svn.boost.org/trac/boost/changeset/84883

Log:
Added compiler symbol to allow compiling with libpng 1.4 or lower.

Text files modified: 
   trunk/boost/gil/extension/io/formats/png/reader_backend.hpp |     3 +++                                     
   trunk/boost/gil/extension/io/formats/png/writer_backend.hpp |     4 +++-                                    
   2 files changed, 6 insertions(+), 1 deletions(-)

Modified: trunk/boost/gil/extension/io/formats/png/reader_backend.hpp
==============================================================================
--- trunk/boost/gil/extension/io/formats/png/reader_backend.hpp	Sat Jun 22 09:57:54 2013	(r84882)
+++ trunk/boost/gil/extension/io/formats/png/reader_backend.hpp	2013-06-22 16:34:18 EDT (Sat, 22 Jun 2013)	(r84883)
@@ -476,6 +476,8 @@
             }
         }
 
+#ifndef BOOST_GIL_IO_PNG_1_4_OR_LOWER
+
 #ifdef BOOST_GIL_IO_PNG_FLOATING_POINT_SUPPORTED
 
         // get physical scale settings
@@ -530,6 +532,7 @@
         }
 #endif // BOOST_GIL_IO_PNG_FIXED_POINT_SUPPORTED
 #endif // BOOST_GIL_IO_PNG_FLOATING_POINT_SUPPORTED
+#endif // BOOST_GIL_IO_PNG_1_4_OR_LOWER
 
         // get comments information from png_info structure
         if( this->_settings._read_comments )

Modified: trunk/boost/gil/extension/io/formats/png/writer_backend.hpp
==============================================================================
--- trunk/boost/gil/extension/io/formats/png/writer_backend.hpp	Sat Jun 22 09:57:54 2013	(r84882)
+++ trunk/boost/gil/extension/io/formats/png/writer_backend.hpp	2013-06-22 16:34:18 EDT (Sat, 22 Jun 2013)	(r84883)
@@ -286,6 +286,8 @@
                         );
         }
 
+#ifndef BOOST_GIL_IO_PNG_1_4_OR_LOWER
+
 #ifdef BOOST_GIL_IO_PNG_FLOATING_POINT_SUPPORTED 
         if( _info._valid_scale_factors )
         {
@@ -320,7 +322,7 @@
 
 #endif // BOOST_GIL_IO_PNG_FIXED_POINT_SUPPORTED
 #endif // BOOST_GIL_IO_PNG_FLOATING_POINT_SUPPORTED
-
+#endif // BOOST_GIL_IO_PNG_1_4_OR_LOWER
 
         if( _info._valid_text )
         {