diff --git a/pom.xml b/pom.xml
index b12c0abeb9461460a554caaf14725a0434e18d29..3c837db6729e3c506671f77742eec93ebfd92766 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,191 +1,203 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.scijava</groupId>
- <artifactId>pom-scijava</artifactId>
- <version>28.0.0</version>
- <relativePath />
- </parent>
+ <parent>
+ <groupId>org.scijava</groupId>
+ <artifactId>pom-scijava</artifactId>
+ <version>28.0.0</version>
+ <relativePath/>
+ </parent>
- <groupId>sc.fiji</groupId>
- <artifactId>bigdataviewer-server</artifactId>
- <version>3.0.1-SNAPSHOT</version>
+ <groupId>sc.fiji</groupId>
+ <artifactId>bigdataviewer-server</artifactId>
+ <version>3.0.1-SNAPSHOT</version>
- <name>BigDataServer</name>
- <description>A web server for BigDataViewer datasets.</description>
- <url>https://imagej.net/BigDataServer</url>
- <inceptionYear>2014</inceptionYear>
- <organization>
- <name>BigDataViewer</name>
- <url>https://imagej.net/BigDataViewer</url>
- </organization>
- <licenses>
- <license>
- <name>GNU General Public License v3+</name>
- <url>https://www.gnu.org/licenses/gpl.html</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
+ <name>BigDataServer</name>
+ <description>A web server for BigDataViewer datasets.</description>
+ <url>https://imagej.net/BigDataServer</url>
+ <inceptionYear>2014</inceptionYear>
+ <organization>
+ <name>BigDataViewer</name>
+ <url>https://imagej.net/BigDataViewer</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>GNU General Public License v3+</name>
+ <url>https://www.gnu.org/licenses/gpl.html</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
- <developers>
- <developer>
- <id>tpietzsch</id>
- <name>Tobias Pietzsch</name>
- <url>https://imagej.net/User:Pietzsch</url>
- <roles>
- <role>founder</role>
- <role>lead</role>
- <role>developer</role>
- <role>debugger</role>
- <role>reviewer</role>
- <role>support</role>
- <role>maintainer</role>
- </roles>
- </developer>
- </developers>
- <contributors>
- <contributor>
- <name>HongKee Moon</name>
- <url>https://imagej.net/User:Moon</url>
- <properties><id>hkmoon</id></properties>
- </contributor>
- </contributors>
+ <developers>
+ <developer>
+ <id>mor0146</id>
+ <name>Vojtech Moravec</name>
+ </developer>
+ </developers>
+ <contributors>
+ <contributor>
+ <name>HongKee Moon</name>
+ <url>https://imagej.net/User:Moon</url>
+ <properties>
+ <id>hkmoon</id>
+ </properties>
+ </contributor>
+ </contributors>
- <mailingLists>
- <mailingList>
- <name>Image.sc Forum</name>
- <archive>https://forum.image.sc/tags/bigdataviewer</archive>
- </mailingList>
- </mailingLists>
+ <mailingLists>
+ <mailingList>
+ <name>Image.sc Forum</name>
+ <archive>https://forum.image.sc/tags/bigdataviewer</archive>
+ </mailingList>
+ </mailingLists>
- <scm>
- <connection>scm:git:git://github.com/bigdataviewer/bigdataviewer-server</connection>
- <developerConnection>scm:git:git@github.com:bigdataviewer/bigdataviewer-server</developerConnection>
- <tag>HEAD</tag>
- <url>https://github.com/bigdataviewer/bigdataviewer-server</url>
- </scm>
- <issueManagement>
- <system>GitHub Issues</system>
- <url>https://github.com/bigdataviewer/bigdataviewer-server/issues</url>
- </issueManagement>
- <ciManagement>
- <system>Travis CI</system>
- <url>https://travis-ci.org/bigdataviewer/bigdataviewer-server</url>
- </ciManagement>
+ <scm>
+ <connection>scm:git:git://github.com/bigdataviewer/bigdataviewer-server</connection>
+ <developerConnection>scm:git:git@github.com:bigdataviewer/bigdataviewer-server</developerConnection>
+ <tag>HEAD</tag>
+ <url>https://github.com/bigdataviewer/bigdataviewer-server</url>
+ </scm>
+ <issueManagement>
+ <system>GitHub Issues</system>
+ <url>https://github.com/bigdataviewer/bigdataviewer-server/issues</url>
+ </issueManagement>
+ <ciManagement>
+ <system>Travis CI</system>
+ <url>https://travis-ci.org/bigdataviewer/bigdataviewer-server</url>
+ </ciManagement>
- <properties>
- <package-name>bdv.server</package-name>
- <main-class>bdv.server.BigDataServer</main-class>
- <license.licenseName>gpl_v3</license.licenseName>
- <license.copyrightOwners>BigDataViewer developers.</license.copyrightOwners>
+ <properties>
+ <package-name>bdv.server</package-name>
+ <main-class>bdv.server.BigDataServer</main-class>
+ <license.licenseName>gpl_v3</license.licenseName>
+ <license.copyrightOwners>BigDataViewer developers.</license.copyrightOwners>
- <!-- NB: Deploy releases to the SciJava Maven repository. -->
- <releaseProfiles>deploy-to-scijava</releaseProfiles>
+ <!-- NB: Deploy releases to the SciJava Maven repository. -->
+ <releaseProfiles>deploy-to-scijava</releaseProfiles>
- <commons-cli.version>1.2</commons-cli.version>
- <stringtemplate.version>3.2.1</stringtemplate.version>
+ <commons-cli.version>1.2</commons-cli.version>
+ <stringtemplate.version>3.2.1</stringtemplate.version>
- <!-- TODO: Remove these version pins and update the code. -->
- <bigdataviewer-core.version>9.0.3</bigdataviewer-core.version>
- <imglib2.version>5.9.0</imglib2.version>
- <imglib2-cache.version>1.0.0-beta-13</imglib2-cache.version>
- <spim_data.version>2.2.4</spim_data.version>
- </properties>
+ <!-- TODO: Remove these version pins and update the code. -->
+ <bigdataviewer-core.version>9.0.3</bigdataviewer-core.version>
+ <imglib2.version>5.9.0</imglib2.version>
+ <imglib2-cache.version>1.0.0-beta-13</imglib2-cache.version>
+ <spim_data.version>2.2.4</spim_data.version>
+ </properties>
- <repositories>
- <repository>
- <id>scijava.public</id>
- <url>https://maven.scijava.org/content/groups/public</url>
- </repository>
- </repositories>
+ <repositories>
+ <repository>
+ <id>scijava.public</id>
+ <url>https://maven.scijava.org/content/groups/public</url>
+ </repository>
+ <repository>
+ <id>cz.it4i</id>
+ <url>https://code.it4i.cz/api/v4/projects/932/packages/maven</url>
+ </repository>
+<!-- <repository>-->
+<!-- <id>gitlab-maven</id>-->
+<!-- <url>https://code.it4i.cz/api/v4/projects/934/packages/maven</url>-->
+<!-- </repository>-->
+ </repositories>
- <dependencies>
- <dependency>
- <groupId>sc.fiji</groupId>
- <artifactId>bigdataviewer-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
- </dependency>
- <dependency>
- <groupId>org.antlr</groupId>
- <artifactId>stringtemplate</artifactId>
- <version>${stringtemplate.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- <version>${commons-cli.version}</version>
- </dependency>
- <dependency>
- <groupId>org.azgra</groupId>
- <artifactId>DataCompressor</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>1.7.28</version>
- </dependency>
- </dependencies>
+<!-- <distributionManagement>-->
+<!-- <repository>-->
+<!-- <id>gitlab-maven</id>-->
+<!-- <url>https://code.it4i.cz/api/v4/projects/934/packages/maven</url>-->
+<!-- </repository>-->
+<!-- <snapshotRepository>-->
+<!-- <id>gitlab-maven</id>-->
+<!-- <url>https://code.it4i.cz/api/v4/projects/934/packages/maven</url>-->
+<!-- </snapshotRepository>-->
+<!-- </distributionManagement>-->
- <profiles>
- <profile>
- <id>fatjar</id>
- <build>
- <plugins>
- <!-- Maven shade for Uber Jar -->
- <!-- https://maven.apache.org/plugins/maven-shade-plugin/shade-mojo.html -->
- <!-- https://databricks.gitbooks.io/databricks-spark-knowledge-base/content/troubleshooting/missing_dependencies_in_jar_files.html -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <configuration>
- <!-- Do not minimize for now to speed up packaging. -->
- <transformers combine.children="append">
- <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
- <resource>META-INF/json/org.scijava.plugin.Plugin</resource>
- </transformer>
- <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
- <resource>META-INF/json/mpicbg.spim.data.generic.sequence.ImgLoaderIo</resource>
- </transformer>
- </transformers>
- <!--<minimizeJar>true</minimizeJar> -->
- <filters>
- <filter>
- <artifact>*:*</artifact>
- <excludes>
- <exclude>META-INF/*.SF</exclude>
- <exclude>META-INF/*.DSA</exclude>
- <exclude>META-INF/*.RSA</exclude>
- </excludes>
- </filter>
- </filters>
- <!-- Additional configuration. -->
- <relocations>
- <relocation>
- <pattern>org.apache.commons.compress</pattern>
- <shadedPattern>org.janelia.saalfeldlab.org.apache.commons.compress</shadedPattern>
- </relocation>
- </relocations>
- </configuration>
- <!-- binds by default to package phase -->
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <!-- Maven shade end -->
- </plugins>
- </build>
- </profile>
- </profiles>
+ <dependencies>
+ <dependency>
+ <groupId>sc.fiji</groupId>
+ <artifactId>bigdataviewer-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.antlr</groupId>
+ <artifactId>stringtemplate</artifactId>
+ <version>${stringtemplate.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <version>${commons-cli.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.7.28</version>
+ </dependency>
+ <dependency>
+ <groupId>cz.it4i</groupId>
+ <artifactId>QcmpCompression</artifactId>
+ <version>0.5-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
+ <profiles>
+ <profile>
+ <id>fatjar</id>
+ <build>
+ <plugins>
+ <!-- Maven shade for Uber Jar -->
+ <!-- https://maven.apache.org/plugins/maven-shade-plugin/shade-mojo.html -->
+ <!-- https://databricks.gitbooks.io/databricks-spark-knowledge-base/content/troubleshooting/missing_dependencies_in_jar_files.html -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <configuration>
+ <!-- Do not minimize for now to speed up packaging. -->
+ <transformers combine.children="append">
+ <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+ <resource>META-INF/json/org.scijava.plugin.Plugin</resource>
+ </transformer>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+ <resource>META-INF/json/mpicbg.spim.data.generic.sequence.ImgLoaderIo</resource>
+ </transformer>
+ </transformers>
+ <!--<minimizeJar>true</minimizeJar> -->
+ <filters>
+ <filter>
+ <artifact>*:*</artifact>
+ <excludes>
+ <exclude>META-INF/*.SF</exclude>
+ <exclude>META-INF/*.DSA</exclude>
+ <exclude>META-INF/*.RSA</exclude>
+ </excludes>
+ </filter>
+ </filters>
+ <!-- Additional configuration. -->
+ <relocations>
+ <relocation>
+ <pattern>org.apache.commons.compress</pattern>
+ <shadedPattern>org.janelia.saalfeldlab.org.apache.commons.compress</shadedPattern>
+ </relocation>
+ </relocations>
+ </configuration>
+ <!-- binds by default to package phase -->
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- Maven shade end -->
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/src/main/java/bdv/server/BigDataServer.java b/src/main/java/bdv/server/BigDataServer.java
index e9ce2c058d8959c71fe69ab10ad5fa73f3020710..72a439cdf5e25b4f6766c090232c3d9df91f86d9 100644
--- a/src/main/java/bdv/server/BigDataServer.java
+++ b/src/main/java/bdv/server/BigDataServer.java
@@ -1,13 +1,12 @@
package bdv.server;
-
-import azgracompress.cli.CliConstants;
-import azgracompress.cli.ParseUtils;
-import azgracompress.compression.CompressionOptions;
-import azgracompress.data.V2i;
-import azgracompress.data.V3i;
-import azgracompress.fileformat.QuantizationType;
import bdv.util.OptionWithOrder;
+import cz.it4i.qcmp.cli.CliConstants;
+import cz.it4i.qcmp.cli.ParseUtils;
+import cz.it4i.qcmp.compression.CompressionOptions;
+import cz.it4i.qcmp.data.V2i;
+import cz.it4i.qcmp.data.V3i;
+import cz.it4i.qcmp.fileformat.QuantizationType;
import mpicbg.spim.data.SpimDataException;
import org.apache.commons.cli.*;
import org.apache.commons.lang.StringUtils;
diff --git a/src/main/java/bdv/server/CellHandler.java b/src/main/java/bdv/server/CellHandler.java
index 81bc339cc4ca974421824100135ad419482817ba..9bcc6ccfc3b715904af7a469e202115ea58eb55f 100644
--- a/src/main/java/bdv/server/CellHandler.java
+++ b/src/main/java/bdv/server/CellHandler.java
@@ -1,15 +1,5 @@
package bdv.server;
-import azgracompress.cache.ICacheFile;
-import azgracompress.cache.QuantizationCacheManager;
-import azgracompress.compression.CompressionOptions;
-import azgracompress.compression.ImageCompressor;
-import azgracompress.data.V3i;
-import azgracompress.io.FileInputData;
-import azgracompress.io.FlatBufferInputData;
-import azgracompress.io.InputData;
-import azgracompress.io.MemoryOutputStream;
-import azgracompress.utilities.Stopwatch;
import bdv.BigDataViewer;
import bdv.img.cache.VolatileGlobalCellCache;
import bdv.img.hdf5.Hdf5ImageLoader;
@@ -22,6 +12,16 @@ import bdv.spimdata.SpimDataMinimal;
import bdv.spimdata.XmlIoSpimDataMinimal;
import bdv.util.ThumbnailGenerator;
import com.google.gson.GsonBuilder;
+import cz.it4i.qcmp.cache.ICacheFile;
+import cz.it4i.qcmp.cache.QuantizationCacheManager;
+import cz.it4i.qcmp.compression.CompressionOptions;
+import cz.it4i.qcmp.compression.ImageCompressor;
+import cz.it4i.qcmp.data.V3i;
+import cz.it4i.qcmp.io.FileInputData;
+import cz.it4i.qcmp.io.FlatBufferInputData;
+import cz.it4i.qcmp.io.InputData;
+import cz.it4i.qcmp.io.MemoryOutputStream;
+import cz.it4i.qcmp.utilities.Stopwatch;
import mpicbg.spim.data.SpimDataException;
import net.imglib2.cache.CacheLoader;
import net.imglib2.cache.LoaderCache;