Modified:
websites/production/commons/content/proper/commons-imaging/apidocs/src-html/org/apache/commons/imaging/formats/tiff/write/TiffOutputDirectory.html
==============================================================================
---
websites/production/commons/content/proper/commons-imaging/apidocs/src-html/org/apache/commons/imaging/formats/tiff/write/TiffOutputDirectory.html
(original)
+++
websites/production/commons/content/proper/commons-imaging/apidocs/src-html/org/apache/commons/imaging/formats/tiff/write/TiffOutputDirectory.html
Sun Jan 11 12:33:25 2015
@@ -436,213 +436,235 @@
<span class="sourceLineNo">428</span> fields.removeAll(matches);<a
name="line.428"></a>
<span class="sourceLineNo">429</span> }<a name="line.429"></a>
<span class="sourceLineNo">430</span><a name="line.430"></a>
-<span class="sourceLineNo">431</span> public TiffOutputField
findField(final TagInfo tagInfo) {<a name="line.431"></a>
-<span class="sourceLineNo">432</span> return findField(tagInfo.tag);<a
name="line.432"></a>
-<span class="sourceLineNo">433</span> }<a name="line.433"></a>
-<span class="sourceLineNo">434</span><a name="line.434"></a>
-<span class="sourceLineNo">435</span> public TiffOutputField
findField(final int tag) {<a name="line.435"></a>
-<span class="sourceLineNo">436</span> for (TiffOutputField field :
fields) {<a name="line.436"></a>
-<span class="sourceLineNo">437</span> if (field.tag == tag) {<a
name="line.437"></a>
-<span class="sourceLineNo">438</span> return field;<a
name="line.438"></a>
-<span class="sourceLineNo">439</span> }<a name="line.439"></a>
-<span class="sourceLineNo">440</span> }<a name="line.440"></a>
-<span class="sourceLineNo">441</span> return null;<a
name="line.441"></a>
-<span class="sourceLineNo">442</span> }<a name="line.442"></a>
-<span class="sourceLineNo">443</span><a name="line.443"></a>
-<span class="sourceLineNo">444</span> public void sortFields() {<a
name="line.444"></a>
-<span class="sourceLineNo">445</span> final
Comparator<TiffOutputField> comparator = new
Comparator<TiffOutputField>() {<a name="line.445"></a>
-<span class="sourceLineNo">446</span> public int compare(final
TiffOutputField e1, final TiffOutputField e2) {<a name="line.446"></a>
-<span class="sourceLineNo">447</span> if (e1.tag != e2.tag) {<a
name="line.447"></a>
-<span class="sourceLineNo">448</span> return e1.tag -
e2.tag;<a name="line.448"></a>
-<span class="sourceLineNo">449</span> }<a name="line.449"></a>
-<span class="sourceLineNo">450</span> return e1.getSortHint() -
e2.getSortHint();<a name="line.450"></a>
-<span class="sourceLineNo">451</span> }<a name="line.451"></a>
-<span class="sourceLineNo">452</span> };<a name="line.452"></a>
-<span class="sourceLineNo">453</span> Collections.sort(fields,
comparator);<a name="line.453"></a>
-<span class="sourceLineNo">454</span> }<a name="line.454"></a>
-<span class="sourceLineNo">455</span><a name="line.455"></a>
-<span class="sourceLineNo">456</span> public String description() {<a
name="line.456"></a>
-<span class="sourceLineNo">457</span> return
TiffDirectory.description(type);<a name="line.457"></a>
-<span class="sourceLineNo">458</span> }<a name="line.458"></a>
-<span class="sourceLineNo">459</span><a name="line.459"></a>
-<span class="sourceLineNo">460</span> @Override<a name="line.460"></a>
-<span class="sourceLineNo">461</span> public void writeItem(final
BinaryOutputStream bos) throws IOException,<a name="line.461"></a>
-<span class="sourceLineNo">462</span> ImageWriteException {<a
name="line.462"></a>
-<span class="sourceLineNo">463</span> // Write Directory Field Count<a
name="line.463"></a>
-<span class="sourceLineNo">464</span> bos.write2Bytes(fields.size());
// DirectoryFieldCount<a name="line.464"></a>
+<span class="sourceLineNo">431</span> /**<a name="line.431"></a>
+<span class="sourceLineNo">432</span> * Finds the TiffOutputField for the
given TagInfo from this TiffOutputDirectory.<a name="line.432"></a>
+<span class="sourceLineNo">433</span> *<a name="line.433"></a>
+<span class="sourceLineNo">434</span> * <p><a name="line.434"></a>
+<span class="sourceLineNo">435</span> * If there is no field matching the
given TagInfo, null will be returned.<a name="line.435"></a>
+<span class="sourceLineNo">436</span> * </p><a name="line.436"></a>
+<span class="sourceLineNo">437</span> *<a name="line.437"></a>
+<span class="sourceLineNo">438</span> * @param tagInfo the TagInfo
specifying the field <a name="line.438"></a>
+<span class="sourceLineNo">439</span> * @return the field matching tagInfo
or null, if the field isn't present<a name="line.439"></a>
+<span class="sourceLineNo">440</span> * @see #findField(int)<a
name="line.440"></a>
+<span class="sourceLineNo">441</span> */<a name="line.441"></a>
+<span class="sourceLineNo">442</span> public TiffOutputField
findField(final TagInfo tagInfo) {<a name="line.442"></a>
+<span class="sourceLineNo">443</span> return findField(tagInfo.tag);<a
name="line.443"></a>
+<span class="sourceLineNo">444</span> }<a name="line.444"></a>
+<span class="sourceLineNo">445</span><a name="line.445"></a>
+<span class="sourceLineNo">446</span> /**<a name="line.446"></a>
+<span class="sourceLineNo">447</span> * Finds the TiffOutputField for the
given tag from this TiffOutputDirectory.<a name="line.447"></a>
+<span class="sourceLineNo">448</span> *<a name="line.448"></a>
+<span class="sourceLineNo">449</span> * <p><a name="line.449"></a>
+<span class="sourceLineNo">450</span> * If there is no field matching the
given tag, null will be returned.<a name="line.450"></a>
+<span class="sourceLineNo">451</span> * </p><a name="line.451"></a>
+<span class="sourceLineNo">452</span> *<a name="line.452"></a>
+<span class="sourceLineNo">453</span> * @param tag the tag specifying the
field <a name="line.453"></a>
+<span class="sourceLineNo">454</span> * @return the field matching tagInfo
or null, if the field isn't present<a name="line.454"></a>
+<span class="sourceLineNo">455</span> * @see #findField(TagInfo)<a
name="line.455"></a>
+<span class="sourceLineNo">456</span> */<a name="line.456"></a>
+<span class="sourceLineNo">457</span> public TiffOutputField
findField(final int tag) {<a name="line.457"></a>
+<span class="sourceLineNo">458</span> for (TiffOutputField field :
fields) {<a name="line.458"></a>
+<span class="sourceLineNo">459</span> if (field.tag == tag) {<a
name="line.459"></a>
+<span class="sourceLineNo">460</span> return field;<a
name="line.460"></a>
+<span class="sourceLineNo">461</span> }<a name="line.461"></a>
+<span class="sourceLineNo">462</span> }<a name="line.462"></a>
+<span class="sourceLineNo">463</span> return null;<a
name="line.463"></a>
+<span class="sourceLineNo">464</span> }<a name="line.464"></a>
<span class="sourceLineNo">465</span><a name="line.465"></a>
-<span class="sourceLineNo">466</span> // Write Fields<a
name="line.466"></a>
-<span class="sourceLineNo">467</span> for (TiffOutputField field :
fields) {<a name="line.467"></a>
-<span class="sourceLineNo">468</span> field.writeField(bos);<a
name="line.468"></a>
-<span class="sourceLineNo">469</span><a name="line.469"></a>
-<span class="sourceLineNo">470</span> // Debug.debug("\t" +
"writing field (" + field.tag + ", 0x" +<a name="line.470"></a>
-<span class="sourceLineNo">471</span> //
Integer.toHexString(field.tag) + ")", field.tagInfo);<a name="line.471"></a>
-<span class="sourceLineNo">472</span> //
if(field.tagInfo.isOffset())<a name="line.472"></a>
-<span class="sourceLineNo">473</span> // Debug.debug("\t\tOFFSET!",
field.bytes);<a name="line.473"></a>
-<span class="sourceLineNo">474</span> }<a name="line.474"></a>
-<span class="sourceLineNo">475</span><a name="line.475"></a>
-<span class="sourceLineNo">476</span> long nextDirectoryOffset = 0;<a
name="line.476"></a>
-<span class="sourceLineNo">477</span> if (nextDirectory != null) {<a
name="line.477"></a>
-<span class="sourceLineNo">478</span> nextDirectoryOffset =
nextDirectory.getOffset();<a name="line.478"></a>
-<span class="sourceLineNo">479</span> }<a name="line.479"></a>
-<span class="sourceLineNo">480</span><a name="line.480"></a>
-<span class="sourceLineNo">481</span> // Write nextDirectoryOffset<a
name="line.481"></a>
-<span class="sourceLineNo">482</span> if (nextDirectoryOffset ==
UNDEFINED_VALUE) {<a name="line.482"></a>
-<span class="sourceLineNo">483</span> bos.write4Bytes(0);<a
name="line.483"></a>
-<span class="sourceLineNo">484</span> } else {<a name="line.484"></a>
-<span class="sourceLineNo">485</span> bos.write4Bytes((int)
nextDirectoryOffset);<a name="line.485"></a>
-<span class="sourceLineNo">486</span> }<a name="line.486"></a>
-<span class="sourceLineNo">487</span> }<a name="line.487"></a>
-<span class="sourceLineNo">488</span><a name="line.488"></a>
-<span class="sourceLineNo">489</span> public void setJpegImageData(final
JpegImageData rawJpegImageData) {<a name="line.489"></a>
-<span class="sourceLineNo">490</span> this.jpegImageData =
rawJpegImageData;<a name="line.490"></a>
-<span class="sourceLineNo">491</span> }<a name="line.491"></a>
-<span class="sourceLineNo">492</span><a name="line.492"></a>
-<span class="sourceLineNo">493</span> public JpegImageData
getRawJpegImageData() {<a name="line.493"></a>
-<span class="sourceLineNo">494</span> return jpegImageData;<a
name="line.494"></a>
-<span class="sourceLineNo">495</span> }<a name="line.495"></a>
-<span class="sourceLineNo">496</span><a name="line.496"></a>
-<span class="sourceLineNo">497</span> public void setTiffImageData(final
TiffImageData rawTiffImageData) {<a name="line.497"></a>
-<span class="sourceLineNo">498</span> this.tiffImageData =
rawTiffImageData;<a name="line.498"></a>
-<span class="sourceLineNo">499</span> }<a name="line.499"></a>
-<span class="sourceLineNo">500</span><a name="line.500"></a>
-<span class="sourceLineNo">501</span> public TiffImageData
getRawTiffImageData() {<a name="line.501"></a>
-<span class="sourceLineNo">502</span> return tiffImageData;<a
name="line.502"></a>
-<span class="sourceLineNo">503</span> }<a name="line.503"></a>
-<span class="sourceLineNo">504</span><a name="line.504"></a>
-<span class="sourceLineNo">505</span> @Override<a name="line.505"></a>
-<span class="sourceLineNo">506</span> public int getItemLength() {<a
name="line.506"></a>
-<span class="sourceLineNo">507</span> return TIFF_ENTRY_LENGTH *
fields.size() + TIFF_DIRECTORY_HEADER_LENGTH<a name="line.507"></a>
-<span class="sourceLineNo">508</span> +
TIFF_DIRECTORY_FOOTER_LENGTH;<a name="line.508"></a>
+<span class="sourceLineNo">466</span> public void sortFields() {<a
name="line.466"></a>
+<span class="sourceLineNo">467</span> final
Comparator<TiffOutputField> comparator = new
Comparator<TiffOutputField>() {<a name="line.467"></a>
+<span class="sourceLineNo">468</span> public int compare(final
TiffOutputField e1, final TiffOutputField e2) {<a name="line.468"></a>
+<span class="sourceLineNo">469</span> if (e1.tag != e2.tag) {<a
name="line.469"></a>
+<span class="sourceLineNo">470</span> return e1.tag -
e2.tag;<a name="line.470"></a>
+<span class="sourceLineNo">471</span> }<a name="line.471"></a>
+<span class="sourceLineNo">472</span> return e1.getSortHint() -
e2.getSortHint();<a name="line.472"></a>
+<span class="sourceLineNo">473</span> }<a name="line.473"></a>
+<span class="sourceLineNo">474</span> };<a name="line.474"></a>
+<span class="sourceLineNo">475</span> Collections.sort(fields,
comparator);<a name="line.475"></a>
+<span class="sourceLineNo">476</span> }<a name="line.476"></a>
+<span class="sourceLineNo">477</span><a name="line.477"></a>
+<span class="sourceLineNo">478</span> public String description() {<a
name="line.478"></a>
+<span class="sourceLineNo">479</span> return
TiffDirectory.description(type);<a name="line.479"></a>
+<span class="sourceLineNo">480</span> }<a name="line.480"></a>
+<span class="sourceLineNo">481</span><a name="line.481"></a>
+<span class="sourceLineNo">482</span> @Override<a name="line.482"></a>
+<span class="sourceLineNo">483</span> public void writeItem(final
BinaryOutputStream bos) throws IOException,<a name="line.483"></a>
+<span class="sourceLineNo">484</span> ImageWriteException {<a
name="line.484"></a>
+<span class="sourceLineNo">485</span> // Write Directory Field Count<a
name="line.485"></a>
+<span class="sourceLineNo">486</span> bos.write2Bytes(fields.size());
// DirectoryFieldCount<a name="line.486"></a>
+<span class="sourceLineNo">487</span><a name="line.487"></a>
+<span class="sourceLineNo">488</span> // Write Fields<a
name="line.488"></a>
+<span class="sourceLineNo">489</span> for (TiffOutputField field :
fields) {<a name="line.489"></a>
+<span class="sourceLineNo">490</span> field.writeField(bos);<a
name="line.490"></a>
+<span class="sourceLineNo">491</span><a name="line.491"></a>
+<span class="sourceLineNo">492</span> // Debug.debug("\t" +
"writing field (" + field.tag + ", 0x" +<a name="line.492"></a>
+<span class="sourceLineNo">493</span> //
Integer.toHexString(field.tag) + ")", field.tagInfo);<a name="line.493"></a>
+<span class="sourceLineNo">494</span> //
if(field.tagInfo.isOffset())<a name="line.494"></a>
+<span class="sourceLineNo">495</span> // Debug.debug("\t\tOFFSET!",
field.bytes);<a name="line.495"></a>
+<span class="sourceLineNo">496</span> }<a name="line.496"></a>
+<span class="sourceLineNo">497</span><a name="line.497"></a>
+<span class="sourceLineNo">498</span> long nextDirectoryOffset = 0;<a
name="line.498"></a>
+<span class="sourceLineNo">499</span> if (nextDirectory != null) {<a
name="line.499"></a>
+<span class="sourceLineNo">500</span> nextDirectoryOffset =
nextDirectory.getOffset();<a name="line.500"></a>
+<span class="sourceLineNo">501</span> }<a name="line.501"></a>
+<span class="sourceLineNo">502</span><a name="line.502"></a>
+<span class="sourceLineNo">503</span> // Write nextDirectoryOffset<a
name="line.503"></a>
+<span class="sourceLineNo">504</span> if (nextDirectoryOffset ==
UNDEFINED_VALUE) {<a name="line.504"></a>
+<span class="sourceLineNo">505</span> bos.write4Bytes(0);<a
name="line.505"></a>
+<span class="sourceLineNo">506</span> } else {<a name="line.506"></a>
+<span class="sourceLineNo">507</span> bos.write4Bytes((int)
nextDirectoryOffset);<a name="line.507"></a>
+<span class="sourceLineNo">508</span> }<a name="line.508"></a>
<span class="sourceLineNo">509</span> }<a name="line.509"></a>
<span class="sourceLineNo">510</span><a name="line.510"></a>
-<span class="sourceLineNo">511</span> @Override<a name="line.511"></a>
-<span class="sourceLineNo">512</span> public String getItemDescription()
{<a name="line.512"></a>
-<span class="sourceLineNo">513</span> final TiffDirectoryType dirType =
TagConstantsUtils<a name="line.513"></a>
-<span class="sourceLineNo">514</span>
.getExifDirectoryType(type);<a name="line.514"></a>
-<span class="sourceLineNo">515</span> return "Directory: " +
dirType.name + " (" + type + ")";<a name="line.515"></a>
-<span class="sourceLineNo">516</span> }<a name="line.516"></a>
-<span class="sourceLineNo">517</span><a name="line.517"></a>
-<span class="sourceLineNo">518</span> private void
removeFieldIfPresent(final TagInfo tagInfo) {<a name="line.518"></a>
-<span class="sourceLineNo">519</span> final TiffOutputField field =
findField(tagInfo);<a name="line.519"></a>
-<span class="sourceLineNo">520</span> if (null != field) {<a
name="line.520"></a>
-<span class="sourceLineNo">521</span> fields.remove(field);<a
name="line.521"></a>
-<span class="sourceLineNo">522</span> }<a name="line.522"></a>
-<span class="sourceLineNo">523</span> }<a name="line.523"></a>
-<span class="sourceLineNo">524</span><a name="line.524"></a>
-<span class="sourceLineNo">525</span> protected List<TiffOutputItem>
getOutputItems(<a name="line.525"></a>
-<span class="sourceLineNo">526</span> final TiffOutputSummary
outputSummary) throws ImageWriteException {<a name="line.526"></a>
-<span class="sourceLineNo">527</span> // first validate directory
fields.<a name="line.527"></a>
-<span class="sourceLineNo">528</span><a name="line.528"></a>
-<span class="sourceLineNo">529</span>
removeFieldIfPresent(TiffTagConstants.TIFF_TAG_JPEG_INTERCHANGE_FORMAT);<a
name="line.529"></a>
-<span class="sourceLineNo">530</span>
removeFieldIfPresent(TiffTagConstants.TIFF_TAG_JPEG_INTERCHANGE_FORMAT_LENGTH);<a
name="line.530"></a>
-<span class="sourceLineNo">531</span><a name="line.531"></a>
-<span class="sourceLineNo">532</span> TiffOutputField jpegOffsetField =
null;<a name="line.532"></a>
-<span class="sourceLineNo">533</span> if (null != jpegImageData) {<a
name="line.533"></a>
-<span class="sourceLineNo">534</span> jpegOffsetField = new
TiffOutputField(<a name="line.534"></a>
-<span class="sourceLineNo">535</span>
TiffTagConstants.TIFF_TAG_JPEG_INTERCHANGE_FORMAT,<a name="line.535"></a>
-<span class="sourceLineNo">536</span> FieldType.LONG, 1,
new byte[TIFF_ENTRY_MAX_VALUE_LENGTH]);<a name="line.536"></a>
-<span class="sourceLineNo">537</span> add(jpegOffsetField);<a
name="line.537"></a>
-<span class="sourceLineNo">538</span><a name="line.538"></a>
-<span class="sourceLineNo">539</span> final byte[] lengthValue =
FieldType.LONG.writeData(<a name="line.539"></a>
-<span class="sourceLineNo">540</span>
jpegImageData.length,<a name="line.540"></a>
-<span class="sourceLineNo">541</span>
outputSummary.byteOrder);<a name="line.541"></a>
-<span class="sourceLineNo">542</span><a name="line.542"></a>
-<span class="sourceLineNo">543</span> final TiffOutputField
jpegLengthField = new TiffOutputField(<a name="line.543"></a>
-<span class="sourceLineNo">544</span>
TiffTagConstants.TIFF_TAG_JPEG_INTERCHANGE_FORMAT_LENGTH,<a name="line.544"></a>
-<span class="sourceLineNo">545</span> FieldType.LONG, 1,
lengthValue);<a name="line.545"></a>
-<span class="sourceLineNo">546</span> add(jpegLengthField);<a
name="line.546"></a>
-<span class="sourceLineNo">547</span><a name="line.547"></a>
-<span class="sourceLineNo">548</span> }<a name="line.548"></a>
-<span class="sourceLineNo">549</span><a name="line.549"></a>
-<span class="sourceLineNo">550</span> //
--------------------------------------------------------------<a
name="line.550"></a>
-<span class="sourceLineNo">551</span><a name="line.551"></a>
-<span class="sourceLineNo">552</span>
removeFieldIfPresent(TiffTagConstants.TIFF_TAG_STRIP_OFFSETS);<a
name="line.552"></a>
-<span class="sourceLineNo">553</span>
removeFieldIfPresent(TiffTagConstants.TIFF_TAG_STRIP_BYTE_COUNTS);<a
name="line.553"></a>
-<span class="sourceLineNo">554</span>
removeFieldIfPresent(TiffTagConstants.TIFF_TAG_TILE_OFFSETS);<a
name="line.554"></a>
-<span class="sourceLineNo">555</span>
removeFieldIfPresent(TiffTagConstants.TIFF_TAG_TILE_BYTE_COUNTS);<a
name="line.555"></a>
-<span class="sourceLineNo">556</span><a name="line.556"></a>
-<span class="sourceLineNo">557</span> TiffOutputField
imageDataOffsetField;<a name="line.557"></a>
-<span class="sourceLineNo">558</span> ImageDataOffsets imageDataInfo =
null;<a name="line.558"></a>
-<span class="sourceLineNo">559</span> if (null != tiffImageData) {<a
name="line.559"></a>
-<span class="sourceLineNo">560</span> final boolean stripsNotTiles
= tiffImageData.stripsNotTiles();<a name="line.560"></a>
-<span class="sourceLineNo">561</span><a name="line.561"></a>
-<span class="sourceLineNo">562</span> TagInfo offsetTag;<a
name="line.562"></a>
-<span class="sourceLineNo">563</span> TagInfo byteCountsTag;<a
name="line.563"></a>
-<span class="sourceLineNo">564</span> if (stripsNotTiles) {<a
name="line.564"></a>
-<span class="sourceLineNo">565</span> offsetTag =
TiffTagConstants.TIFF_TAG_STRIP_OFFSETS;<a name="line.565"></a>
-<span class="sourceLineNo">566</span> byteCountsTag =
TiffTagConstants.TIFF_TAG_STRIP_BYTE_COUNTS;<a name="line.566"></a>
-<span class="sourceLineNo">567</span> } else {<a
name="line.567"></a>
-<span class="sourceLineNo">568</span> offsetTag =
TiffTagConstants.TIFF_TAG_TILE_OFFSETS;<a name="line.568"></a>
-<span class="sourceLineNo">569</span> byteCountsTag =
TiffTagConstants.TIFF_TAG_TILE_BYTE_COUNTS;<a name="line.569"></a>
-<span class="sourceLineNo">570</span> }<a name="line.570"></a>
+<span class="sourceLineNo">511</span> public void setJpegImageData(final
JpegImageData rawJpegImageData) {<a name="line.511"></a>
+<span class="sourceLineNo">512</span> this.jpegImageData =
rawJpegImageData;<a name="line.512"></a>
+<span class="sourceLineNo">513</span> }<a name="line.513"></a>
+<span class="sourceLineNo">514</span><a name="line.514"></a>
+<span class="sourceLineNo">515</span> public JpegImageData
getRawJpegImageData() {<a name="line.515"></a>
+<span class="sourceLineNo">516</span> return jpegImageData;<a
name="line.516"></a>
+<span class="sourceLineNo">517</span> }<a name="line.517"></a>
+<span class="sourceLineNo">518</span><a name="line.518"></a>
+<span class="sourceLineNo">519</span> public void setTiffImageData(final
TiffImageData rawTiffImageData) {<a name="line.519"></a>
+<span class="sourceLineNo">520</span> this.tiffImageData =
rawTiffImageData;<a name="line.520"></a>
+<span class="sourceLineNo">521</span> }<a name="line.521"></a>
+<span class="sourceLineNo">522</span><a name="line.522"></a>
+<span class="sourceLineNo">523</span> public TiffImageData
getRawTiffImageData() {<a name="line.523"></a>
+<span class="sourceLineNo">524</span> return tiffImageData;<a
name="line.524"></a>
+<span class="sourceLineNo">525</span> }<a name="line.525"></a>
+<span class="sourceLineNo">526</span><a name="line.526"></a>
+<span class="sourceLineNo">527</span> @Override<a name="line.527"></a>
+<span class="sourceLineNo">528</span> public int getItemLength() {<a
name="line.528"></a>
+<span class="sourceLineNo">529</span> return TIFF_ENTRY_LENGTH *
fields.size() + TIFF_DIRECTORY_HEADER_LENGTH<a name="line.529"></a>
+<span class="sourceLineNo">530</span> +
TIFF_DIRECTORY_FOOTER_LENGTH;<a name="line.530"></a>
+<span class="sourceLineNo">531</span> }<a name="line.531"></a>
+<span class="sourceLineNo">532</span><a name="line.532"></a>
+<span class="sourceLineNo">533</span> @Override<a name="line.533"></a>
+<span class="sourceLineNo">534</span> public String getItemDescription()
{<a name="line.534"></a>
+<span class="sourceLineNo">535</span> final TiffDirectoryType dirType =
TagConstantsUtils<a name="line.535"></a>
+<span class="sourceLineNo">536</span>
.getExifDirectoryType(type);<a name="line.536"></a>
+<span class="sourceLineNo">537</span> return "Directory: " +
dirType.name + " (" + type + ")";<a name="line.537"></a>
+<span class="sourceLineNo">538</span> }<a name="line.538"></a>
+<span class="sourceLineNo">539</span><a name="line.539"></a>
+<span class="sourceLineNo">540</span> private void
removeFieldIfPresent(final TagInfo tagInfo) {<a name="line.540"></a>
+<span class="sourceLineNo">541</span> final TiffOutputField field =
findField(tagInfo);<a name="line.541"></a>
+<span class="sourceLineNo">542</span> if (null != field) {<a
name="line.542"></a>
+<span class="sourceLineNo">543</span> fields.remove(field);<a
name="line.543"></a>
+<span class="sourceLineNo">544</span> }<a name="line.544"></a>
+<span class="sourceLineNo">545</span> }<a name="line.545"></a>
+<span class="sourceLineNo">546</span><a name="line.546"></a>
+<span class="sourceLineNo">547</span> protected List<TiffOutputItem>
getOutputItems(<a name="line.547"></a>
+<span class="sourceLineNo">548</span> final TiffOutputSummary
outputSummary) throws ImageWriteException {<a name="line.548"></a>
+<span class="sourceLineNo">549</span> // first validate directory
fields.<a name="line.549"></a>
+<span class="sourceLineNo">550</span><a name="line.550"></a>
+<span class="sourceLineNo">551</span>
removeFieldIfPresent(TiffTagConstants.TIFF_TAG_JPEG_INTERCHANGE_FORMAT);<a
name="line.551"></a>
+<span class="sourceLineNo">552</span>
removeFieldIfPresent(TiffTagConstants.TIFF_TAG_JPEG_INTERCHANGE_FORMAT_LENGTH);<a
name="line.552"></a>
+<span class="sourceLineNo">553</span><a name="line.553"></a>
+<span class="sourceLineNo">554</span> TiffOutputField jpegOffsetField =
null;<a name="line.554"></a>
+<span class="sourceLineNo">555</span> if (null != jpegImageData) {<a
name="line.555"></a>
+<span class="sourceLineNo">556</span> jpegOffsetField = new
TiffOutputField(<a name="line.556"></a>
+<span class="sourceLineNo">557</span>
TiffTagConstants.TIFF_TAG_JPEG_INTERCHANGE_FORMAT,<a name="line.557"></a>
+<span class="sourceLineNo">558</span> FieldType.LONG, 1,
new byte[TIFF_ENTRY_MAX_VALUE_LENGTH]);<a name="line.558"></a>
+<span class="sourceLineNo">559</span> add(jpegOffsetField);<a
name="line.559"></a>
+<span class="sourceLineNo">560</span><a name="line.560"></a>
+<span class="sourceLineNo">561</span> final byte[] lengthValue =
FieldType.LONG.writeData(<a name="line.561"></a>
+<span class="sourceLineNo">562</span>
jpegImageData.length,<a name="line.562"></a>
+<span class="sourceLineNo">563</span>
outputSummary.byteOrder);<a name="line.563"></a>
+<span class="sourceLineNo">564</span><a name="line.564"></a>
+<span class="sourceLineNo">565</span> final TiffOutputField
jpegLengthField = new TiffOutputField(<a name="line.565"></a>
+<span class="sourceLineNo">566</span>
TiffTagConstants.TIFF_TAG_JPEG_INTERCHANGE_FORMAT_LENGTH,<a name="line.566"></a>
+<span class="sourceLineNo">567</span> FieldType.LONG, 1,
lengthValue);<a name="line.567"></a>
+<span class="sourceLineNo">568</span> add(jpegLengthField);<a
name="line.568"></a>
+<span class="sourceLineNo">569</span><a name="line.569"></a>
+<span class="sourceLineNo">570</span> }<a name="line.570"></a>
<span class="sourceLineNo">571</span><a name="line.571"></a>
-<span class="sourceLineNo">572</span> // --------<a
name="line.572"></a>
+<span class="sourceLineNo">572</span> //
--------------------------------------------------------------<a
name="line.572"></a>
<span class="sourceLineNo">573</span><a name="line.573"></a>
-<span class="sourceLineNo">574</span> final
TiffElement.DataElement[] imageData = tiffImageData.getImageData();<a
name="line.574"></a>
-<span class="sourceLineNo">575</span><a name="line.575"></a>
-<span class="sourceLineNo">576</span> // TiffOutputField
imageDataOffsetsField = null;<a name="line.576"></a>
-<span class="sourceLineNo">577</span><a name="line.577"></a>
-<span class="sourceLineNo">578</span> int[] imageDataOffsets = new
int[imageData.length];<a name="line.578"></a>
-<span class="sourceLineNo">579</span> int[] imageDataByteCounts =
new int[imageData.length];<a name="line.579"></a>
-<span class="sourceLineNo">580</span> for (int i = 0; i <
imageData.length; i++) {<a name="line.580"></a>
-<span class="sourceLineNo">581</span> imageDataByteCounts[i] =
imageData[i].length;<a name="line.581"></a>
-<span class="sourceLineNo">582</span> }<a name="line.582"></a>
+<span class="sourceLineNo">574</span>
removeFieldIfPresent(TiffTagConstants.TIFF_TAG_STRIP_OFFSETS);<a
name="line.574"></a>
+<span class="sourceLineNo">575</span>
removeFieldIfPresent(TiffTagConstants.TIFF_TAG_STRIP_BYTE_COUNTS);<a
name="line.575"></a>
+<span class="sourceLineNo">576</span>
removeFieldIfPresent(TiffTagConstants.TIFF_TAG_TILE_OFFSETS);<a
name="line.576"></a>
+<span class="sourceLineNo">577</span>
removeFieldIfPresent(TiffTagConstants.TIFF_TAG_TILE_BYTE_COUNTS);<a
name="line.577"></a>
+<span class="sourceLineNo">578</span><a name="line.578"></a>
+<span class="sourceLineNo">579</span> TiffOutputField
imageDataOffsetField;<a name="line.579"></a>
+<span class="sourceLineNo">580</span> ImageDataOffsets imageDataInfo =
null;<a name="line.580"></a>
+<span class="sourceLineNo">581</span> if (null != tiffImageData) {<a
name="line.581"></a>
+<span class="sourceLineNo">582</span> final boolean stripsNotTiles
= tiffImageData.stripsNotTiles();<a name="line.582"></a>
<span class="sourceLineNo">583</span><a name="line.583"></a>
-<span class="sourceLineNo">584</span> // --------<a
name="line.584"></a>
-<span class="sourceLineNo">585</span><a name="line.585"></a>
-<span class="sourceLineNo">586</span> // Append imageData-related
fields to first directory<a name="line.586"></a>
-<span class="sourceLineNo">587</span> imageDataOffsetField = new
TiffOutputField(offsetTag,<a name="line.587"></a>
-<span class="sourceLineNo">588</span> FieldType.LONG,
imageDataOffsets.length,<a name="line.588"></a>
-<span class="sourceLineNo">589</span>
FieldType.LONG.writeData(imageDataOffsets,<a name="line.589"></a>
-<span class="sourceLineNo">590</span>
outputSummary.byteOrder));<a name="line.590"></a>
-<span class="sourceLineNo">591</span> add(imageDataOffsetField);<a
name="line.591"></a>
-<span class="sourceLineNo">592</span><a name="line.592"></a>
-<span class="sourceLineNo">593</span> // --------<a
name="line.593"></a>
-<span class="sourceLineNo">594</span><a name="line.594"></a>
-<span class="sourceLineNo">595</span> final byte[] data =
FieldType.LONG.writeData(imageDataByteCounts, outputSummary.byteOrder);<a
name="line.595"></a>
-<span class="sourceLineNo">596</span> final TiffOutputField
byteCountsField = new TiffOutputField(<a name="line.596"></a>
-<span class="sourceLineNo">597</span> byteCountsTag,
FieldType.LONG, imageDataByteCounts.length,<a name="line.597"></a>
-<span class="sourceLineNo">598</span> data);<a
name="line.598"></a>
-<span class="sourceLineNo">599</span> add(byteCountsField);<a
name="line.599"></a>
-<span class="sourceLineNo">600</span><a name="line.600"></a>
-<span class="sourceLineNo">601</span> // --------<a
name="line.601"></a>
-<span class="sourceLineNo">602</span><a name="line.602"></a>
-<span class="sourceLineNo">603</span> imageDataInfo = new
ImageDataOffsets(imageData, imageDataOffsets, imageDataOffsetField);<a
name="line.603"></a>
-<span class="sourceLineNo">604</span> }<a name="line.604"></a>
+<span class="sourceLineNo">584</span> TagInfo offsetTag;<a
name="line.584"></a>
+<span class="sourceLineNo">585</span> TagInfo byteCountsTag;<a
name="line.585"></a>
+<span class="sourceLineNo">586</span> if (stripsNotTiles) {<a
name="line.586"></a>
+<span class="sourceLineNo">587</span> offsetTag =
TiffTagConstants.TIFF_TAG_STRIP_OFFSETS;<a name="line.587"></a>
+<span class="sourceLineNo">588</span> byteCountsTag =
TiffTagConstants.TIFF_TAG_STRIP_BYTE_COUNTS;<a name="line.588"></a>
+<span class="sourceLineNo">589</span> } else {<a
name="line.589"></a>
+<span class="sourceLineNo">590</span> offsetTag =
TiffTagConstants.TIFF_TAG_TILE_OFFSETS;<a name="line.590"></a>
+<span class="sourceLineNo">591</span> byteCountsTag =
TiffTagConstants.TIFF_TAG_TILE_BYTE_COUNTS;<a name="line.591"></a>
+<span class="sourceLineNo">592</span> }<a name="line.592"></a>
+<span class="sourceLineNo">593</span><a name="line.593"></a>
+<span class="sourceLineNo">594</span> // --------<a
name="line.594"></a>
+<span class="sourceLineNo">595</span><a name="line.595"></a>
+<span class="sourceLineNo">596</span> final
TiffElement.DataElement[] imageData = tiffImageData.getImageData();<a
name="line.596"></a>
+<span class="sourceLineNo">597</span><a name="line.597"></a>
+<span class="sourceLineNo">598</span> // TiffOutputField
imageDataOffsetsField = null;<a name="line.598"></a>
+<span class="sourceLineNo">599</span><a name="line.599"></a>
+<span class="sourceLineNo">600</span> int[] imageDataOffsets = new
int[imageData.length];<a name="line.600"></a>
+<span class="sourceLineNo">601</span> int[] imageDataByteCounts =
new int[imageData.length];<a name="line.601"></a>
+<span class="sourceLineNo">602</span> for (int i = 0; i <
imageData.length; i++) {<a name="line.602"></a>
+<span class="sourceLineNo">603</span> imageDataByteCounts[i] =
imageData[i].length;<a name="line.603"></a>
+<span class="sourceLineNo">604</span> }<a name="line.604"></a>
<span class="sourceLineNo">605</span><a name="line.605"></a>
-<span class="sourceLineNo">606</span> //
--------------------------------------------------------------<a
name="line.606"></a>
+<span class="sourceLineNo">606</span> // --------<a
name="line.606"></a>
<span class="sourceLineNo">607</span><a name="line.607"></a>
-<span class="sourceLineNo">608</span> final List<TiffOutputItem>
result = new ArrayList<TiffOutputItem>();<a name="line.608"></a>
-<span class="sourceLineNo">609</span> result.add(this);<a
name="line.609"></a>
-<span class="sourceLineNo">610</span> sortFields();<a
name="line.610"></a>
-<span class="sourceLineNo">611</span><a name="line.611"></a>
-<span class="sourceLineNo">612</span> for (TiffOutputField field :
fields) {<a name="line.612"></a>
-<span class="sourceLineNo">613</span> if (field.isLocalValue()) {<a
name="line.613"></a>
-<span class="sourceLineNo">614</span> continue;<a
name="line.614"></a>
-<span class="sourceLineNo">615</span> }<a name="line.615"></a>
+<span class="sourceLineNo">608</span> // Append imageData-related
fields to first directory<a name="line.608"></a>
+<span class="sourceLineNo">609</span> imageDataOffsetField = new
TiffOutputField(offsetTag,<a name="line.609"></a>
+<span class="sourceLineNo">610</span> FieldType.LONG,
imageDataOffsets.length,<a name="line.610"></a>
+<span class="sourceLineNo">611</span>
FieldType.LONG.writeData(imageDataOffsets,<a name="line.611"></a>
+<span class="sourceLineNo">612</span>
outputSummary.byteOrder));<a name="line.612"></a>
+<span class="sourceLineNo">613</span> add(imageDataOffsetField);<a
name="line.613"></a>
+<span class="sourceLineNo">614</span><a name="line.614"></a>
+<span class="sourceLineNo">615</span> // --------<a
name="line.615"></a>
<span class="sourceLineNo">616</span><a name="line.616"></a>
-<span class="sourceLineNo">617</span> final TiffOutputItem item =
field.getSeperateValue();<a name="line.617"></a>
-<span class="sourceLineNo">618</span> result.add(item);<a
name="line.618"></a>
-<span class="sourceLineNo">619</span> // outputSummary.add(item,
field);<a name="line.619"></a>
-<span class="sourceLineNo">620</span> }<a name="line.620"></a>
-<span class="sourceLineNo">621</span><a name="line.621"></a>
-<span class="sourceLineNo">622</span> if (null != imageDataInfo) {<a
name="line.622"></a>
-<span class="sourceLineNo">623</span> Collections.addAll(result,
imageDataInfo.outputItems);<a name="line.623"></a>
+<span class="sourceLineNo">617</span> final byte[] data =
FieldType.LONG.writeData(imageDataByteCounts, outputSummary.byteOrder);<a
name="line.617"></a>
+<span class="sourceLineNo">618</span> final TiffOutputField
byteCountsField = new TiffOutputField(<a name="line.618"></a>
+<span class="sourceLineNo">619</span> byteCountsTag,
FieldType.LONG, imageDataByteCounts.length,<a name="line.619"></a>
+<span class="sourceLineNo">620</span> data);<a
name="line.620"></a>
+<span class="sourceLineNo">621</span> add(byteCountsField);<a
name="line.621"></a>
+<span class="sourceLineNo">622</span><a name="line.622"></a>
+<span class="sourceLineNo">623</span> // --------<a
name="line.623"></a>
<span class="sourceLineNo">624</span><a name="line.624"></a>
-<span class="sourceLineNo">625</span>
outputSummary.addTiffImageData(imageDataInfo);<a name="line.625"></a>
+<span class="sourceLineNo">625</span> imageDataInfo = new
ImageDataOffsets(imageData, imageDataOffsets, imageDataOffsetField);<a
name="line.625"></a>
<span class="sourceLineNo">626</span> }<a name="line.626"></a>
<span class="sourceLineNo">627</span><a name="line.627"></a>
-<span class="sourceLineNo">628</span> if (null != jpegImageData) {<a
name="line.628"></a>
-<span class="sourceLineNo">629</span> final TiffOutputItem item =
new TiffOutputItem.Value("JPEG image data",<a name="line.629"></a>
-<span class="sourceLineNo">630</span>
jpegImageData.getData());<a name="line.630"></a>
-<span class="sourceLineNo">631</span> result.add(item);<a
name="line.631"></a>
-<span class="sourceLineNo">632</span> outputSummary.add(item,
jpegOffsetField);<a name="line.632"></a>
-<span class="sourceLineNo">633</span> }<a name="line.633"></a>
-<span class="sourceLineNo">634</span><a name="line.634"></a>
-<span class="sourceLineNo">635</span> return result;<a
name="line.635"></a>
-<span class="sourceLineNo">636</span> }<a name="line.636"></a>
-<span class="sourceLineNo">637</span>}<a name="line.637"></a>
+<span class="sourceLineNo">628</span> //
--------------------------------------------------------------<a
name="line.628"></a>
+<span class="sourceLineNo">629</span><a name="line.629"></a>
+<span class="sourceLineNo">630</span> final List<TiffOutputItem>
result = new ArrayList<TiffOutputItem>();<a name="line.630"></a>
+<span class="sourceLineNo">631</span> result.add(this);<a
name="line.631"></a>
+<span class="sourceLineNo">632</span> sortFields();<a
name="line.632"></a>
+<span class="sourceLineNo">633</span><a name="line.633"></a>
+<span class="sourceLineNo">634</span> for (TiffOutputField field :
fields) {<a name="line.634"></a>
+<span class="sourceLineNo">635</span> if (field.isLocalValue()) {<a
name="line.635"></a>
+<span class="sourceLineNo">636</span> continue;<a
name="line.636"></a>
+<span class="sourceLineNo">637</span> }<a name="line.637"></a>
+<span class="sourceLineNo">638</span><a name="line.638"></a>
+<span class="sourceLineNo">639</span> final TiffOutputItem item =
field.getSeperateValue();<a name="line.639"></a>
+<span class="sourceLineNo">640</span> result.add(item);<a
name="line.640"></a>
+<span class="sourceLineNo">641</span> // outputSummary.add(item,
field);<a name="line.641"></a>
+<span class="sourceLineNo">642</span> }<a name="line.642"></a>
+<span class="sourceLineNo">643</span><a name="line.643"></a>
+<span class="sourceLineNo">644</span> if (null != imageDataInfo) {<a
name="line.644"></a>
+<span class="sourceLineNo">645</span> Collections.addAll(result,
imageDataInfo.outputItems);<a name="line.645"></a>
+<span class="sourceLineNo">646</span><a name="line.646"></a>
+<span class="sourceLineNo">647</span>
outputSummary.addTiffImageData(imageDataInfo);<a name="line.647"></a>
+<span class="sourceLineNo">648</span> }<a name="line.648"></a>
+<span class="sourceLineNo">649</span><a name="line.649"></a>
+<span class="sourceLineNo">650</span> if (null != jpegImageData) {<a
name="line.650"></a>
+<span class="sourceLineNo">651</span> final TiffOutputItem item =
new TiffOutputItem.Value("JPEG image data",<a name="line.651"></a>
+<span class="sourceLineNo">652</span>
jpegImageData.getData());<a name="line.652"></a>
+<span class="sourceLineNo">653</span> result.add(item);<a
name="line.653"></a>
+<span class="sourceLineNo">654</span> outputSummary.add(item,
jpegOffsetField);<a name="line.654"></a>
+<span class="sourceLineNo">655</span> }<a name="line.655"></a>
+<span class="sourceLineNo">656</span><a name="line.656"></a>
+<span class="sourceLineNo">657</span> return result;<a
name="line.657"></a>
+<span class="sourceLineNo">658</span> }<a name="line.658"></a>
+<span class="sourceLineNo">659</span>}<a name="line.659"></a>
Modified:
websites/production/commons/content/proper/commons-imaging/apidocs/src-html/org/apache/commons/imaging/formats/tiff/write/TiffOutputSet.html
==============================================================================
---
websites/production/commons/content/proper/commons-imaging/apidocs/src-html/org/apache/commons/imaging/formats/tiff/write/TiffOutputSet.html
(original)
+++
websites/production/commons/content/proper/commons-imaging/apidocs/src-html/org/apache/commons/imaging/formats/tiff/write/TiffOutputSet.html
Sun Jan 11 12:33:25 2015
@@ -145,157 +145,160 @@
<span class="sourceLineNo">137</span> throws ImageWriteException
{<a name="line.137"></a>
<span class="sourceLineNo">138</span> final TiffOutputDirectory
gpsDirectory = getOrCreateGPSDirectory();<a name="line.138"></a>
<span class="sourceLineNo">139</span><a name="line.139"></a>
-<span class="sourceLineNo">140</span> final String longitudeRef =
longitude < 0 ? "W" : "E";<a name="line.140"></a>
-<span class="sourceLineNo">141</span> longitude =
Math.abs(longitude);<a name="line.141"></a>
-<span class="sourceLineNo">142</span> final String latitudeRef =
latitude < 0 ? "S" : "N";<a name="line.142"></a>
-<span class="sourceLineNo">143</span> latitude = Math.abs(latitude);<a
name="line.143"></a>
-<span class="sourceLineNo">144</span><a name="line.144"></a>
-<span class="sourceLineNo">145</span>
gpsDirectory.removeField(GpsTagConstants.GPS_TAG_GPS_LONGITUDE_REF);<a
name="line.145"></a>
-<span class="sourceLineNo">146</span>
gpsDirectory.add(GpsTagConstants.GPS_TAG_GPS_LONGITUDE_REF,<a
name="line.146"></a>
-<span class="sourceLineNo">147</span> longitudeRef);<a
name="line.147"></a>
-<span class="sourceLineNo">148</span><a name="line.148"></a>
-<span class="sourceLineNo">149</span>
gpsDirectory.removeField(GpsTagConstants.GPS_TAG_GPS_LATITUDE_REF);<a
name="line.149"></a>
-<span class="sourceLineNo">150</span>
gpsDirectory.add(GpsTagConstants.GPS_TAG_GPS_LATITUDE_REF,<a
name="line.150"></a>
-<span class="sourceLineNo">151</span> latitudeRef);<a
name="line.151"></a>
-<span class="sourceLineNo">152</span><a name="line.152"></a>
-<span class="sourceLineNo">153</span> {<a name="line.153"></a>
-<span class="sourceLineNo">154</span> double value = longitude;<a
name="line.154"></a>
-<span class="sourceLineNo">155</span> final double longitudeDegrees
= (long) value;<a name="line.155"></a>
-<span class="sourceLineNo">156</span> value %= 1;<a
name="line.156"></a>
-<span class="sourceLineNo">157</span> value *= 60.0;<a
name="line.157"></a>
-<span class="sourceLineNo">158</span> final double longitudeMinutes
= (long) value;<a name="line.158"></a>
+<span class="sourceLineNo">140</span>
gpsDirectory.removeField(GpsTagConstants.GPS_TAG_GPS_VERSION_ID);<a
name="line.140"></a>
+<span class="sourceLineNo">141</span>
gpsDirectory.add(GpsTagConstants.GPS_TAG_GPS_VERSION_ID,
GpsTagConstants.GPS_VERSION);<a name="line.141"></a>
+<span class="sourceLineNo">142</span><a name="line.142"></a>
+<span class="sourceLineNo">143</span> final String longitudeRef =
longitude < 0 ? "W" : "E";<a name="line.143"></a>
+<span class="sourceLineNo">144</span> longitude =
Math.abs(longitude);<a name="line.144"></a>
+<span class="sourceLineNo">145</span> final String latitudeRef =
latitude < 0 ? "S" : "N";<a name="line.145"></a>
+<span class="sourceLineNo">146</span> latitude = Math.abs(latitude);<a
name="line.146"></a>
+<span class="sourceLineNo">147</span><a name="line.147"></a>
+<span class="sourceLineNo">148</span>
gpsDirectory.removeField(GpsTagConstants.GPS_TAG_GPS_LONGITUDE_REF);<a
name="line.148"></a>
+<span class="sourceLineNo">149</span>
gpsDirectory.add(GpsTagConstants.GPS_TAG_GPS_LONGITUDE_REF,<a
name="line.149"></a>
+<span class="sourceLineNo">150</span> longitudeRef);<a
name="line.150"></a>
+<span class="sourceLineNo">151</span><a name="line.151"></a>
+<span class="sourceLineNo">152</span>
gpsDirectory.removeField(GpsTagConstants.GPS_TAG_GPS_LATITUDE_REF);<a
name="line.152"></a>
+<span class="sourceLineNo">153</span>
gpsDirectory.add(GpsTagConstants.GPS_TAG_GPS_LATITUDE_REF,<a
name="line.153"></a>
+<span class="sourceLineNo">154</span> latitudeRef);<a
name="line.154"></a>
+<span class="sourceLineNo">155</span><a name="line.155"></a>
+<span class="sourceLineNo">156</span> {<a name="line.156"></a>
+<span class="sourceLineNo">157</span> double value = longitude;<a
name="line.157"></a>
+<span class="sourceLineNo">158</span> final double longitudeDegrees
= (long) value;<a name="line.158"></a>
<span class="sourceLineNo">159</span> value %= 1;<a
name="line.159"></a>
<span class="sourceLineNo">160</span> value *= 60.0;<a
name="line.160"></a>
-<span class="sourceLineNo">161</span> final double longitudeSeconds
= value;<a name="line.161"></a>
-<span class="sourceLineNo">162</span><a name="line.162"></a>
-<span class="sourceLineNo">163</span>
gpsDirectory.removeField(GpsTagConstants.GPS_TAG_GPS_LONGITUDE);<a
name="line.163"></a>
-<span class="sourceLineNo">164</span> gpsDirectory<a
name="line.164"></a>
-<span class="sourceLineNo">165</span>
.add(GpsTagConstants.GPS_TAG_GPS_LONGITUDE,<a name="line.165"></a>
-<span class="sourceLineNo">166</span>
RationalNumber.valueOf(longitudeDegrees),<a name="line.166"></a>
-<span class="sourceLineNo">167</span>
RationalNumber.valueOf(longitudeMinutes),<a name="line.167"></a>
-<span class="sourceLineNo">168</span>
RationalNumber.valueOf(longitudeSeconds));<a name="line.168"></a>
-<span class="sourceLineNo">169</span> }<a name="line.169"></a>
-<span class="sourceLineNo">170</span><a name="line.170"></a>
-<span class="sourceLineNo">171</span> {<a name="line.171"></a>
-<span class="sourceLineNo">172</span> double value = latitude;<a
name="line.172"></a>
-<span class="sourceLineNo">173</span> final double latitudeDegrees
= (long) value;<a name="line.173"></a>
-<span class="sourceLineNo">174</span> value %= 1;<a
name="line.174"></a>
-<span class="sourceLineNo">175</span> value *= 60.0;<a
name="line.175"></a>
-<span class="sourceLineNo">176</span> final double latitudeMinutes
= (long) value;<a name="line.176"></a>
+<span class="sourceLineNo">161</span> final double longitudeMinutes
= (long) value;<a name="line.161"></a>
+<span class="sourceLineNo">162</span> value %= 1;<a
name="line.162"></a>
+<span class="sourceLineNo">163</span> value *= 60.0;<a
name="line.163"></a>
+<span class="sourceLineNo">164</span> final double longitudeSeconds
= value;<a name="line.164"></a>
+<span class="sourceLineNo">165</span><a name="line.165"></a>
+<span class="sourceLineNo">166</span>
gpsDirectory.removeField(GpsTagConstants.GPS_TAG_GPS_LONGITUDE);<a
name="line.166"></a>
+<span class="sourceLineNo">167</span> gpsDirectory<a
name="line.167"></a>
+<span class="sourceLineNo">168</span>
.add(GpsTagConstants.GPS_TAG_GPS_LONGITUDE,<a name="line.168"></a>
+<span class="sourceLineNo">169</span>
RationalNumber.valueOf(longitudeDegrees),<a name="line.169"></a>
+<span class="sourceLineNo">170</span>
RationalNumber.valueOf(longitudeMinutes),<a name="line.170"></a>
+<span class="sourceLineNo">171</span>
RationalNumber.valueOf(longitudeSeconds));<a name="line.171"></a>
+<span class="sourceLineNo">172</span> }<a name="line.172"></a>
+<span class="sourceLineNo">173</span><a name="line.173"></a>
+<span class="sourceLineNo">174</span> {<a name="line.174"></a>
+<span class="sourceLineNo">175</span> double value = latitude;<a
name="line.175"></a>
+<span class="sourceLineNo">176</span> final double latitudeDegrees
= (long) value;<a name="line.176"></a>
<span class="sourceLineNo">177</span> value %= 1;<a
name="line.177"></a>
<span class="sourceLineNo">178</span> value *= 60.0;<a
name="line.178"></a>
-<span class="sourceLineNo">179</span> final double latitudeSeconds
= value;<a name="line.179"></a>
-<span class="sourceLineNo">180</span><a name="line.180"></a>
-<span class="sourceLineNo">181</span>
gpsDirectory.removeField(GpsTagConstants.GPS_TAG_GPS_LATITUDE);<a
name="line.181"></a>
-<span class="sourceLineNo">182</span>
gpsDirectory.add(GpsTagConstants.GPS_TAG_GPS_LATITUDE,<a name="line.182"></a>
-<span class="sourceLineNo">183</span>
RationalNumber.valueOf(latitudeDegrees),<a name="line.183"></a>
-<span class="sourceLineNo">184</span>
RationalNumber.valueOf(latitudeMinutes),<a name="line.184"></a>
-<span class="sourceLineNo">185</span>
RationalNumber.valueOf(latitudeSeconds));<a name="line.185"></a>
-<span class="sourceLineNo">186</span> }<a name="line.186"></a>
-<span class="sourceLineNo">187</span><a name="line.187"></a>
-<span class="sourceLineNo">188</span> }<a name="line.188"></a>
-<span class="sourceLineNo">189</span><a name="line.189"></a>
-<span class="sourceLineNo">190</span> public void removeField(final TagInfo
tagInfo) {<a name="line.190"></a>
-<span class="sourceLineNo">191</span> removeField(tagInfo.tag);<a
name="line.191"></a>
-<span class="sourceLineNo">192</span> }<a name="line.192"></a>
-<span class="sourceLineNo">193</span><a name="line.193"></a>
-<span class="sourceLineNo">194</span> public void removeField(final int
tag) {<a name="line.194"></a>
-<span class="sourceLineNo">195</span> for (TiffOutputDirectory
directory : directories) {<a name="line.195"></a>
-<span class="sourceLineNo">196</span> directory.removeField(tag);<a
name="line.196"></a>
-<span class="sourceLineNo">197</span> }<a name="line.197"></a>
-<span class="sourceLineNo">198</span> }<a name="line.198"></a>
-<span class="sourceLineNo">199</span><a name="line.199"></a>
-<span class="sourceLineNo">200</span> public TiffOutputField
findField(final TagInfo tagInfo) {<a name="line.200"></a>
-<span class="sourceLineNo">201</span> return findField(tagInfo.tag);<a
name="line.201"></a>
-<span class="sourceLineNo">202</span> }<a name="line.202"></a>
-<span class="sourceLineNo">203</span><a name="line.203"></a>
-<span class="sourceLineNo">204</span> public TiffOutputField
findField(final int tag) {<a name="line.204"></a>
-<span class="sourceLineNo">205</span> for (TiffOutputDirectory
directory : directories) {<a name="line.205"></a>
-<span class="sourceLineNo">206</span> final TiffOutputField field =
directory.findField(tag);<a name="line.206"></a>
-<span class="sourceLineNo">207</span> if (null != field) {<a
name="line.207"></a>
-<span class="sourceLineNo">208</span> return field;<a
name="line.208"></a>
-<span class="sourceLineNo">209</span> }<a name="line.209"></a>
-<span class="sourceLineNo">210</span> }<a name="line.210"></a>
-<span class="sourceLineNo">211</span> return null;<a
name="line.211"></a>
-<span class="sourceLineNo">212</span> }<a name="line.212"></a>
-<span class="sourceLineNo">213</span><a name="line.213"></a>
-<span class="sourceLineNo">214</span> public TiffOutputDirectory
addRootDirectory() throws ImageWriteException {<a name="line.214"></a>
-<span class="sourceLineNo">215</span> final TiffOutputDirectory result
= new TiffOutputDirectory(<a name="line.215"></a>
-<span class="sourceLineNo">216</span> DIRECTORY_TYPE_ROOT,
byteOrder);<a name="line.216"></a>
-<span class="sourceLineNo">217</span> addDirectory(result);<a
name="line.217"></a>
-<span class="sourceLineNo">218</span> return result;<a
name="line.218"></a>
-<span class="sourceLineNo">219</span> }<a name="line.219"></a>
-<span class="sourceLineNo">220</span><a name="line.220"></a>
-<span class="sourceLineNo">221</span> public TiffOutputDirectory
addExifDirectory() throws ImageWriteException {<a name="line.221"></a>
-<span class="sourceLineNo">222</span> final TiffOutputDirectory result
= new TiffOutputDirectory(<a name="line.222"></a>
-<span class="sourceLineNo">223</span> DIRECTORY_TYPE_EXIF,
byteOrder);<a name="line.223"></a>
-<span class="sourceLineNo">224</span> addDirectory(result);<a
name="line.224"></a>
-<span class="sourceLineNo">225</span> return result;<a
name="line.225"></a>
-<span class="sourceLineNo">226</span> }<a name="line.226"></a>
-<span class="sourceLineNo">227</span><a name="line.227"></a>
-<span class="sourceLineNo">228</span> public TiffOutputDirectory
addGPSDirectory() throws ImageWriteException {<a name="line.228"></a>
-<span class="sourceLineNo">229</span> final TiffOutputDirectory result
= new TiffOutputDirectory(<a name="line.229"></a>
-<span class="sourceLineNo">230</span> DIRECTORY_TYPE_GPS,
byteOrder);<a name="line.230"></a>
-<span class="sourceLineNo">231</span> addDirectory(result);<a
name="line.231"></a>
-<span class="sourceLineNo">232</span> return result;<a
name="line.232"></a>
-<span class="sourceLineNo">233</span> }<a name="line.233"></a>
-<span class="sourceLineNo">234</span><a name="line.234"></a>
-<span class="sourceLineNo">235</span> public TiffOutputDirectory
addInteroperabilityDirectory()<a name="line.235"></a>
-<span class="sourceLineNo">236</span> throws ImageWriteException
{<a name="line.236"></a>
-<span class="sourceLineNo">237</span> getOrCreateExifDirectory();<a
name="line.237"></a>
-<span class="sourceLineNo">238</span><a name="line.238"></a>
-<span class="sourceLineNo">239</span> final TiffOutputDirectory result
= new TiffOutputDirectory(<a name="line.239"></a>
-<span class="sourceLineNo">240</span>
DIRECTORY_TYPE_INTEROPERABILITY, byteOrder);<a name="line.240"></a>
-<span class="sourceLineNo">241</span> addDirectory(result);<a
name="line.241"></a>
-<span class="sourceLineNo">242</span> return result;<a
name="line.242"></a>
-<span class="sourceLineNo">243</span> }<a name="line.243"></a>
-<span class="sourceLineNo">244</span><a name="line.244"></a>
-<span class="sourceLineNo">245</span> @Override<a name="line.245"></a>
-<span class="sourceLineNo">246</span> public String toString() {<a
name="line.246"></a>
-<span class="sourceLineNo">247</span> return toString(null);<a
name="line.247"></a>
-<span class="sourceLineNo">248</span> }<a name="line.248"></a>
-<span class="sourceLineNo">249</span><a name="line.249"></a>
-<span class="sourceLineNo">250</span> public String toString(String prefix)
{<a name="line.250"></a>
-<span class="sourceLineNo">251</span> if (prefix == null) {<a
name="line.251"></a>
-<span class="sourceLineNo">252</span> prefix = "";<a
name="line.252"></a>
-<span class="sourceLineNo">253</span> }<a name="line.253"></a>
-<span class="sourceLineNo">254</span><a name="line.254"></a>
-<span class="sourceLineNo">255</span> final StringBuilder result = new
StringBuilder(39);<a name="line.255"></a>
-<span class="sourceLineNo">256</span><a name="line.256"></a>
-<span class="sourceLineNo">257</span> result.append(prefix);<a
name="line.257"></a>
-<span class="sourceLineNo">258</span> result.append("TiffOutputSet
{");<a name="line.258"></a>
-<span class="sourceLineNo">259</span> result.append(NEWLINE);<a
name="line.259"></a>
-<span class="sourceLineNo">260</span><a name="line.260"></a>
-<span class="sourceLineNo">261</span> result.append(prefix);<a
name="line.261"></a>
-<span class="sourceLineNo">262</span> result.append("byteOrder: ");<a
name="line.262"></a>
-<span class="sourceLineNo">263</span> result.append(byteOrder);<a
name="line.263"></a>
-<span class="sourceLineNo">264</span> result.append(NEWLINE);<a
name="line.264"></a>
-<span class="sourceLineNo">265</span><a name="line.265"></a>
-<span class="sourceLineNo">266</span> for (int i = 0; i <
directories.size(); i++) {<a name="line.266"></a>
-<span class="sourceLineNo">267</span> final TiffOutputDirectory
directory = directories.get(i);<a name="line.267"></a>
-<span class="sourceLineNo">268</span>
result.append(String.format("%s\tdirectory %d: %s (%d)%n",<a
name="line.268"></a>
-<span class="sourceLineNo">269</span> prefix, i,
directory.description(), directory.type));<a name="line.269"></a>
-<span class="sourceLineNo">270</span><a name="line.270"></a>
-<span class="sourceLineNo">271</span> final
List<TiffOutputField> fields = directory.getFields();<a
name="line.271"></a>
-<span class="sourceLineNo">272</span> for (TiffOutputField field :
fields) {<a name="line.272"></a>
-<span class="sourceLineNo">273</span> result.append(prefix);<a
name="line.273"></a>
-<span class="sourceLineNo">274</span> result.append("\t\tfield
" + i + ": " + field.tagInfo);<a name="line.274"></a>
-<span class="sourceLineNo">275</span> result.append(NEWLINE);<a
name="line.275"></a>
-<span class="sourceLineNo">276</span> }<a name="line.276"></a>
-<span class="sourceLineNo">277</span> }<a name="line.277"></a>
-<span class="sourceLineNo">278</span> result.append(prefix);<a
name="line.278"></a>
-<span class="sourceLineNo">279</span><a name="line.279"></a>
-<span class="sourceLineNo">280</span> result.append('}');<a
name="line.280"></a>
-<span class="sourceLineNo">281</span> result.append(NEWLINE);<a
name="line.281"></a>
+<span class="sourceLineNo">179</span> final double latitudeMinutes
= (long) value;<a name="line.179"></a>
+<span class="sourceLineNo">180</span> value %= 1;<a
name="line.180"></a>
+<span class="sourceLineNo">181</span> value *= 60.0;<a
name="line.181"></a>
+<span class="sourceLineNo">182</span> final double latitudeSeconds
= value;<a name="line.182"></a>
+<span class="sourceLineNo">183</span><a name="line.183"></a>
+<span class="sourceLineNo">184</span>
gpsDirectory.removeField(GpsTagConstants.GPS_TAG_GPS_LATITUDE);<a
name="line.184"></a>
+<span class="sourceLineNo">185</span>
gpsDirectory.add(GpsTagConstants.GPS_TAG_GPS_LATITUDE,<a name="line.185"></a>
+<span class="sourceLineNo">186</span>
RationalNumber.valueOf(latitudeDegrees),<a name="line.186"></a>
+<span class="sourceLineNo">187</span>
RationalNumber.valueOf(latitudeMinutes),<a name="line.187"></a>
+<span class="sourceLineNo">188</span>
RationalNumber.valueOf(latitudeSeconds));<a name="line.188"></a>
+<span class="sourceLineNo">189</span> }<a name="line.189"></a>
+<span class="sourceLineNo">190</span><a name="line.190"></a>
+<span class="sourceLineNo">191</span> }<a name="line.191"></a>
+<span class="sourceLineNo">192</span><a name="line.192"></a>
+<span class="sourceLineNo">193</span> public void removeField(final TagInfo
tagInfo) {<a name="line.193"></a>
+<span class="sourceLineNo">194</span> removeField(tagInfo.tag);<a
name="line.194"></a>
+<span class="sourceLineNo">195</span> }<a name="line.195"></a>
+<span class="sourceLineNo">196</span><a name="line.196"></a>
+<span class="sourceLineNo">197</span> public void removeField(final int
tag) {<a name="line.197"></a>
+<span class="sourceLineNo">198</span> for (TiffOutputDirectory
directory : directories) {<a name="line.198"></a>
+<span class="sourceLineNo">199</span> directory.removeField(tag);<a
name="line.199"></a>
+<span class="sourceLineNo">200</span> }<a name="line.200"></a>
+<span class="sourceLineNo">201</span> }<a name="line.201"></a>
+<span class="sourceLineNo">202</span><a name="line.202"></a>
+<span class="sourceLineNo">203</span> public TiffOutputField
findField(final TagInfo tagInfo) {<a name="line.203"></a>
+<span class="sourceLineNo">204</span> return findField(tagInfo.tag);<a
name="line.204"></a>
+<span class="sourceLineNo">205</span> }<a name="line.205"></a>
+<span class="sourceLineNo">206</span><a name="line.206"></a>
+<span class="sourceLineNo">207</span> public TiffOutputField
findField(final int tag) {<a name="line.207"></a>
+<span class="sourceLineNo">208</span> for (TiffOutputDirectory
directory : directories) {<a name="line.208"></a>
+<span class="sourceLineNo">209</span> final TiffOutputField field =
directory.findField(tag);<a name="line.209"></a>
+<span class="sourceLineNo">210</span> if (null != field) {<a
name="line.210"></a>
+<span class="sourceLineNo">211</span> return field;<a
name="line.211"></a>
+<span class="sourceLineNo">212</span> }<a name="line.212"></a>
+<span class="sourceLineNo">213</span> }<a name="line.213"></a>
+<span class="sourceLineNo">214</span> return null;<a
name="line.214"></a>
+<span class="sourceLineNo">215</span> }<a name="line.215"></a>
+<span class="sourceLineNo">216</span><a name="line.216"></a>
+<span class="sourceLineNo">217</span> public TiffOutputDirectory
addRootDirectory() throws ImageWriteException {<a name="line.217"></a>
+<span class="sourceLineNo">218</span> final TiffOutputDirectory result
= new TiffOutputDirectory(<a name="line.218"></a>
+<span class="sourceLineNo">219</span> DIRECTORY_TYPE_ROOT,
byteOrder);<a name="line.219"></a>
+<span class="sourceLineNo">220</span> addDirectory(result);<a
name="line.220"></a>
+<span class="sourceLineNo">221</span> return result;<a
name="line.221"></a>
+<span class="sourceLineNo">222</span> }<a name="line.222"></a>
+<span class="sourceLineNo">223</span><a name="line.223"></a>
+<span class="sourceLineNo">224</span> public TiffOutputDirectory
addExifDirectory() throws ImageWriteException {<a name="line.224"></a>
+<span class="sourceLineNo">225</span> final TiffOutputDirectory result
= new TiffOutputDirectory(<a name="line.225"></a>
+<span class="sourceLineNo">226</span> DIRECTORY_TYPE_EXIF,
byteOrder);<a name="line.226"></a>
+<span class="sourceLineNo">227</span> addDirectory(result);<a
name="line.227"></a>
+<span class="sourceLineNo">228</span> return result;<a
name="line.228"></a>
+<span class="sourceLineNo">229</span> }<a name="line.229"></a>
+<span class="sourceLineNo">230</span><a name="line.230"></a>
+<span class="sourceLineNo">231</span> public TiffOutputDirectory
addGPSDirectory() throws ImageWriteException {<a name="line.231"></a>
+<span class="sourceLineNo">232</span> final TiffOutputDirectory result
= new TiffOutputDirectory(<a name="line.232"></a>
+<span class="sourceLineNo">233</span> DIRECTORY_TYPE_GPS,
byteOrder);<a name="line.233"></a>
+<span class="sourceLineNo">234</span> addDirectory(result);<a
name="line.234"></a>
+<span class="sourceLineNo">235</span> return result;<a
name="line.235"></a>
+<span class="sourceLineNo">236</span> }<a name="line.236"></a>
+<span class="sourceLineNo">237</span><a name="line.237"></a>
+<span class="sourceLineNo">238</span> public TiffOutputDirectory
addInteroperabilityDirectory()<a name="line.238"></a>
+<span class="sourceLineNo">239</span> throws ImageWriteException
{<a name="line.239"></a>
+<span class="sourceLineNo">240</span> getOrCreateExifDirectory();<a
name="line.240"></a>
+<span class="sourceLineNo">241</span><a name="line.241"></a>
+<span class="sourceLineNo">242</span> final TiffOutputDirectory result
= new TiffOutputDirectory(<a name="line.242"></a>
+<span class="sourceLineNo">243</span>
DIRECTORY_TYPE_INTEROPERABILITY, byteOrder);<a name="line.243"></a>
+<span class="sourceLineNo">244</span> addDirectory(result);<a
name="line.244"></a>
+<span class="sourceLineNo">245</span> return result;<a
name="line.245"></a>
+<span class="sourceLineNo">246</span> }<a name="line.246"></a>
+<span class="sourceLineNo">247</span><a name="line.247"></a>
+<span class="sourceLineNo">248</span> @Override<a name="line.248"></a>
+<span class="sourceLineNo">249</span> public String toString() {<a
name="line.249"></a>
+<span class="sourceLineNo">250</span> return toString(null);<a
name="line.250"></a>
+<span class="sourceLineNo">251</span> }<a name="line.251"></a>
+<span class="sourceLineNo">252</span><a name="line.252"></a>
+<span class="sourceLineNo">253</span> public String toString(String prefix)
{<a name="line.253"></a>
+<span class="sourceLineNo">254</span> if (prefix == null) {<a
name="line.254"></a>
+<span class="sourceLineNo">255</span> prefix = "";<a
name="line.255"></a>
+<span class="sourceLineNo">256</span> }<a name="line.256"></a>
+<span class="sourceLineNo">257</span><a name="line.257"></a>
+<span class="sourceLineNo">258</span> final StringBuilder result = new
StringBuilder(39);<a name="line.258"></a>
+<span class="sourceLineNo">259</span><a name="line.259"></a>
+<span class="sourceLineNo">260</span> result.append(prefix);<a
name="line.260"></a>
+<span class="sourceLineNo">261</span> result.append("TiffOutputSet
{");<a name="line.261"></a>
+<span class="sourceLineNo">262</span> result.append(NEWLINE);<a
name="line.262"></a>
+<span class="sourceLineNo">263</span><a name="line.263"></a>
+<span class="sourceLineNo">264</span> result.append(prefix);<a
name="line.264"></a>
+<span class="sourceLineNo">265</span> result.append("byteOrder: ");<a
name="line.265"></a>
+<span class="sourceLineNo">266</span> result.append(byteOrder);<a
name="line.266"></a>
+<span class="sourceLineNo">267</span> result.append(NEWLINE);<a
name="line.267"></a>
+<span class="sourceLineNo">268</span><a name="line.268"></a>
+<span class="sourceLineNo">269</span> for (int i = 0; i <
directories.size(); i++) {<a name="line.269"></a>
+<span class="sourceLineNo">270</span> final TiffOutputDirectory
directory = directories.get(i);<a name="line.270"></a>
+<span class="sourceLineNo">271</span>
result.append(String.format("%s\tdirectory %d: %s (%d)%n",<a
name="line.271"></a>
+<span class="sourceLineNo">272</span> prefix, i,
directory.description(), directory.type));<a name="line.272"></a>
+<span class="sourceLineNo">273</span><a name="line.273"></a>
+<span class="sourceLineNo">274</span> final
List<TiffOutputField> fields = directory.getFields();<a
name="line.274"></a>
+<span class="sourceLineNo">275</span> for (TiffOutputField field :
fields) {<a name="line.275"></a>
+<span class="sourceLineNo">276</span> result.append(prefix);<a
name="line.276"></a>
+<span class="sourceLineNo">277</span> result.append("\t\tfield
" + i + ": " + field.tagInfo);<a name="line.277"></a>
+<span class="sourceLineNo">278</span> result.append(NEWLINE);<a
name="line.278"></a>
+<span class="sourceLineNo">279</span> }<a name="line.279"></a>
+<span class="sourceLineNo">280</span> }<a name="line.280"></a>
+<span class="sourceLineNo">281</span> result.append(prefix);<a
name="line.281"></a>
<span class="sourceLineNo">282</span><a name="line.282"></a>
-<span class="sourceLineNo">283</span> return result.toString();<a
name="line.283"></a>
-<span class="sourceLineNo">284</span> }<a name="line.284"></a>
+<span class="sourceLineNo">283</span> result.append('}');<a
name="line.283"></a>
+<span class="sourceLineNo">284</span> result.append(NEWLINE);<a
name="line.284"></a>
<span class="sourceLineNo">285</span><a name="line.285"></a>
-<span class="sourceLineNo">286</span> public void dump() {<a
name="line.286"></a>
-<span class="sourceLineNo">287</span> Debug.debug(this.toString());<a
name="line.287"></a>
-<span class="sourceLineNo">288</span> }<a name="line.288"></a>
-<span class="sourceLineNo">289</span><a name="line.289"></a>
-<span class="sourceLineNo">290</span>}<a name="line.290"></a>
+<span class="sourceLineNo">286</span> return result.toString();<a
name="line.286"></a>
+<span class="sourceLineNo">287</span> }<a name="line.287"></a>
+<span class="sourceLineNo">288</span><a name="line.288"></a>
+<span class="sourceLineNo">289</span> public void dump() {<a
name="line.289"></a>
+<span class="sourceLineNo">290</span> Debug.debug(this.toString());<a
name="line.290"></a>
+<span class="sourceLineNo">291</span> }<a name="line.291"></a>
+<span class="sourceLineNo">292</span><a name="line.292"></a>
+<span class="sourceLineNo">293</span>}<a name="line.293"></a>
Added:
websites/production/commons/content/proper/commons-imaging/apidocs/src-html/org/apache/commons/imaging/palette/LongestAxisMedianCut.html
==============================================================================
---
websites/production/commons/content/proper/commons-imaging/apidocs/src-html/org/apache/commons/imaging/palette/LongestAxisMedianCut.html
(added)
+++
websites/production/commons/content/proper/commons-imaging/apidocs/src-html/org/apache/commons/imaging/palette/LongestAxisMedianCut.html
Sun Jan 11 12:33:25 2015
@@ -0,0 +1,211 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
+<html lang="de">
+<head>
+<title>Source code</title>
+<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css"
title="Style">
+</head>
+<body>
+<div class="sourceContainer">
+<pre><span class="sourceLineNo">001</span>/*<a name="line.1"></a>
+<span class="sourceLineNo">002</span> * Licensed to the Apache Software
Foundation (ASF) under one or more<a name="line.2"></a>
+<span class="sourceLineNo">003</span> * contributor license agreements. See
the NOTICE file distributed with<a name="line.3"></a>
+<span class="sourceLineNo">004</span> * this work for additional information
regarding copyright ownership.<a name="line.4"></a>
+<span class="sourceLineNo">005</span> * The ASF licenses this file to You
under the Apache License, Version 2.0<a name="line.5"></a>
+<span class="sourceLineNo">006</span> * (the "License"); you may not use this
file except in compliance with<a name="line.6"></a>
+<span class="sourceLineNo">007</span> * the License. You may obtain a copy of
the License at<a name="line.7"></a>
+<span class="sourceLineNo">008</span> *<a name="line.8"></a>
+<span class="sourceLineNo">009</span> *
http://www.apache.org/licenses/LICENSE-2.0<a name="line.9"></a>
+<span class="sourceLineNo">010</span> *<a name="line.10"></a>
+<span class="sourceLineNo">011</span> * Unless required by applicable law or
agreed to in writing, software<a name="line.11"></a>
+<span class="sourceLineNo">012</span> * distributed under the License is
distributed on an "AS IS" BASIS,<a name="line.12"></a>
+<span class="sourceLineNo">013</span> * WITHOUT WARRANTIES OR CONDITIONS OF
ANY KIND, either express or implied.<a name="line.13"></a>
+<span class="sourceLineNo">014</span> * See the License for the specific
language governing permissions and<a name="line.14"></a>
+<span class="sourceLineNo">015</span> * limitations under the License.<a
name="line.15"></a>
+<span class="sourceLineNo">016</span> */<a name="line.16"></a>
+<span class="sourceLineNo">017</span>package
org.apache.commons.imaging.palette;<a name="line.17"></a>
+<span class="sourceLineNo">018</span><a name="line.18"></a>
+<span class="sourceLineNo">019</span>import java.util.ArrayList;<a
name="line.19"></a>
+<span class="sourceLineNo">020</span>import java.util.Collections;<a
name="line.20"></a>
+<span class="sourceLineNo">021</span>import java.util.Comparator;<a
name="line.21"></a>
+<span class="sourceLineNo">022</span>import java.util.List;<a
name="line.22"></a>
+<span class="sourceLineNo">023</span><a name="line.23"></a>
+<span class="sourceLineNo">024</span>import
org.apache.commons.imaging.ImageWriteException;<a name="line.24"></a>
+<span class="sourceLineNo">025</span><a name="line.25"></a>
+<span class="sourceLineNo">026</span>public class LongestAxisMedianCut
implements MedianCut {<a name="line.26"></a>
+<span class="sourceLineNo">027</span> private static final
Comparator<ColorGroup> COMPARATOR = new Comparator<ColorGroup>()
{<a name="line.27"></a>
+<span class="sourceLineNo">028</span> public int compare(final
ColorGroup cg1, final ColorGroup cg2) {<a name="line.28"></a>
+<span class="sourceLineNo">029</span> if (cg1.maxDiff ==
cg2.maxDiff) {<a name="line.29"></a>
+<span class="sourceLineNo">030</span> return cg2.diffTotal -
cg1.diffTotal;<a name="line.30"></a>
+<span class="sourceLineNo">031</span> }<a name="line.31"></a>
+<span class="sourceLineNo">032</span> return cg2.maxDiff -
cg1.maxDiff;<a name="line.32"></a>
+<span class="sourceLineNo">033</span> }<a name="line.33"></a>
+<span class="sourceLineNo">034</span> };<a name="line.34"></a>
+<span class="sourceLineNo">035</span><a name="line.35"></a>
+<span class="sourceLineNo">036</span> public boolean
performNextMedianCut(final List<ColorGroup> colorGroups, final boolean
ignoreAlpha)<a name="line.36"></a>
+<span class="sourceLineNo">037</span> throws ImageWriteException
{<a name="line.37"></a>
+<span class="sourceLineNo">038</span> Collections.sort(colorGroups,
COMPARATOR);<a name="line.38"></a>
+<span class="sourceLineNo">039</span> final ColorGroup colorGroup =
colorGroups.get(0);<a name="line.39"></a>
+<span class="sourceLineNo">040</span><a name="line.40"></a>
+<span class="sourceLineNo">041</span> if (colorGroup.maxDiff == 0) {<a
name="line.41"></a>
+<span class="sourceLineNo">042</span> return false;<a
name="line.42"></a>
+<span class="sourceLineNo">043</span> }<a name="line.43"></a>
+<span class="sourceLineNo">044</span> if (!ignoreAlpha<a
name="line.44"></a>
+<span class="sourceLineNo">045</span> &&
colorGroup.alphaDiff > colorGroup.redDiff<a name="line.45"></a>
+<span class="sourceLineNo">046</span> &&
colorGroup.alphaDiff > colorGroup.greenDiff<a name="line.46"></a>
+<span class="sourceLineNo">047</span> &&
colorGroup.alphaDiff > colorGroup.blueDiff) {<a name="line.47"></a>
+<span class="sourceLineNo">048</span> doCut(colorGroup,
ColorComponent.ALPHA, colorGroups, ignoreAlpha);<a name="line.48"></a>
+<span class="sourceLineNo">049</span> } else if (colorGroup.redDiff
> colorGroup.greenDiff<a name="line.49"></a>
+<span class="sourceLineNo">050</span> &&
colorGroup.redDiff > colorGroup.blueDiff) {<a name="line.50"></a>
+<span class="sourceLineNo">051</span> doCut(colorGroup,
ColorComponent.RED, colorGroups, ignoreAlpha);<a name="line.51"></a>
+<span class="sourceLineNo">052</span> } else if (colorGroup.greenDiff
> colorGroup.blueDiff) {<a name="line.52"></a>
+<span class="sourceLineNo">053</span> doCut(colorGroup,
ColorComponent.GREEN, colorGroups, ignoreAlpha);<a name="line.53"></a>
+<span class="sourceLineNo">054</span> } else {<a name="line.54"></a>
+<span class="sourceLineNo">055</span> doCut(colorGroup,
ColorComponent.BLUE, colorGroups, ignoreAlpha);<a name="line.55"></a>
+<span class="sourceLineNo">056</span> }<a name="line.56"></a>
+<span class="sourceLineNo">057</span> return true;<a name="line.57"></a>
+<span class="sourceLineNo">058</span> }<a name="line.58"></a>
+<span class="sourceLineNo">059</span> <a name="line.59"></a>
+<span class="sourceLineNo">060</span> private void doCut(final ColorGroup
colorGroup, final ColorComponent mode,<a name="line.60"></a>
+<span class="sourceLineNo">061</span> final List<ColorGroup>
colorGroups, final boolean ignoreAlpha) throws ImageWriteException {<a
name="line.61"></a>
+<span class="sourceLineNo">062</span><a name="line.62"></a>
+<span class="sourceLineNo">063</span> final
Comparator<ColorCount> comp = new Comparator<ColorCount>() {<a
name="line.63"></a>
+<span class="sourceLineNo">064</span> public int compare(final
ColorCount c1, final ColorCount c2) {<a name="line.64"></a>
+<span class="sourceLineNo">065</span> switch (mode) {<a
name="line.65"></a>
+<span class="sourceLineNo">066</span> case ALPHA:<a
name="line.66"></a>
+<span class="sourceLineNo">067</span> return c1.alpha -
c2.alpha;<a name="line.67"></a>
+<span class="sourceLineNo">068</span> case RED:<a
name="line.68"></a>
+<span class="sourceLineNo">069</span> return c1.red -
c2.red;<a name="line.69"></a>
+<span class="sourceLineNo">070</span> case GREEN:<a
name="line.70"></a>
+<span class="sourceLineNo">071</span> return c1.green -
c2.green;<a name="line.71"></a>
+<span class="sourceLineNo">072</span> case BLUE:<a
name="line.72"></a>
+<span class="sourceLineNo">073</span> return c1.blue -
c2.blue;<a name="line.73"></a>
+<span class="sourceLineNo">074</span> default:<a
name="line.74"></a>
+<span class="sourceLineNo">075</span> return 0;<a
name="line.75"></a>
+<span class="sourceLineNo">076</span> }<a name="line.76"></a>
+<span class="sourceLineNo">077</span> }<a name="line.77"></a>
+<span class="sourceLineNo">078</span> };<a name="line.78"></a>
+<span class="sourceLineNo">079</span><a name="line.79"></a>
+<span class="sourceLineNo">080</span>
Collections.sort(colorGroup.colorCounts, comp);<a name="line.80"></a>
+<span class="sourceLineNo">081</span> final int countHalf = (int)
Math.round((double) colorGroup.totalPoints / 2);<a name="line.81"></a>
+<span class="sourceLineNo">082</span> int oldCount = 0;<a
name="line.82"></a>
+<span class="sourceLineNo">083</span> int newCount = 0;<a
name="line.83"></a>
+<span class="sourceLineNo">084</span> int medianIndex;<a
name="line.84"></a>
+<span class="sourceLineNo">085</span> for (medianIndex = 0; medianIndex
< colorGroup.colorCounts.size(); medianIndex++) {<a name="line.85"></a>
+<span class="sourceLineNo">086</span> final ColorCount colorCount =
colorGroup.colorCounts.get(medianIndex);<a name="line.86"></a>
+<span class="sourceLineNo">087</span><a name="line.87"></a>
+<span class="sourceLineNo">088</span> newCount +=
colorCount.count;<a name="line.88"></a>
+<span class="sourceLineNo">089</span><a name="line.89"></a>
+<span class="sourceLineNo">090</span> if (newCount < countHalf)
{<a name="line.90"></a>
+<span class="sourceLineNo">091</span> oldCount = newCount;<a
name="line.91"></a>
+<span class="sourceLineNo">092</span> } else {<a name="line.92"></a>
+<span class="sourceLineNo">093</span> break;<a
name="line.93"></a>
+<span class="sourceLineNo">094</span> }<a name="line.94"></a>
+<span class="sourceLineNo">095</span> }<a name="line.95"></a>
+<span class="sourceLineNo">096</span><a name="line.96"></a>
+<span class="sourceLineNo">097</span> if (medianIndex ==
colorGroup.colorCounts.size() - 1) {<a name="line.97"></a>
+<span class="sourceLineNo">098</span> medianIndex--;<a
name="line.98"></a>
+<span class="sourceLineNo">099</span> } else if (medianIndex > 0)
{<a name="line.99"></a>
+<span class="sourceLineNo">100</span> final int newDiff =
Math.abs(newCount - countHalf);<a name="line.100"></a>
+<span class="sourceLineNo">101</span> final int oldDiff =
Math.abs(countHalf - oldCount);<a name="line.101"></a>
+<span class="sourceLineNo">102</span> if (oldDiff < newDiff) {<a
name="line.102"></a>
+<span class="sourceLineNo">103</span> medianIndex--;<a
name="line.103"></a>
+<span class="sourceLineNo">104</span> }<a name="line.104"></a>
+<span class="sourceLineNo">105</span> }<a name="line.105"></a>
+<span class="sourceLineNo">106</span><a name="line.106"></a>
+<span class="sourceLineNo">107</span> colorGroups.remove(colorGroup);<a
name="line.107"></a>
+<span class="sourceLineNo">108</span> final List<ColorCount>
colorCounts1 = new ArrayList<ColorCount>(<a name="line.108"></a>
+<span class="sourceLineNo">109</span>
colorGroup.colorCounts.subList(0, medianIndex + 1));<a name="line.109"></a>
+<span class="sourceLineNo">110</span> final List<ColorCount>
colorCounts2 = new ArrayList<ColorCount>(<a name="line.110"></a>
+<span class="sourceLineNo">111</span>
colorGroup.colorCounts.subList(medianIndex + 1,<a name="line.111"></a>
+<span class="sourceLineNo">112</span>
colorGroup.colorCounts.size()));<a name="line.112"></a>
+<span class="sourceLineNo">113</span><a name="line.113"></a>
+<span class="sourceLineNo">114</span> ColorGroup less = new
ColorGroup(new ArrayList<ColorCount>(colorCounts1), ignoreAlpha);<a
name="line.114"></a>
+<span class="sourceLineNo">115</span> colorGroups.add(less);<a
name="line.115"></a>
+<span class="sourceLineNo">116</span> ColorGroup more = new
ColorGroup(new ArrayList<ColorCount>(colorCounts2), ignoreAlpha);<a
name="line.116"></a>
+<span class="sourceLineNo">117</span> colorGroups.add(more);<a
name="line.117"></a>
+<span class="sourceLineNo">118</span><a name="line.118"></a>
+<span class="sourceLineNo">119</span> final ColorCount medianValue =
colorGroup.colorCounts.get(medianIndex);<a name="line.119"></a>
+<span class="sourceLineNo">120</span> int limit;<a name="line.120"></a>
+<span class="sourceLineNo">121</span> switch (mode) {<a
name="line.121"></a>
+<span class="sourceLineNo">122</span> case ALPHA:<a
name="line.122"></a>
+<span class="sourceLineNo">123</span> limit =
medianValue.alpha;<a name="line.123"></a>
+<span class="sourceLineNo">124</span> break;<a
name="line.124"></a>
+<span class="sourceLineNo">125</span> case RED:<a
name="line.125"></a>
+<span class="sourceLineNo">126</span> limit =
medianValue.red;<a name="line.126"></a>
+<span class="sourceLineNo">127</span> break;<a
name="line.127"></a>
+<span class="sourceLineNo">128</span> case GREEN:<a
name="line.128"></a>
+<span class="sourceLineNo">129</span> limit =
medianValue.green;<a name="line.129"></a>
+<span class="sourceLineNo">130</span> break;<a
name="line.130"></a>
+<span class="sourceLineNo">131</span> case BLUE:<a
name="line.131"></a>
+<span class="sourceLineNo">132</span> limit =
medianValue.blue;<a name="line.132"></a>
+<span class="sourceLineNo">133</span> break;<a
name="line.133"></a>
+<span class="sourceLineNo">134</span> default:<a
name="line.134"></a>
+<span class="sourceLineNo">135</span> throw new Error("Bad
mode.");<a name="line.135"></a>
+<span class="sourceLineNo">136</span> }<a name="line.136"></a>
+<span class="sourceLineNo">137</span> colorGroup.cut = new
ColorGroupCut(less, more, mode, limit);<a name="line.137"></a>
+<span class="sourceLineNo">138</span> }<a name="line.138"></a>
+<span class="sourceLineNo">139</span>}<a name="line.139"></a>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</pre>
+</div>
+</body>
+</html>
\ No newline at end of file
Propchange:
websites/production/commons/content/proper/commons-imaging/apidocs/src-html/org/apache/commons/imaging/palette/LongestAxisMedianCut.html
------------------------------------------------------------------------------
svn:eol-style = native
Added:
websites/production/commons/content/proper/commons-imaging/apidocs/src-html/org/apache/commons/imaging/palette/MedianCut.html
==============================================================================
---
websites/production/commons/content/proper/commons-imaging/apidocs/src-html/org/apache/commons/imaging/palette/MedianCut.html
(added)
+++
websites/production/commons/content/proper/commons-imaging/apidocs/src-html/org/apache/commons/imaging/palette/MedianCut.html
Sun Jan 11 12:33:25 2015
@@ -0,0 +1,98 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
+<html lang="de">
+<head>
+<title>Source code</title>
+<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css"
title="Style">
+</head>
+<body>
+<div class="sourceContainer">
+<pre><span class="sourceLineNo">001</span>/*<a name="line.1"></a>
+<span class="sourceLineNo">002</span> * Licensed to the Apache Software
Foundation (ASF) under one or more<a name="line.2"></a>
+<span class="sourceLineNo">003</span> * contributor license agreements. See
the NOTICE file distributed with<a name="line.3"></a>
+<span class="sourceLineNo">004</span> * this work for additional information
regarding copyright ownership.<a name="line.4"></a>
+<span class="sourceLineNo">005</span> * The ASF licenses this file to You
under the Apache License, Version 2.0<a name="line.5"></a>
+<span class="sourceLineNo">006</span> * (the "License"); you may not use this
file except in compliance with<a name="line.6"></a>
+<span class="sourceLineNo">007</span> * the License. You may obtain a copy of
the License at<a name="line.7"></a>
+<span class="sourceLineNo">008</span> *<a name="line.8"></a>
+<span class="sourceLineNo">009</span> *
http://www.apache.org/licenses/LICENSE-2.0<a name="line.9"></a>
+<span class="sourceLineNo">010</span> *<a name="line.10"></a>
+<span class="sourceLineNo">011</span> * Unless required by applicable law or
agreed to in writing, software<a name="line.11"></a>
+<span class="sourceLineNo">012</span> * distributed under the License is
distributed on an "AS IS" BASIS,<a name="line.12"></a>
+<span class="sourceLineNo">013</span> * WITHOUT WARRANTIES OR CONDITIONS OF
ANY KIND, either express or implied.<a name="line.13"></a>
+<span class="sourceLineNo">014</span> * See the License for the specific
language governing permissions and<a name="line.14"></a>
+<span class="sourceLineNo">015</span> * limitations under the License.<a
name="line.15"></a>
+<span class="sourceLineNo">016</span> */<a name="line.16"></a>
+<span class="sourceLineNo">017</span>package
org.apache.commons.imaging.palette;<a name="line.17"></a>
+<span class="sourceLineNo">018</span><a name="line.18"></a>
+<span class="sourceLineNo">019</span>import java.util.List;<a
name="line.19"></a>
+<span class="sourceLineNo">020</span><a name="line.20"></a>
+<span class="sourceLineNo">021</span>import
org.apache.commons.imaging.ImageWriteException;<a name="line.21"></a>
+<span class="sourceLineNo">022</span><a name="line.22"></a>
+<span class="sourceLineNo">023</span>public interface MedianCut {<a
name="line.23"></a>
+<span class="sourceLineNo">024</span> boolean performNextMedianCut(final
List<ColorGroup> colorGroups, final boolean ignoreAlpha)<a
name="line.24"></a>
+<span class="sourceLineNo">025</span> throws ImageWriteException;<a
name="line.25"></a>
+<span class="sourceLineNo">026</span>}<a name="line.26"></a>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</pre>
+</div>
+</body>
+</html>
\ No newline at end of file
