From 579aea353f728bd93e071bc46e9d500104a4ca34 Mon Sep 17 00:00:00 2001 From: Matthew Gerring Date: Tue, 19 Nov 2019 11:40:49 +0000 Subject: [PATCH 1/2] Added RGB Seemed to be needed when saving a ILazyWriteableDataset with dtype RGB and writing slices of type RGB using setSlice(monitor, slice, sliceND); --- .../src/org/eclipse/dawnsci/hdf5/HDF5Utils.java | 1 + 1 file changed, 1 insertion(+) diff --git a/org.eclipse.dawnsci.hdf5/src/org/eclipse/dawnsci/hdf5/HDF5Utils.java b/org.eclipse.dawnsci.hdf5/src/org/eclipse/dawnsci/hdf5/HDF5Utils.java index ea22f043..5c9fb4b7 100644 --- a/org.eclipse.dawnsci.hdf5/src/org/eclipse/dawnsci/hdf5/HDF5Utils.java +++ b/org.eclipse.dawnsci.hdf5/src/org/eclipse/dawnsci/hdf5/HDF5Utils.java @@ -211,6 +211,7 @@ public static long getHDF5type(int dtype) { return HDF5Constants.H5T_NATIVE_INT8; case Dataset.INT16: case Dataset.ARRAYINT16: + case Dataset.RGB: return HDF5Constants.H5T_NATIVE_INT16; case Dataset.INT32: case Dataset.ARRAYINT32: From 8f07e3054784878b2ee7576a768d21850e3c3443 Mon Sep 17 00:00:00 2001 From: Matthew Gerring Date: Tue, 19 Nov 2019 14:03:45 +0000 Subject: [PATCH 2/2] Removed sonarqube from build. It has broken. --- .travis.yml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index 74884ef8..bd4efdc4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,19 +1,6 @@ dist: trusty sudo: required -# SonarQube -# See https://docs.travis-ci.com/user/sonarqube/ -addons: - sonarqube: - token: - # See https://travis-ci.org/eclipse/dawnsci/settings, here be variables (ask webmaster@eclipse.org for permission to see) - # SONAR_TOKEN = SONAR_GITHUB_TOKEN = The sonar token at https://sonarqube.com/account/security/ - secure: $SONAR_TOKEN - github_token: - # See https://github.com/settings/tokens to create a token for GITHUB_READ_REPO - # GITHUB_READ_REPO = https://github.com/settings/tokens sonarqube-travis token ('repo' and 'admin:repo_hook' permissions) - secure: $GITHUB_READ_REPO - language: java cache: @@ -51,5 +38,4 @@ env: # No need to run this as default travis will find maven and run it script: - mvn -q clean install surefire:test -Dtest.includes=org/eclipse/dawnsci/**/*Suite.java - - sonar-scanner