* Fix DC1394FrameGrabber on the Windows platform (issue bytedeco/p…

…rocamcalib#4)
bytedeco · Apr 25, 2016 · 23efcf1 · 23efcf1
1 parent bc2ddec
commit 23efcf1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,5 @@
 
+ * Fix `DC1394FrameGrabber` on the Windows platform ([issue bytedeco/procamcalib#4](https://github.com/bytedeco/procamcalib/issues/4))
  * Support `AVPacket` in `FFmpegFrameGrabber` and `FFmpegFrameRecorder` to copy without re-encoding ([issue #93](https://github.com/bytedeco/javacv/issues/93))
  * Lower Maven prerequisite in the `pom.xml` file to 3.0 ([issue bytedeco/javacpp#93](https://github.com/bytedeco/javacpp/issues/93))
  * Add new `PrincipalComponentAnalysis` sample ([pull #373](https://github.com/bytedeco/javacv/pull/373))

diff --git a/src/main/java/org/bytedeco/javacv/DC1394FrameGrabber.java b/src/main/java/org/bytedeco/javacv/DC1394FrameGrabber.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009-2012 Samuel Audet
+ * Copyright (C) 2009-2016 Samuel Audet
  *
  * Licensed either under the Apache License, Version 2.0, or (at your option)
  * under the terms of the GNU General Public License as published by
@@ -130,7 +130,7 @@ public void release() throws Exception {
     private static final boolean linux = Loader.getPlatform().startsWith("linux");
     private dc1394_t d = null;
     private dc1394camera_t camera = null;
-    private pollfd fds = new pollfd();
+    private pollfd fds = linux ? new pollfd() : null;
     private boolean oneShotMode = false;
     private boolean resetDone   = false;
     private dc1394video_frame_t[] raw_image =