r44886 - /packages/opencv/trunk/debian/patches/0007-typos-in-strings-docs.patch
iwamatsu at users.alioth.debian.org
iwamatsu at users.alioth.debian.org
Wed May 23 03:27:58 UTC 2012
Author: iwamatsu
Date: Wed May 23 03:27:56 2012
New Revision: 44886
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44886
Log:
Update patches/0007-typos-in-strings-docs.patch
Modified:
packages/opencv/trunk/debian/patches/0007-typos-in-strings-docs.patch
Modified: packages/opencv/trunk/debian/patches/0007-typos-in-strings-docs.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/trunk/debian/patches/0007-typos-in-strings-docs.patch?rev=44886&op=diff
==============================================================================
--- packages/opencv/trunk/debian/patches/0007-typos-in-strings-docs.patch (original)
+++ packages/opencv/trunk/debian/patches/0007-typos-in-strings-docs.patch Wed May 23 03:27:56 2012
@@ -1,45 +1,93 @@
-From 884fb8f58d6b1d8a5fd44f563050bf9bd1830402 Mon Sep 17 00:00:00 2001
-From: Nobuhiro Iwamatsu <iwamatsu at debian.org>
-Date: Wed, 24 Aug 2011 12:11:57 +0900
-Subject: Fix typo
-
-Signed-off-by: Nobuhiro Iwamatsu <iwamatsu at debian.org>
----
- modules/highgui/src/cap_libv4l.cpp | 2 +-
- modules/highgui/src/cap_v4l.cpp | 2 +-
- modules/legacy/src/clique.cpp | 4 ++--
- modules/legacy/src/lcm.cpp | 2 +-
- modules/legacy/src/trifocal.cpp | 2 +-
-
- diff --git a/modules/highgui/src/cap_libv4l.cpp b/modules/highgui/src/cap_libv4l.cpp
- index 54cc351..8fa99b1 100644
- --- a/modules/highgui/src/cap_libv4l.cpp
+diff --git a/debian/patches/0007-typos-in-strings-docs.patch b/debian/patches/0007-typos-in-strings-docs.patch
+index 10d8243..bac5170 100644
+--- a/debian/patches/0007-typos-in-strings-docs.patch
++++ b/debian/patches/0007-typos-in-strings-docs.patch
+@@ -11,57 +11,6 @@ Signed-off-by: Nobuhiro Iwamatsu <iwamatsu at debian.org>
+ modules/legacy/src/lcm.cpp | 2 +-
+ modules/legacy/src/trifocal.cpp | 2 +-
+
+- diff --git a/modules/highgui/src/cap_libv4l.cpp b/modules/highgui/src/cap_libv4l.cpp
+- index 54cc351..8fa99b1 100644
+- --- a/modules/highgui/src/cap_libv4l.cpp
+-diff --git a/modules/highgui/src/cap_libv4l.cpp b/modules/highgui/src/cap_libv4l.cpp
+-index ce75072..47b6d50 100644
+---- a/modules/highgui/src/cap_libv4l.cpp
+-+++ b/modules/highgui/src/cap_libv4l.cpp
+-@@ -1615,7 +1615,7 @@ static int icvSetControl (CvCaptureCAM_V4L* capture, int property_id, double val
+- }
+-
+- if (v4l1_ioctl(capture->deviceHandle, VIDIOCSPICT, &capture->imageProperties) < 0){
+-- fprintf(stderr, "HIGHGUI ERROR: V4L: Unable to set video informations\n");
+-+ fprintf(stderr, "HIGHGUI ERROR: V4L: Unable to set video information\n");
+- icvCloseCAM_V4L(capture);
+- return -1;
+- }
+-diff --git a/modules/highgui/src/cap_v4l.cpp b/modules/highgui/src/cap_v4l.cpp
+-index cf3ef89..6c426a0 100644
+---- a/modules/highgui/src/cap_v4l.cpp
+-+++ b/modules/highgui/src/cap_v4l.cpp
+-@@ -2682,7 +2682,7 @@ static int icvSetControl (CvCaptureCAM_V4L* capture,
+- < 0)
+- {
+- fprintf(stderr,
+-- "HIGHGUI ERROR: V4L: Unable to set video informations\n");
+-+ "HIGHGUI ERROR: V4L: Unable to set video information\n");
+- icvCloseCAM_V4L(capture);
+- return -1;
+- }
+-diff --git a/modules/legacy/src/clique.cpp b/modules/legacy/src/clique.cpp
+-index 68a901f..53e6b08 100644
+---- a/modules/legacy/src/clique.cpp
+-+++ b/modules/legacy/src/clique.cpp
+-@@ -343,7 +343,7 @@ int cvFindNextMaximalClique( CvCliqueFinder* finder )
+- break;
+- case NEXT:
+- //here we will look for candidate to translate into not
+-- //s[k] now contains index of choosen candidate
+-+ //s[k] now contains index of chosen candidate
+- {
+- int* new_ = All[k+1];
+- if( nod[k] != 0 )
+-@@ -590,7 +590,7 @@ void cvBronKerbosch( CvGraph* graph )
+- break;
+- case NEXT:
+- //here we will look for candidate to translate into not
+-- //s[k] now contains index of choosen candidate
+-+ //s[k] now contains index of chosen candidate
+- {
+- int* new_ = All[k+1];
+- if( nod[k] != 0 )
+ diff --git a/modules/legacy/src/lcm.cpp b/modules/legacy/src/lcm.cpp
+ index 9c2e952..b880b43 100644
+ --- a/modules/legacy/src/lcm.cpp
diff --git a/modules/highgui/src/cap_libv4l.cpp b/modules/highgui/src/cap_libv4l.cpp
-index ce75072..47b6d50 100644
+index 233e6f6..75f8477 100644
--- a/modules/highgui/src/cap_libv4l.cpp
+++ b/modules/highgui/src/cap_libv4l.cpp
-@@ -1615,7 +1615,7 @@ static int icvSetControl (CvCaptureCAM_V4L* capture, int property_id, double val
- }
-
- if (v4l1_ioctl(capture->deviceHandle, VIDIOCSPICT, &capture->imageProperties) < 0){
-- fprintf(stderr, "HIGHGUI ERROR: V4L: Unable to set video informations\n");
-+ fprintf(stderr, "HIGHGUI ERROR: V4L: Unable to set video information\n");
- icvCloseCAM_V4L(capture);
- return -1;
- }
+@@ -235,7 +235,9 @@ make & enjoy!
+ #include <sys/mman.h>
+ #include <string.h>
+ #include <stdlib.h>
++#if defined(__linux__)
+ #include <asm/types.h> /* for videodev2.h */
++#endif
+ #include <assert.h>
+ #include <sys/stat.h>
+ #include <sys/ioctl.h>
diff --git a/modules/highgui/src/cap_v4l.cpp b/modules/highgui/src/cap_v4l.cpp
-index cf3ef89..6c426a0 100644
+index 5f9e111..f3fb6f4 100644
--- a/modules/highgui/src/cap_v4l.cpp
+++ b/modules/highgui/src/cap_v4l.cpp
-@@ -2682,7 +2682,7 @@ static int icvSetControl (CvCaptureCAM_V4L* capture,
- < 0)
- {
- fprintf(stderr,
-- "HIGHGUI ERROR: V4L: Unable to set video informations\n");
-+ "HIGHGUI ERROR: V4L: Unable to set video information\n");
- icvCloseCAM_V4L(capture);
- return -1;
- }
+@@ -218,7 +218,9 @@ make & enjoy!
+
+ #include <string.h>
+ #include <stdlib.h>
++#if defined(__linux__)
+ #include <asm/types.h> /* for videodev2.h */
++#endif
+ #include <assert.h>
+ #include <sys/stat.h>
+ #include <sys/ioctl.h>
diff --git a/modules/legacy/src/clique.cpp b/modules/legacy/src/clique.cpp
index 68a901f..53e6b08 100644
--- a/modules/legacy/src/clique.cpp
@@ -76,7 +124,7 @@
for(SiteSet = VoronoiDiagram->sites;
SiteSet != NULL;
diff --git a/modules/legacy/src/trifocal.cpp b/modules/legacy/src/trifocal.cpp
-index 1f361f0..5908b7d 100644
+index 22f2fda..571c530 100644
--- a/modules/legacy/src/trifocal.cpp
+++ b/modules/legacy/src/trifocal.cpp
@@ -903,7 +903,7 @@ int icvComputeProjectMatricesNPoints( CvMat* points1,CvMat* points2,CvMat* poin
@@ -88,6 +136,3 @@
while( wasCount < NumSamples )
{
---
-1.7.5.4
-
More information about the debian-science-commits
mailing list