source: branches/4.2/components/native/bf-cpp/src/conflicts.txt @ 6496

Revision 6496, 2.7 KB checked in by melissa, 10 years ago (diff)

Updated bf-cpp to compile with latest ome.xml.* and loci.formats.meta.* changes.

Line 
1#
2# conflicts.txt
3#
4
5# OME Bio-Formats C++ bindings for native access to Bio-Formats Java library.
6# Copyright (c) 2008-@year@, UW-Madison LOCI.
7# All rights reserved.
8#
9# Redistribution and use in source and binary forms, with or without
10# modification, are permitted provided that the following conditions are met:
11#     * Redistributions of source code must retain the above copyright
12#       notice, this list of conditions and the following disclaimer.
13#     * Redistributions in binary form must reproduce the above copyright
14#       notice, this list of conditions and the following disclaimer in the
15#       documentation and/or other materials provided with the distribution.
16#     * Neither the name of the UW-Madison LOCI nor the
17#       names of its contributors may be used to endorse or promote products
18#       derived from this software without specific prior written permission.
19#
20# THIS SOFTWARE IS PROVIDED BY UW-MADISON LOCI ''AS IS'' AND ANY
21# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
22# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
23# DISCLAIMED. IN NO EVENT SHALL UW-MADISON LOCI BE LIABLE FOR ANY
24# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
25# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
26# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
27# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
29# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30
31# IMPORTANT NOTE: Although this software is distributed according to a
32# "BSD-style" license, it requires the Bio-Formats Java library to do
33# anything useful, which is licensed under the GPL v2 or later.
34# As such, if you wish to distribute this software with Bio-Formats itself,
35# your combined work must be distributed under the terms of the GPL.
36
37# This file lists Java constants with potential namespace conflicts.
38# These constants will be renamed with a "JACE_" prefix to avoid the issue.
39
40java.awt.Frame.NORMAL
41java.awt.Transparency.OPAQUE
42java.awt.image.ImageObserver.ERROR
43loci.formats.in.SDTInfo.BH_HEADER_CHKSUM
44loci.formats.in.SDTInfo.BH_HEADER_NOT_VALID
45loci.formats.in.SDTInfo.BH_HEADER_VALID
46loci.formats.tiff.IFD.IFD
47loci.formats.tiff.PhotoInterp.CMYK
48loci.formats.tiff.PhotoInterp.RGB
49loci.formats.enums.LineCap.LINE
50loci.formats.in.LiFlimReader.COMPRESSION_NONE
51loci.formats.out.TiffWriter.COMPRESSION_LZW
52loci.formats.out.TiffWriter.COMPRESSION_JPEG
53ome.xml.model.enums.Compression.NONE
54ome.xml.model.enums.LineCap.LINE
Note: See TracBrowser for help on using the repository browser.