*** tiff_file_format_test.cpp	2010-03-02 10:02:43.000000000 +0100
--- tiff_file_format_test.cpp.mine	2010-03-02 09:48:53.000000000 +0100
***************
*** 21,27 ****
  // 73x43 2-bit minisblack gray image
  BOOST_AUTO_TEST_CASE( two_bit_minisblack_gray_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic\\depth\\flower-minisblack-02.tif" );
  
      {
          typedef bit_aligned_image1_type< 2, gray_layout_t >::type image_t;
--- 21,27 ----
  // 73x43 2-bit minisblack gray image
  BOOST_AUTO_TEST_CASE( two_bit_minisblack_gray_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic/depth/flower-minisblack-02.tif" );
  
      {
          typedef bit_aligned_image1_type< 2, gray_layout_t >::type image_t;
***************
*** 42,48 ****
  // flower-minisblack-04.tif	73x43 4-bit minisblack gray image
  BOOST_AUTO_TEST_CASE( four_bit_minisblack_gray_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic\\depth\\flower-minisblack-04.tif" );
  
      {
          typedef bit_aligned_image1_type< 4, gray_layout_t >::type image_t;
--- 42,48 ----
  // flower-minisblack-04.tif	73x43 4-bit minisblack gray image
  BOOST_AUTO_TEST_CASE( four_bit_minisblack_gray_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic/depth/flower-minisblack-04.tif" );
  
      {
          typedef bit_aligned_image1_type< 4, gray_layout_t >::type image_t;
***************
*** 63,69 ****
  // flower-minisblack-06.tif 73x43 6-bit minisblack gray image
  BOOST_AUTO_TEST_CASE( six_bit_minisblack_gray_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic\\depth\\flower-minisblack-06.tif" );
  
      {
          typedef bit_aligned_image1_type< 6, gray_layout_t >::type image_t;
--- 63,69 ----
  // flower-minisblack-06.tif 73x43 6-bit minisblack gray image
  BOOST_AUTO_TEST_CASE( six_bit_minisblack_gray_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic/depth/flower-minisblack-06.tif" );
  
      {
          typedef bit_aligned_image1_type< 6, gray_layout_t >::type image_t;
***************
*** 84,90 ****
  // flower-minisblack-08.tif	73x43 8-bit minisblack gray image
  BOOST_AUTO_TEST_CASE( eight_bit_minisblack_gray_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic\\depth\\flower-minisblack-08.tif" );
  
      {
          typedef gray8_image_t image_t;
--- 84,90 ----
  // flower-minisblack-08.tif	73x43 8-bit minisblack gray image
  BOOST_AUTO_TEST_CASE( eight_bit_minisblack_gray_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic/depth/flower-minisblack-08.tif" );
  
      {
          typedef gray8_image_t image_t;
***************
*** 105,111 ****
  // flower-minisblack-10.tif	73x43 10-bit minisblack gray image
  BOOST_AUTO_TEST_CASE( ten_bit_minisblack_gray_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic\\depth\\flower-minisblack-10.tif" );
  
      {
          typedef bit_aligned_image1_type< 10, gray_layout_t >::type image_t;
--- 105,111 ----
  // flower-minisblack-10.tif	73x43 10-bit minisblack gray image
  BOOST_AUTO_TEST_CASE( ten_bit_minisblack_gray_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic/depth/flower-minisblack-10.tif" );
  
      {
          typedef bit_aligned_image1_type< 10, gray_layout_t >::type image_t;
***************
*** 126,132 ****
  // flower-minisblack-12.tif	73x43 12-bit minisblack gray image
  BOOST_AUTO_TEST_CASE( twelve_bit_minisblack_gray_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic\\depth\\flower-minisblack-12.tif" );
  
      {
          typedef bit_aligned_image1_type< 12, gray_layout_t >::type image_t;
--- 126,132 ----
  // flower-minisblack-12.tif	73x43 12-bit minisblack gray image
  BOOST_AUTO_TEST_CASE( twelve_bit_minisblack_gray_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic/depth/flower-minisblack-12.tif" );
  
      {
          typedef bit_aligned_image1_type< 12, gray_layout_t >::type image_t;
***************
*** 147,153 ****
  // flower-minisblack-14.tif	73x43 14-bit minisblack gray image
  BOOST_AUTO_TEST_CASE( fourteen_bit_minisblack_gray_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic\\depth\\flower-minisblack-14.tif" );
  
      {
          typedef bit_aligned_image1_type< 14, gray_layout_t >::type image_t;
--- 147,153 ----
  // flower-minisblack-14.tif	73x43 14-bit minisblack gray image
  BOOST_AUTO_TEST_CASE( fourteen_bit_minisblack_gray_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic/depth/flower-minisblack-14.tif" );
  
      {
          typedef bit_aligned_image1_type< 14, gray_layout_t >::type image_t;
***************
*** 168,174 ****
  // flower-minisblack-16.tif	73x43 16-bit minisblack gray image
  BOOST_AUTO_TEST_CASE( sixteen_bit_minisblack_gray_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic\\depth\\flower-minisblack-16.tif" );
  
      {
          typedef gray16_image_t image_t;
--- 168,174 ----
  // flower-minisblack-16.tif	73x43 16-bit minisblack gray image
  BOOST_AUTO_TEST_CASE( sixteen_bit_minisblack_gray_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic/depth/flower-minisblack-16.tif" );
  
      {
          typedef gray16_image_t image_t;
***************
*** 189,195 ****
  // flower-minisblack-24.tif	73x43 24-bit minisblack gray image
  BOOST_AUTO_TEST_CASE( twentyfour_bit_minisblack_gray_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic\\depth\\flower-minisblack-24.tif" );
  
      {
          typedef bit_aligned_image1_type< 24, gray_layout_t >::type image_t;
--- 189,195 ----
  // flower-minisblack-24.tif	73x43 24-bit minisblack gray image
  BOOST_AUTO_TEST_CASE( twentyfour_bit_minisblack_gray_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic/depth/flower-minisblack-24.tif" );
  
      {
          typedef bit_aligned_image1_type< 24, gray_layout_t >::type image_t;
***************
*** 210,216 ****
  // flower-minisblack-32.tif	73x43 32-bit minisblack gray image
  BOOST_AUTO_TEST_CASE( thirtytwo_bit_minisblack_gray_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic\\depth\\flower-minisblack-32.tif" );
  
      {
          typedef gray32_image_t image_t;
--- 210,216 ----
  // flower-minisblack-32.tif	73x43 32-bit minisblack gray image
  BOOST_AUTO_TEST_CASE( thirtytwo_bit_minisblack_gray_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic/depth/flower-minisblack-32.tif" );
  
      {
          typedef gray32_image_t image_t;
***************
*** 231,237 ****
  // flower-palette-02.tif 73x43 4-entry colormapped image
  BOOST_AUTO_TEST_CASE( four_entry_colormapped_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic\\depth\\flower-palette-02.tif" );
  
      {
          typedef rgb16_image_t image_t;
--- 231,237 ----
  // flower-palette-02.tif 73x43 4-entry colormapped image
  BOOST_AUTO_TEST_CASE( four_entry_colormapped_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic/depth/flower-palette-02.tif" );
  
      {
          typedef rgb16_image_t image_t;
***************
*** 252,258 ****
  // flower-palette-04.tif	73x43 16-entry colormapped image
  BOOST_AUTO_TEST_CASE( sixteen_entry_colormapped_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic\\depth\\flower-palette-04.tif" );
  
      {
          typedef rgb16_image_t image_t;
--- 252,258 ----
  // flower-palette-04.tif	73x43 16-entry colormapped image
  BOOST_AUTO_TEST_CASE( sixteen_entry_colormapped_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic/depth/flower-palette-04.tif" );
  
      {
          typedef rgb16_image_t image_t;
***************
*** 273,279 ****
  // flower-palette-08.tif	73x43 256-entry colormapped image
  BOOST_AUTO_TEST_CASE( twohundred_twenty_five_entry_colormapped_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic\\depth\\flower-palette-08.tif" );
  
      {
          typedef rgb16_image_t image_t;
--- 273,279 ----
  // flower-palette-08.tif	73x43 256-entry colormapped image
  BOOST_AUTO_TEST_CASE( twohundred_twenty_five_entry_colormapped_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic/depth/flower-palette-08.tif" );
  
      {
          typedef rgb16_image_t image_t;
***************
*** 294,300 ****
  // flower-palette-16.tif	73x43 65536-entry colormapped image
  BOOST_AUTO_TEST_CASE( sixtyfive_thousand_entry_colormapped_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic\\depth\\flower-palette-16.tif" );
  
      {
          typedef rgb16_image_t image_t;
--- 294,300 ----
  // flower-palette-16.tif	73x43 65536-entry colormapped image
  BOOST_AUTO_TEST_CASE( sixtyfive_thousand_entry_colormapped_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic/depth/flower-palette-16.tif" );
  
      {
          typedef rgb16_image_t image_t;
***************
*** 315,321 ****
  // flower-rgb-contig-02.tif	73x43 2-bit contiguous RGB image
  BOOST_AUTO_TEST_CASE( two_bit_contiguous_RGB_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic\\depth\\flower-rgb-contig-02.tif" );
  
      {
          typedef bit_aligned_image3_type< 2, 2, 2, rgb_layout_t >::type image_t;
--- 315,321 ----
  // flower-rgb-contig-02.tif	73x43 2-bit contiguous RGB image
  BOOST_AUTO_TEST_CASE( two_bit_contiguous_RGB_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic/depth/flower-rgb-contig-02.tif" );
  
      {
          typedef bit_aligned_image3_type< 2, 2, 2, rgb_layout_t >::type image_t;
***************
*** 336,342 ****
  // flower-rgb-contig-04.tif	73x43 4-bit contiguous RGB image
  BOOST_AUTO_TEST_CASE( four_bit_contiguous_RGB_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic\\depth\\flower-rgb-contig-04.tif" );
  
      {
          typedef bit_aligned_image3_type< 4, 4, 4, rgb_layout_t >::type image_t;
--- 336,342 ----
  // flower-rgb-contig-04.tif	73x43 4-bit contiguous RGB image
  BOOST_AUTO_TEST_CASE( four_bit_contiguous_RGB_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic/depth/flower-rgb-contig-04.tif" );
  
      {
          typedef bit_aligned_image3_type< 4, 4, 4, rgb_layout_t >::type image_t;
***************
*** 357,363 ****
  // flower-rgb-contig-08.tif	73x43 8-bit contiguous RGB image
  BOOST_AUTO_TEST_CASE( eight_bit_contiguous_RGB_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic\\depth\\flower-rgb-contig-08.tif" );
  
      {
          typedef rgb8_image_t image_t;
--- 357,363 ----
  // flower-rgb-contig-08.tif	73x43 8-bit contiguous RGB image
  BOOST_AUTO_TEST_CASE( eight_bit_contiguous_RGB_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic/depth/flower-rgb-contig-08.tif" );
  
      {
          typedef rgb8_image_t image_t;
***************
*** 378,384 ****
  // flower-rgb-contig-10.tif	73x43 10-bit contiguous RGB image
  BOOST_AUTO_TEST_CASE( ten_bit_contiguous_RGB_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic\\depth\\flower-rgb-contig-10.tif" );
  
      {
          typedef bit_aligned_image3_type< 10, 10, 10, rgb_layout_t >::type image_t;
--- 378,384 ----
  // flower-rgb-contig-10.tif	73x43 10-bit contiguous RGB image
  BOOST_AUTO_TEST_CASE( ten_bit_contiguous_RGB_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic/depth/flower-rgb-contig-10.tif" );
  
      {
          typedef bit_aligned_image3_type< 10, 10, 10, rgb_layout_t >::type image_t;
***************
*** 399,405 ****
  // flower-rgb-contig-12.tif	73x43 12-bit contiguous RGB image
  BOOST_AUTO_TEST_CASE( twelve_bit_contiguous_RGB_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic\\depth\\flower-rgb-contig-12.tif" );
  
      {
          typedef bit_aligned_image3_type< 12, 12, 12, rgb_layout_t >::type image_t;
--- 399,405 ----
  // flower-rgb-contig-12.tif	73x43 12-bit contiguous RGB image
  BOOST_AUTO_TEST_CASE( twelve_bit_contiguous_RGB_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic/depth/flower-rgb-contig-12.tif" );
  
      {
          typedef bit_aligned_image3_type< 12, 12, 12, rgb_layout_t >::type image_t;
***************
*** 420,426 ****
  // flower-rgb-contig-14.tif	73x43 14-bit contiguous RGB image
  BOOST_AUTO_TEST_CASE( fourteen_bit_contiguous_RGB_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic\\depth\\flower-rgb-contig-14.tif" );
  
      {
          typedef bit_aligned_image3_type< 14, 14, 14, rgb_layout_t >::type image_t;
--- 420,426 ----
  // flower-rgb-contig-14.tif	73x43 14-bit contiguous RGB image
  BOOST_AUTO_TEST_CASE( fourteen_bit_contiguous_RGB_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic/depth/flower-rgb-contig-14.tif" );
  
      {
          typedef bit_aligned_image3_type< 14, 14, 14, rgb_layout_t >::type image_t;
***************
*** 441,447 ****
  // flower-rgb-contig-16.tif	73x43 16-bit contiguous RGB image
  BOOST_AUTO_TEST_CASE( sixteen_bit_contiguous_RGB_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic\\depth\\flower-rgb-contig-16.tif" );
  
      {
          typedef rgb16_image_t image_t;
--- 441,447 ----
  // flower-rgb-contig-16.tif	73x43 16-bit contiguous RGB image
  BOOST_AUTO_TEST_CASE( sixteen_bit_contiguous_RGB_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic/depth/flower-rgb-contig-16.tif" );
  
      {
          typedef rgb16_image_t image_t;
***************
*** 462,468 ****
  // flower-rgb-contig-24.tif	73x43 24-bit contiguous RGB image
  BOOST_AUTO_TEST_CASE( twenty_four_bit_contiguous_RGB_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic\\depth\\flower-rgb-contig-24.tif" );
  
      {
          typedef bit_aligned_image3_type< 24, 24, 24, rgb_layout_t >::type image_t;
--- 462,468 ----
  // flower-rgb-contig-24.tif	73x43 24-bit contiguous RGB image
  BOOST_AUTO_TEST_CASE( twenty_four_bit_contiguous_RGB_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic/depth/flower-rgb-contig-24.tif" );
  
      {
          typedef bit_aligned_image3_type< 24, 24, 24, rgb_layout_t >::type image_t;
***************
*** 483,489 ****
  // flower-rgb-contig-32.tif	73x43 32-bit contiguous RGB image
  BOOST_AUTO_TEST_CASE( thirty_two_bit_contiguous_RGB_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic\\depth\\flower-rgb-contig-32.tif" );
  
      {
          typedef rgb32_image_t image_t;
--- 483,489 ----
  // flower-rgb-contig-32.tif	73x43 32-bit contiguous RGB image
  BOOST_AUTO_TEST_CASE( thirty_two_bit_contiguous_RGB_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic/depth/flower-rgb-contig-32.tif" );
  
      {
          typedef rgb32_image_t image_t;
***************
*** 504,510 ****
  // flower-rgb-planar-02.tif	73x43 2-bit seperated RGB image
  BOOST_AUTO_TEST_CASE( two_bit_seperated_RGB_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic\\depth\\flower-rgb-planar-02.tif" );
  
      {
          typedef bit_aligned_image3_type< 2, 2, 2, rgb_layout_t >::type image_t;
--- 504,510 ----
  // flower-rgb-planar-02.tif	73x43 2-bit seperated RGB image
  BOOST_AUTO_TEST_CASE( two_bit_seperated_RGB_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic/depth/flower-rgb-planar-02.tif" );
  
      {
          typedef bit_aligned_image3_type< 2, 2, 2, rgb_layout_t >::type image_t;
***************
*** 525,531 ****
  // flower-rgb-planar-04.tif	73x43 4-bit seperated RGB image
  BOOST_AUTO_TEST_CASE( four_bit_seperated_RGB_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic\\depth\\flower-rgb-planar-04.tif" );
  
      {
          typedef bit_aligned_image3_type< 4, 4, 4, rgb_layout_t >::type image_t;
--- 525,531 ----
  // flower-rgb-planar-04.tif	73x43 4-bit seperated RGB image
  BOOST_AUTO_TEST_CASE( four_bit_seperated_RGB_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic/depth/flower-rgb-planar-04.tif" );
  
      {
          typedef bit_aligned_image3_type< 4, 4, 4, rgb_layout_t >::type image_t;
***************
*** 546,552 ****
  // flower-rgb-planar-08.tif	73x43 8-bit seperated RGB image
  BOOST_AUTO_TEST_CASE( eight_bit_seperated_RGB_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic\\depth\\flower-rgb-planar-08.tif" );
  
      {
          typedef rgb8_planar_image_t image_t;
--- 546,552 ----
  // flower-rgb-planar-08.tif	73x43 8-bit seperated RGB image
  BOOST_AUTO_TEST_CASE( eight_bit_seperated_RGB_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic/depth/flower-rgb-planar-08.tif" );
  
      {
          typedef rgb8_planar_image_t image_t;
***************
*** 567,573 ****
  // flower-rgb-planar-10.tif	73x43 10-bit seperated RGB image
  BOOST_AUTO_TEST_CASE( ten_bit_seperated_RGB_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic\\depth\\flower-rgb-planar-10.tif" );
  
      {
          typedef bit_aligned_image3_type< 10, 10, 10, rgb_layout_t >::type image_t;
--- 567,573 ----
  // flower-rgb-planar-10.tif	73x43 10-bit seperated RGB image
  BOOST_AUTO_TEST_CASE( ten_bit_seperated_RGB_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic/depth/flower-rgb-planar-10.tif" );
  
      {
          typedef bit_aligned_image3_type< 10, 10, 10, rgb_layout_t >::type image_t;
***************
*** 588,594 ****
  // flower-rgb-planar-12.tif	73x43 12-bit seperated RGB image
  BOOST_AUTO_TEST_CASE( twelve_bit_seperated_RGB_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic\\depth\\flower-rgb-planar-12.tif" );
  
      {
          typedef bit_aligned_image3_type< 12, 12, 12, rgb_layout_t >::type image_t;
--- 588,594 ----
  // flower-rgb-planar-12.tif	73x43 12-bit seperated RGB image
  BOOST_AUTO_TEST_CASE( twelve_bit_seperated_RGB_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic/depth/flower-rgb-planar-12.tif" );
  
      {
          typedef bit_aligned_image3_type< 12, 12, 12, rgb_layout_t >::type image_t;
***************
*** 609,615 ****
  // flower-rgb-planar-14.tif	73x43 14-bit seperated RGB image
  BOOST_AUTO_TEST_CASE( fourteen_bit_seperated_RGB_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic\\depth\\flower-rgb-planar-14.tif" );
  
      {
          typedef bit_aligned_image3_type< 14, 14, 14, rgb_layout_t >::type image_t;
--- 609,615 ----
  // flower-rgb-planar-14.tif	73x43 14-bit seperated RGB image
  BOOST_AUTO_TEST_CASE( fourteen_bit_seperated_RGB_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic/depth/flower-rgb-planar-14.tif" );
  
      {
          typedef bit_aligned_image3_type< 14, 14, 14, rgb_layout_t >::type image_t;
***************
*** 630,636 ****
  // flower-rgb-planar-16.tif	73x43 16-bit seperated RGB image
  BOOST_AUTO_TEST_CASE( sixteen_bit_seperated_RGB_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic\\depth\\flower-rgb-planar-16.tif" );
  
      {
          typedef rgb16_planar_image_t image_t;
--- 630,636 ----
  // flower-rgb-planar-16.tif	73x43 16-bit seperated RGB image
  BOOST_AUTO_TEST_CASE( sixteen_bit_seperated_RGB_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic/depth/flower-rgb-planar-16.tif" );
  
      {
          typedef rgb16_planar_image_t image_t;
***************
*** 651,657 ****
  // flower-rgb-planar-24.tif	73x43 24-bit seperated RGB image
  BOOST_AUTO_TEST_CASE( twenty_four_bit_seperated_RGB_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic\\depth\\flower-rgb-planar-24.tif" );
  
      {
          typedef bit_aligned_image3_type< 24, 24, 24, rgb_layout_t >::type image_t;
--- 651,657 ----
  // flower-rgb-planar-24.tif	73x43 24-bit seperated RGB image
  BOOST_AUTO_TEST_CASE( twenty_four_bit_seperated_RGB_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic/depth/flower-rgb-planar-24.tif" );
  
      {
          typedef bit_aligned_image3_type< 24, 24, 24, rgb_layout_t >::type image_t;
***************
*** 672,678 ****
  // flower-rgb-planar-32.tif	73x43 32-bit seperated RGB image
  BOOST_AUTO_TEST_CASE( thirty_two_bit_seperated_RGB_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic\\depth\\flower-rgb-planar-32.tif" );
  
      {
          typedef rgb32_planar_image_t image_t;
--- 672,678 ----
  // flower-rgb-planar-32.tif	73x43 32-bit seperated RGB image
  BOOST_AUTO_TEST_CASE( thirty_two_bit_seperated_RGB_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic/depth/flower-rgb-planar-32.tif" );
  
      {
          typedef rgb32_planar_image_t image_t;
***************
*** 693,699 ****
  // flower-separated-contig-08.tif	73x43 8-bit contiguous CMYK image
  BOOST_AUTO_TEST_CASE( eight_bit_contiguous_CMYK_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic\\depth\\flower-separated-contig-08.tif" );
  
      {
          typedef cmyk8_image_t image_t;
--- 693,699 ----
  // flower-separated-contig-08.tif	73x43 8-bit contiguous CMYK image
  BOOST_AUTO_TEST_CASE( eight_bit_contiguous_CMYK_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic/depth/flower-separated-contig-08.tif" );
  
      {
          typedef cmyk8_image_t image_t;
***************
*** 714,720 ****
  // flower-separated-contig-16.tif	73x43 16-bit contiguous CMYK image
  BOOST_AUTO_TEST_CASE( sixteen_bit_contiguous_CMYK_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic\\depth\\flower-separated-contig-16.tif" );
  
      {
          typedef cmyk16_image_t image_t;
--- 714,720 ----
  // flower-separated-contig-16.tif	73x43 16-bit contiguous CMYK image
  BOOST_AUTO_TEST_CASE( sixteen_bit_contiguous_CMYK_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic/depth/flower-separated-contig-16.tif" );
  
      {
          typedef cmyk16_image_t image_t;
***************
*** 735,741 ****
  // flower-separated-planar-08.tif	73x43 8-bit separated CMYK image
  BOOST_AUTO_TEST_CASE( eight_bit_separated_CMYK_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic\\depth\\flower-separated-planar-08.tif" );
  
      {
          typedef cmyk8_planar_image_t image_t;
--- 735,741 ----
  // flower-separated-planar-08.tif	73x43 8-bit separated CMYK image
  BOOST_AUTO_TEST_CASE( eight_bit_separated_CMYK_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic/depth/flower-separated-planar-08.tif" );
  
      {
          typedef cmyk8_planar_image_t image_t;
***************
*** 756,762 ****
  // flower-separated-planar-16.tif	73x43 16-bit separated CMYK image
  BOOST_AUTO_TEST_CASE( sixteen_bit_separated_CMYK_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic\\depth\\flower-separated-planar-16.tif" );
  
      {
          typedef cmyk16_planar_image_t image_t;
--- 756,762 ----
  // flower-separated-planar-16.tif	73x43 16-bit separated CMYK image
  BOOST_AUTO_TEST_CASE( sixteen_bit_separated_CMYK_image_test )
  {
!     std::string filename( tiff_in + "libtiffpic/depth/flower-separated-planar-16.tif" );
  
      {
          typedef cmyk16_planar_image_t image_t;