← Back to branch summary

~ubuntu-branches/ubuntu/wily/openimageio/wily

~ubuntu-branches/ubuntu/wily/openimageio/wily

Viewing all changes in revision 19.

Committer: Package Import Robot
Author(s): Adam Conrad
Date: 2014-02-07 18:54:12 UTC
mfrom: (4.3.11 sid)
Revision ID: package-import@ubuntu.com-20140207185412-2gmpmp82clc40fxy

Tags: 1.3.12~dfsg0-1ubuntu1

* Merge from Debian unstable.  Remaining changes:
  - 0099-as-needed-fix.patch: Move -latomic to the right part of the link
    line to resolve FTBFS with as-needed on -latomic arches like powerpc.
  - 0099-libOpenImageIO-underlinked.patch: Link libOpenImageIO with -ldl.

files added:
.pc/0002-Fix_IlmBase_issue.patch/CMakeLists.txt

CMakeLists.txt

debian/libopenimageio1.3.install

src/doc/pythonbindings.tex

src/gif.imageio

src/gif.imageio/CMakeLists.txt

src/gif.imageio/gifinput.cpp

src/gif.imageio/gifoutput.cpp

src/include/string_ref.h

src/libOpenImageIO/imagebufalgo_deep.cpp

src/python/py_imagebufalgo.cpp

src/python/py_roi.cpp

testsuite/dpx/ref/L.dpx

testsuite/dpx/ref/R.dpx

testsuite/dpx/ref/stereo.dpx

testsuite/gif

testsuite/gif/ref

testsuite/gif/ref/out-alt.txt

testsuite/gif/ref/out.txt

testsuite/gif/run.py

testsuite/oiiotool/ref/chsum.tif

testsuite/oiiotool/ref/flat.exr

testsuite/oiiotool/ref/rangecompress.tif

testsuite/oiiotool/ref/rangeexpand.tif

testsuite/oiiotool/src/deepalpha.exr

testsuite/python-imagebuf

testsuite/python-imagebuf/ref

testsuite/python-imagebuf/ref/out.tif

testsuite/python-imagebuf/ref/out.txt

testsuite/python-imagebuf/run.py

testsuite/python-imagebuf/test_imagebuf.py

testsuite/python-imagebufalgo

testsuite/python-imagebufalgo/ref

testsuite/python-imagebufalgo/ref/black.tif

testsuite/python-imagebufalgo/ref/checker.tif

testsuite/python-imagebufalgo/ref/crop.tif

testsuite/python-imagebufalgo/ref/out.tif

testsuite/python-imagebufalgo/ref/out.txt

testsuite/python-imagebufalgo/ref/tahoe-small.tx

testsuite/python-imagebufalgo/run.py

testsuite/python-imagebufalgo/test_imagebufalgo.py

testsuite/python-imageinput

testsuite/python-imageinput/ref

testsuite/python-imageinput/ref/out-alt.txt

testsuite/python-imageinput/ref/out.txt

testsuite/python-imageinput/run.py

testsuite/python-imageinput/test_imageinput.py

testsuite/python-imageoutput

testsuite/python-imageoutput/ref

testsuite/python-imageoutput/ref/out.txt

testsuite/python-imageoutput/run.py

testsuite/python-imageoutput/test_imageoutput.py

testsuite/python-imagespec

testsuite/python-imagespec/ref

testsuite/python-imagespec/ref/out.txt

testsuite/python-imagespec/run.py

testsuite/python-imagespec/test_imagespec.py

testsuite/python-roi

testsuite/python-roi/ref

testsuite/python-roi/ref/out.txt

testsuite/python-roi/run.py

testsuite/python-roi/test_roi.py

testsuite/python-typedesc

testsuite/python-typedesc/ref

testsuite/python-typedesc/ref/out.txt

testsuite/python-typedesc/run.py

testsuite/python-typedesc/test_typedesc.py

testsuite/spi

testsuite/spi/ref

testsuite/spi/ref/out.txt

testsuite/spi/run.py

testsuite/texture-crop

testsuite/texture-crop/ref

testsuite/texture-crop/ref/out.exr

testsuite/texture-crop/run.py

testsuite/texture-cropover

testsuite/texture-cropover/ref

testsuite/texture-cropover/ref/out.exr

testsuite/texture-cropover/run.py

testsuite/texture-icwrite

testsuite/texture-icwrite/ref

testsuite/texture-icwrite/ref/out1.tif

testsuite/texture-icwrite/ref/out2.tif

testsuite/texture-icwrite/ref/out3.tif

testsuite/texture-icwrite/ref/out4.tif

