Commits

Edd Dawson  committed 779caaa

Upgraded tests to test-o-matic 0.4.x API. Bumped version number in version.hpp. Removed dependency on boost for unit tests. Updated readme. Removed bundle.spec. Added changes from John Tytgat to silence Visual C++ compiler warnings.

  • Participants
  • Parent commits 1794494

Comments (0)

Files changed (6)

File bundle.spec

-[files]
-slamfile
-
-docs/readme.html
-docs/LICENSE_1_0.txt
-docs/libpng_LICENSE.txt
-docs/zlib_LICENSE.txt
-
-include/pngxx/*
-include/pngxx/exceptions/*
-include/pngxx/detail/*
-
-src/*.cpp
-src/3rd_party/libpng/*
-src/3rd_party/zlib/*
-
-examples/circles/*
-examples/details/*
-examples/giotto/*
-examples/remalpha/*
-
-tests/*.py
-tests/system_tests/*.desc
-tests/system_tests/*.png
-tests/system_tests/tests.script
-tests/system_tests/load/*
-tests/system_tests/save/*
-tests/unit_tests/*
-
-[depends]
-../imagexx
-../test_o_matic
-
-[hooks]
-check_header_version include/pngxx/version.hpp docs/readme.html
-check_copyright *.cpp *.hpp *.py slamfile *.script
-tabs_to_spaces 4 *.cpp *.hpp

File docs/readme.html

 
 		<!-- Note to self: don't forget to change the version in zlib.h when releasing new versions of pngxx -->
 
+		<h3>Version 0.3.2 released on 11 August 2011</h3>
+		<ul>
+			<li>Applied patch from John Tytgat to fix some Visual C++ compiler warnings.</li>
+			<li>Updated tests to use test-o-matic 0.4.x API</li>
+			<li>Removed dependency on boost for unit tests</li>
+		</ul>
+
 		<h3>Version 0.3.1 released on 19 October 2009</h3>
 		<ul>
 			<li>Fixed bug where the pixel format of an incoming image could be mis-understood, resulting in an insufficient memory being allocated for raster rows and then buffer over-runs. Thanks to Dmitriy Lyfar for reporting the issue.</li>

File include/pngxx/version.hpp

 
 #define PNGXX_MAJOR 0
 #define PNGXX_MINOR 3
-#define PNGXX_FIX 1
+#define PNGXX_FIX 2
 
 namespace pngxx
 {

File src/read.cpp

 
     bool loader::raster_ready() const
     {
-        return pimpl_->source_.get();
+        return pimpl_->source_.get() != 0;
     }
 
     void loader::reset()
         bool alpha_in_tRNS = false;
 
         TRY(png_get_IHDR(rsp, pimpl_->info_, &width, &height, &bit_depth, &colour_type, &interlace_type, 0, 0));
-        TRY(alpha_in_tRNS = png_get_valid(rsp, pimpl_->info_, PNG_INFO_tRNS));
+        TRY(alpha_in_tRNS = (png_get_valid(rsp, pimpl_->info_, PNG_INFO_tRNS) != 0));
 
         imagexx::pixel_format format = imagexx::rgb;
 

File tests/unit_tests/main.cpp

 
 int main()
 {
-    tom::logger lgr = tom::default_logger();
+    tom::simple_logger lgr(std::cout, false);
     tom::runner rnr;
 
     for (const tom::test *t = tom::first_test(); t; t = t->next)
         tom::run_test(*t, lgr, rnr);
 
-    return tom::summary(lgr, std::cout);
+    return lgr.summary(std::cout);
 }
 

File tests/unit_tests/slamfile

 flags : release : optimize
 
 depends : common : ../../ ../../../test_o_matic ../../../imagexx
-include : common : ../../../test_o_matic ../../include $(boost_include_path) ../../../imagexx/include .
+include : common : ../../../test_o_matic ../../include ../../../imagexx/include .
 
 target : common : test
 type : common : executable