Commit 82349636 authored by Anton Gladky's avatar Anton Gladky

Imported Upstream version 1.7.1~2c958a6.dfsg

parent 488cb079
repo: c4839d2d6ccc6221277fb7e7f20d11be95d369b5
node: 73d77eda235c1da16996169aa79492acac5c0417
node: 2c958a61ea8bdfb7f48bf079c899a52f7e92f33a
branch: default
latesttag: Simage-1.7.0
latesttagdistance: 1
latesttagdistance: 23
Systems in Motion, <URL:http://www.sim.no>
Peder Blekken <pederb@sim.no>
Kongsberg Oil & Gas Technologies, http://www.coin3d.org
Additional contributors:
========================
Most Active Developers (in alphabetical order):
===============================================
Lars J. Aas <larsa@sim.no>
Peder Blekken <pederb@sim.no>
Morten Eriksen <mortene@sim.no>
Marius Bugge Monsen <mariusbu@sim.no>
Marius Kintel <kintel@sim.no>
Tamer Fahmy <tamer@sim.no>
Thomas Hammer <thammer@sim.no>
Karin Kosina <kyrah@sim.no>
Øystein Handegard <handegar@sim.no>
Frode Ingebrigtsen <frodein@sim.no>
Marius Kintel <kintel@sim.no>
Karin Kosina <kyrah@sim.no>
Lars Moastuen <larsm@sim.no>
All files in this library are public domain, except the files in the
mpeg2enc directory.
The files in the mpeg2enc directory are licensed under the terms of
the LICENSE.mpeg2enc file.
The license for the files in the mpeg2enc directory can be found
in the file mpeg2enc/mpeg2enc.h.
All other files in this library are licensed under the terms of the
LICENSE file.
Please send patches for bugs and new features to: Peder Blekken,
<pederb@sim.no>.
See <URL:http://www.coin3d.org/> for additional information.
Contact us at
support@sim.no / sales@sim.no
Or on dead trees at
Kongsberg Oil & Gas Technologies
Bygdoy Alle 5
0257 Oslo
NORWAY
This diff is collapsed.
Copyright (c) Kongsberg Oil & Gas Technologies
Permission to use, copy, modify, and distribute this software for any
purpose with or without fee is hereby granted, provided that the above
copyright notice and this permission notice appear in all copies.
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
Copyright (C) 1996, MPEG Software Simulation Group. All Rights Reserved.
Disclaimer of Warranty
These software programs are available to the user without any license fee or
royalty on an "as is" basis. The MPEG Software Simulation Group disclaims
any and all warranties, whether express, implied, or statuary, including any
implied warranties or merchantability or of fitness for a particular
purpose. In no event shall the copyright-holder be liable for any
incidental, punitive, or consequential damages of any kind whatsoever
arising from the use of these programs.
This disclaimer of warranty extends to the user of these programs and user's
customers, employees, agents, transferees, successors, and assigns.
The MPEG Software Simulation Group does not represent or warrant that the
programs furnished hereunder are free of infringement of any third-party
patents.
Commercial implementations of MPEG-1 and MPEG-2 video, including shareware,
are subject to royalty fees to patent holders. Many of these patents are
general enough such that they are unavoidable regardless of implementation
design.
Please visit MPEGLA at http://www.mpegla.com/ for more information about
licensing.
# **************************************************************************
if BUILD_HTMLPAGES
HTMLDIR = html
else
HTMLDIR =
endif
if SIMAGE_MPEG2ENC_SUPPORT
MPEG2ENCDIR = mpeg2enc
else
MPEG2ENCDIR =
endif
SUBDIRS = $(MPEG2ENCDIR) src guile
if BUILD_LIBRARY
SRCDIRS = $(MPEG2ENCDIR) src guile
else
SRCDIRS =
endif
SUBDIRS = $(HTMLDIR) $(SRCDIRS)
dist_bin_SCRIPTS = simage-config
m4datadir = $(datadir)/aclocal
m4datadir = $(datarootdir)/aclocal
dist_m4data_DATA = cfg/simage.m4
cfgdatadir = $(datadir)/Coin/conf
cfgdatadir = $(datarootdir)/Coin/conf
cfgdata_DATA = simage-@CONFIG@.cfg
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA= simage.pc
EXTRA_DIST = \
simage.cfg.in \
simage.pc.in \
cfg/depcomp \
cfg/ltconfig \
cfg/wrapmsvc.exe \
cfg/gendsp.sh \
cfg/errors.txt \
build/simage.spec.in \
build/README \
build/msvc6/config-debug.h \
build/msvc6/simage1_install.dsp \
build/msvc6/simage1.dsw \
build/msvc6/include/simage.h \
build/msvc6/simage1_uninstall.dsp \
build/msvc6/config-release.h \
build/msvc6/config.h \
build/msvc6/simage1.dsp \
build/msvc7/config-debug.h \
build/msvc7/simage1.sln \
build/msvc7/simage1_uninstall.vcproj \
build/msvc7/include/simage.h \
build/msvc7/simage1.vcproj \
build/msvc7/config-release.h \
build/msvc7/config.h \
build/msvc7/simage1_install.vcproj \
build/msvc8/config-debug.h \
build/msvc8/simage1.sln \
build/msvc8/simage1_uninstall.vcproj \
build/msvc8/include/simage.h \
build/msvc8/simage1.vcproj \
build/msvc8/config-release.h \
build/msvc8/config.h \
build/msvc8/simage1_install.vcproj \
build/msvc9/config-debug.h \
build/msvc9/simage1.sln \
build/msvc9/simage1_uninstall.vcproj \
build/msvc9/include/simage.h \
build/msvc9/simage1.vcproj \
build/msvc9/config-release.h \
build/msvc9/config.h \
build/msvc9/simage1_install.vcproj \
build/misc/create-directories.bat \
build/misc/install-headers.bat \
build/misc/uninstall-headers.bat \
build/misc/README.GDI+ \
build/misc/install-sdk.bat \
build/misc/uninstall-sdk.bat \
docs/announcement-1_6_0.txt \
docs/announcement-1_6_1.txt \
src/simage_jpeg_reader.icc \
src/simage_jpeg_writer.icc \
README.WIN32
simage.cfg.in \
simage.pc.in \
cfg/depcomp \
cfg/ltconfig \
cfg/wrapmsvc.exe \
cfg/gendsp.sh \
cfg/errors.txt \
cfg/doxy4win.pl \
build/simage.spec.in \
build/README \
build/msvc6/config-debug.h \
build/msvc6/simage1_install.dsp \
build/msvc6/simage1.dsw \
build/msvc6/include/simage.h \
build/msvc6/simage1_uninstall.dsp \
build/msvc6/config-release.h \
build/msvc6/config.h \
build/msvc6/simage1.dsp \
build/msvc7/config-debug.h \
build/msvc7/simage1.sln \
build/msvc7/simage1_uninstall.vcproj \
build/msvc7/include/simage.h \
build/msvc7/simage1.vcproj \
build/msvc7/config-release.h \
build/msvc7/config.h \
build/msvc7/simage1_install.vcproj \
build/msvc8/config-debug.h \
build/msvc8/simage1.sln \
build/msvc8/simage1_uninstall.vcproj \
build/msvc8/include/simage.h \
build/msvc8/simage1.vcproj \
build/msvc8/config-release.h \
build/msvc8/config.h \
build/msvc8/simage1_install.vcproj \
build/msvc9/config-debug.h \
build/msvc9/simage1.sln \
build/msvc9/simage1_uninstall.vcproj \
build/msvc9/include/simage.h \
build/msvc9/simage1.vcproj \
build/msvc9/config-release.h \
build/msvc9/config.h \
build/msvc9/simage1_install.vcproj \
build/misc/create-directories.bat \
build/misc/install-headers.bat \
build/misc/uninstall-headers.bat \
build/misc/README.GDI+ \
build/misc/install-sdk.bat \
build/misc/uninstall-sdk.bat \
docs/announcement-1_6_0.txt \
docs/announcement-1_6_1.txt \
docs/simage.doxygen.in \
docs/doxygen/header.html \
docs/doxygen/footer.html \
docs/doxygen/stylesheet.css \
docs/doxygen/Coin_logo.png
src/simage_jpeg_reader.icc \
src/simage_jpeg_writer.icc \
README.WIN32
DISTCLEANFILES = \
libtool \
simage-@CONFIG@.cfg
simage-@CONFIG@.cfg \
docs/simage.doxygen
simage-@CONFIG@.cfg: config.status $(srcdir)/simage.cfg.in
@$(SHELL) config.status --file=$@:simage.cfg.in
......@@ -91,6 +110,25 @@ install-exec-local: $(srcdir)/cfg/wrapmsvc.exe
# **************************************************************************
docs/simage.doxygen: $(srcdir)/docs/simage.doxygen.in config.status
@if test -d docs; then :; else mkdir docs; fi
@./config.status --file=$@:$@.in
@$(srcdir)/cfg/doxy4win.pl docs/simage.doxygen
doxygen-doc: built-sources
if test x"@SIMAGE_DOC_HTML@" = x"YES"; then \
mkdir -p "@simage_html_dir@"; \
else :; fi
@sim_ac_doxygen_exe@ $(top_builddir)/docs/simage.doxygen
doxygen-docs: built-sources
if test x"@SIMAGE_DOC_HTML@" = x"YES"; then \
mkdir -p "@simage_html_dir@"; \
else :; fi
@sim_ac_doxygen_exe@ $(top_builddir)/docs/simage.doxygen
# **************************************************************************
simage1_$(VERSION):
$(MAKE) VERSION=dist distdir
mv simage-dist simage1_$(VERSION)
......
This diff is collapsed.
New in v1.7.1a (so far):
New in v1.7.0 (2010-02-26):
* Added CGImage based backend on OS X.
* Added Quicktime based backend for older OS X versions.
......
NEWSFLASH
NEWSFLASH
You can now build simage the same way you build Coin, by using
Visual Studio project files you will find under one of the
......@@ -12,11 +12,11 @@ Building the simage library on the Microsoft Windows platform
You can build the simage library in two ways:
1. Using Cygwin[1]
2. Using the Visual C++ project file and workspace
that is part of the "Coin3D for Windows"
installation package. See <URL:http://www.coin3d.org>
for more details.
1. Using Cygwin[1]
2. Using the Visual C++ project file and workspace
that is part of the "Coin3D for Windows"
installation package. See <URL:http://www.coin3d.org>
for more details.
Both alternatives require Visual C++ version 6.0 or newer.
......@@ -40,8 +40,8 @@ Make sure you have the latest version of Cygwin.
Open a bash shell and configure and build the same way as you would on
UNIX-based systems, i.e.
$ [srcdir]/configure
$ make install
$ [srcdir]/configure
$ make install
Note that if you encounter any problems when trying to build on
......
This diff is collapsed.
......@@ -45,7 +45,7 @@ AppName=simage
AppExe=
AppExeFile=
Version=@VERSION@
Company=Systems in Motion
Company=Kongsberg Oil & Gas Technologies
Title=simage
TitleType=1
BackgrndBmp=
......
......@@ -21,10 +21,10 @@ Summary: Tiny library for loading texture bitmaps.
Name: simage
Version: @VERSION@
Release: @simage_configure_date@
Copyright: Public Domain
Copyright: BSD License
Group: Development/Libraries
URL: http://www.coin3d.org
Vendor: Systems in Motion
Vendor: Kongsberg Oil & Gas Technologies
Packager: Morten Eriksen <mortene@sim.no>
%description
......@@ -38,11 +38,10 @@ PIC and TARGA. simage is used by the Coin 3D library.
%prep
cd $RPM_SOURCE_DIR
export CVSROOT=:pserver:cvs@cvs.sim.no:/export/cvsroot
if test ! -d simage; then
cvs checkout -P simage
if test ! -d Coin; then
hg clone http://hg.sim.no/simage/default simage
else
cvs update -dP simage
hg -Rsimage pull -u
fi
......@@ -57,7 +56,7 @@ rm -f ./config.cache
# The options must cover the set of install-directories in the %files section.
$RPM_SOURCE_DIR/simage/configure \
--bindir=@bindir@ --includedir=@includedir@ \
--libdir=@libdir@ --datadir=@datadir@
--libdir=@libdir@ --datadir=@datarootdir@
make
......@@ -75,7 +74,7 @@ make install-strip
@libdir@/libsimage.so.@LT_CURRENT@.@LT_AGE@.@LT_REVISION@
@libdir@/libsimage.la
@libdir@/libsimage.so
@datadir@/aclocal/simage.m4
@datarootdir@/aclocal/simage.m4
%clean
......
This diff is collapsed.
This diff is collapsed.
#! /usr/bin/perl -p -i.bak
sub cygpath {
$path=`CYGWIN= cygpath -w "$_[0]"`;
chop($path);
$path;
}
s/\<PATH\>([^ ]*)/&cygpath($1)/eg;
s/^HTML_OUTPUT.*/HTML_OUTPUT = html/;
s/^MAN_OUTPUT.*/MAN_OUTPUT = man/;
This diff is collapsed.
......@@ -78,6 +78,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
/* Define to the home page for this package. */
#undef PACKAGE_URL
/* Define to the version of this package. */
#undef PACKAGE_VERSION
......
This diff is collapsed.
......@@ -3,8 +3,8 @@
m4_define([SIMAGE_MAJOR], [1])
m4_define([SIMAGE_MINOR], [7])
m4_define([SIMAGE_MICRO], [0])
m4_define([SIMAGE_BETA], [])
m4_define([SIMAGE_MICRO], [1])
m4_define([SIMAGE_BETA], [a])
m4_define([SIMAGE_VERSION_STRING],
[SIMAGE_MAJOR.SIMAGE_MINOR.SIMAGE_MICRO[]SIMAGE_BETA])
......@@ -220,6 +220,76 @@ AC_SUBST([SIMAGE_EXTRA_CFLAGS], [])
AC_SUBST([SIMAGE_EXTRA_LDFLAGS], [$LDFLAGS])
AC_SUBST([SIMAGE_EXTRA_LIBS], [$LIBS])
test "x$prefix" = xNONE && prefix=$ac_default_prefix
# *******************************************************************
# disable build if you just want to generate doc.
sim_ac_build_library=true
AC_ARG_ENABLE(
[build],
[AC_HELP_STRING([--disable-build], [disable configuration for library build])],
[case $enableval in
no | false)
sim_ac_build_library=false
SIM_AC_CONFIGURATION_SETTING([Simage build type], [build disabled])
;;
esac])
AM_CONDITIONAL(BUILD_LIBRARY, $sim_ac_build_library)
# *******************************************************************
# * Do we want to build the documentation?
# *******************************************************************
AC_ARG_ENABLE(html,
AC_HELP_STRING([--enable-html], [build and install Simage HTML documentation]),
[case $enableval in
yes | true) want_html=yes ;;
*) want_html=no ;;
esac],
[want_html=no])
case $htmldir in
/*)
# do nothing - absolute path
;;
*)
# expand $docdir and append /html
htmldir=`eval echo ${docdir}`/html
;;
esac
AC_SUBST(htmldir)
# Used in the Doxygen parameter file.
AC_SUBST([SIMAGE_DOC_HTML], [`echo $want_html | tr '[a-z]' '[A-Z]'`])
AC_SUBST([simage_html_dir], [`pwd`/html])
AM_CONDITIONAL(BUILD_HTMLPAGES, test x"$want_html" = x"yes")
if test x"$want_html" = x"yes"; then
SIM_AC_DOXYGEN_TOOL([], [SIM_AC_ERROR([no-doxygen])])
# Perl is used for the Doxygen-based doc generation
AC_PATH_PROG(sim_ac_perl_exe, perl, false, $PATH)
if test x"$sim_ac_perl_exe" = xfalse; then
AC_MSG_ERROR([Could not find the Perl executable, which is needed for Doxygen doc generation.])
fi
SIM_AC_CONFIGURATION_SETTING([HTML installation], [$htmldir])
fi
# path_tag is used to identify paths in docs/coin.doxygen that needs to be
# transformed using cygpath under cygwin.
case $host in
*-cygwin) path_tag="<PATH>" ;;
*) path_tag= ;;
esac
AC_SUBST(path_tag)
# Make it possible for the user to turn off optimization flags
SIM_AC_COMPILER_OPTIMIZATION
SIM_AC_COMPILE_DEBUG([
CPPFLAGS="$CPPFLAGS -DSIMAGE_DEBUG=1"
], [
......@@ -885,19 +955,19 @@ if $BUILD_WITH_MSVC; then
if $SIMAGE_STATIC; then
LIBFLAGS="-LIB $LIBFLAGS"
LIBFLAGS="$LIBFLAGS /OUT:simage$SIMAGE_MAJOR_VERSION$SUFFIX.lib"
SIM_AC_CONFIGURATION_SETTING([Simage Build Type], [Static .LIB])
SIM_AC_CONFIGURATION_SETTING([Simage build type], [Static .LIB])
else
LIBFLAGS="-DLL /INCREMENTAL:NO $LIBFLAGS"
case $enable_symbols in
no | false)
LIBFLAGS="$LIBFLAGS /RELEASE"
SIM_AC_CONFIGURATION_SETTING([Simage Build Type], [Dynamic .DLL])
SIM_AC_CONFIGURATION_SETTING([Simage build type], [Dynamic .DLL])
;;
*)
CFLAGS="/Fd$debugfile $CFLAGS"
CXXFLAGS="/Fd$debugfile $CXXFLAGS"
LIBFLAGS="$LIBFLAGS /DEBUG /PDB:simage$SIMAGE_MAJOR_VERSION$SUFFIX.pdb"
SIM_AC_CONFIGURATION_SETTING([Simage Build Type], [Dynamic .DLL + .PDB])
SIM_AC_CONFIGURATION_SETTING([Simage build type], [Dynamic .DLL + .PDB])
;;
esac
LIBFLAGS="$LIBFLAGS /OUT:simage$SIMAGE_MAJOR_VERSION$SUFFIX.dll"
......@@ -949,13 +1019,14 @@ AC_SUBST([ac_compiler_gnu])
simage_build_dir=`pwd`
simage_src_dir=`cd "$srcdir"; pwd`
AC_SUBST([simage_build_dir])
AC_SUBST([simage_src_dir])
SIM_AC_MSVC_DSP_SETUP([SIMAGE], [simage], [simage], [-I$simage_build_dir/include -I$simage_src_dir/include])
# **************************************************************************
AM_CONFIG_HEADER([config.h include/simage.h])
AM_CONFIG_HEADER([config.h])
AC_CONFIG_FILES([
simage.pc
......@@ -963,6 +1034,7 @@ AC_CONFIG_FILES([
src/Makefile
guile/Makefile
mpeg2enc/Makefile
html/Makefile
build/simage.spec
])
......
<hr noshade>
<p align="right">Copyright &copy by <a href="http://www.kongsberg.com/kogt">Kongsberg Oil & Gas Technologies</a>. All rights reserved.</p>
<address style="align: right;"><small>
Generated on $datetime for $projectname by <a href="http://www.doxygen.org/">Doxygen</a> $doxygenversion.</small></address>
</body>
</html>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
<title>$title</title>
<link href="stylesheet.css" rel="stylesheet" type="text/css">
</head><body><table width="100%">
<tr>
<td>
<img src="Coin_logo.png" alt="Coin Logo">
</td>
<td align="right">
<a href="http://www.coin3d.org/">http://www.coin3d.org/</a><br />
<a href="http://www.kongsberg.com/kogt/">http://www.kongsberg.com/kogt/</a><br />
</td>
</tr>
</table>
<hr noshade />
BODY,H1,H2,H3,H4,H5,H6,P,CENTER,TD,TH,UL,DL,DIV {
font-family: Geneva, Arial, Helvetica, sans-serif;
}
BODY,TD {
font-size: 90%;
}
H1 {
text-align: center;
font-size: 160%;
}
H2 {
font-size: 120%;
}
H3 {
font-size: 100%;
}
IMG {
border: 0;
}
CAPTION { font-weight: bold }
DIV.qindex {
width: 100%;
background-color: #e8eef2;
border: 1px solid #84b0c7;
text-align: center;
margin: 2px;
padding: 2px;
line-height: 140%;
}
DIV.nav {
width: 100%;
background-color: #e8eef2;
border: 1px solid #84b0c7;
text-align: center;
margin: 2px;
padding: 2px;
line-height: 140%;
}
DIV.navtab {
background-color: #e8eef2;
border: 1px solid #84b0c7;
text-align: center;
margin: 2px;
margin-right: 15px;
padding: 2px;
}
TD.navtab {
font-size: 70%;
}
A.qindex {
text-decoration: none;
font-weight: bold;
color: #1A419D;
}
A.qindex:visited {
text-decoration: none;
font-weight: bold;
color: #1A419D
}
A.qindex:hover {
text-decoration: none;
background-color: #ddddff;
}
A.qindexHL {
text-decoration: none;
font-weight: bold;
background-color: #6666cc;
color: #ffffff;
border: 1px double #9295C2;
}
A.qindexHL:hover {
text-decoration: none;
background-color: #6666cc;
color: #ffffff;
}
A.qindexHL:visited { text-decoration: none; background-color: #6666cc; color: #ffffff }
A.el { text-decoration: none; font-weight: bold }
A.elRef { font-weight: bold }
A.code:link { text-decoration: none; font-weight: normal; color: #0000FF}
A.code:visited { text-decoration: none; font-weight: normal; color: #0000FF}
A.codeRef:link { font-weight: normal; color: #0000FF}
A.codeRef:visited { font-weight: normal; color: #0000FF}
A:hover { text-decoration: none; background-color: #f2f2ff }
DL.el { margin-left: -1cm }
.fragment {
font-family: monospace, fixed;
font-size: 95%;
}
PRE.fragment {
border: 1px solid #CCCCCC;
background-color: #f5f5f5;
margin-top: 4px;
margin-bottom: 4px;
margin-left: 2px;
margin-right: 8px;
padding-left: 6px;
padding-right: 6px;
padding-top: 4px;
padding-bottom: 4px;
}
DIV.ah { background-color: black; font-weight: bold; color: #ffffff; margin-bottom: 3px; margin-top: 3px }
DIV.groupHeader {
margin-left: 16px;
margin-top: 12px;
margin-bottom: 6px;
font-weight: bold;
}
DIV.groupText { margin-left: 16px; font-style: italic; font-size: 90% }
BODY {
background: white;
color: black;
margin-right: 20px;
margin-left: 20px;
}
TD.indexkey {
background-color: #e8eef2;
font-weight: bold;
padding-right : 10px;
padding-top : 2px;
padding-left : 10px;
padding-bottom : 2px;
margin-left : 0px;
margin-right : 0px;
margin-top : 2px;
margin-bottom : 2px;
border: 1px solid #CCCCCC;
}
TD.indexvalue {
background-color: #e8eef2;
font-style: italic;
padding-right : 10px;
padding-top : 2px;
padding-left : 10px;
padding-bottom : 2px;
margin-left : 0px;
margin-right : 0px;
margin-top : 2px;
margin-bottom : 2px;
border: 1px solid #CCCCCC;
}
TR.memlist {
background-color: #f0f0f0;
}
P.formulaDsp { text-align: center; }
IMG.formulaDsp { }
IMG.formulaInl { vertical-align: middle; }
SPAN.keyword { color: #008000 }
SPAN.keywordtype { color: #604020 }
SPAN.keywordflow { color: #e08000 }
SPAN.comment { color: #800000 }
SPAN.preprocessor { color: #806020 }
SPAN.stringliteral { color: #002080 }
SPAN.charliteral { color: #008080 }