Fixed compression of tiff images. Added parameter to choose compression in isis2std. Fixes #1745 (de540dbe) · Commits · aflab / astrogeology / ISIS3

isis/src/base/apps/isis2std/isis2std.cpp

+12 −1

Original line number	Diff line number	Diff line
		@@ -58,7 +58,18 @@ void IsisMain() {

		FileName outputName = ui.GetFileName("TO");
		int quality = ui.GetInteger("QUALITY");
		exporter->write(outputName, quality);


		QString compression;
		if (format == "TIFF") {
		compression = ui.GetString("COMPRESSION").toLower();

		}
		else {
		compression = "none";
		}

		exporter->write(outputName, quality, compression);

		if (mode != "GRAYSCALE" && ui.GetString("STRETCH") != "MANUAL") {
		ui.Clear("MINIMUM");

isis/src/base/apps/isis2std/isis2std.xml

+61 −7

Original line number	Diff line number	Diff line
		@@ -8,12 +8,12 @@

		<description>
		<p>
		This program will export an ISIS cube to one of several popular standard
		This program exports an ISIS cube to one of several popular standard image
		formats. The current supported formats are BMP, GIF, JPEG, JP2, PNG, and TIFF.
		</p>
		<p>
		This program depends on TrollTech's version of the Qt Library to export BMP,
		GIF and JPEG formated output images. For these format types, due to limitations of Qt, the
		This program uses TrollTech's version of the Qt Library to export BMP,
		GIF and JPEG formatted output images. For these format types, due to limitations of Qt, the
		input file size must not exceed 2 gigabytes and the only valid output bit type is 8BIT.
		</p>
		<p>
		@@ -24,7 +24,7 @@
		convert the file. It is recommended that large images are exported to JP2 or TIFF format.
		For some output image types, users may specify a value for the level of compression
		represented as a percentage using the QUALITY parameter. The default is no compression
		(i.e. QUALITY = 100%).
		(i.e. QUALITY = 100%). For the TIFF format a compression algorithm can be selected.
		</p>
		<p>
		Each of the input cube parameters (FROM, ALPHA, RED, GREEN, and BLUE) requires a single band
		@@ -36,8 +36,8 @@
		<p>
		In addition, if the cube has Mapping labels, the program will produce a world file for use
		in Arc and/or other GIS packages. The file will have an extension that uses the first and
		last letters for the image extenstion and a "w". For example, tif produces a world file
		extension of tfw.
		last letters for the image extention and a "w". For example, .tif produces a world file
		extension of .tfw.
		</p>
		<p>
		To ensure acceptable contrast in the output file, the user may select from three stretch
		@@ -115,6 +115,11 @@
		improve coverage for isis2std program and the ImageExporter and its derived classes.
		Fixes #1380.
		</change>
		<change name="Jeffrey Covington" date="2015-02-12">
		Changed default compression of TIFF format images to no compression. Added COMPRESSION parameter to
		choose the compression algorithm for TIFF format images. Fixes #1745

		</change>
		</history>
		<category>
		<categoryItem>Import and Export</categoryItem>
		@@ -311,6 +316,7 @@
		</description>
		<exclusions>
		<item>BITTYPE</item>
		<item>COMPRESSION</item>
		</exclusions>
		</option>
		<option value="BMP">
		@@ -321,6 +327,7 @@
		</description>
		<exclusions>
		<item>BITTYPE</item>
		<item>COMPRESSION</item>
		</exclusions>
		</option>
		<option value="GIF">
		@@ -331,6 +338,7 @@
		</description>
		<exclusions>
		<item>BITTYPE</item>
		<item>COMPRESSION</item>
		</exclusions>
		</option>
		<option value="TIFF">
		@@ -348,6 +356,7 @@
		</description>
		<exclusions>
		<item>BITTYPE</item>
		<item>COMPRESSION</item>
		</exclusions>
		</option>
		<option value="JP2">
		@@ -358,6 +367,7 @@
		</description>
		<exclusions>
		<item>QUALITY</item>
		<item>COMPRESSION</item>
		</exclusions>
		</option>
		</list>
		@@ -383,7 +393,7 @@
		</default>
		<brief>Bit type of output file</brief>
		<description>
		This parameter allows the user to set the bit type of the output image.
		This parameter allows the userPackBits is also known as Macintosh RLE. to set the bit type of the output image.
		Some FORMAT values will only allow 8BIT outputs.
		16 bit signed (-32767=black, 32768=white)
		</description>
		@@ -410,6 +420,50 @@
		</option>
		</list>
		</parameter>
		<parameter name="COMPRESSION">
		<type>string</type>
		<default>
		<item>NONE</item>
		</default>
		<brief>The compression algorithm for TIFF format</brief>
		<description>
		The compression algorithm used to compress an output TIFF format image. Only used if the format
		is set to TIFF. The default is no compression. PACKBITS is the most widely supported compression
		algorithm for the TIFF format.
		</description>
		<list>
		<option value="NONE">
		<brief>Use no compression</brief>
		<description>
		Use no compression on the output TIFF image.
		</description>
		</option>
		<option value="PACKBITS">
		<brief>Use PackBits compression</brief>
		<description>
		Use PackBits compression on the output TIFF format image. PackBits is also known as Macintosh RLE.
		This compression algorithm should be supported by all TIFF readers that conform to the
		Baseline TIFF specification.
		</description>
		</option>
		<option value="LZW">
		<brief>Use LZW compression</brief>
		<description>
		Use Lempel-Ziv-Welch(LZW) compression on the output TIFF format image.
		</description>
		</option>
		<option value="DEFLATE">
		<brief>Use Deflate compression</brief>
		<description>
		Use Deflate compression on the output TIFF format image.

		Note: This uses the official version of Deflate for TIFF images described in the
		TIFF Specification Supplement 2. Other versions of deflate for TIFF images are considered
		obsolete.
		</description>
		</option>
		</list>
		</parameter>
		</group>

		<group name="Stretch Options">

isis/src/base/apps/isis2std/tsts/tiff/Makefile

+33 −0

Original line number	Diff line number	Diff line
		@@ -50,8 +50,41 @@ commands:
		# stretch=linear > /dev/null;
		# std2isis FROM=$(OUTPUT)/isis2stdTruth_gray_s16bit.tif \
		# TO=$(OUTPUT)/isis2stdTruth_gray_s16bit.cub > /dev/null;

		$(APPNAME) from=$(INPUT)/isisTruth.cub+1 \
		to=$(OUTPUT)/isis2stdTruth_packbits.tif \
		mode=grayscale \
		format=tiff \
		compression=packbits \
		stretch=linear > /dev/null;
		std2isis FROM=$(OUTPUT)/isis2stdTruth_packbits.tif \
		TO=$(OUTPUT)/isis2stdTruth_packbits.cub > /dev/null;
		$(APPNAME) from=$(INPUT)/isisTruth.cub+1 \
		to=$(OUTPUT)/isis2stdTruth_lzw.tif \
		mode=grayscale \
		format=tiff \
		compression=lzw \
		stretch=linear > /dev/null;
		std2isis FROM=$(OUTPUT)/isis2stdTruth_lzw.tif \
		TO=$(OUTPUT)/isis2stdTruth_lzw.cub > /dev/null;
		$(APPNAME) from=$(INPUT)/isisTruth.cub+1 \
		to=$(OUTPUT)/isis2stdTruth_deflate.tif \
		mode=grayscale \
		format=tiff \
		compression=deflate \
		stretch=linear > /dev/null;
		std2isis FROM=$(OUTPUT)/isis2stdTruth_deflate.tif \
		TO=$(OUTPUT)/isis2stdTruth_deflate.cub > /dev/null;
		$(RM) $(OUTPUT)/isis2stdTruth_gray.tif;
		$(RM) $(OUTPUT)/isis2stdTruth_rgb.tfw;
		$(RM) $(OUTPUT)/isis2stdTruth_rgb.tif;
		$(RM) $(OUTPUT)/isis2stdTruth_gray_u16bit.tif;
		# $(RM) $(OUTPUT)/isis2stdTruth_gray_s16bit.tif;
		$(RM) $(OUTPUT)/isis2stdTruth_packbits.tif
		$(RM) $(OUTPUT)/isis2stdTruth_lzw.tif
		$(RM) $(OUTPUT)/isis2stdTruth_deflate.tif

isis/src/base/objs/ImageExporter/ImageExporter.cpp

+7 −4

Original line number	Diff line number	Diff line
		@@ -83,14 +83,17 @@ namespace Isis {
		/**
		* Export the Isis cube channels to the given standard image. If supported by
		* the specific exporter child, will also produce an image with the given
		* scaled quality. This will do a black-box export using a ProcessExport
		* routine. After the export is completed, a world file will also be created
		* if a map projection exists.
		* scaled quality. Will also use the selected compression algorithm if
		* supported by the image format. This will do a black-box export using a
		* ProcessExport routine. After the export is completed, a world file will
		* also be created if a map projection exists.
		*
		* @param outputName The filename of the output cube
		* @param quality The quality of the output from 0 to 100, defaults to 100
		* @param compression The compression algorithm used. Image format specific.
		*/
		void ImageExporter::write(FileName outputName, int quality) {
		void ImageExporter::write(FileName outputName, int quality,
		QString compression) {
		ProcessExport &p = process();
		if (!p.HasInputRange()) p.SetInputRange();
		p.ProcessCubes(*this);

isis/src/base/objs/ImageExporter/ImageExporter.h

+4 −1

Original line number	Diff line number	Diff line
		@@ -64,6 +64,8 @@ namespace Isis {
		* pixel type. Added pure virtual initialize() method to be called in
		* the setGrayscale(), setRgb(), and setRgba() methods. References
		* #1380.
		* @history 2015-02-12 Jeffrey Covington - Added optional parameter to virtual method write()
		* to choose a compression algorithm. Fixes #1745.
		*/
		class ImageExporter {
		public:
		@@ -72,7 +74,8 @@ namespace Isis {

		void operator()(vector<Buffer *> &in) const;

		virtual void write(FileName outputName, int quality=100);
		virtual void write(FileName outputName, int quality=100,
		QString compression="none");

		int samples() const;
		int lines() const;