Fix compilation on win32 under VS8

Original commit message from CVS:
* gst/videoscale/vs_4tap.c:
* win32/MANIFEST:
* win32/common/config.h:
* win32/vs8/libgstvideoscale.vcproj:
Fix compilation on win32 under VS8
Patch by: Sergey Scobich <sergey dot scobich at gmail dot com>
Partially fixes #381175

diff --git a/ChangeLog b/ChangeLog
index 2863681..57fe341 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-12-01  Jan Schmidt  <thaytan@mad.scientist.com>
+
+       * gst/videoscale/vs_4tap.c:
+       * win32/MANIFEST:
+       * win32/common/config.h:
+       * win32/vs8/libgstvideoscale.vcproj:
+       Fix compilation on win32 under VS8
+       Patch by: Sergey Scobich <sergey dot scobich at gmail dot com>
+       Partially fixes #381175
+
 2006-11-30  Michael Smith  <msmith@fluendo.com>
 
        * tests/check/pipelines/theoraenc.c: (check_buffer_granulepos),

diff --git a/gst/videoscale/vs_4tap.c b/gst/videoscale/vs_4tap.c
index 1be6d51..de67ccb 100644 (file)
--- a/gst/videoscale/vs_4tap.c
+++ b/gst/videoscale/vs_4tap.c
@@ -37,6 +37,14 @@
 #define MIN(a,b) (((a) < (b)) ? (a) : (b))
 #define CLAMP(x,a,b) MAX(MIN((x),(b)),(a))
 
+#ifndef M_PI
+#define M_PI  3.14159265358979323846
+#endif
+
+#ifdef WIN32
+#define rint(x) (floor((x)+0.5))
+#endif
+
 int16_t vs_4tap_taps[256][4];
 
 double

diff --git a/win32/MANIFEST b/win32/MANIFEST
index 5532e81..6f849d8 100644 (file)
--- a/win32/MANIFEST
+++ b/win32/MANIFEST
@@ -37,4 +37,28 @@ win32/vs6/libgstvideorate.dsp
 win32/vs6/libgstvideoscale.dsp
 win32/vs6/libgstvideotestsrc.dsp
 win32/vs6/libgstvolume.dsp
-win32/vs6/libgstvorbis.dsp
\ No newline at end of file
+win32/vs6/libgstvorbis.dsp
+win32/vs8/gst-plugins-base.sln
+win32/vs8/libgstadder.vcproj
+win32/vs8/libgstaudio.vcproj
+win32/vs8/libgstaudioconvert.vcproj
+win32/vs8/libgstaudiorate.vcproj
+win32/vs8/libgstaudioresample.vcproj
+win32/vs8/libgstaudiotestsrc.vcproj
+win32/vs8/libgstdecodebin.vcproj
+win32/vs8/libgstffmpegcolorspace.vcproj
+win32/vs8/libgstinterfaces.vcproj
+win32/vs8/libgstogg.vcproj
+win32/vs8/libgstplaybin.vcproj
+win32/vs8/libgstriff.vcproj
+win32/vs8/libgstsubparse.vcproj
+win32/vs8/libgsttag.vcproj
+win32/vs8/libgsttcp.vcproj
+win32/vs8/libgsttheora.vcproj
+win32/vs8/libgsttypefind.vcproj
+win32/vs8/libgstvideo.vcproj
+win32/vs8/libgstvideorate.vcproj
+win32/vs8/libgstvideoscale.vcproj
+win32/vs8/libgstvideotestsrc.vcproj
+win32/vs8/libgstvolume.vcproj
+win32/vs8/libgstvorbis.vcproj

diff --git a/win32/common/config.h b/win32/common/config.h
index 2548798..684f95d 100644 (file)
--- a/win32/common/config.h
+++ b/win32/common/config.h
@@ -169,10 +169,10 @@
 #undef HAVE_SYS_SOCKET_H
 
 /* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
+#undef HAVE_SYS_STAT_H 1
 
 /* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
+#undef HAVE_SYS_TYPES_H 1
 
 /* support for features: theoradec theoraenc */
 #undef HAVE_THEORA
@@ -208,16 +208,16 @@
 #define PACKAGE_BUGREPORT "http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer"
 
 /* Define to the full name of this package. */
-#define PACKAGE_NAME "GStreamer Base Plug-ins"
+#undef PACKAGE_NAME "GStreamer Base Plug-ins"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "GStreamer Base Plug-ins 0.10.10.1"
+#undef PACKAGE_STRING "GStreamer Base Plug-ins 0.10.10.2"
 
 /* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "gst-plugins-base"
+#undef PACKAGE_TARNAME "gst-plugins-base"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "0.10.10.1"
+#undef PACKAGE_VERSION "0.10.10.2"
 
 /* directory where plugins are located */
 #undef PLUGINDIR
@@ -241,7 +241,7 @@
 #undef STDC_HEADERS
 
 /* Version number of package */
-#define VERSION "0.10.10.1"
+#define VERSION "0.10.10.2"
 
 /* Define to 1 if your processor stores words with the most significant byte
    first (like Motorola and SPARC, unlike Intel and VAX). */

diff --git a/win32/vs8/libgstvideoscale.vcproj b/win32/vs8/libgstvideoscale.vcproj
index ebc1ae0..8f9477b 100644 (file)
--- a/win32/vs8/libgstvideoscale.vcproj
+++ b/win32/vs8/libgstvideoscale.vcproj
@@ -188,6 +188,10 @@
                                >
                        </File>
                        <File
+                               RelativePath="..\..\gst\videoscale\vs_4tap.c"
+                               >
+                       </File>
+                       <File
                                RelativePath="..\..\gst\videoscale\vs_image.c"
                                >
                        </File>