Update of /cvsroot/dirac/compress/libdirac_common
In directory
sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv28533/libdirac_com
mon
Modified Files:
Makefile.am
Added Files:
dirac_inttypes.h
Log Message:
Use autoconf macro AX_CREATE_STDINT_H to create a local
stdint file because
different versions of gcc have the "ISO C9X: 7.18
Integer types" in different
header files. MS VC++ does not define these types so
manually typedef the
ones used in Dirac (int64_t and uint64_t) to MSVC++ types.
Index: Makefile.am
============================================================
=======
RCS file:
/cvsroot/dirac/compress/libdirac_common/Makefile.am,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** Makefile.am 31 Jan 2008 11:25:15 -0000 1.18
--- Makefile.am 6 May 2008 09:35:51 -0000 1.19
***************
*** 2,6 ****
#
! INCLUDES = -I$(top_srcdir) -I$(srcdir)
h_sources = arith_codec.h arrays.h band_codec.h
band_vlc.h
--- 2,8 ----
#
! DISTCLEANFILES = dirac-stdint.h
!
! INCLUDES = -I$(top_srcdir) -I$(srcdir) -I$(top_builddir)
h_sources = arith_codec.h arrays.h band_codec.h
band_vlc.h
***************
*** 8,12 ****
mot_comp.h motion.h mv_codec.h pic_io.h
upconvert.h
wavelet_utils.h cmd_line.h dirac_assertions.h
dirac_types.h
! mot_comp_mmx.h video_format_defaults.h
dirac_exception.h
cpp_sources = arith_codec.cpp band_codec.cpp band_vlc.cpp
common.cpp
--- 10,15 ----
mot_comp.h motion.h mv_codec.h pic_io.h
upconvert.h
wavelet_utils.h cmd_line.h dirac_assertions.h
dirac_types.h
! mot_comp_mmx.h video_format_defaults.h
dirac_exception.h
! dirac-stdint.h
cpp_sources = arith_codec.cpp band_codec.cpp band_vlc.cpp
common.cpp
***************
*** 31,35 ****
library_includedir=$(includedir)/$(GENERIC_LIBRARY_NAME)/lib
dirac_common
! library_include_HEADERS = common_types.h dirac_types.h
if USE_MSVC
--- 34,38 ----
library_includedir=$(includedir)/$(GENERIC_LIBRARY_NAME)/lib
dirac_common
! library_include_HEADERS = common_types.h dirac_inttypes.h
dirac-stdint.h dirac_types.h
if USE_MSVC
--- NEW FILE: dirac_inttypes.h ---
/* ***** BEGIN LICENSE BLOCK *****
*
* $Id: dirac_inttypes.h,v 1.1 2008/05/06 09:35:51
asuraparaju Exp $ $Name: $
*
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla
Public License
* Version 1.1 (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.mozilla.org/MP
L/
*
* Software distributed under the License is distributed on
an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied.
See the License for
* the specific language governing rights and limitations
under the License.
*
* The Original Code is BBC Research and Development code.
*
* The Initial Developer of the Original Code is the British
Broadcasting
* Corporation.
* Portions created by the Initial Developer are Copyright
(C) 2004.
* All Rights Reserved.
*
* Contributor(s): Anuradha Suraparaju (Original Author)
*
* Alternatively, the contents of this file may be used under
the terms of
* the GNU General Public License Version 2 (the
"GPL"), or the GNU Lesser
* Public License Version 2.1 (the "LGPL"), in
which case the provisions of
* the GPL or the LGPL are applicable instead of those above.
If you wish to
* allow use of your version of this file only under the
terms of the either
* the GPL or LGPL and not to allow others to use your
version of this file
* under the MPL, indicate your decision by deleting the
provisions above
* and replace them with the notice and other provisions
required by the GPL
* or LGPL. If you do not delete the provisions above, a
recipient may use
* your version of this file under the terms of any one of
the MPL, the GPL
* or the LGPL.
* ***** END LICENSE BLOCK ***** */
#ifndef DIRAC_INTTYPES_H
#define DIRAC_INTTYPES_H
#ifndef _MSC_VER
#include <libdirac_common/dirac-stdint.h>
#else
typedef __int64 int64_t;
typedef unsigned __int64 uint64_t;
#endif //_MSC_VER
#endif //DIRAC_INTTYPES_H
------------------------------------------------------------
-------------
This SF.net email is sponsored by the 2008 JavaOne(SM)
Conference
Don't miss this year's exciting event. There's still time to
save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;1987
57673;13503038;p?http://java.sun.com/javaone
_______________________________________________
Dirac-commits mailing list
Dirac-commits lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dirac-com
mits
|