Merge PNGJ 0.85 into namespace

PNGJ Version 0.85  (1 April 2012)

Apache 2.0 License

http://code.google.com/p/pngj/

Merged code:
  - Changed namespace ar.com.hjg.pngj -> jogamp.opengl.util.pngj
    to avoid collision when using a different version of PNGJ.

  - Removed test and lossy packages and helper classes
    to reduce footprint.

License information is added in main LICENSE.txt file.

5 files changed, 338 insertions, 0 deletions

diff --git a/make/lib/pngj/LICENSE.txt b/make/lib/pngj/LICENSE.txt
new file mode 100644
index 000000000..d64569567
--- /dev/null
+++ b/make/lib/pngj/LICENSE.txt
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/make/lib/pngj/NOTICE.txt b/make/lib/pngj/NOTICE.txt
new file mode 100644
index 000000000..1b7009f5b
--- /dev/null
+++ b/make/lib/pngj/NOTICE.txt
@@ -0,0 +1,6 @@
+PNGJ : PNG image IO Java librry

+Copyright 2009 Hern�n J. Gonz�lez

+

+This product includes software developed by

+Hern�n J. Gonz�lez (http://hjg.com.ar/).

+

diff --git a/make/lib/pngj/RELEASE-NOTES.txt b/make/lib/pngj/RELEASE-NOTES.txt
new file mode 100644
index 000000000..2e03b544b
--- /dev/null
+++ b/make/lib/pngj/RELEASE-NOTES.txt
@@ -0,0 +1,70 @@
+PNGJ:  Release Notes  & History

+==============================================================================

+

+Version 0.85  (1 April 2012)

+ - More robust Chunk management (ChunkGroup is now inside PngChunk; both PngReader and PngWriter have a ChunkList...)    

+ - PngMetadata: both  PngReader and PngWriter have an instance to deal with metadata (chunks) at high level. eg: setDpi()/getDpi 

+ - Added sPLT chunk

+ - The test of all testsuite images now copies all chunks ok.

+ - Deprecated Pngwrite.writeRow(ImageLine), use better Pngwrite.writeRow(ImageLine,rown)

+ - remove PngReader.foundChunksInfo 

+  

+Version 0.80  (28 March 2012)

+ - Roll back auto increment of ImageLine rownumber at writing. Define some new PngWrite.writeLine() methods with slight change in semantics  

+ - Fix bad chunk-id in PngChunkITXT

+ 

+Version 0.71  (March 2012)

+ - Full support for all Chunk types (bKGD CHRM ICCP ITXT TRNS ZTXT - some yet untested)  

+ - ar.com.hjg.pngj.nosandbox is now empty: PngFileHelper is back to main jar

+ - Lossy compression ar.com.hjg.pngj.lossy - (very EXPERIMENTAL yet, undocumented, lots of rough edges) 

+

+Version 0.62  (Jun 2011)

+-----------------------

+- Added Javadocs

+- Implemented ImageLineHelper.tf_palIdx2RGB()

+- Several code and comment polishing

+

+Version 0.61  (Jun 2011)

+-----------------------

+- Better PNG filter strategies (different filters in same writer).

+- Fixed issue with compression level (zip stream), it had no effect before.

+- More chunks implemented (cHRM  , sRGB , sBIT)

+- Restricted visibility of some methods/fields

+

+Version 0.6  (May 2011)

+-----------------------

+- Full support for indexed and grayscale, with  any bitdepth 

+- The only non supported PNG images are the interlaced now.

+- Chunk management fully reimplemented. (package ar.hjg.com.png.chunks)

+- Decouple google-appengine-unfriendy code in package   

+ ar.com.hjg.pngj.nosandbox package. See PngFileHelper.

+- Constructors PngReader/PngWriter now use streams. See factory methods 

+in ar.com.hjg.pngj.nosandbox.PngFileHelper if you want to use files.

+- Added test images from PNG suite - see MirrorTest

+- Polished code, translated some spanish comments 

+

+Version 0.2  (Apr 2011)

+-----------------------

+- Issue with extra trailing IDAT chunks fixed.  

+

+Version 0.1  (January 2009)

+---------------------------

+- Full reading/writing capabilities for truecolor formats: RGB/RGBA , 8 and 16 bpp

+- Other formats: paletted and grayscale images implemented (almost no testing), 

+only with 8bitdepth resolution (1,2,4 bits not implemented). 

+- Palette handling: very rudimentary: PngReader only reads the raw chunk and 

+PngWriter -if applicable- writes it back.

+- Special color transformations (ICC) : unvisible for the API. The chunks are

+read and write 'raw'. 

+- Special chunks: limited support for Physical resolution (DPI) and textual chunks.

+All other ancillary chunks are blindly read and write.

+

+

+Feedback:

+--------

+

+http://code.google.com/p/pngj

+

[email protected]

+

+Hernan J. Gonzalez
\ No newline at end of file
diff --git a/make/lib/pngj/about.html b/make/lib/pngj/about.html
new file mode 100644
index 000000000..23df5e0b8
--- /dev/null
+++ b/make/lib/pngj/about.html
@@ -0,0 +1,47 @@
+<body>

+<p>

+<b>PNGJ: A simple library for reading/writing PNG images.</b>

+</p>

+

+

+<p>

+ Focused on high resolution images,

+both huge in size (and hence not appropiate to be loaded in memory, eg. as a BufferedImage)

+and quality (the library is dedicated to truecolor images, with 8 and 16 bits per sample,

+with or without alpha). It provides basic line-oriented reading and writing capabilities.

+</p>

+<p>

+

+A quick example: this code reads a PNG image file (true colour, 8-16 bpp, RGB-RGBA) and

+rewrites it cutting the red channel by two.

+</p>

+

+<pre>

+

+    public static void decreaseRed(String origFilename, String destFilename) {

+      PngReader pngr = new PngReader(origFilename);

+      PngWriter pngw = new PngWriter(destFilename, pngr.imgInfo);

+      pngw.setOverrideFile(true); // allows to override writen file if it already exits

+      System.out.println(pngr.toString());

+      pngw.prepare(pngr); // not necesary; but this can copy some informational chunks from original 

+      int channels = pngr.imgInfo.channels;

+      if(channels<3) throw new RuntimeException("Only for truecolour images");

+      for (int row = 0; row &lt; pngr.imgInfo.rows; row++) {

+        ImageLine l1 = pngr.readRow(row);

+        for(int j=0;j&lt;pngr.imgInfo.cols;j++)

+          l1.scanline[j*channels]/=2;

+        pngw.writeRow(l1);

+      }

+      pngr.end();

+      pngw.end();

+   }

+  </pre>

+<p>

+See the docs and source of the samples for more.

+</p>

+

+http://code.google.com/p/pngj/<br>

+<a href="http://code.google.com/p/pngj/">PNGJ</a>

+

+</body>

+</html>

diff --git a/make/lib/pngj/jogl-merge.txt b/make/lib/pngj/jogl-merge.txt
new file mode 100644
index 000000000..4ab93edbf
--- /dev/null
+++ b/make/lib/pngj/jogl-merge.txt
@@ -0,0 +1,13 @@
+PNGJ Version 0.85  (1 April 2012)
+
+http://code.google.com/p/pngj/
+
+Merged code:
+  - Changed namespace ar.com.hjg.pngj -> jogamp.opengl.util.pngj
+    to avoid collision when using a different version of PNGJ.
+
+  - Removed test and lossy packages and helper classes
+    to reduce footprint.
+
+License information is added in main LICENSE.txt file.
+