testsuite/texture-icwrite/run.py

files removed:
.pc/0002-Fix_IlmBase_issue.patch/src

.pc/0002-Fix_IlmBase_issue.patch/src/CMakeLists.txt

debian/libopenimageio1.2.install

src/CMakeLists.txt

src/doc/tasks.txt

src/python/unit_tests_image_input.py

src/python/unit_tests_image_output.py

src/python/unit_tests_imagespec.py

src/python/unit_tests_typedesc.py

files modified:
.pc/0001-Fix_docs_generation.patch/src/doc/CMakeLists.txt

.pc/0001-Fix_docs_generation.patch/src/doc/Makefile

.pc/0003-Fix_multiarch_paths.patch/src/cmake/modules/FindIlmBase.cmake

.pc/0003-Fix_multiarch_paths.patch/src/cmake/modules/FindOpenEXR.cmake

.pc/0004-Fix_FTBFS_on_atomic_operations.patch/src/include/thread.h

.pc/0099-as-needed-fix.patch/src/libOpenImageIO/CMakeLists.txt

.pc/0099-libOpenImageIO-underlinked.patch/src/libOpenImageIO/CMakeLists.txt

CHANGES

CREDITS

Makefile

README.rst

debian/changelog

debian/control

debian/copyright

debian/patches/0001-Fix_docs_generation.patch

debian/patches/0002-Fix_IlmBase_issue.patch

debian/patches/0003-Fix_multiarch_paths.patch

debian/patches/0004-Fix_FTBFS_on_atomic_operations.patch

debian/rules

debian/watch

site/spi/Makefile-bits

site/spi/Makefile-bits-arnold

site/spi/Makefile-bits-spcomp2

src/cineon.imageio/libcineon/CineonHeader.cpp

src/cmake/externalpackages.cmake

src/cmake/modules/FindIlmBase.cmake

src/cmake/modules/FindOpenEXR.cmake

src/cmake/oiio_macros.cmake

src/dds.imageio/CMakeLists.txt

src/doc/CMakeLists.txt

src/doc/Makefile

src/doc/builtinplugins.tex

src/doc/iconvert.tex

src/doc/imagebuf.tex

src/doc/imagebufalgo.tex

src/doc/imagecache.tex

src/doc/imageioapi.tex

src/doc/imageoutput.tex

src/doc/maketx.tex

src/doc/oiiointro.tex

src/doc/oiiotool.tex

src/doc/openimageio.tex

src/doc/stdmetadata.tex

src/doc/texturesys.tex

src/doc/writingplugins.tex

src/dpx.imageio/dpxinput.cpp

src/dpx.imageio/dpxoutput.cpp

src/dpx.imageio/libdpx/DPX.h

src/dpx.imageio/libdpx/DPXHeader.cpp

src/dpx.imageio/libdpx/DPXHeader.h

src/dpx.imageio/libdpx/Reader.cpp

src/fits.imageio/fitsinput.cpp

src/hdr.imageio/hdroutput.cpp

src/ico.imageio/icoinput.cpp

src/ico.imageio/icooutput.cpp

src/iconvert/iconvert.cpp

src/idiff/idiff.cpp

src/igrep/igrep.cpp

src/iinfo/iinfo.cpp

src/include/CMakeLists.txt

src/include/color.h

src/include/export.h

src/include/filesystem.h

src/include/imagebuf.h

src/include/imagebufalgo.h

src/include/imagebufalgo_util.h

src/include/imagecache.h

src/include/imageio.h

src/include/paramlist.h

src/include/pugixml.cpp

src/include/pugixml.hpp

src/include/strutil.h

src/include/sysutil.h

src/include/texture.h

src/include/thread.h

src/include/tinyformat.h

src/include/typedesc.h

src/iv/CMakeLists.txt

src/iv/imageviewer.cpp

src/iv/ivimage.cpp

src/iv/ivmain.cpp

src/jpeg.imageio/jpeginput.cpp

src/libOpenImageIO/CMakeLists.txt

src/libOpenImageIO/color_ocio.cpp

src/libOpenImageIO/filesystem_test.cpp

src/libOpenImageIO/formatspec.cpp

src/libOpenImageIO/imagebuf.cpp

src/libOpenImageIO/imagebuf_test.cpp

src/libOpenImageIO/imagebufalgo.cpp

src/libOpenImageIO/imagebufalgo_copy.cpp

src/libOpenImageIO/imagebufalgo_pixelmath.cpp

src/libOpenImageIO/imagebufalgo_test.cpp

src/libOpenImageIO/imagebufalgo_yee.cpp

