mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2025-05-27 13:10:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove CMake check for sizeof(long).

Browse Source
This commit is contained in:
Tsuda Kageyu 2014-12-09 08:55:46 +09:00
parent 0e6d8617ae
commit 0731bc7b2e
3 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ConfigureChecks.cmake
View File

@ -20,11 +20,6 @@ if(NOT ${SIZEOF_INT} EQUAL 4)
MESSAGE(FATAL_ERROR "TagLib requires that int is 32-bit wide.")
endif()
check_type_size("long" SIZEOF_LONG)
if(${SIZEOF_LONG} EQUAL 8)
set(LONG_IS_INT64 1)
endif()
check_type_size("long long" SIZEOF_LONGLONG)
if(NOT ${SIZEOF_LONGLONG} EQUAL 8)
MESSAGE(FATAL_ERROR "TagLib requires that long long is 64-bit wide.")

3
config.h.cmake
View File

@ -8,9 +8,6 @@
/* 1 if little-endian, 2 if big-endian. */
#cmakedefine FLOAT_BYTEORDER ${FLOAT_BYTEORDER}
/* Defined if long is 64-bit wide */
#cmakedefine LONG_IS_INT64 ${LONG_IS_INT64}
/* Defined if your compiler supports some byte swap functions */
#cmakedefine HAVE_GCC_BYTESWAP_16 1
#cmakedefine HAVE_GCC_BYTESWAP_32 1

15
taglib/mp4/mp4atom.cpp
View File

@ -56,20 +56,21 @@ MP4::Atom::Atom(File *file)
if(length == 1) {
const long long longLength = file->readBlock(8).toLongLong();
#ifdef LONG_IS_INT64
length = longLength;
#else
if(longLength <= 0xFFFFFFFF) {
// The atom has a 64-bit length, but it's actually a 32-bit value
length = (long)longLength;
if(sizeof(long) == sizeof(long long)) {
length = longLength;
}
else {
if(longLength <= 0xFFFFFFFF) {
// The atom has a 64-bit length, but it's actually a 32-bit value
length = (long)longLength;
}
else {
debug("MP4: 64-bit atoms are not supported");
length = 0;
file->seek(0, File::End);
return;
}
}
#endif
}
if(length < 8) {
debug("MP4: Invalid atom size");