[Boost-commit] svn:boost r42001 - trunk/libs/gil/test

From: hljin_at_[hidden]
Date: 2007-12-12 20:28:15

Author: hljin
Date: 2007-12-12 20:28:15 EST (Wed, 12 Dec 2007)
New Revision: 42001
URL: http://svn.boost.org/trac/boost/changeset/42001

Log:
GIL: fixed the Makefile along with a minor fix
Text files modified: 
   trunk/libs/gil/test/Makefile  |    34 +++++++++++++++++++++++++---------      
   trunk/libs/gil/test/pixel.cpp |     2 +-                                      
   2 files changed, 26 insertions(+), 10 deletions(-)

Modified: trunk/libs/gil/test/Makefile
==============================================================================
--- trunk/libs/gil/test/Makefile	(original)
+++ trunk/libs/gil/test/Makefile	2007-12-12 20:28:15 EST (Wed, 12 Dec 2007)
@@ -1,8 +1,9 @@
 .SUFFIXES: .cpp 
 #CXX=/usr/local/gcc4/bin/g++
 #CXX=/usr/local/gcc411/bin/g++
-#CXX=/usr/local/gcc412/bin/g++
-CXX=g++
+#CXX=/usr/local/gcc422/bin/g++
+#CXX=g++
+CXX='/cygdrive/c/Program Files/Intel/Compiler/C++/10.0.027/IA32/Bin/icl.exe'
 
 CXX_FLAGS=-Wall -DBOOST_GIL_USE_CONCEPT_CHECK #-DNDEBUG 
 CXX_CHECKSUM_FLAGS=-Wall -DBOOST_GIL_NO_IO -DBOOST_GIL_USE_CONCEPT_CHECK #-DNDEBUG 
@@ -15,17 +16,32 @@
 LIBPNG_INCLUDE_PATH=-I../../../../lib/libpng
 LIBPNG_LIB_PATH=-L../../../../lib/libpng
 LIBZ_LIB_PATH=-L../../../../lib/zlib
-ALL_OBJECTS=main.o channel.o pixel.o pixel_iterator.o image.o image_io.o sample_image.o
 
-all: performance checksum
+all: performance channel_test pixel_test pixel_iterator_test image_checksum_test image_io_checksum_test
 .cpp.o:
 #	${CXX} ${CXX_FLAGS} ${BOOST_INCLUDE_PATH} ${LIBJPEG_INCLUDE_PATH} ${LIBTIFF_INCLUDE_PATH} ${LIBPNG_INCLUDE_PATH} -c $<
         ${CXX} ${CXX_CHECKSUM_FLAGS} ${BOOST_INCLUDE_PATH} -c $<
 clean:
         -rm -f *.o *.exe 
-performance:	performance.o
+performance: performance.o
         ${CXX} -o performance ${CXX_FLAGS} performance.o
-test:	${ALL_OBJECTS}
-	${CXX} -o test ${CXX_FLAGS} ${ALL_OBJECTS} ${LIBJPEG_LIB_PATH} -ljpeg ${LIBTIFF_LIB_PATH} -ltiff ${LIBPNG_LIB_PATH} -lpng ${LIBZ_LIB_PATH} -lz
-checksum:	${ALL_OBJECTS}
-	${CXX} -o test ${CXX_CHECKSUM_FLAGS} ${ALL_OBJECTS} 
+channel_test:	channel.o error_if.o
+	${CXX} -o channel_test ${CXX_CHECKSUM_FLAGS} channel.o error_if.o
+pixel_test:	pixel.o error_if.o
+	${CXX} -o pixel_test ${CXX_CHECKSUM_FLAGS} pixel.o error_if.o
+pixel_iterator_test:	pixel_iterator.o error_if.o
+	${CXX} -o pixel_iterator_test ${CXX_CHECKSUM_FLAGS} pixel_iterator.o error_if.o
+image_checksum_test:	image.o error_if.o sample_image.o
+	${CXX} -o image_checksum_test ${CXX_CHECKSUM_FLAGS} image.o error_if.o sample_image.o 
+image_test:	image.o  error_if.o sample_image.o
+	${CXX} -o image_test ${CXX_FLAGS} image.o error_if.o sample_image.o ${LIBJPEG_LIB_PATH} -ljpeg ${LIBTIFF_LIB_PATH} -ltiff ${LIBPNG_LIB_PATH} -lpng ${LIBZ_LIB_PATH} -lz
+image_io_checksum_test:	image_io.o error_if.o
+	${CXX} -o image_io_checksum_test ${CXX_CHECKSUM_FLAGS} image_io.o error_if.o
+image_io_test:	image_io.o error_if.o
+	${CXX} -o image_io_test ${CXX_FLAGS} image_io.o error_if.o ${LIBJPEG_LIB_PATH} -ljpeg ${LIBTIFF_LIB_PATH} -ltiff ${LIBPNG_LIB_PATH} -lpng ${LIBZ_LIB_PATH} -lz
+run_all: channel_test pixel_test pixel_iterator_test image_checksum_test image_io_checksum_test
+	channel_test 
+	pixel_test 
+	pixel_iterator_test 
+	image_checksum_test 
+	image_io_checksum_test

Modified: trunk/libs/gil/test/pixel.cpp
==============================================================================
--- trunk/libs/gil/test/pixel.cpp	(original)
+++ trunk/libs/gil/test/pixel.cpp	2007-12-12 20:28:15 EST (Wed, 12 Dec 2007)
@@ -146,7 +146,7 @@
 };
 
 template <typename PixelRef, int Tag=0>
-class reference_core : value_core<typename boost::remove_reference<PixelRef>::type::value_type, Tag> {
+class reference_core : public value_core<typename boost::remove_reference<PixelRef>::type::value_type, Tag> {
 public:
     typedef PixelRef type;
     typedef typename boost::remove_reference<PixelRef>::type pixel_t;