src/libOpenImageIO/imageio_pvt.h

src/libOpenImageIO/imageioplugin.cpp

src/libOpenImageIO/imageoutput.cpp

src/libOpenImageIO/maketexture.cpp

src/libOpenImageIO/strutil_test.cpp

src/libtexture/environment.cpp

src/libtexture/imagecache.cpp

src/libtexture/imagecache_pvt.h

src/libtexture/texture3d.cpp

src/libtexture/texture_pvt.h

src/libtexture/texturesys.cpp

src/libutil/argparse.cpp

src/libutil/filesystem.cpp

src/libutil/strutil.cpp

src/libutil/sysutil.cpp

src/libutil/typedesc.cpp

src/libutil/ustring.cpp

src/maketx/maketx.cpp

src/oiiotool/imagerec.cpp

src/oiiotool/oiiotool.cpp

src/oiiotool/oiiotool.h

src/oiiotool/printinfo.cpp

src/openexr.imageio/exrinput.cpp

src/openexr.imageio/exroutput.cpp

src/png.imageio/png_pvt.h

src/png.imageio/pnginput.cpp

src/png.imageio/pngoutput.cpp

src/ptex.imageio/CMakeLists.txt

src/ptex.imageio/ptex/PtexWriter.cpp

src/python/CMakeLists.txt

src/python/py_imagebuf.cpp

src/python/py_imageinput.cpp

src/python/py_imageoutput.cpp

src/python/py_imagespec.cpp

src/python/py_oiio.cpp

src/python/py_oiio.h

src/python/py_paramvalue.cpp

src/python/py_typedesc.cpp

src/rla.imageio/rlaoutput.cpp

src/targa.imageio/targainput.cpp

src/targa.imageio/targaoutput.cpp

src/testtex/testtex.cpp

src/tiff.imageio/tiffinput.cpp

testsuite/dpx/ref/out.txt

testsuite/dpx/run.py

testsuite/fits/ref/out.txt

testsuite/oiiotool-composite/run.py

testsuite/oiiotool/ref/fit.tif

testsuite/oiiotool/ref/fit2.tif

testsuite/oiiotool/ref/grid-clamped.tif

testsuite/oiiotool/ref/out.txt

testsuite/oiiotool/ref/resize.tif

testsuite/oiiotool/ref/resize2.tif

testsuite/oiiotool/ref/resize512.tif

testsuite/oiiotool/ref/resize64.tif

testsuite/oiiotool/run.py

testsuite/openexr-v2/ref/out.txt

testsuite/perchannel/ref/out.txt

testsuite/perchannel/run.py

testsuite/png/ref/out.txt

testsuite/runtest.py

testsuite/targa-tgautils/ref/out.txt

testsuite/tiff-suite/ref/out.txt

Show diffs side-by-side

added added

removed removed

.pc/0001-Fix_docs_generation.patch/src/doc/CMakeLists.txt

.pc/0001-Fix_docs_generation.patch/src/doc/Makefile

.pc/0002-Fix_IlmBase_issue.patch/CMakeLists.txt

.pc/0002-Fix_IlmBase_issue.patch/src/

.pc/0002-Fix_IlmBase_issue.patch/src/CMakeLists.txt

.pc/0003-Fix_multiarch_paths.patch/src/cmake/modules/FindIlmBase.cmake

.pc/0003-Fix_multiarch_paths.patch/src/cmake/modules/FindOpenEXR.cmake

.pc/0004-Fix_FTBFS_on_atomic_operations.patch/src/include/thread.h

.pc/0099-as-needed-fix.patch/src/libOpenImageIO/CMakeLists.txt

.pc/0099-libOpenImageIO-underlinked.patch/src/libOpenImageIO/CMakeLists.txt

debian/changelog

debian/copyright

debian/libopenimageio1.2.install

debian/libopenimageio1.3.install

debian/patches/0001-Fix_docs_generation.patch

debian/patches/0002-Fix_IlmBase_issue.patch

debian/patches/0003-Fix_multiarch_paths.patch

debian/patches/0004-Fix_FTBFS_on_atomic_operations.patch

site/spi/Makefile-bits

site/spi/Makefile-bits-arnold

site/spi/Makefile-bits-spcomp2

src/CMakeLists.txt

src/cineon.imageio/libcineon/CineonHeader.cpp

src/cmake/externalpackages.cmake

src/cmake/modules/FindIlmBase.cmake

src/cmake/modules/FindOpenEXR.cmake

src/cmake/oiio_macros.cmake

src/dds.imageio/CMakeLists.txt

src/doc/CMakeLists.txt

