Merge lp:~gal-fourier/ubuntu/natty/opencv/bug-756154 into lp:ubuntu/natty/opencv

Proposed by Gal Shalif
Status: Rejected
Rejected by: James Westby
Proposed branch: lp:~gal-fourier/ubuntu/natty/opencv/bug-756154
Merge into: lp:ubuntu/natty/opencv
Diff against target: 257 lines (+215/-1)
6 files modified
debian/changelog (+14/-0)
debian/control (+1/-1)
debian/patches/cvcap_ffmpeg_fix_compile_against_libav0.7.patch (+120/-0)
debian/patches/series (+4/-0)
debian/patches/ubuntu11.04_no_videodev.h_include_file.patch (+56/-0)
debian/patches/ubuntu11.10_oneiric_fix_compilation_error_with_gcc4.6.patch (+20/-0)
To merge this branch: bzr merge lp:~gal-fourier/ubuntu/natty/opencv/bug-756154
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Chris Coulson Pending
Review via email: mp+68171@code.launchpad.net

This proposal supersedes a proposal from 2011-07-07.

Description of the change

Ubuntu 11.10 Oneiric fix of compilation error of opencv-2.1.0 when compiled against the (new) ffmpeg package libav-0.7:

Fix changes as requested by reviewer Chris Coulson (community) at https://code.launchpad.net/~gal-fourier/ubuntu/natty/opencv/bug-756154/+merge/67179 :

Chris Coulson wrote on 2011-07-11

Hi,

Thanks for your work. I have a few comments though:

1) "unstable" isn't a valid target for Ubuntu. This should be targetted to "oneiric" instead.
2) You can collapse the 2 changelog entries in to 1, as 2.1.0-3ubuntu2 has never been uploaded
3) Please wrap changelog entries to around 80 characters. The current changelog entries trigger this lintian warning: http://lintian.debian.org/tags/debian-changelog-line-too-long.html
4) In cvcap_ffmpeg_fix_compile_against_libav0.7.patch, you use 2 different values when checking LIBAVFORMAT_BUILD. Is this deliberate? Eg, in these 2 hunks:

@@ -514,6 +514,24 @@
 }

+#if LIBAVFORMAT_BUILD >= (53<<16 | 0<<8 | 0) /* As defined when compiled against libav-0.7 from Ubuntu 11.10 Oneiric */
+/* Gal Shalif: temporary add a backward compatible function - till OpenCV is properly ported to compile against ffmpeg 0.7 */
+/* Gal Shalif: code is copy from Ubuntu 11.04 Natty libav-0.6.2/libavcodec/utils.c */
+int avcodec_decode_video(AVCodecContext *avctx, AVFrame *picture,
+ int *got_picture_ptr,
+ uint8_t *buf, int buf_size)
+{
+ AVPacket avpkt;
+ av_init_packet(&avpkt);
+ avpkt.data = buf;
+ avpkt.size = buf_size;
+ // HACK for CorePNG to decode as normal PNG by default
+ avpkt.flags = AV_PKT_FLAG_KEY;
+
+ return avcodec_decode_video2(avctx, picture, got_picture_ptr, &avpkt);
+}
+#endif /* LIBAVFORMAT_BUILD >= (53<<16 | 0<<8 | 0) */
+
 bool CvCapture_FFMPEG::grabFrame()
 {
     bool valid = false;
@@ -795,6 +813,17 @@
 #endif
 };

