Merge pull request #1459 from jburel/encoding

Fix writing of tiff description
Add support for more metadata.
cpp: test: Non-GNU-sed portability fixes for newline substitution
merge develop -Dorg -Ssuccess-only: PR 1407 (TIFF: fix plane count calculation for pyramids with multiple planes)
merge develop -Dorg -Ssuccess-only: PR 1420 (Updating samples and adding units samples)
merge develop -Dorg -Ssuccess-only: PR 1442 (Update roi handler)
merge develop -Dorg -Ssuccess-only: PR 1457 (IM3: fix memoization and whitespace)
merge develop -Dorg -Ssuccess-only: PR 1460 (C++: Implement MetadataConverter)
merge develop -Dorg -Ssuccess-only: PR 1465 (NDPI: fix tile offset adjustment for files larger than 4GB)
merge develop -Dorg -Ssuccess-only: PR 1467 (cmake: Replace FindXerces with FindXercesC)
merge develop -Dorg -Ssuccess-only: PR 1468 (C++: binary build and showinf fixes)
merge develop -Dorg -Ssuccess-only: PR 1469 (cpp: bioformats: Correct placement of warning pragmas in PixelProperties)
merge develop -Dorg -Ssuccess-only: PR 1471 (mock object)
merge develop -Dorg -Ssuccess-only

Repository: openmicroscopy/bioformats
Excluded PRs:
  # PR 1309 melissalinkert 'Allow tile-based access of large JPEG-2000 images' (exclude comment)
  # PR 1458 sbesson 'Fix Javadocs warnings' (label: exclude)
  # PR 1015 qidane 'Messy binary' (exclude comment)
  # PR 858 melissalinkert 'Initial support for Veeco AFM data' (label: exclude)
  # PR 1461 csachs 'Changed ND2 metadata string handling to work properly with empty strings' (user: csachs)
  # PR 857 melissalinkert 'Initial support for Zeiss .lms files' (label: exclude)
  # PR 1177 rleigh-dundee 'specification: Add metadata for HDF5 embedding' (exclude comment)
  # PR 1381 melissalinkert 'Parse physical pixel sizes from CellSens .vsi datasets' (label: exclude)
  # PR 1426 qidane 'Initial Rendering Definitions schema' (exclude comment)
  # PR 1443 joshmoore 'Genshi ZIP' (label: exclude)
  # PR 1161 sommerc 'Initial CellH5 Reader class' (user: sommerc)
Updating b3962bd..4a55271
Previously merged:
  # PR 1459 jburel 'Fix writing of tiff description'
  # PR 1462 sbesson 'Add bash script for updating copyright headers'
  # PR 1463 sbesson 'Add script to bump version numbers'
  # PR 1365 ctrueden 'PrairieView 5.2 fixes and improvements'
  # PR 1437 stelfrich 'Changed handling of empty series names in ND2 files'
  # PR 1456 mtbc 'add note about using mvn eclipse:eclipse'
  # PR 1454 rleigh-dundee 'C++: Autoload schema catalogues and set up environment for tests'
  # PR 1366 ctrueden 'Miscellaneous cleanup'
  # PR 1452 joshmoore 'Use __import__ for generateDS to handle FS case issues'
  # PR 1448 melissalinkert 'Metamorph: allow both sanitized and unsanitized delimiters'
  # PR 1455 sbesson 'Remove source code hyperlinks from Java source files'
  # PR 1453 jburel 'Fix mock object to match changes from int to double for channel'
  # PR 1435 joshmoore 'Ordered MapPairs implementation'
  # PR 1441 melissalinkert 'Fix OME-XML BinData decoding'
  # PR 1444 snoopycrimecop 'Update auto-generated documentation'
  # PR 1431 rleigh-dundee 'Specification: Add XML catalogues for released schemas'
  # PR 1450 melissalinkert 'Reduce memory needed to open PNG images'
  # PR 1451 melissalinkert 'Fix im3 metadata'

Merged PRs:
  # PR 1407 melissalinkert 'TIFF: fix plane count calculation for pyramids with multiple planes'
  # PR 1420 qidane 'Updating samples and adding units samples'
  # PR 1442 bramalingam 'Update roi handler'
  # PR 1457 melissalinkert 'IM3: fix memoization and whitespace'
  # PR 1460 rleigh-dundee 'C++: Implement MetadataConverter'
  # PR 1465 melissalinkert 'NDPI: fix tile offset adjustment for files larger than 4GB'
  # PR 1467 rleigh-dundee 'cmake: Replace FindXerces with FindXercesC'
  # PR 1468 rleigh-dundee 'C++: binary build and showinf fixes'
  # PR 1469 rleigh-dundee 'cpp: bioformats: Correct placement of warning pragmas in PixelProperties'
  # PR 1471 jburel 'mock object'

Generated by OME-5.1-merge-push#633 (http://ci.openmicroscopy.org/job/OME-5.1-merge-push/633/)