src/doc/Makefile

src/doc/builtinplugins.tex

src/doc/iconvert.tex

src/doc/imagebuf.tex

src/doc/imagebufalgo.tex

src/doc/imagecache.tex

src/doc/imageioapi.tex

src/doc/imageoutput.tex

src/doc/maketx.tex

src/doc/oiiointro.tex

src/doc/oiiotool.tex

src/doc/openimageio.tex

src/doc/pythonbindings.tex

src/doc/stdmetadata.tex

src/doc/tasks.txt

src/doc/texturesys.tex

src/doc/writingplugins.tex

src/dpx.imageio/dpxinput.cpp

src/dpx.imageio/dpxoutput.cpp

src/dpx.imageio/libdpx/DPX.h

src/dpx.imageio/libdpx/DPXHeader.cpp

src/dpx.imageio/libdpx/DPXHeader.h

src/dpx.imageio/libdpx/Reader.cpp

src/fits.imageio/fitsinput.cpp

src/gif.imageio/

src/gif.imageio/CMakeLists.txt

src/gif.imageio/gifinput.cpp

src/gif.imageio/gifoutput.cpp

src/hdr.imageio/hdroutput.cpp

src/ico.imageio/icoinput.cpp

src/ico.imageio/icooutput.cpp

src/iconvert/iconvert.cpp

src/idiff/idiff.cpp

src/igrep/igrep.cpp

src/iinfo/iinfo.cpp

src/include/CMakeLists.txt

src/include/color.h

src/include/export.h

src/include/filesystem.h

src/include/imagebuf.h

src/include/imagebufalgo.h

src/include/imagebufalgo_util.h

src/include/imagecache.h

src/include/imageio.h

src/include/paramlist.h

src/include/pugixml.cpp

src/include/pugixml.hpp

src/include/string_ref.h

src/include/strutil.h

src/include/sysutil.h

src/include/texture.h

src/include/thread.h

src/include/tinyformat.h

src/include/typedesc.h

src/iv/CMakeLists.txt

src/iv/imageviewer.cpp

src/iv/ivimage.cpp

src/iv/ivmain.cpp

src/jpeg.imageio/jpeginput.cpp

src/libOpenImageIO/CMakeLists.txt

src/libOpenImageIO/color_ocio.cpp

src/libOpenImageIO/filesystem_test.cpp

src/libOpenImageIO/formatspec.cpp

src/libOpenImageIO/imagebuf.cpp

src/libOpenImageIO/imagebuf_test.cpp

src/libOpenImageIO/imagebufalgo.cpp

src/libOpenImageIO/imagebufalgo_copy.cpp

src/libOpenImageIO/imagebufalgo_deep.cpp

src/libOpenImageIO/imagebufalgo_pixelmath.cpp

src/libOpenImageIO/imagebufalgo_test.cpp

src/libOpenImageIO/imagebufalgo_yee.cpp

src/libOpenImageIO/imageio_pvt.h

src/libOpenImageIO/imageioplugin.cpp

src/libOpenImageIO/imageoutput.cpp

src/libOpenImageIO/maketexture.cpp

src/libOpenImageIO/strutil_test.cpp

src/libtexture/environment.cpp

src/libtexture/imagecache.cpp

src/libtexture/imagecache_pvt.h

src/libtexture/texture3d.cpp

src/libtexture/texture_pvt.h

src/libtexture/texturesys.cpp

src/libutil/argparse.cpp

src/libutil/filesystem.cpp

src/libutil/strutil.cpp

src/libutil/sysutil.cpp

src/libutil/typedesc.cpp

src/libutil/ustring.cpp

src/maketx/maketx.cpp

src/oiiotool/imagerec.cpp

src/oiiotool/oiiotool.cpp

src/oiiotool/oiiotool.h

src/oiiotool/printinfo.cpp

src/openexr.imageio/exrinput.cpp

src/openexr.imageio/exroutput.cpp

src/png.imageio/png_pvt.h

src/png.imageio/pnginput.cpp

src/png.imageio/pngoutput.cpp

src/ptex.imageio/CMakeLists.txt

src/ptex.imageio/ptex/PtexWriter.cpp

src/python/CMakeLists.txt

src/python/py_imagebuf.cpp

src/python/py_imagebufalgo.cpp

src/python/py_imageinput.cpp

src/python/py_imageoutput.cpp

src/python/py_imagespec.cpp

src/python/py_oiio.cpp

src/python/py_oiio.h

src/python/py_paramvalue.cpp

src/python/py_roi.cpp

src/python/py_typedesc.cpp

src/python/unit_tests_image_input.py