+#if LIBAVFORMAT_BUILD >= (53<<16 | 2<<8 | 0) /* As defined when compiled against libav-0.7 from Ubuntu 11.10 Oneiric */
+/* Gal Shalif: temporary add a backward compatible define - till OpenCV is properly ported to compile against ffmpeg 0.7 */
+
+/* Gal Shalif: code is copy from Ubuntu 11.04 Natty libav-0.6.2/libavutil/error.h and is enclosed within LIBAVUTIL_VERSION_MAJOR < 51 ... #endif */
+#define AVERROR_NUMEXPECTED AVERROR(EDOM) ///< Number syntax expected in filename
+#define AVERROR_NOFMT AVERROR(EILSEQ) ///< Unknown format
+#define AVERROR_IO AVERROR(EIO) ///< I/O error
+#define AVERROR_NOMEM AVERROR(ENOMEM) ///< Not enough memory
+
+#endif /* LIBAVFORMAT_BUILD >= (53<<16 | 2<<8 | 0) */
+
 static const char * icvFFMPEGErrStr(int err)
 {
     switch(err) {

Reply
review: Needs Fixing

To post a comment you must log in.
Chris Coulson (chrisccoulson) wrote : Posted in a previous version of this proposal

Hi,

Thanks for your work. I have a few comments though:

1) "unstable" isn't a valid target for Ubuntu. This should be targetted to "oneiric" instead.
2) You can collapse the 2 changelog entries in to 1, as 2.1.0-3ubuntu2 has never been uploaded
3) Please wrap changelog entries to around 80 characters. The current changelog entries trigger this lintian warning: http://lintian.debian.org/tags/debian-changelog-line-too-long.html
4) In cvcap_ffmpeg_fix_compile_against_libav0.7.patch, you use 2 different values when checking LIBAVFORMAT_BUILD. Is this deliberate? Eg, in these 2 hunks:

@@ -514,6 +514,24 @@
 }

+#if LIBAVFORMAT_BUILD >= (53<<16 | 0<<8 | 0) /* As defined when compiled against libav-0.7 from Ubuntu 11.10 Oneiric */
+/* Gal Shalif: temporary add a backward compatible function - till OpenCV is properly ported to compile against ffmpeg 0.7 */
+/* Gal Shalif: code is copy from Ubuntu 11.04 Natty libav-0.6.2/libavcodec/utils.c */
+int avcodec_decode_video(AVCodecContext *avctx, AVFrame *picture,
+ int *got_picture_ptr,
+ uint8_t *buf, int buf_size)
+{
+ AVPacket avpkt;
+ av_init_packet(&avpkt);
+ avpkt.data = buf;
+ avpkt.size = buf_size;
+ // HACK for CorePNG to decode as normal PNG by default
+ avpkt.flags = AV_PKT_FLAG_KEY;
+
+ return avcodec_decode_video2(avctx, picture, got_picture_ptr, &avpkt);
+}
+#endif /* LIBAVFORMAT_BUILD >= (53<<16 | 0<<8 | 0) */
+
 bool CvCapture_FFMPEG::grabFrame()
 {
     bool valid = false;
@@ -795,6 +813,17 @@
 #endif
 };

+#if LIBAVFORMAT_BUILD >= (53<<16 | 2<<8 | 0) /* As defined when compiled against libav-0.7 from Ubuntu 11.10 Oneiric */
+/* Gal Shalif: temporary add a backward compatible define - till OpenCV is properly ported to compile against ffmpeg 0.7 */
+
+/* Gal Shalif: code is copy from Ubuntu 11.04 Natty libav-0.6.2/libavutil/error.h and is enclosed within LIBAVUTIL_VERSION_MAJOR < 51 ... #endif */
+#define AVERROR_NUMEXPECTED AVERROR(EDOM) ///< Number syntax expected in filename
+#define AVERROR_NOFMT AVERROR(EILSEQ) ///< Unknown format
+#define AVERROR_IO AVERROR(EIO) ///< I/O error
+#define AVERROR_NOMEM AVERROR(ENOMEM) ///< Not enough memory
+
+#endif /* LIBAVFORMAT_BUILD >= (53<<16 | 2<<8 | 0) */
+
 static const char * icvFFMPEGErrStr(int err)
 {
     switch(err) {

review: Needs Fixing
Daniel Holbach (dholbach) wrote :

Thanks for your work on this. It seems that with https://launchpad.net/ubuntu/+source/opencv/2.1.0-7 in Oneiric this upload is not necessary any more, as all the bugs are fixed already. Thanks again!

Daniel Holbach (dholbach) wrote :

Hello Gal,

Am 18.08.2011 16:00, schrieb Gal Shalif:
> Thanks for the update.
>
>> ... with https://launchpad.net/ubuntu/+source/opencv/2.1.0-7 in
> Oneiric ...
> The upload above is mostly an integration of my patch :-)

Great work! :-)

Have a great day,
 Daniel

--
Ubuntu Global Jam: 2nd-4th September 2011
https://wiki.ubuntu.com/UbuntuGlobalJam

Unmerged revisions

23. By Gal Shalif on 2011-07-17

