Revision: 8230
http://playerstage.svn.sourceforge.net/playerstage/?rev=8230&view=rev
Author: gbiggs
Date: 2009-08-26 08:36:23 +0000 (Wed, 26 Aug 2009)
Log Message:
-----------
Applied patch #2842767: some win32 issues
Modified Paths:
--------------
code/player/trunk/server/drivers/blobfinder/shapetracker/orientation.h
code/player/trunk/server/drivers/blobfinder/shapetracker/shapetracker.cc
code/player/trunk/server/drivers/blobfinder/simpleshape/simpleshape.cc
code/player/trunk/server/drivers/blobfinder/upcbarcode/upcbarcode.cc
code/player/trunk/server/drivers/camera/compress/cameracompress.cc
code/player/trunk/server/drivers/camera/compress/camerauncompress.cc
code/player/trunk/server/drivers/camera/cvcam/cvcam.cc
code/player/trunk/server/drivers/camera/imageseq/imageseq.cc
Modified: code/player/trunk/server/drivers/blobfinder/shapetracker/orientation.h
===================================================================
--- code/player/trunk/server/drivers/blobfinder/shapetracker/orientation.h
2009-08-26 08:30:24 UTC (rev 8229)
+++ code/player/trunk/server/drivers/blobfinder/shapetracker/orientation.h
2009-08-26 08:36:23 UTC (rev 8230)
@@ -38,7 +38,7 @@
#include <stdio.h>
#include <math.h>
-#include <opencv/cv.h>
+#include <cv.h>
//Estimate the length between two points (cvpoint)
Modified:
code/player/trunk/server/drivers/blobfinder/shapetracker/shapetracker.cc
===================================================================
--- code/player/trunk/server/drivers/blobfinder/shapetracker/shapetracker.cc
2009-08-26 08:30:24 UTC (rev 8229)
+++ code/player/trunk/server/drivers/blobfinder/shapetracker/shapetracker.cc
2009-08-26 08:36:23 UTC (rev 8230)
@@ -50,8 +50,8 @@
#include <libplayercore/playercore.h>
#include <base/imagebase.h>
-#include <opencv/cv.h>
-//#include <opencv/highgui.h>
+#include <cv.h>
+//#include <highgui.h>
#define winName "ShapeTracker"
Modified: code/player/trunk/server/drivers/blobfinder/simpleshape/simpleshape.cc
===================================================================
--- code/player/trunk/server/drivers/blobfinder/simpleshape/simpleshape.cc
2009-08-26 08:30:24 UTC (rev 8229)
+++ code/player/trunk/server/drivers/blobfinder/simpleshape/simpleshape.cc
2009-08-26 08:36:23 UTC (rev 8230)
@@ -106,8 +106,8 @@
#include <string.h>
#include "../../base/imagebase.h"
-#include <opencv/cv.h>
-#include <opencv/highgui.h>
+#include <cv.h>
+#include <highgui.h>
// Invariant feature set for a contour
class FeatureSet
Modified: code/player/trunk/server/drivers/blobfinder/upcbarcode/upcbarcode.cc
===================================================================
--- code/player/trunk/server/drivers/blobfinder/upcbarcode/upcbarcode.cc
2009-08-26 08:30:24 UTC (rev 8229)
+++ code/player/trunk/server/drivers/blobfinder/upcbarcode/upcbarcode.cc
2009-08-26 08:36:23 UTC (rev 8230)
@@ -108,8 +108,8 @@
#include "../../base/imagebase.h"
-#include <opencv/cv.h>
-#include <opencv/highgui.h>
+#include <cv.h>
+#include <highgui.h>
// Info on potential blobs.
struct blob_t
Modified: code/player/trunk/server/drivers/camera/compress/cameracompress.cc
===================================================================
--- code/player/trunk/server/drivers/camera/compress/cameracompress.cc
2009-08-26 08:30:24 UTC (rev 8229)
+++ code/player/trunk/server/drivers/camera/compress/cameracompress.cc
2009-08-26 08:36:23 UTC (rev 8230)
@@ -75,10 +75,11 @@
#include <string.h>
#include <stdlib.h>
+#ifndef WIN32
#include <unistd.h>
+#endif
#include <stddef.h>
#include <stdlib.h> // for atoi(3)
-#include <netinet/in.h> // for htons(3)
#include <math.h>
#include <libplayercore/playercore.h>
@@ -306,7 +307,11 @@
if (this->save)
{
+#ifdef WIN32
+ _snprintf(filename, sizeof(filename), "click-%04d.jpeg",this->frameno++);
+#else
snprintf(filename, sizeof(filename), "click-%04d.jpeg",this->frameno++);
+#endif
FILE *fp = fopen(filename, "w+");
int ret = fwrite(this->data.image, 1, this->data.image_count, fp);
if (ret < 0)
Modified: code/player/trunk/server/drivers/camera/compress/camerauncompress.cc
===================================================================
--- code/player/trunk/server/drivers/camera/compress/camerauncompress.cc
2009-08-26 08:30:24 UTC (rev 8229)
+++ code/player/trunk/server/drivers/camera/compress/camerauncompress.cc
2009-08-26 08:36:23 UTC (rev 8230)
@@ -77,9 +77,10 @@
#include <string.h>
#include <stdlib.h>
+#ifndef WIN32
#include <unistd.h>
+#endif
#include <stdlib.h> // for atoi(3)
-#include <netinet/in.h> // for htons(3)
#include <math.h>
#include <libplayercore/playercore.h>
@@ -247,7 +248,11 @@
if (this->save)
{
+#ifdef WIN32
+ _snprintf(filename, sizeof(filename), "click-%04d.ppm",this->frameno++);
+#else
snprintf(filename, sizeof(filename), "click-%04d.ppm",this->frameno++);
+#endif
FILE *fp = fopen(filename, "w+");
int ret = fwrite (this->data.image, 1, this->data.image_count, fp);
if (ret < 0)
Modified: code/player/trunk/server/drivers/camera/cvcam/cvcam.cc
===================================================================
--- code/player/trunk/server/drivers/camera/cvcam/cvcam.cc 2009-08-26
08:30:24 UTC (rev 8229)
+++ code/player/trunk/server/drivers/camera/cvcam/cvcam.cc 2009-08-26
08:36:23 UTC (rev 8230)
@@ -87,8 +87,8 @@
#include <pthread.h>
#include <libplayercore/playercore.h>
-#include <opencv/cv.h>
-#include <opencv/highgui.h>
+#include <cv.h>
+#include <highgui.h>
//---------------------------------
Modified: code/player/trunk/server/drivers/camera/imageseq/imageseq.cc
===================================================================
--- code/player/trunk/server/drivers/camera/imageseq/imageseq.cc
2009-08-26 08:30:24 UTC (rev 8229)
+++ code/player/trunk/server/drivers/camera/imageseq/imageseq.cc
2009-08-26 08:36:23 UTC (rev 8230)
@@ -87,17 +87,19 @@
#include <string.h>
#include <stdlib.h>
+#include <stddef.h>
+#ifndef WIN32
#include <unistd.h>
+#endif
+#include <time.h> // for nanosleep() and struct timespec
#include <stdlib.h> // for atoi(3)
-#include <netinet/in.h> // for htons(3)
#include <math.h>
-#include <opencv/cv.h>
-#include <opencv/highgui.h>
+#include <cv.h>
+#include <highgui.h>
#include <libplayercore/playercore.h>
-
class ImageSeq : public ThreadedDriver
{
// Constructor
@@ -175,7 +177,11 @@
pthread_testcancel();
// Compose filename
+#ifdef WIN32
+ _snprintf(filename, sizeof(filename), this->pattern, this->frame);
+#else
snprintf(filename, sizeof(filename), this->pattern, this->frame);
+#endif
// Load the image
if (this->LoadImage(filename) != 0)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