src/python/unit_tests_image_output.py

src/python/unit_tests_imagespec.py

src/python/unit_tests_typedesc.py

src/rla.imageio/rlaoutput.cpp

src/targa.imageio/targainput.cpp

src/targa.imageio/targaoutput.cpp

src/testtex/testtex.cpp

src/tiff.imageio/tiffinput.cpp

testsuite/dpx/ref/L.dpx

testsuite/dpx/ref/R.dpx

testsuite/dpx/ref/out.txt

testsuite/dpx/ref/stereo.dpx

testsuite/dpx/run.py

testsuite/fits/ref/out.txt

testsuite/gif/ref/

testsuite/gif/ref/out-alt.txt

testsuite/gif/ref/out.txt

testsuite/gif/run.py

testsuite/oiiotool-composite/run.py

testsuite/oiiotool/ref/chsum.tif

testsuite/oiiotool/ref/fit.tif

testsuite/oiiotool/ref/fit2.tif

testsuite/oiiotool/ref/flat.exr

testsuite/oiiotool/ref/grid-clamped.tif

testsuite/oiiotool/ref/out.txt

testsuite/oiiotool/ref/rangecompress.tif

testsuite/oiiotool/ref/rangeexpand.tif

testsuite/oiiotool/ref/resize.tif

testsuite/oiiotool/ref/resize2.tif

testsuite/oiiotool/ref/resize512.tif

testsuite/oiiotool/ref/resize64.tif

testsuite/oiiotool/run.py

testsuite/oiiotool/src/deepalpha.exr

testsuite/openexr-v2/ref/out.txt

testsuite/perchannel/ref/out.txt

testsuite/perchannel/run.py

testsuite/png/ref/out.txt

testsuite/python-imagebuf/

testsuite/python-imagebuf/ref/

testsuite/python-imagebuf/ref/out.tif

testsuite/python-imagebuf/ref/out.txt

testsuite/python-imagebuf/run.py

testsuite/python-imagebuf/test_imagebuf.py

testsuite/python-imagebufalgo/

testsuite/python-imagebufalgo/ref/

testsuite/python-imagebufalgo/ref/black.tif

testsuite/python-imagebufalgo/ref/checker.tif

testsuite/python-imagebufalgo/ref/crop.tif

testsuite/python-imagebufalgo/ref/out.tif

testsuite/python-imagebufalgo/ref/out.txt

testsuite/python-imagebufalgo/ref/tahoe-small.tx

testsuite/python-imagebufalgo/run.py

testsuite/python-imagebufalgo/test_imagebufalgo.py

testsuite/python-imageinput/

testsuite/python-imageinput/ref/

testsuite/python-imageinput/ref/out-alt.txt

testsuite/python-imageinput/ref/out.txt

testsuite/python-imageinput/run.py

testsuite/python-imageinput/test_imageinput.py

testsuite/python-imageoutput/

testsuite/python-imageoutput/ref/

testsuite/python-imageoutput/ref/out.txt

testsuite/python-imageoutput/run.py

testsuite/python-imageoutput/test_imageoutput.py

testsuite/python-imagespec/

testsuite/python-imagespec/ref/

testsuite/python-imagespec/ref/out.txt

testsuite/python-imagespec/run.py

testsuite/python-imagespec/test_imagespec.py

testsuite/python-roi/

testsuite/python-roi/ref/

testsuite/python-roi/ref/out.txt

testsuite/python-roi/run.py

testsuite/python-roi/test_roi.py

testsuite/python-typedesc/

testsuite/python-typedesc/ref/

testsuite/python-typedesc/ref/out.txt

testsuite/python-typedesc/run.py

testsuite/python-typedesc/test_typedesc.py

testsuite/runtest.py

testsuite/spi/ref/

testsuite/spi/ref/out.txt

testsuite/spi/run.py

testsuite/targa-tgautils/ref/out.txt

testsuite/texture-crop/

testsuite/texture-crop/ref/

testsuite/texture-crop/ref/out.exr

testsuite/texture-crop/run.py

testsuite/texture-cropover/

testsuite/texture-cropover/ref/

testsuite/texture-cropover/ref/out.exr

testsuite/texture-cropover/run.py

testsuite/texture-icwrite/

testsuite/texture-icwrite/ref/

testsuite/texture-icwrite/ref/out1.tif

testsuite/texture-icwrite/ref/out2.tif

testsuite/texture-icwrite/ref/out3.tif

testsuite/texture-icwrite/ref/out4.tif

testsuite/texture-icwrite/run.py

testsuite/tiff-suite/ref/out.txt

Older »