* Add patch ubuntu11.10_oneiric_fix_compilation_error_with_gcc4.6.patch:
  + fix build error on Ubuntu 11.10 Oneiric (LP: #791527):
* Add cvcap_ffmpeg_fix_compile_against_libav0.7.patch:
  fix compilation errors when compiled against libav-0.7
  (as applicable for Ubuntu 11.10 Oneiric) (LP: 756154)
* Add patch ubuntu11.04_no_videodev.h_include_file.patch:
  fix build error on Ubuntu 11.04 Natty (LP: #756154):
  - Backport the upstream 2.2 changeset to void the use of the obsolete V4L1
    (i.e. do not use the obsolete linux/videodev.h)

22. By Gal Shalif on 2011-07-07

Add cvcap_ffmpeg_fix_compile_against_libav0.7.patch - fix compilation errors when compiled against libav-0.7 (as applicable for Ubuntu 11.10 Oneiric) (LP: 756154)

21. By Gal Shalif on 2011-06-21

Add patch ubuntu11.10_oneiric_fix_compilation_error_with_gcc4.6.patch - fix build error on Ubuntu 11.10 Oneiric (LP: #791527):

20. By Gal Shalif on 2011-06-01

* Add patch ubuntu11.04_no_videodev.h_include_file.patch - fix build error on Ubuntu 11.04 Natty (LP: #756154):
  - Backport the upstream 2.2 changeset to void the use of the obsolete V4L1 (linux/videodev.h)

19. By Gal Shalif on 2011-05-08

add a forgoten patch file

18. By Gal Shalif on 2011-05-08

add a forgoten patch file

17. By Gal Shalif on 2011-05-08

* Use libv4l1-videodev.h (from libv4l-dev) as a replacement for the obsolete linux/videodev.h on Ubuntu 11.04
  - Add libv4l-dev to build dependencies
  - ubuntu11.04_no_videodev.h_include_file.patch: modify src/highgui/cvcap_libv4l.cpp, src/highgui/cvcap_v4l.cpp

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-12-14 14:34:19 +0000
3+++ debian/changelog 2011-07-17 13:48:35 +0000
4@@ -1,3 +1,17 @@
5+opencv (2.1.0-3ubuntu2) oneiric; urgency=low
6+
7+ * Add patch ubuntu11.10_oneiric_fix_compilation_error_with_gcc4.6.patch:
8+ + fix build error on Ubuntu 11.10 Oneiric (LP: #791527):
9+ * Add cvcap_ffmpeg_fix_compile_against_libav0.7.patch:
10+ fix compilation errors when compiled against libav-0.7
11+ (as applicable for Ubuntu 11.10 Oneiric) (LP: 756154)
12+ * Add patch ubuntu11.04_no_videodev.h_include_file.patch:
13+ fix build error on Ubuntu 11.04 Natty (LP: #756154):
14+ - Backport the upstream 2.2 changeset to void the use of the obsolete V4L1
15+ (i.e. do not use the obsolete linux/videodev.h)
16+
17+ -- Gal Shalif (Work at Fourier Systems) <gal_fourier@shalif.com> Sun, 17 Jul 2011 11:00:00 +0300
18+
19 opencv (2.1.0-3ubuntu1) natty; urgency=low
20
21 * Adjust hack to re-included stdint.h for GCC-4.5. LP: #685500.
22
23=== modified file 'debian/control'
24--- debian/control 2010-08-25 01:49:14 +0000
25+++ debian/control 2011-07-17 13:48:35 +0000
26@@ -4,7 +4,7 @@
27 Maintainer: Debian Scientific Computing Team <pkg-scicomp-devel@lists.alioth.debian.org>
28 Uploaders: Sam Hocevar (Debian packages) <sam+deb@zoy.org>, Nobuhiro Iwamatsu <iwamatsu@debian.org>
29 Build-Depends: debhelper (>= 7.0.50~), quilt (>= 0.46-7~), cmake,
30- libavcodec-dev (>= 0.svn20080206), libavformat-dev, libswscale-dev, libgtk2.0-dev,
31+ libavcodec-dev (>= 0.svn20080206), libavformat-dev, libswscale-dev, libgtk2.0-dev, libv4l-dev,
32 libjasper-dev, libjpeg62-dev, libpng12-dev, libtiff4-dev,
33 libraw1394-dev [!kfreebsd-amd64 !kfreebsd-i386 !hurd-i386],
34 libdc1394-22-dev [!kfreebsd-amd64 !kfreebsd-i386 !hurd-i386],
35
36=== added file 'debian/patches/cvcap_ffmpeg_fix_compile_against_libav0.7.patch'
37--- debian/patches/cvcap_ffmpeg_fix_compile_against_libav0.7.patch 1970-01-01 00:00:00 +0000
38+++ debian/patches/cvcap_ffmpeg_fix_compile_against_libav0.7.patch 2011-07-17 13:48:35 +0000
39@@ -0,0 +1,120 @@
40+Author: Gal Shalif <gal@fourier-sys.com>
41+Debian BTS: N/A
42+Bug-Ubuntu: https://launchpad.net/bugs/756154
43+Description: Fix opencv-2.1.0 compilation errors when copiled with libav-0.7 (a.k.a. ffmpeg 0.7) - as applicable for Ubuntu 11.10 Oneiric
44+ Note: Ubuntu 11.04 Natty use libav-0.6.2 with:
45+ #define LIBAVCODEC_VERSION_MAJOR 52
46+ #define LIBAVUTIL_VERSION_MAJOR 50
47+ #define LIBAVFORMAT_BUILD (52<<16 | 64<<8 | 2)
48+ Note: Ubuntu 11.10 Oneiric use libav-0.7 with:
49+ #define LIBAVCODEC_VERSION_MAJOR 53
50+ #define LIBAVUTIL_VERSION_MAJOR 51
51+ #define LIBAVFORMAT_BUILD (53<<16 | 2<<8 | 0)
52+--- a/src/highgui/cvcap_ffmpeg.cpp 2011-07-06 12:44:09.585566733 +0300
53++++ b/src/highgui/cvcap_ffmpeg.cpp 2011-07-06 13:09:43.261010471 +0300
54+@@ -464,7 +464,7 @@
55+ AVCodecContext *enc = &ic->streams[i]->codec;
56+ #endif
57+
58+- if( CODEC_TYPE_VIDEO == enc->codec_type && video_stream < 0) {
59++ if( AVMEDIA_TYPE_VIDEO == enc->codec_type && video_stream < 0) {
60+ AVCodec *codec = avcodec_find_decoder(enc->codec_id);
61+ if (!codec ||
62+ avcodec_open(enc, codec) < 0)
63+@@ -514,6 +514,24 @@
64+ }
65+
66+
67++#if LIBAVFORMAT_BUILD >= (53<<16 | 2<<8 | 0) /* As defined when compiled against libav-0.7 from Ubuntu 11.10 Oneiric */
68++/* Gal Shalif: temporary add a backward compatible function - till OpenCV is properly ported to compile against ffmpeg 0.7 */
69++/* Gal Shalif: code is copy from Ubuntu 11.04 Natty libav-0.6.2/libavcodec/utils.c */
70++int avcodec_decode_video(AVCodecContext *avctx, AVFrame *picture,
71++ int *got_picture_ptr,
72++ uint8_t *buf, int buf_size)
73++{
74++ AVPacket avpkt;
75++ av_init_packet(&avpkt);
76++ avpkt.data = buf;
77++ avpkt.size = buf_size;
78++ // HACK for CorePNG to decode as normal PNG by default
79++ avpkt.flags = AV_PKT_FLAG_KEY;
80++
81++ return avcodec_decode_video2(avctx, picture, got_picture_ptr, &avpkt);
82++}
83++#endif /* LIBAVFORMAT_BUILD >= (53<<16 | 2<<8 | 0) */
84++
85+ bool CvCapture_FFMPEG::grabFrame()
86+ {
87+ bool valid = false;
88+@@ -795,6 +813,17 @@
89+ #endif
90+ };
91+
92++#if LIBAVFORMAT_BUILD >= (53<<16 | 2<<8 | 0) /* As defined when compiled against libav-0.7 from Ubuntu 11.10 Oneiric */
93++/* Gal Shalif: temporary add a backward compatible define - till OpenCV is properly ported to compile against ffmpeg 0.7 */
94++
95++/* Gal Shalif: code is copy from Ubuntu 11.04 Natty libav-0.6.2/libavutil/error.h and is enclosed within LIBAVUTIL_VERSION_MAJOR < 51 ... #endif */
96++#define AVERROR_NUMEXPECTED AVERROR(EDOM) ///< Number syntax expected in filename
97++#define AVERROR_NOFMT AVERROR(EILSEQ) ///< Unknown format
98++#define AVERROR_IO AVERROR(EIO) ///< I/O error
99++#define AVERROR_NOMEM AVERROR(ENOMEM) ///< Not enough memory
100++
101++#endif /* LIBAVFORMAT_BUILD >= (53<<16 | 2<<8 | 0) */
102++
103+ static const char * icvFFMPEGErrStr(int err)
104+ {
105+ switch(err) {
106+@@ -891,7 +920,7 @@
107+ #endif
108+
109+ #if LIBAVFORMAT_BUILD > 4621
110+- c->codec_id = av_guess_codec(oc->oformat, NULL, oc->filename, NULL, CODEC_TYPE_VIDEO);
111++ c->codec_id = av_guess_codec(oc->oformat, NULL, oc->filename, NULL, AVMEDIA_TYPE_VIDEO);
112+ #else
113+ c->codec_id = oc->oformat->video_codec;
114+ #endif
115+@@ -903,7 +932,7 @@
116+ //if(codec_tag) c->codec_tag=codec_tag;
117+ codec = avcodec_find_encoder(c->codec_id);
118+
119+- c->codec_type = CODEC_TYPE_VIDEO;
120++ c->codec_type = AVMEDIA_TYPE_VIDEO;
121+
122+ /* put sample parameters */
123+ c->bit_rate = bitrate;
124+@@ -990,7 +1019,7 @@
125+ AVPacket pkt;
126+ av_init_packet(&pkt);
127+
128+- pkt.flags |= PKT_FLAG_KEY;
129++ pkt.flags |= AV_PKT_FLAG_KEY;
130+ pkt.stream_index= video_st->index;
131+ pkt.data= (uint8_t *)picture;
132+ pkt.size= sizeof(AVPicture);
133+@@ -1010,7 +1039,7 @@
134+ pkt.pts = c->coded_frame->pts;
135+ #endif
136+ if(c->coded_frame->key_frame)
137+- pkt.flags |= PKT_FLAG_KEY;
138++ pkt.flags |= AV_PKT_FLAG_KEY;
139+ pkt.stream_index= video_st->index;
140+ pkt.data= outbuf;
141+ pkt.size= out_size;
142+@@ -1210,7 +1239,7 @@
143+ av_register_all ();
144+
145+ /* auto detect the output format from the name and fourcc code. */
146+- fmt = guess_format(NULL, filename, NULL);
147++ fmt = av_guess_format(NULL, filename, NULL);
148+ if (!fmt)
149+ return false;
150+
151+@@ -1233,7 +1262,7 @@
152+ #endif
153+
154+ // alloc memory for context
155+- oc = av_alloc_format_context();
156++ oc = avformat_alloc_context();
157+ assert (oc);
158+
159+ /* set file name */
160
161=== modified file 'debian/patches/series'
162--- debian/patches/series 2010-12-14 14:34:19 +0000
163+++ debian/patches/series 2011-07-17 13:48:35 +0000
164@@ -6,3 +6,7 @@
165 hurd.patch
166 fix_minor_version_python.patch
167 fix_stdint_gcc45.patch
168+ubuntu11.04_no_videodev.h_include_file.patch
169+ubuntu11.10_oneiric_fix_compilation_error_with_gcc4.6.patch
170+cvcap_ffmpeg_fix_compile_against_libav0.7.patch
171+
172
173=== added file 'debian/patches/ubuntu11.04_no_videodev.h_include_file.patch'
174--- debian/patches/ubuntu11.04_no_videodev.h_include_file.patch 1970-01-01 00:00:00 +0000
175+++ debian/patches/ubuntu11.04_no_videodev.h_include_file.patch 2011-07-17 13:48:35 +0000
176@@ -0,0 +1,56 @@
177+Author: Gal Shalif <gal@fourier-sys.com>
178+Debian BTS: N/A
179+Bug-Ubuntu: https://launchpad.net/bugs/756154
180+Description: Disable the use of V4L1 (do not require the obsolete linux/videodev.h file) to fix link error for Ubuntu 11.04 Natty
181+ Fix bug by a backport of upstream changeset 5206 from https://code.ros.org/trac/opencv/changeset/5206
182+ Update src/highgui/cvcap_libv4l.cpp with V4L2 support from upstream https://code.ros.org/trac/opencv/changeset/5206/branches/2.2/opencv/modules/highgui/src/cap_libv4l.cpp
183+Forwarded: yes/no/not-needed
184+Reviewed-by: Martin Pitt <martin.pitt@ubuntu.com>
185+Last-Update: 2011-05-31
186+--- a/cvconfig.h.cmake 2010-04-06 04:24:37.000000000 +0300
187++++ b/cvconfig.h.cmake 2011-05-31 10:44:35.090386901 +0300
188+@@ -19,6 +19,9 @@
189+ /* V4L2 capturing support */
190+ #cmakedefine HAVE_CAMV4L2
191+
192++/* V4L/V4L2 capturing support via libv4l */
193++#cmakedefine HAVE_LIBV4L
194++
195+ /* Carbon windowing environment */
196+ #cmakedefine HAVE_CARBON
197+
198+--- a/src/highgui/cvcap.cpp 2011-05-31 10:42:11.615197876 +0300
199++++ b/src/highgui/cvcap.cpp 2011-05-31 10:49:10.376986822 +0300
200+@@ -161,7 +161,7 @@
201+ if (capture)
202+ return capture;
203+ #endif
204+- #if defined (HAVE_CAMV4L) || defined (HAVE_CAMV4L2)
205++ #if defined HAVE_LIBV4L || (defined (HAVE_CAMV4L) && defined (HAVE_CAMV4L2))
206+ capture = cvCreateCameraCapture_V4L (index);
207+ if (capture)
208+ return capture;
209+--- a/src/highgui/cvcap_libv4l.cpp 2010-04-06 04:24:44.000000000 +0300
210++++ b/src/highgui/cvcap_libv4l.cpp 2011-05-31 18:21:36.397699498 +0300
211+@@ -202,7 +202,7 @@
212+
213+ #include "_highgui.h"
214+
215+-#if !defined WIN32 && defined HAVE_CAMV4L && defined HAVE_CAMV4L2
216++#if !defined WIN32 && defined HAVE_LIBV4L
217+
218+ #define CLEAR(x) memset (&(x), 0, sizeof (x))
219+
220+@@ -219,8 +219,12 @@
221+ #include <sys/stat.h>
222+ #include <sys/ioctl.h>
223+
224++#ifdef HAVE_CAMV4L
225+ #include <linux/videodev.h>
226++#endif
227++#ifdef HAVE_CAMV4L2
228+ #include <linux/videodev2.h>
229++#endif
230+
231+ #include <libv4l1.h>
232+ #include <libv4l2.h>
233
234=== added file 'debian/patches/ubuntu11.10_oneiric_fix_compilation_error_with_gcc4.6.patch'
235--- debian/patches/ubuntu11.10_oneiric_fix_compilation_error_with_gcc4.6.patch 1970-01-01 00:00:00 +0000
236+++ debian/patches/ubuntu11.10_oneiric_fix_compilation_error_with_gcc4.6.patch 2011-07-17 13:48:35 +0000
237@@ -0,0 +1,20 @@
238+Author: Gal Shalif <gal@fourier-sys.com>
239+Debian BTS: N/A
240+Bug-Ubuntu: https://launchpad.net/bugs/791527
241+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=624917
242+Description: Add the missing definition of typedef ptrdiff_t
243+ Fix bug that had first manifest with Ubuntu 11.10 Oneiric with gcc 4.6 - but is not required for the older Ubuntu 11.04 Natty with gcc 4.5)
244+Forwarded: yes/no/not-needed
245+Reviewed-by: TBD
246+Last-Update: 2011-06-21
247+--- a/include/opencv/cxcore.h 2010-04-06 04:24:40.000000000 +0300
248++++ b/include/opencv/cxcore.h 2011-06-21 14:08:01.129192382 +0300
249+@@ -44,6 +44,8 @@
250+ #ifndef __OPENCV_CORE_H__
251+ #define __OPENCV_CORE_H__
252+
253++#include <stddef.h> /* Fix Ubuntu bug # 791527 - see https://bugs.launchpad.net/ubuntu/+source/opencv/+bug/791527 */
254++
255+ #ifdef __IPL_H__
256+ #define HAVE_IPL
257+ #endif

Subscribers

People subscribed via source and target branches

to all changes: