eessppeelllloo/frei0r
1
0
Fork 0
mirror of https://github.com/dyne/frei0r.git synced 2025-12-05 14:19:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix MSVC compilation

Browse Source 
The following filters needed to be disabled because of
Variable Length Arrays (VLA), but are enabled when
compiling with clang-cl:

* curves
* d90stairsteppingfix
* dither
This commit is contained in:
Peter Eszlari
2021-02-20 11:21:09 +01:00
committed by Jaromil
parent a9d15ff07e
commit db45e9320b
88 changed files with 72 additions and 691 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@@ -33,3 +33,7 @@ TAGS
ylwrap
frei0r.pc
doc/html
/build/
/out/
/.vs/
CMakeSettings.json

9
CMakeLists.txt
View File

@@ -1,11 +1,12 @@
cmake_minimum_required (VERSION 2.8)
include(GNUInstallDirs)
cmake_minimum_required (VERSION 3.0)
list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
project (frei0r)
set (VERSION 1.8)
include(GNUInstallDirs)
option (WITHOUT_OPENCV "Disable plugins dependent upon OpenCV" OFF)
if (NOT WITHOUT_OPENCV)
find_package (OpenCV)
@@ -21,10 +22,6 @@ endif ()
include_directories (AFTER include)
if (MSVC)
include_directories (include/msvc)
endif (MSVC)
if (NOT CMAKE_BUILD_TYPE)
set (CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING
"Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel."

6
cmake/modules/LibFindMacros.cmake
View File

@@ -79,12 +79,6 @@ endmacro (libfind_process)
macro(libfind_library PREFIX basename)
set(TMP "")
if(MSVC80)
set(TMP -vc80)
endif(MSVC80)
if(MSVC90)
set(TMP -vc90)
endif(MSVC90)
set(${PREFIX}_LIBNAMES ${basename}${TMP})
if(${ARGC} GREATER 2)
set(${PREFIX}_LIBNAMES ${basename}${TMP}-${ARGV2})

305
include/msvc/inttypes.h
View File

@@ -1,305 +0,0 @@
// ISO C9x compliant inttypes.h for Microsoft Visual Studio
// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124
//
// Copyright (c) 2006 Alexander Chemeris
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
//
// 1. Redistributions of source code must retain the above copyright notice,
// this list of conditions and the following disclaimer.
//
// 2. Redistributions in binary form must reproduce the above copyright
// notice, this list of conditions and the following disclaimer in the
// documentation and/or other materials provided with the distribution.
//
// 3. The name of the author may be used to endorse or promote products
// derived from this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//
///////////////////////////////////////////////////////////////////////////////
#ifndef _MSC_VER // [
#error "Use this header only with Microsoft Visual C++ compilers!"
#endif // _MSC_VER ]
#ifndef _MSC_INTTYPES_H_ // [
#define _MSC_INTTYPES_H_
#if _MSC_VER > 1000
#pragma once
#endif
#include "stdint.h"
// 7.8 Format conversion of integer types
typedef struct {
intmax_t quot;
intmax_t rem;
} imaxdiv_t;
// 7.8.1 Macros for format specifiers
#if !defined(__cplusplus) || defined(__STDC_FORMAT_MACROS) // [ See footnote 185 at page 198
// The fprintf macros for signed integers are:
#define PRId8 "d"
#define PRIi8 "i"
#define PRIdLEAST8 "d"
#define PRIiLEAST8 "i"
#define PRIdFAST8 "d"
#define PRIiFAST8 "i"
#define PRId16 "hd"
#define PRIi16 "hi"
#define PRIdLEAST16 "hd"
#define PRIiLEAST16 "hi"
#define PRIdFAST16 "hd"
#define PRIiFAST16 "hi"
#define PRId32 "I32d"
#define PRIi32 "I32i"
#define PRIdLEAST32 "I32d"
#define PRIiLEAST32 "I32i"
#define PRIdFAST32 "I32d"
#define PRIiFAST32 "I32i"
#define PRId64 "I64d"
#define PRIi64 "I64i"
#define PRIdLEAST64 "I64d"
#define PRIiLEAST64 "I64i"
#define PRIdFAST64 "I64d"
#define PRIiFAST64 "I64i"
#define PRIdMAX "I64d"
#define PRIiMAX "I64i"
#define PRIdPTR "Id"
#define PRIiPTR "Ii"
// The fprintf macros for unsigned integers are:
#define PRIo8 "o"
#define PRIu8 "u"
#define PRIx8 "x"
#define PRIX8 "X"
#define PRIoLEAST8 "o"
#define PRIuLEAST8 "u"
#define PRIxLEAST8 "x"
#define PRIXLEAST8 "X"
#define PRIoFAST8 "o"
#define PRIuFAST8 "u"
#define PRIxFAST8 "x"
#define PRIXFAST8 "X"
#define PRIo16 "ho"
#define PRIu16 "hu"
#define PRIx16 "hx"
#define PRIX16 "hX"
#define PRIoLEAST16 "ho"
#define PRIuLEAST16 "hu"
#define PRIxLEAST16 "hx"
#define PRIXLEAST16 "hX"
#define PRIoFAST16 "ho"
#define PRIuFAST16 "hu"
#define PRIxFAST16 "hx"
#define PRIXFAST16 "hX"
#define PRIo32 "I32o"
#define PRIu32 "I32u"
#define PRIx32 "I32x"
#define PRIX32 "I32X"
#define PRIoLEAST32 "I32o"
#define PRIuLEAST32 "I32u"
#define PRIxLEAST32 "I32x"
#define PRIXLEAST32 "I32X"
#define PRIoFAST32 "I32o"
#define PRIuFAST32 "I32u"
#define PRIxFAST32 "I32x"
#define PRIXFAST32 "I32X"
#define PRIo64 "I64o"
#define PRIu64 "I64u"
#define PRIx64 "I64x"
#define PRIX64 "I64X"
#define PRIoLEAST64 "I64o"
#define PRIuLEAST64 "I64u"
#define PRIxLEAST64 "I64x"
#define PRIXLEAST64 "I64X"
#define PRIoFAST64 "I64o"
#define PRIuFAST64 "I64u"
#define PRIxFAST64 "I64x"
#define PRIXFAST64 "I64X"
#define PRIoMAX "I64o"
#define PRIuMAX "I64u"
#define PRIxMAX "I64x"
#define PRIXMAX "I64X"
#define PRIoPTR "Io"
#define PRIuPTR "Iu"
#define PRIxPTR "Ix"
#define PRIXPTR "IX"
// The fscanf macros for signed integers are:
#define SCNd8 "d"
#define SCNi8 "i"
#define SCNdLEAST8 "d"
#define SCNiLEAST8 "i"
#define SCNdFAST8 "d"
#define SCNiFAST8 "i"
#define SCNd16 "hd"
#define SCNi16 "hi"
#define SCNdLEAST16 "hd"
#define SCNiLEAST16 "hi"
#define SCNdFAST16 "hd"
#define SCNiFAST16 "hi"
#define SCNd32 "ld"
#define SCNi32 "li"
#define SCNdLEAST32 "ld"
#define SCNiLEAST32 "li"
#define SCNdFAST32 "ld"
#define SCNiFAST32 "li"
#define SCNd64 "I64d"
#define SCNi64 "I64i"
#define SCNdLEAST64 "I64d"
#define SCNiLEAST64 "I64i"
#define SCNdFAST64 "I64d"
#define SCNiFAST64 "I64i"
#define SCNdMAX "I64d"
#define SCNiMAX "I64i"
#ifdef _WIN64 // [
# define SCNdPTR "I64d"
# define SCNiPTR "I64i"
#else // _WIN64 ][
# define SCNdPTR "ld"
# define SCNiPTR "li"
#endif // _WIN64 ]
// The fscanf macros for unsigned integers are:
#define SCNo8 "o"
#define SCNu8 "u"
#define SCNx8 "x"
#define SCNX8 "X"
#define SCNoLEAST8 "o"
#define SCNuLEAST8 "u"
#define SCNxLEAST8 "x"
#define SCNXLEAST8 "X"
#define SCNoFAST8 "o"
#define SCNuFAST8 "u"
#define SCNxFAST8 "x"
#define SCNXFAST8 "X"
#define SCNo16 "ho"
#define SCNu16 "hu"
#define SCNx16 "hx"
#define SCNX16 "hX"
#define SCNoLEAST16 "ho"
#define SCNuLEAST16 "hu"
#define SCNxLEAST16 "hx"
#define SCNXLEAST16 "hX"
#define SCNoFAST16 "ho"
#define SCNuFAST16 "hu"
#define SCNxFAST16 "hx"
#define SCNXFAST16 "hX"
#define SCNo32 "lo"
#define SCNu32 "lu"
#define SCNx32 "lx"
#define SCNX32 "lX"
#define SCNoLEAST32 "lo"
#define SCNuLEAST32 "lu"
#define SCNxLEAST32 "lx"
#define SCNXLEAST32 "lX"
#define SCNoFAST32 "lo"
#define SCNuFAST32 "lu"
#define SCNxFAST32 "lx"
#define SCNXFAST32 "lX"
#define SCNo64 "I64o"
#define SCNu64 "I64u"
#define SCNx64 "I64x"
#define SCNX64 "I64X"
#define SCNoLEAST64 "I64o"
#define SCNuLEAST64 "I64u"
#define SCNxLEAST64 "I64x"
#define SCNXLEAST64 "I64X"
#define SCNoFAST64 "I64o"
#define SCNuFAST64 "I64u"
#define SCNxFAST64 "I64x"
#define SCNXFAST64 "I64X"
#define SCNoMAX "I64o"
#define SCNuMAX "I64u"
#define SCNxMAX "I64x"
#define SCNXMAX "I64X"
#ifdef _WIN64 // [
# define SCNoPTR "I64o"
# define SCNuPTR "I64u"
# define SCNxPTR "I64x"
# define SCNXPTR "I64X"
#else // _WIN64 ][
# define SCNoPTR "lo"
# define SCNuPTR "lu"
# define SCNxPTR "lx"
# define SCNXPTR "lX"
#endif // _WIN64 ]
#endif // __STDC_FORMAT_MACROS ]
// 7.8.2 Functions for greatest-width integer types
// 7.8.2.1 The imaxabs function
#define imaxabs _abs64
// 7.8.2.2 The imaxdiv function
// This is modified version of div() function from Microsoft's div.c found
// in %MSVC.NET%\crt\src\div.c
#ifdef STATIC_IMAXDIV // [
static
#else // STATIC_IMAXDIV ][
_inline
#endif // STATIC_IMAXDIV ]
imaxdiv_t __cdecl imaxdiv(intmax_t numer, intmax_t denom)
{
imaxdiv_t result;
result.quot = numer / denom;
result.rem = numer % denom;
if (numer < 0 && result.rem > 0) {
// did division wrong; must fix up
++result.quot;
result.rem -= denom;
}
return result;
}
// 7.8.2.3 The strtoimax and strtoumax functions
#define strtoimax _strtoi64
#define strtoumax _strtoui64
// 7.8.2.4 The wcstoimax and wcstoumax functions
#define wcstoimax _wcstoi64
#define wcstoumax _wcstoui64
#endif // _MSC_INTTYPES_H_ ]

247
include/msvc/stdint.h
View File

@@ -1,247 +0,0 @@
// ISO C9x compliant stdint.h for Microsoft Visual Studio
// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124
//
// Copyright (c) 2006-2008 Alexander Chemeris
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
//
// 1. Redistributions of source code must retain the above copyright notice,
// this list of conditions and the following disclaimer.
//
// 2. Redistributions in binary form must reproduce the above copyright
// notice, this list of conditions and the following disclaimer in the
// documentation and/or other materials provided with the distribution.
//
// 3. The name of the author may be used to endorse or promote products
// derived from this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//
///////////////////////////////////////////////////////////////////////////////
#ifndef _MSC_VER // [
#error "Use this header only with Microsoft Visual C++ compilers!"
#endif // _MSC_VER ]
#ifndef _MSC_STDINT_H_ // [
#define _MSC_STDINT_H_
#if _MSC_VER > 1000
#pragma once
#endif
#include <limits.h>
// For Visual Studio 6 in C++ mode and for many Visual Studio versions when
// compiling for ARM we should wrap <wchar.h> include with 'extern "C++" {}'
// or compiler give many errors like this:
// error C2733: second C linkage of overloaded function 'wmemchr' not allowed
#ifdef __cplusplus
extern "C" {
#endif
# include <wchar.h>
#ifdef __cplusplus
}
#endif
// Define _W64 macros to mark types changing their size, like intptr_t.
#ifndef _W64
# if !defined(__midl) && (defined(_X86_) || defined(_M_IX86)) && _MSC_VER >= 1300
# define _W64 __w64
# else
# define _W64
# endif
#endif
// 7.18.1 Integer types
// 7.18.1.1 Exact-width integer types
// Visual Studio 6 and Embedded Visual C++ 4 doesn't
// realize that, e.g. char has the same size as __int8
// so we give up on __intX for them.
#if (_MSC_VER < 1300)
typedef signed char int8_t;
typedef signed short int16_t;
typedef signed int int32_t;
typedef unsigned char uint8_t;
typedef unsigned short uint16_t;
typedef unsigned int uint32_t;
#else
typedef signed __int8 int8_t;
typedef signed __int16 int16_t;
typedef signed __int32 int32_t;
typedef unsigned __int8 uint8_t;
typedef unsigned __int16 uint16_t;
typedef unsigned __int32 uint32_t;
#endif
typedef signed __int64 int64_t;
typedef unsigned __int64 uint64_t;
// 7.18.1.2 Minimum-width integer types
typedef int8_t int_least8_t;
typedef int16_t int_least16_t;
typedef int32_t int_least32_t;
typedef int64_t int_least64_t;
typedef uint8_t uint_least8_t;
typedef uint16_t uint_least16_t;
typedef uint32_t uint_least32_t;
typedef uint64_t uint_least64_t;
// 7.18.1.3 Fastest minimum-width integer types
typedef int8_t int_fast8_t;
typedef int16_t int_fast16_t;
typedef int32_t int_fast32_t;
typedef int64_t int_fast64_t;
typedef uint8_t uint_fast8_t;
typedef uint16_t uint_fast16_t;
typedef uint32_t uint_fast32_t;
typedef uint64_t uint_fast64_t;
// 7.18.1.4 Integer types capable of holding object pointers
#ifdef _WIN64 // [
typedef signed __int64 intptr_t;
typedef unsigned __int64 uintptr_t;
#else // _WIN64 ][
typedef _W64 signed int intptr_t;
typedef _W64 unsigned int uintptr_t;
#endif // _WIN64 ]
// 7.18.1.5 Greatest-width integer types
typedef int64_t intmax_t;
typedef uint64_t uintmax_t;
// 7.18.2 Limits of specified-width integer types
#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) // [ See footnote 220 at page 257 and footnote 221 at page 259
// 7.18.2.1 Limits of exact-width integer types
#define INT8_MIN ((int8_t)_I8_MIN)
#define INT8_MAX _I8_MAX
#define INT16_MIN ((int16_t)_I16_MIN)
#define INT16_MAX _I16_MAX
#define INT32_MIN ((int32_t)_I32_MIN)
#define INT32_MAX _I32_MAX
#define INT64_MIN ((int64_t)_I64_MIN)
#define INT64_MAX _I64_MAX
#define UINT8_MAX _UI8_MAX
#define UINT16_MAX _UI16_MAX
#define UINT32_MAX _UI32_MAX
#define UINT64_MAX _UI64_MAX
// 7.18.2.2 Limits of minimum-width integer types
#define INT_LEAST8_MIN INT8_MIN
#define INT_LEAST8_MAX INT8_MAX
#define INT_LEAST16_MIN INT16_MIN
#define INT_LEAST16_MAX INT16_MAX
#define INT_LEAST32_MIN INT32_MIN
#define INT_LEAST32_MAX INT32_MAX
#define INT_LEAST64_MIN INT64_MIN
#define INT_LEAST64_MAX INT64_MAX
#define UINT_LEAST8_MAX UINT8_MAX
#define UINT_LEAST16_MAX UINT16_MAX
#define UINT_LEAST32_MAX UINT32_MAX
#define UINT_LEAST64_MAX UINT64_MAX
// 7.18.2.3 Limits of fastest minimum-width integer types
#define INT_FAST8_MIN INT8_MIN
#define INT_FAST8_MAX INT8_MAX
#define INT_FAST16_MIN INT16_MIN
#define INT_FAST16_MAX INT16_MAX
#define INT_FAST32_MIN INT32_MIN
#define INT_FAST32_MAX INT32_MAX
#define INT_FAST64_MIN INT64_MIN
#define INT_FAST64_MAX INT64_MAX
#define UINT_FAST8_MAX UINT8_MAX
#define UINT_FAST16_MAX UINT16_MAX
#define UINT_FAST32_MAX UINT32_MAX
#define UINT_FAST64_MAX UINT64_MAX
// 7.18.2.4 Limits of integer types capable of holding object pointers
#ifdef _WIN64 // [
# define INTPTR_MIN INT64_MIN
# define INTPTR_MAX INT64_MAX
# define UINTPTR_MAX UINT64_MAX
#else // _WIN64 ][
# define INTPTR_MIN INT32_MIN
# define INTPTR_MAX INT32_MAX
# define UINTPTR_MAX UINT32_MAX
#endif // _WIN64 ]
// 7.18.2.5 Limits of greatest-width integer types
#define INTMAX_MIN INT64_MIN
#define INTMAX_MAX INT64_MAX
#define UINTMAX_MAX UINT64_MAX
// 7.18.3 Limits of other integer types
#ifdef _WIN64 // [
# define PTRDIFF_MIN _I64_MIN
# define PTRDIFF_MAX _I64_MAX
#else // _WIN64 ][
# define PTRDIFF_MIN _I32_MIN
# define PTRDIFF_MAX _I32_MAX
#endif // _WIN64 ]
#define SIG_ATOMIC_MIN INT_MIN
#define SIG_ATOMIC_MAX INT_MAX
#ifndef SIZE_MAX // [
# ifdef _WIN64 // [
# define SIZE_MAX _UI64_MAX
# else // _WIN64 ][
# define SIZE_MAX _UI32_MAX
# endif // _WIN64 ]
#endif // SIZE_MAX ]
// WCHAR_MIN and WCHAR_MAX are also defined in <wchar.h>
#ifndef WCHAR_MIN // [
# define WCHAR_MIN 0
#endif // WCHAR_MIN ]
#ifndef WCHAR_MAX // [
# define WCHAR_MAX _UI16_MAX
#endif // WCHAR_MAX ]
#define WINT_MIN 0
#define WINT_MAX _UI16_MAX
#endif // __STDC_LIMIT_MACROS ]
// 7.18.4 Limits of other integer types
#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) // [ See footnote 224 at page 260
// 7.18.4.1 Macros for minimum-width integer constants
#define INT8_C(val) val##i8
#define INT16_C(val) val##i16
#define INT32_C(val) val##i32
#define INT64_C(val) val##i64
#define UINT8_C(val) val##ui8
#define UINT16_C(val) val##ui16
#define UINT32_C(val) val##ui32
#define UINT64_C(val) val##ui64
// 7.18.4.2 Macros for greatest-width integer constants
#define INTMAX_C INT64_C
#define UINTMAX_C UINT64_C
#endif // __STDC_CONSTANT_MACROS ]
#endif // _MSC_STDINT_H_ ]

4
src/CMakeLists.txt
View File

@@ -1,5 +1,7 @@
set (CMAKE_SHARED_LINKER_FLAGS "-Wl,--as-needed")
link_libraries(m)
if(NOT MSVC)
link_libraries(m)
endif()
add_subdirectory (filter)
add_subdirectory (generator)
add_subdirectory (mixer2)

1
src/filter/3dflippo/CMakeLists.txt
View File

@@ -2,7 +2,6 @@ set (SOURCES 3dflippo.c)
set (TARGET 3dflippo)
if (MSVC)
set_source_files_properties (3dflippo.c PROPERTIES LANGUAGE CXX)
set (SOURCES ${SOURCES} ${FREI0R_DEF})
endif (MSVC)

1
src/filter/RGB/CMakeLists.txt
View File

@@ -3,7 +3,6 @@ set (G_SOURCES G.c)
set (B_SOURCES B.c)
if (MSVC)
set_source_files_properties (R.c G.c B.c PROPERTIES LANGUAGE CXX)
set (R_SOURCES ${R_SOURCES} ${FREI0R_DEF})
set (G_SOURCES ${G_SOURCES} ${FREI0R_DEF})
set (B_SOURCES ${B_SOURCES} ${FREI0R_DEF})

9
src/filter/alpha0ps/CMakeLists.txt
View File

@@ -3,7 +3,6 @@ set (G_SOURCES alphagrad.c)
set (S_SOURCES alphaspot.c)
if (MSVC)
set_source_files_properties (alpha0ps.c alphagrad.c alphaspot.c PROPERTIES LANGUAGE CXX)
set (O_SOURCES ${O_SOURCES} ${FREI0R_DEF})
set (G_SOURCES ${G_SOURCES} ${FREI0R_DEF})
set (S_SOURCES ${S_SOURCES} ${FREI0R_DEF})
@@ -13,9 +12,11 @@ add_library (alpha0ps MODULE ${O_SOURCES})
add_library (alphagrad MODULE ${G_SOURCES})
add_library (alphaspot MODULE ${S_SOURCES})
target_link_libraries(alpha0ps -lm)
target_link_libraries(alphagrad -lm)
target_link_libraries(alphaspot -lm)
if(NOT MSVC)
target_link_libraries(alpha0ps -lm)
target_link_libraries(alphagrad -lm)
target_link_libraries(alphaspot -lm)
endif()
set_target_properties (alpha0ps PROPERTIES PREFIX "")
set_target_properties (alphagrad PROPERTIES PREFIX "")

3
src/filter/alpha0ps/alpha0ps.c
View File

@@ -380,11 +380,12 @@ float AitNev3(int t, float xt[], float yt[], float x)
{
float p[10];
int i,j,m;
float zero = 0.0f; // MSVC doesn't allow division through a zero literal, but allows it through non-const variable set to zero
if ((x<xt[0])||(x>xt[t-1]))
{
// printf("\n\n x=%f je izven mej tabele!",x);
return 1.0/0.0;
return 1.0/zero;
}
//poisce, katere tocke bo uporabil

1
src/filter/balanc0r/CMakeLists.txt
View File

@@ -2,7 +2,6 @@ set (SOURCES balanc0r.c)
set (TARGET balanc0r)
if (MSVC)
set_source_files_properties (balanc0r.c PROPERTIES LANGUAGE CXX)
set (SOURCES ${SOURCES} ${FREI0R_DEF})
endif (MSVC)

1
src/filter/bgsubtract0r/CMakeLists.txt
View File

@@ -2,7 +2,6 @@ set (SOURCES bgsubtract0r.c)
set (TARGET bgsubtract0r)
if (MSVC)
set_source_files_properties (bgsubtract0r.c PROPERTIES LANGUAGE CXX)
set (SOURCES ${SOURCES} ${FREI0R_DEF})
endif (MSVC)

5
src/filter/blur/CMakeLists.txt
View File

@@ -2,11 +2,12 @@ set (SOURCES IIRblur.c fibe.h)
set (TARGET IIRblur)
if (MSVC)
set_source_files_properties (IIRblur.c PROPERTIES LANGUAGE CXX)
set (SOURCES ${SOURCES} ${FREI0R_DEF})
endif (MSVC)
link_libraries(m)
if(NOT MSVC)
link_libraries(m)
endif()
add_library (${TARGET} MODULE ${SOURCES})
set_target_properties (${TARGET} PROPERTIES PREFIX "")

3
src/filter/blur/IIRblur.c
View File

@@ -80,11 +80,12 @@ float AitNev3(int t, float xt[], float yt[], float x)
{
float p[10];
int i,j,m;
float zero = 0.0f; // MSVC doesn't allow division through a zero literal, but allows it through non-const variable set to zero
if ((x<xt[0])||(x>xt[t-1]))
{
// printf("\n\n x=%f je izven mej tabele!",x);
return 1.0/0.0;
return 1.0/zero;
}
//poisce, katere tocke bo uporabil

1
src/filter/brightness/CMakeLists.txt
View File

@@ -2,7 +2,6 @@ set (SOURCES brightness.c)
set (TARGET brightness)
if (MSVC)
set_source_files_properties (brightness.c PROPERTIES LANGUAGE CXX)
set (SOURCES ${SOURCES} ${FREI0R_DEF})
endif (MSVC)

1
src/filter/bw0r/CMakeLists.txt
View File

@@ -2,7 +2,6 @@ set (SOURCES bw0r.c)
set (TARGET bw0r)
if (MSVC)
set_source_files_properties (bw0r.c PROPERTIES LANGUAGE CXX)
set (SOURCES ${SOURCES} ${FREI0R_DEF})
endif (MSVC)

1
src/filter/c0rners/CMakeLists.txt
View File

@@ -2,7 +2,6 @@ set (SOURCES c0rners.c interp.h)
set (TARGET c0rners)
if (MSVC)
set_source_files_properties (c0rners.c PROPERTIES LANGUAGE CXX)
set (SOURCES ${SOURCES} ${FREI0R_DEF})
endif (MSVC)

5
src/filter/c0rners/interp.h
View File

@@ -107,11 +107,6 @@ void remap32(int wi, int hi, int wo, int ho, unsigned char *vhs, unsigned char *
//**************************************
//HERE BEGIN THE INTERPOLATION FUNCTIONS
#if defined(_MSC_VER)
__inline const float roundf(float x){
return (int)floor(x+0.5);
}
#endif /* _MSC_VER */
//------------------------------------------------------
//za debugging - z izpisovanjem

1
src/filter/cairogradient/CMakeLists.txt
View File

@@ -5,7 +5,6 @@ include_directories(${Cairo_INCLUDE_DIR})
set(LIBS ${LIBS} ${Cairo_LIBRARY})
if (MSVC)
set_source_files_properties (cairogradient.c PROPERTIES LANGUAGE CXX)
set (SOURCES ${SOURCES} ${FREI0R_DEF})
endif (MSVC)

1
src/filter/cairoimagegrid/CMakeLists.txt
View File

@@ -5,7 +5,6 @@ include_directories(${Cairo_INCLUDE_DIR})
set(LIBS ${LIBS} ${Cairo_LIBRARY})
if (MSVC)
set_source_files_properties (cairoimagegrid.c PROPERTIES LANGUAGE CXX)
set (SOURCES ${SOURCES} ${FREI0R_DEF})
endif (MSVC)

1
src/filter/cluster/CMakeLists.txt
View File

@@ -2,7 +2,6 @@ set (SOURCES cluster.c)
set (TARGET cluster)
if (MSVC)
set_source_files_properties (cluster.c PROPERTIES LANGUAGE CXX)
set (SOURCES ${SOURCES} ${FREI0R_DEF})
endif (MSVC)

5
src/filter/colgate/CMakeLists.txt
View File

@@ -2,11 +2,12 @@ set (SOURCES colgate.c)
set (TARGET colgate)
if (MSVC)
set_source_files_properties (colgate.c PROPERTIES LANGUAGE CXX)
set (SOURCES ${SOURCES} ${FREI0R_DEF})
endif (MSVC)
link_libraries(m)
if(NOT MSVC)
link_libraries(m)
endif()
add_library (${TARGET} MODULE ${SOURCES})
set_target_properties (${TARGET} PROPERTIES PREFIX "")

5
src/filter/coloradj/CMakeLists.txt
View File

@@ -2,11 +2,12 @@ set (SOURCES coloradj_RGB.c)
set (TARGET coloradj_RGB)
if (MSVC)
set_source_files_properties (coloradj_RGB.c PROPERTIES LANGUAGE CXX)
set (SOURCES ${SOURCES} ${FREI0R_DEF})
endif (MSVC)
link_libraries(m)
if(NOT MSVC)
link_libraries(m)
endif()
add_library (${TARGET} MODULE ${SOURCES})
set_target_properties (${TARGET} PROPERTIES PREFIX "")

1
src/filter/colordistance/CMakeLists.txt
View File

@@ -2,7 +2,6 @@ set (SOURCES colordistance.c)
set (TARGET colordistance)
if (MSVC)
set_source_files_properties (colordistance.c PROPERTIES LANGUAGE CXX)
set (SOURCES ${SOURCES} ${FREI0R_DEF})
endif (MSVC)

6
src/filter/colordistance/colordistance.c
View File

@@ -109,12 +109,6 @@ void f0r_get_param_value(f0r_instance_t instance,
}
#if defined(_MSC_VER)
__inline const int rint(float x){
return (int)(x+0.5);
}
#endif
void f0r_update(f0r_instance_t instance, double time,
const uint32_t* inframe, uint32_t* outframe)
{

1
src/filter/colorhalftone/CMakeLists.txt
View File

@@ -2,7 +2,6 @@ set (SOURCES colorhalftone.c)
set (TARGET colorhalftone)
if (MSVC)
set_source_files_properties (colorhalftone.c PROPERTIES LANGUAGE CXX)
set (SOURCES ${SOURCES} ${FREI0R_DEF})
endif (MSVC)

1
src/filter/colorize/CMakeLists.txt
View File

@@ -2,7 +2,6 @@ set (SOURCES colorize.c)
set (TARGET colorize)
if (MSVC)
set_source_files_properties (colorize.c PROPERTIES LANGUAGE CXX)
set (SOURCES ${SOURCES} ${FREI0R_DEF})
endif (MSVC)

1
src/filter/colortap/CMakeLists.txt
View File

@@ -2,7 +2,6 @@ set (SOURCES colortap.c)
set (TARGET colortap)
if (MSVC)
set_source_files_properties (colortap.c PROPERTIES LANGUAGE CXX)
set (SOURCES ${SOURCES} ${FREI0R_DEF})
endif (MSVC)

1
src/filter/contrast0r/CMakeLists.txt
View File

@@ -2,7 +2,6 @@ set (SOURCES contrast0r.c)
set (TARGET contrast0r)
if (MSVC)
set_source_files_properties (contrast0r.c PROPERTIES LANGUAGE CXX)
set (SOURCES ${SOURCES} ${FREI0R_DEF})
endif (MSVC)

5
src/filter/curves/CMakeLists.txt
View File

@@ -1,3 +1,7 @@
if(MSVC AND NOT CMAKE_CXX_COMPILER_ID MATCHES Clang)
return() # MSVC cl doesn't support Variable Length Arrays (VLA), but clang-cl does
endif()
# Set C99 flag for gcc
if (CMAKE_COMPILER_IS_GNUCC)
set(CMAKE_C_FLAGS "-std=c99")
@@ -7,7 +11,6 @@ set (SOURCES curves.c)
set (TARGET curves)
if (MSVC)
set_source_files_properties (curves.c PROPERTIES LANGUAGE CXX)
set (SOURCES ${SOURCES} ${FREI0R_DEF})
endif (MSVC)

4
src/filter/d90stairsteppingfix/CMakeLists.txt
View File

@@ -1,3 +1,7 @@
if(MSVC AND NOT CMAKE_CXX_COMPILER_ID MATCHES Clang)
return() # MSVC cl doesn't support Variable Length Arrays (VLA), but clang-cl does
endif()
set (SOURCES d90stairsteppingfix.cpp)
set (TARGET d90stairsteppingfix)

5
src/filter/defish0r/CMakeLists.txt
View File

@@ -2,11 +2,12 @@ set (SOURCES defish0r.c interp.h)
set (TARGET defish0r)
if (MSVC)
set_source_files_properties (defish0r.c PROPERTIES LANGUAGE CXX)
set (SOURCES ${SOURCES} ${FREI0R_DEF})
endif (MSVC)
link_libraries(m)
if(NOT MSVC)
link_libraries(m)
endif()
add_library (${TARGET} MODULE ${SOURCES})
set_target_properties (${TARGET} PROPERTIES PREFIX "")

4
src/filter/defish0r/defish0r.c
View File

@@ -137,10 +137,6 @@ float defish(int n, float r, float f, float mr)
return rr;
}
#if defined(_MSC_VER)
#define hypotf _hypotf
#endif
//----------------------------------------------------------------
//nafila array map s polozaji pikslov
//locena funkcija, da jo poklicem samo enkrat na zacetku,

5
src/filter/denoise/CMakeLists.txt
View File

@@ -2,11 +2,12 @@ set (SOURCES hqdn3d.c)
set (TARGET hqdn3d)
if (MSVC)
set_source_files_properties (hqdn3d.c PROPERTIES LANGUAGE CXX)
set (SOURCES ${SOURCES} ${FREI0R_DEF})
endif (MSVC)
link_libraries(m)
if(NOT MSVC)
link_libraries(m)
endif()
add_library (${TARGET} MODULE ${SOURCES})
set_target_properties (${TARGET} PROPERTIES PREFIX "")

1
src/filter/distort0r/CMakeLists.txt
View File

@@ -2,7 +2,6 @@ set (SOURCES distort0r.c)
set (TARGET distort0r)
if (MSVC)
set_source_files_properties (distort0r.c PROPERTIES LANGUAGE CXX)
set (SOURCES ${SOURCES} ${FREI0R_DEF})
endif (MSVC)

5
src/filter/dither/CMakeLists.txt
View File

@@ -1,8 +1,11 @@
if(MSVC AND NOT CMAKE_CXX_COMPILER_ID MATCHES Clang)
return() # MSVC cl doesn't support Variable Length Arrays (VLA), but clang-cl does
endif()
set (SOURCES dither.c)
set (TARGET dither)
if (MSVC)
set_source_files_properties (dither.c PROPERTIES LANGUAGE CXX)
set (SOURCES ${SOURCES} ${FREI0R_DEF})
endif (MSVC)

1
src/filter/emboss/CMakeLists.txt
View File

@@ -2,7 +2,6 @@ set (SOURCES emboss.c)
set (TARGET emboss)
if (MSVC)
set_source_files_properties (emboss.c PROPERTIES LANGUAGE CXX)
set (SOURCES ${SOURCES} ${FREI0R_DEF})
endif (MSVC)

1
src/filter/flippo/CMakeLists.txt
View File

@@ -2,7 +2,6 @@ set (SOURCES flippo.c)
set (TARGET flippo)
if (MSVC)
set_source_files_properties (flippo.c PROPERTIES LANGUAGE CXX)
set (SOURCES ${SOURCES} ${FREI0R_DEF})
endif (MSVC)

5
src/filter/gamma/CMakeLists.txt
View File

@@ -2,11 +2,12 @@ set (SOURCES gamma.c)
set (TARGET gamma)
if (MSVC)
set_source_files_properties (gamma.c PROPERTIES LANGUAGE CXX)
set (SOURCES ${SOURCES} ${FREI0R_DEF})
endif (MSVC)
link_libraries(m)
if(NOT MSVC)
link_libraries(m)
endif()
add_library (${TARGET} MODULE ${SOURCES})
set_target_properties (${TARGET} PROPERTIES PREFIX "")

1
src/filter/glitch0r/CMakeLists.txt
View File

@@ -2,7 +2,6 @@ set (SOURCES glitch0r.c)
set (TARGET glitch0r)
if (MSVC)
set_source_files_properties (glitch0r.c PROPERTIES LANGUAGE CXX)
set (SOURCES ${SOURCES} ${FREI0R_DEF})
endif (MSVC)

1
src/filter/glow/CMakeLists.txt
View File

@@ -2,7 +2,6 @@ set (SOURCES glow.c)
set (TARGET glow)
if (MSVC)
set_source_files_properties (glow.c PROPERTIES LANGUAGE CXX)
set (SOURCES ${SOURCES} ${FREI0R_DEF})
endif (MSVC)

1
src/filter/host_param_test/CMakeLists.txt
View File

@@ -2,7 +2,6 @@ set (SOURCES host_param_test.c)
set (TARGET host_param_test)
if (MSVC)
set_source_files_properties (host_param_test.c PROPERTIES LANGUAGE CXX)
set (SOURCES ${SOURCES} ${FREI0R_DEF})
endif (MSVC)

5
src/filter/hueshift0r/CMakeLists.txt
View File

@@ -2,11 +2,12 @@ set (SOURCES hueshift0r.c matrix.h)
set (TARGET hueshift0r)
if (MSVC)
set_source_files_properties (hueshift0r.c PROPERTIES LANGUAGE CXX)
set (SOURCES ${SOURCES} ${FREI0R_DEF})
endif (MSVC)
link_libraries(m)
if(NOT MSVC)
link_libraries(m)
endif()
add_library (${TARGET} MODULE ${SOURCES})
set_target_properties (${TARGET} PROPERTIES PREFIX "")

1
src/filter/invert0r/CMakeLists.txt
View File

@@ -2,7 +2,6 @@ set (SOURCES invert0r.c)
set (TARGET invert0r)
if (MSVC)
set_source_files_properties (invert0r.c PROPERTIES LANGUAGE CXX)
set (SOURCES ${SOURCES} ${FREI0R_DEF})
endif (MSVC)

1
src/filter/keyspillm0pup/CMakeLists.txt
View File

@@ -2,7 +2,6 @@ set (SOURCES keyspillm0pup.c)
set (TARGET keyspillm0pup)
if (MSVC)
set_source_files_properties (keyspillm0pup.c PROPERTIES LANGUAGE CXX)
set (SOURCES ${SOURCES} ${FREI0R_DEF})
endif (MSVC)

1
src/filter/lenscorrection/CMakeLists.txt
View File

@@ -2,7 +2,6 @@ set (SOURCES lenscorrection.c)
set (TARGET lenscorrection)
if (MSVC)
set_source_files_properties (lenscorrection.c PROPERTIES LANGUAGE CXX)
set (SOURCES ${SOURCES} ${FREI0R_DEF})
endif (MSVC)

1
src/filter/letterb0xed/CMakeLists.txt
View File

@@ -2,7 +2,6 @@ set (SOURCES letterb0xed.c)
set (TARGET letterb0xed)
if (MSVC)
set_source_files_properties (letterb0xed.c PROPERTIES LANGUAGE CXX)
set (SOURCES ${SOURCES} ${FREI0R_DEF})
endif (MSVC)

1
src/filter/levels/CMakeLists.txt
View File

@@ -7,7 +7,6 @@ set (SOURCES levels.c)
set (TARGET levels)
if (MSVC)
set_source_files_properties (levels.c PROPERTIES LANGUAGE CXX)
set (SOURCES ${SOURCES} ${FREI0R_DEF})
endif (MSVC)

8
src/filter/lightgraffiti/lightgraffiti.cpp
View File

@@ -64,9 +64,15 @@
[3] http://kdenlive.org/users/granjow/writing-light-graffiti-effect
*/
#if defined(_MSC_VER)
#define _USE_MATH_DEFINES
#endif /* _MSC_VER */
#include <cmath>
#include "frei0r.hpp"
#include <cmath>
#include <cstdio>
#include <climits>
#include <algorithm>

1
src/filter/luminance/CMakeLists.txt
View File

@@ -2,7 +2,6 @@ set (SOURCES luminance.c)
set (TARGET luminance)
if (MSVC)
set_source_files_properties (luminance.c PROPERTIES LANGUAGE CXX)
set (SOURCES ${SOURCES} ${FREI0R_DEF})
endif (MSVC)

1
src/filter/mask0mate/CMakeLists.txt
View File

@@ -2,7 +2,6 @@ set (SOURCES mask0mate.c)
set (TARGET mask0mate)
if (MSVC)
set_source_files_properties (mask0mate.c PROPERTIES LANGUAGE CXX)
set (SOURCES ${SOURCES} ${FREI0R_DEF})
endif (MSVC)

1
src/filter/measure/CMakeLists.txt
View File

@@ -2,7 +2,6 @@ set (B_SOURCES pr0be.c measure.h font2.h)
set (F_SOURCES pr0file.c measure.h font2.h)
if (MSVC)
set_source_files_properties (pr0be.c pr0file.c PROPERTIES LANGUAGE CXX)
set (B_SOURCES ${B_SOURCES} ${FREI0R_DEF})
set (F_SOURCES ${F_SOURCES} ${FREI0R_DEF})
endif (MSVC)

1
src/filter/medians/CMakeLists.txt
View File

@@ -2,7 +2,6 @@ set (SOURCES medians.c ctmf.h small_medians.h)
set (TARGET medians)
if (MSVC)
set_source_files_properties (medians.c PROPERTIES LANGUAGE CXX)
set (SOURCES ${SOURCES} ${FREI0R_DEF})
endif (MSVC)

10
src/filter/medians/ctmf.h
View File

@@ -36,17 +36,7 @@
#include <math.h>
#include <stdlib.h>
#include <string.h>
/* Type declarations */
#ifdef _MSC_VER
#include <basetsd.h>
typedef UINT8 uint8_t;
typedef UINT16 uint16_t;
typedef UINT32 uint32_t;
#pragma warning( disable: 4799 )
#else
#include <stdint.h>
#endif
/* Intrinsic declarations */
#if defined(__SSE2__) || defined(__MMX__)

1
src/filter/normaliz0r/CMakeLists.txt
View File

@@ -2,7 +2,6 @@ set (SOURCES normaliz0r.c)
set (TARGET normaliz0r)
if (MSVC)
set_source_files_properties (normaliz0r.c PROPERTIES LANGUAGE CXX)
set (SOURCES ${SOURCES} ${FREI0R_DEF})
endif (MSVC)

1
src/filter/perspective/CMakeLists.txt
View File

@@ -2,7 +2,6 @@ set (SOURCES perspective.c)
set (TARGET perspective)
if (MSVC)
set_source_files_properties (perspective.c PROPERTIES LANGUAGE CXX)
set (SOURCES ${SOURCES} ${FREI0R_DEF})
endif (MSVC)

6
src/filter/perspective/perspective.c
View File

@@ -174,12 +174,6 @@ void f0r_get_param_value(f0r_instance_t instance,
}
}
#if defined(_MSC_VER)
__inline const long lrint(double x){
return (long)(x+0.5);
}
#endif
void f0r_update(f0r_instance_t instance, double time,
const uint32_t* inframe, uint32_t* outframe)
{

1
src/filter/pixeliz0r/CMakeLists.txt
View File

@@ -2,7 +2,6 @@ set (SOURCES pixeliz0r.c)
set (TARGET pixeliz0r)
if (MSVC)
set_source_files_properties (pixeliz0r.c PROPERTIES LANGUAGE CXX)
set (SOURCES ${SOURCES} ${FREI0R_DEF})
endif (MSVC)

1
src/filter/posterize/CMakeLists.txt
View File

@@ -2,7 +2,6 @@ set (SOURCES posterize.c)
set (TARGET posterize)
if (MSVC)
set_source_files_properties (posterize.c PROPERTIES LANGUAGE CXX)
set (SOURCES ${SOURCES} ${FREI0R_DEF})
endif (MSVC)

5
src/filter/rgbnoise/CMakeLists.txt
View File

@@ -2,11 +2,12 @@ set (SOURCES rgbnoise.c)
set (TARGET rgbnoise)
if (MSVC)
set_source_files_properties (rgbnoise.c PROPERTIES LANGUAGE CXX)
set (SOURCES ${SOURCES} ${FREI0R_DEF})
endif (MSVC)
link_libraries(m)
if(NOT MSVC)
link_libraries(m)
endif()
add_library (${TARGET} MODULE ${SOURCES})
set_target_properties (${TARGET} PROPERTIES PREFIX "")

1
src/filter/rgbparade/CMakeLists.txt
View File

@@ -2,7 +2,6 @@ set (SOURCES rgbparade.c rgbparade_image.h)
set (TARGET rgbparade)
if (MSVC)
set_source_files_properties (rgbparade.c PROPERTIES LANGUAGE CXX)
set (SOURCES ${SOURCES} ${FREI0R_DEF})
endif (MSVC)

1
src/filter/rgbsplit0r/CMakeLists.txt
View File

@@ -2,7 +2,6 @@ set (SOURCES rgbsplit0r.c)
set (TARGET rgbsplit0r)
if (MSVC)
set_source_files_properties (rgbsplit0r.c PROPERTIES LANGUAGE CXX)
set (SOURCES ${SOURCES} ${FREI0R_DEF})
endif (MSVC)

1
src/filter/saturat0r/CMakeLists.txt
View File

@@ -2,7 +2,6 @@ set (SOURCES saturat0r.c)
set (TARGET saturat0r)
if (MSVC)
set_source_files_properties (saturat0r.c PROPERTIES LANGUAGE CXX)
set (SOURCES ${SOURCES} ${FREI0R_DEF})
endif (MSVC)

1
src/filter/scale0tilt/CMakeLists.txt
View File

@@ -2,7 +2,6 @@ set (SOURCES scale0tilt.c)
set (TARGET scale0tilt)
if (MSVC)
set_source_files_properties (scale0tilt.c PROPERTIES LANGUAGE CXX)
set (SOURCES ${SOURCES} ${FREI0R_DEF})
endif (MSVC)

1
src/filter/select0r/CMakeLists.txt
View File

@@ -2,7 +2,6 @@ set (SOURCES select0r.c)
set (TARGET select0r)
if (MSVC)
set_source_files_properties (select0r.c PROPERTIES LANGUAGE CXX)
set (SOURCES ${SOURCES} ${FREI0R_DEF})
endif (MSVC)

1
src/filter/sharpness/CMakeLists.txt
View File

@@ -2,7 +2,6 @@ set (SOURCES sharpness.c)
set (TARGET sharpness)
if (MSVC)
set_source_files_properties (sharpness.c PROPERTIES LANGUAGE CXX)
set (SOURCES ${SOURCES} ${FREI0R_DEF})
endif (MSVC)

1
src/filter/sigmoidaltransfer/CMakeLists.txt
View File

@@ -2,7 +2,6 @@ set (SOURCES sigmoidaltransfer.c)
set (TARGET sigmoidaltransfer)
if (MSVC)
set_source_files_properties (sigmoidaltransfer.c PROPERTIES LANGUAGE CXX)
set (SOURCES ${SOURCES} ${FREI0R_DEF})
endif (MSVC)

1
src/filter/softglow/CMakeLists.txt
View File

@@ -2,7 +2,6 @@ set (SOURCES softglow.c)
set (TARGET softglow)
if (MSVC)
set_source_files_properties (softglow.c PROPERTIES LANGUAGE CXX)
set (SOURCES ${SOURCES} ${FREI0R_DEF})
endif (MSVC)

1
src/filter/spillsupress/CMakeLists.txt
View File

@@ -2,7 +2,6 @@ set (SOURCES spillsupress.c)
set (TARGET spillsupress)
if (MSVC)
set_source_files_properties (spillsupress.c PROPERTIES LANGUAGE CXX)
set (SOURCES ${SOURCES} ${FREI0R_DEF})
endif (MSVC)

1
src/filter/squareblur/CMakeLists.txt
View File

@@ -2,7 +2,6 @@ set (SOURCES squareblur.c)
set (TARGET squareblur)
if (MSVC)
set_source_files_properties (squareblur.c PROPERTIES LANGUAGE CXX)
set (SOURCES ${SOURCES} ${FREI0R_DEF})
endif (MSVC)

1
src/filter/tehroxx0r/CMakeLists.txt
View File

@@ -2,7 +2,6 @@ set (SOURCES tehRoxx0r.c)
set (TARGET tehRoxx0r)
if (MSVC)
set_source_files_properties (tehRoxx0r.c PROPERTIES LANGUAGE CXX)
set (SOURCES ${SOURCES} ${FREI0R_DEF})
endif (MSVC)

1
src/filter/three_point_balance/CMakeLists.txt
View File

@@ -7,7 +7,6 @@ set (SOURCES three_point_balance.c)
set (TARGET three_point_balance)
if (MSVC)
set_source_files_properties (three_point_balance.c PROPERTIES LANGUAGE CXX)
set (SOURCES ${SOURCES} ${FREI0R_DEF})
endif (MSVC)

1
src/filter/threshold0r/CMakeLists.txt
View File

@@ -2,7 +2,6 @@ set (SOURCES threshold0r.c)
set (TARGET threshold0r)
if (MSVC)
set_source_files_properties (threshold0r.c PROPERTIES LANGUAGE CXX)
set (SOURCES ${SOURCES} ${FREI0R_DEF})
endif (MSVC)

1
src/filter/tint0r/CMakeLists.txt
View File

@@ -2,7 +2,6 @@ set (SOURCES tint0r.c)
set (TARGET tint0r)
if (MSVC)
set_source_files_properties (tint0r.c PROPERTIES LANGUAGE CXX)
set (SOURCES ${SOURCES} ${FREI0R_DEF})
endif (MSVC)

1
src/filter/transparency/CMakeLists.txt
View File

@@ -2,7 +2,6 @@ set (SOURCES transparency.c)
set (TARGET transparency)
if (MSVC)
set_source_files_properties (transparency.c PROPERTIES LANGUAGE CXX)
set (SOURCES ${SOURCES} ${FREI0R_DEF})
endif (MSVC)

1
src/filter/vectorscope/CMakeLists.txt
View File

@@ -2,7 +2,6 @@ set (SOURCES vectorscope.c vectorscope_image.h)
set (TARGET vectorscope)
if (MSVC)
set_source_files_properties (vectorscope.c PROPERTIES LANGUAGE CXX)
set (SOURCES ${SOURCES} ${FREI0R_DEF})
endif (MSVC)

1
src/filter/vertigo/CMakeLists.txt
View File

@@ -2,7 +2,6 @@ set (SOURCES vertigo.c)
set (TARGET vertigo)
if (MSVC)
set_source_files_properties (vertigo.c PROPERTIES LANGUAGE CXX)
set (SOURCES ${SOURCES} ${FREI0R_DEF})
endif (MSVC)

3
src/filter/vignette/vignette.cpp
View File

@@ -17,6 +17,9 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#if defined(_MSC_VER)
#define _USE_MATH_DEFINES
#endif /* _MSC_VER */
#include <cmath>
#include "frei0r.hpp"
#include "frei0r_math.h"

1
src/generator/ising0r/CMakeLists.txt
View File

@@ -2,7 +2,6 @@ set (SOURCES ising0r.c)
set (TARGET ising0r)
if (MSVC)
set_source_files_properties (ising0r.c PROPERTIES LANGUAGE CXX)
set (SOURCES ${SOURCES} ${FREI0R_DEF})
endif (MSVC)

8
src/generator/partik0l/partik0l.cpp
View File

@@ -24,6 +24,10 @@
*
*/
#if defined(_MSC_VER)
#define _USE_MATH_DEFINES
#endif /* _MSC_VER */
#include <cmath>
#include "frei0r.hpp"
@@ -31,10 +35,6 @@
#include <string.h>
#include <algorithm>
#if defined(_MSC_VER)
#define _USE_MATH_DEFINES
#endif /* _MSC_VER */
#include <cmath>
#include <time.h>
#include <inttypes.h>

5
src/generator/test_pat/CMakeLists.txt
View File

@@ -6,7 +6,6 @@ set (L_SOURCES test_pat_L.c)
set (R_SOURCES test_pat_R.c)
if (MSVC)
set_source_files_properties (test_pat_B.c test_pat_C.c test_pat_G.c test_pat_I.c test_pat_L.c test_pat_R.c PROPERTIES LANGUAGE CXX)
set (B_SOURCES ${B_SOURCES} ${FREI0R_DEF})
set (C_SOURCES ${C_SOURCES} ${FREI0R_DEF})
set (G_SOURCES ${G_SOURCES} ${FREI0R_DEF})
@@ -15,7 +14,9 @@ if (MSVC)
set (R_SOURCES ${R_SOURCES} ${FREI0R_DEF})
endif (MSVC)
link_libraries(m)
if(NOT MSVC)
link_libraries(m)
endif()
add_library (test_pat_B MODULE ${B_SOURCES})
add_library (test_pat_C MODULE ${C_SOURCES})
add_library (test_pat_G MODULE ${G_SOURCES})

1
src/mixer2/alphainjection/CMakeLists.txt
View File

@@ -2,7 +2,6 @@ set (SOURCES alphainjection.c)
set (TARGET alphainjection)
if (MSVC)
set_source_files_properties (alphainjection.c PROPERTIES LANGUAGE CXX)
set (SOURCES ${SOURCES} ${FREI0R_1_1_DEF})
endif (MSVC)

1
src/mixer2/cairoaffineblend/CMakeLists.txt
View File

@@ -5,7 +5,6 @@ include_directories(${Cairo_INCLUDE_DIR})
set(LIBS ${LIBS} ${Cairo_LIBRARY})
if (MSVC)
set_source_files_properties (cairoaffineblend.c PROPERTIES LANGUAGE CXX)
set (SOURCES ${SOURCES} ${FREI0R_DEF})
endif (MSVC)

1
src/mixer2/cairoblend/CMakeLists.txt
View File

@@ -5,7 +5,6 @@ include_directories(${Cairo_INCLUDE_DIR})
set(LIBS ${LIBS} ${Cairo_LIBRARY})
if (MSVC)
set_source_files_properties (cairoblend.c PROPERTIES LANGUAGE CXX)
set (SOURCES ${SOURCES} ${FREI0R_DEF})
endif (MSVC)

1
src/mixer2/composition/CMakeLists.txt
View File

@@ -2,7 +2,6 @@ set (SOURCES composition.c)
set (TARGET composition)
if (MSVC)
set_source_files_properties (composition.c PROPERTIES LANGUAGE CXX)
set (SOURCES ${SOURCES} ${FREI0R_1_1_DEF})
endif (MSVC)

1
src/mixer2/uvmap/CMakeLists.txt
View File

@@ -2,7 +2,6 @@ set (SOURCES uvmap.c)
set (TARGET uvmap)
if (MSVC)
set_source_files_properties (uvmap.c PROPERTIES LANGUAGE CXX)
set (SOURCES ${SOURCES} ${FREI0R_1_1_DEF})
endif (MSVC)

6
src/mixer2/uvmap/uvmap.c
View File

@@ -75,12 +75,6 @@ void f0r_get_param_value(f0r_instance_t instance,
f0r_param_t param, int param_index)
{ /* no params */ }
#if defined(_MSC_VER)
__inline const long int lrintf(float x){
return (long int)(x+0.5);
}
#endif /* _MSC_VER */
void f0r_update2(f0r_instance_t instance,
double time,
const uint32_t* inframe1,

1
src/mixer3/RGB/CMakeLists.txt
View File

@@ -2,7 +2,6 @@ set (SOURCES RGB.c)
set (TARGET RGB)
if (MSVC)
set_source_files_properties (RGB.c PROPERTIES LANGUAGE CXX)
set (SOURCES ${SOURCES} ${FREI0R_1_1_DEF})
endif (MSVC)