* [gentoo-commits] proj/kde:master commit in: media-libs/opencv/files/
@ 2011-04-29 20:02 Tomas Chvatal
0 siblings, 0 replies; 5+ messages in thread
From: Tomas Chvatal @ 2011-04-29 20:02 UTC (permalink / raw
To: gentoo-commits
commit: 522bc10d89815639cb5a73c07b5f46720c76ce26
Author: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 29 20:01:30 2011 +0000
Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Fri Apr 29 20:01:30 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=522bc10d
[media-libs/clapack] erm use correct variable
---
.../opencv/files/2.2.0-use_system_libs.patch | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-libs/opencv/files/2.2.0-use_system_libs.patch b/media-libs/opencv/files/2.2.0-use_system_libs.patch
index e5d2135..6a94642 100644
--- a/media-libs/opencv/files/2.2.0-use_system_libs.patch
+++ b/media-libs/opencv/files/2.2.0-use_system_libs.patch
@@ -12,11 +12,11 @@ diff -urN OpenCV-2.2.0.old/CMakeLists.txt OpenCV-2.2.0/CMakeLists.txt
# ===================================================
diff -urN OpenCV-2.2.0.old/modules/core/CMakeLists.txt OpenCV-2.2.0/modules/core/CMakeLists.txt
--- OpenCV-2.2.0.old/modules/core/CMakeLists.txt 2010-12-05 04:35:24.000000000 +0100
-+++ OpenCV-2.2.0/modules/core/CMakeLists.txt 2011-04-29 21:58:50.000000000 +0200
++++ OpenCV-2.2.0/modules/core/CMakeLists.txt 2011-04-29 22:01:06.000000000 +0200
@@ -1,3 +1,3 @@
-include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/include")
-set(deps opencv_lapack zlib)
-+include_directories("${ZLIB_INCLUDE_DIRECTORIES}")
++include_directories("${ZLIB_INCLUDE_DIRSS}")
+set(deps ${LAPACK_LIBRARIES} ${ZLIB_LIBRARIES})
define_opencv_module(core ${deps})
diff -urN OpenCV-2.2.0.old/modules/core/src/lapack.cpp OpenCV-2.2.0/modules/core/src/lapack.cpp
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/kde:master commit in: media-libs/opencv/files/
@ 2011-04-29 20:04 Tomas Chvatal
0 siblings, 0 replies; 5+ messages in thread
From: Tomas Chvatal @ 2011-04-29 20:04 UTC (permalink / raw
To: gentoo-commits
commit: d05952d4373ff3a35b8c2232395c385601bb0cb7
Author: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 29 20:03:39 2011 +0000
Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Fri Apr 29 20:03:39 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=d05952d4
[media-libs/clapack] Lets try once more to write the variable correctly...
---
.../opencv/files/2.2.0-use_system_libs.patch | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-libs/opencv/files/2.2.0-use_system_libs.patch b/media-libs/opencv/files/2.2.0-use_system_libs.patch
index 6a94642..fb5eea0 100644
--- a/media-libs/opencv/files/2.2.0-use_system_libs.patch
+++ b/media-libs/opencv/files/2.2.0-use_system_libs.patch
@@ -12,11 +12,11 @@ diff -urN OpenCV-2.2.0.old/CMakeLists.txt OpenCV-2.2.0/CMakeLists.txt
# ===================================================
diff -urN OpenCV-2.2.0.old/modules/core/CMakeLists.txt OpenCV-2.2.0/modules/core/CMakeLists.txt
--- OpenCV-2.2.0.old/modules/core/CMakeLists.txt 2010-12-05 04:35:24.000000000 +0100
-+++ OpenCV-2.2.0/modules/core/CMakeLists.txt 2011-04-29 22:01:06.000000000 +0200
++++ OpenCV-2.2.0/modules/core/CMakeLists.txt 2011-04-29 22:02:39.000000000 +0200
@@ -1,3 +1,3 @@
-include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/include")
-set(deps opencv_lapack zlib)
-+include_directories("${ZLIB_INCLUDE_DIRSS}")
++include_directories("${ZLIB_INCLUDE_DIRS}")
+set(deps ${LAPACK_LIBRARIES} ${ZLIB_LIBRARIES})
define_opencv_module(core ${deps})
diff -urN OpenCV-2.2.0.old/modules/core/src/lapack.cpp OpenCV-2.2.0/modules/core/src/lapack.cpp
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/kde:master commit in: media-libs/opencv/files/
@ 2011-04-29 20:16 Tomas Chvatal
0 siblings, 0 replies; 5+ messages in thread
From: Tomas Chvatal @ 2011-04-29 20:16 UTC (permalink / raw
To: gentoo-commits
commit: a7bdab050e40e769a6f3b264f40b4dc8ce003275
Author: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 29 20:15:11 2011 +0000
Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Fri Apr 29 20:15:11 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=a7bdab05
[media-libs/clapack] Finaly sort out required includes for clapack
---
.../opencv/files/2.2.0-use_system_libs.patch | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/media-libs/opencv/files/2.2.0-use_system_libs.patch b/media-libs/opencv/files/2.2.0-use_system_libs.patch
index fb5eea0..3a0fdde 100644
--- a/media-libs/opencv/files/2.2.0-use_system_libs.patch
+++ b/media-libs/opencv/files/2.2.0-use_system_libs.patch
@@ -21,12 +21,13 @@ diff -urN OpenCV-2.2.0.old/modules/core/CMakeLists.txt OpenCV-2.2.0/modules/core
define_opencv_module(core ${deps})
diff -urN OpenCV-2.2.0.old/modules/core/src/lapack.cpp OpenCV-2.2.0/modules/core/src/lapack.cpp
--- OpenCV-2.2.0.old/modules/core/src/lapack.cpp 2010-12-05 04:35:24.000000000 +0100
-+++ OpenCV-2.2.0/modules/core/src/lapack.cpp 2011-04-29 21:59:16.000000000 +0200
-@@ -48,7 +48,7 @@
++++ OpenCV-2.2.0/modules/core/src/lapack.cpp 2011-04-29 22:11:31.000000000 +0200
+@@ -48,7 +48,8 @@
typedef __CLPK_integer integer;
typedef __CLPK_real real;
#else
- #include "clapack.h"
++ #include <f2c.h>
+ #include <clapack/clapack.h>
#endif
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/kde:master commit in: media-libs/opencv/files/
@ 2011-04-29 21:43 Tomas Chvatal
0 siblings, 0 replies; 5+ messages in thread
From: Tomas Chvatal @ 2011-04-29 21:43 UTC (permalink / raw
To: gentoo-commits
commit: 6288552a5668748f6b391641fada7f25c96046d4
Author: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 29 21:42:26 2011 +0000
Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Fri Apr 29 21:42:26 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=6288552a
[media-libs/opencv] Enhance the lib passing a bit more.
---
.../opencv/files/2.2.0-use_system_libs.patch | 24 +++++++++++++++----
1 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/media-libs/opencv/files/2.2.0-use_system_libs.patch b/media-libs/opencv/files/2.2.0-use_system_libs.patch
index 3a9c10c..5804fc3 100644
--- a/media-libs/opencv/files/2.2.0-use_system_libs.patch
+++ b/media-libs/opencv/files/2.2.0-use_system_libs.patch
@@ -1,23 +1,25 @@
diff -urN OpenCV-2.2.0.old/CMakeLists.txt OpenCV-2.2.0/CMakeLists.txt
--- OpenCV-2.2.0.old/CMakeLists.txt 2010-12-05 04:35:23.000000000 +0100
-+++ OpenCV-2.2.0/CMakeLists.txt 2011-04-29 21:47:44.000000000 +0200
-@@ -193,6 +193,8 @@
++++ OpenCV-2.2.0/CMakeLists.txt 2011-04-29 23:26:42.000000000 +0200
+@@ -193,6 +193,10 @@
# ----------------------------------------------------------------------------
# CHECK FOR SYSTEM LIBRARIES, OPTIONS, ETC..
# ----------------------------------------------------------------------------
+find_package(LAPACK REQUIRED)
+find_package(ZLIB REQUIRED)
++find_package(PkgConfig REQUIRED)
++pkg_check_modules(FLANN REQUIRED flann)
# Build/install (or not) some apps:
# ===================================================
diff -urN OpenCV-2.2.0.old/modules/core/CMakeLists.txt OpenCV-2.2.0/modules/core/CMakeLists.txt
--- OpenCV-2.2.0.old/modules/core/CMakeLists.txt 2010-12-05 04:35:24.000000000 +0100
-+++ OpenCV-2.2.0/modules/core/CMakeLists.txt 2011-04-29 22:02:39.000000000 +0200
++++ OpenCV-2.2.0/modules/core/CMakeLists.txt 2011-04-29 23:17:16.000000000 +0200
@@ -1,3 +1,3 @@
-include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/include")
-set(deps opencv_lapack zlib)
+include_directories("${ZLIB_INCLUDE_DIRS}")
-+set(deps ${LAPACK_LIBRARIES} ${ZLIB_LIBRARIES})
++set(deps ${LAPACK_LIBRARIES} ${ZLIB_LIBRARIES} ${FLANN_LIBRARIES})
define_opencv_module(core ${deps})
diff -urN OpenCV-2.2.0.old/modules/core/src/lapack.cpp OpenCV-2.2.0/modules/core/src/lapack.cpp
--- OpenCV-2.2.0.old/modules/core/src/lapack.cpp 2010-12-05 04:35:24.000000000 +0100
@@ -34,7 +36,7 @@ diff -urN OpenCV-2.2.0.old/modules/core/src/lapack.cpp OpenCV-2.2.0/modules/core
#undef abs
diff -urN OpenCV-2.2.0.old/modules/highgui/CMakeLists.txt OpenCV-2.2.0/modules/highgui/CMakeLists.txt
--- OpenCV-2.2.0.old/modules/highgui/CMakeLists.txt 2010-12-05 04:35:24.000000000 +0100
-+++ OpenCV-2.2.0/modules/highgui/CMakeLists.txt 2011-04-29 22:24:32.000000000 +0200
++++ OpenCV-2.2.0/modules/highgui/CMakeLists.txt 2011-04-29 23:11:47.000000000 +0200
@@ -219,8 +219,8 @@
set(the_target "opencv_highgui")
@@ -66,3 +68,15 @@ diff -urN OpenCV-2.2.0.old/modules/highgui/src/grfmt_png.cpp OpenCV-2.2.0/module
#ifdef HAVE_PNG
/****************************************************************************************\
+diff -urN OpenCV-2.2.0.old/OpenCVModule.cmake OpenCV-2.2.0/OpenCVModule.cmake
+--- OpenCV-2.2.0.old/OpenCVModule.cmake 2010-12-05 04:35:25.000000000 +0100
++++ OpenCV-2.2.0/OpenCVModule.cmake 2011-04-29 23:34:22.000000000 +0200
+@@ -57,7 +57,7 @@
+ )
+
+ # Add the required libraries for linking:
+- target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} ${IPP_LIBS} ${ARGN})
++ target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} ${IPP_LIBS} ${ARGN} ${FLANN_LIBRARIES} ${CLAPACK_LIBRARIES})
+
+ if(MSVC)
+ if(CMAKE_CROSSCOMPILING)
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/kde:master commit in: media-libs/opencv/files/
@ 2011-04-30 17:08 Andreas K. Huettel
0 siblings, 0 replies; 5+ messages in thread
From: Andreas K. Huettel @ 2011-04-30 17:08 UTC (permalink / raw
To: gentoo-commits
commit: 18360ae24794a90e4bf9910298cdab551fcdb250
Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Sat Apr 30 17:10:34 2011 +0000
Commit: Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Apr 30 17:10:34 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=18360ae2
[media-libs/opencv] Convert upstream patches to sane line endings
(Portage version: 2.1.9.46/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key B6C5F7DE)
---
media-libs/opencv/files/2.2.0-ffmpeg01.patch | 209 +++++++++++++------------
media-libs/opencv/files/2.2.0-ffmpeg02.patch | 115 +++++++-------
media-libs/opencv/files/2.2.0-libpng1.5.patch | 79 +++++-----
3 files changed, 203 insertions(+), 200 deletions(-)
diff --git a/media-libs/opencv/files/2.2.0-ffmpeg01.patch b/media-libs/opencv/files/2.2.0-ffmpeg01.patch
index 4a5392f..bfde3a9 100644
--- a/media-libs/opencv/files/2.2.0-ffmpeg01.patch
+++ b/media-libs/opencv/files/2.2.0-ffmpeg01.patch
@@ -1,104 +1,105 @@
-Index: D:/WaterWATCH/dev/opencv/modules/highgui/src/cap_ffmpeg.cpp
-===================================================================
---- D:/WaterWATCH/dev/opencv/modules/highgui/src/cap_ffmpeg.cpp (revision 2112)
-+++ D:/WaterWATCH/dev/opencv/modules/highgui/src/cap_ffmpeg.cpp (revision 2113)
-@@ -466,7 +466,7 @@
- AVCodecContext *enc = &ic->streams[i]->codec;
- #endif
-
-- if( CODEC_TYPE_VIDEO == enc->codec_type && video_stream < 0) {
-+ if( AVMEDIA_TYPE_VIDEO == enc->codec_type && video_stream < 0) {
- AVCodec *codec = avcodec_find_decoder(enc->codec_id);
- if (!codec ||
- avcodec_open(enc, codec) < 0)
-@@ -550,15 +550,27 @@
- continue;
- }
-
--#if LIBAVFORMAT_BUILD > 4628
-- avcodec_decode_video(video_st->codec,
-- picture, &got_picture,
-- packet.data, packet.size);
--#else
-- avcodec_decode_video(&video_st->codec,
-- picture, &got_picture,
-- packet.data, packet.size);
--#endif
-+
-+ AVPacket avpkt;
-+ av_init_packet(&avpkt);
-+ avpkt.data = packet.data;
-+ avpkt.size = packet.size;
-+ //
-+ // HACK for CorePNG to decode as normal PNG by default
-+ // same method used by ffmpeg
-+ avpkt.flags = AV_PKT_FLAG_KEY;
-+ avcodec_decode_video2(video_st->codec,
-+ picture, &got_picture, &avpkt);
-+//Functions Removed from ffmpeg on 4/19/11
-+//#if LIBAVFORMAT_BUILD > 4628
-+// avcodec_decode_video(video_st->codec,
-+// picture, &got_picture,
-+// packet.data, packet.size);
-+//#else
-+// avcodec_decode_video(&video_st->codec,
-+// picture, &got_picture,
-+// packet.data, packet.size);
-+//#endif
-
- if (got_picture) {
- // we have a new picture, so memorize it
-@@ -899,7 +911,7 @@
- #endif
-
- #if LIBAVFORMAT_BUILD > 4621
-- c->codec_id = av_guess_codec(oc->oformat, NULL, oc->filename, NULL, CODEC_TYPE_VIDEO);
-+ c->codec_id = av_guess_codec(oc->oformat, NULL, oc->filename, NULL, AVMEDIA_TYPE_VIDEO);
- #else
- c->codec_id = oc->oformat->video_codec;
- #endif
-@@ -911,7 +923,7 @@
- //if(codec_tag) c->codec_tag=codec_tag;
- codec = avcodec_find_encoder(c->codec_id);
-
-- c->codec_type = CODEC_TYPE_VIDEO;
-+ c->codec_type = AVMEDIA_TYPE_VIDEO;
-
- /* put sample parameters */
- c->bit_rate = bitrate;
-@@ -998,7 +1010,7 @@
- AVPacket pkt;
- av_init_packet(&pkt);
-
-- pkt.flags |= PKT_FLAG_KEY;
-+ pkt.flags |= AV_PKT_FLAG_KEY;
- pkt.stream_index= video_st->index;
- pkt.data= (uint8_t *)picture;
- pkt.size= sizeof(AVPicture);
-@@ -1018,7 +1030,7 @@
- pkt.pts = c->coded_frame->pts;
- #endif
- if(c->coded_frame->key_frame)
-- pkt.flags |= PKT_FLAG_KEY;
-+ pkt.flags |= AV_PKT_FLAG_KEY;
- pkt.stream_index= video_st->index;
- pkt.data= outbuf;
- pkt.size= out_size;
-@@ -1215,7 +1227,7 @@
- av_register_all ();
-
- /* auto detect the output format from the name and fourcc code. */
-- fmt = guess_format(NULL, filename, NULL);
-+ fmt = av_guess_format(NULL, filename, NULL);
- if (!fmt)
- return false;
-
-@@ -1238,7 +1250,7 @@
- #endif
-
- // alloc memory for context
-- oc = av_alloc_format_context();
-+ oc = avformat_alloc_context();
- assert (oc);
-
- /* set file name */
+
+Index: D:/WaterWATCH/dev/opencv/modules/highgui/src/cap_ffmpeg.cpp
+===================================================================
+--- D:/WaterWATCH/dev/opencv/modules/highgui/src/cap_ffmpeg.cpp (revision 2112)
++++ D:/WaterWATCH/dev/opencv/modules/highgui/src/cap_ffmpeg.cpp (revision 2113)
+@@ -466,7 +466,7 @@
+ AVCodecContext *enc = &ic->streams[i]->codec;
+ #endif
+
+- if( CODEC_TYPE_VIDEO == enc->codec_type && video_stream < 0) {
++ if( AVMEDIA_TYPE_VIDEO == enc->codec_type && video_stream < 0) {
+ AVCodec *codec = avcodec_find_decoder(enc->codec_id);
+ if (!codec ||
+ avcodec_open(enc, codec) < 0)
+@@ -550,15 +550,27 @@
+ continue;
+ }
+
+-#if LIBAVFORMAT_BUILD > 4628
+- avcodec_decode_video(video_st->codec,
+- picture, &got_picture,
+- packet.data, packet.size);
+-#else
+- avcodec_decode_video(&video_st->codec,
+- picture, &got_picture,
+- packet.data, packet.size);
+-#endif
++
++ AVPacket avpkt;
++ av_init_packet(&avpkt);
++ avpkt.data = packet.data;
++ avpkt.size = packet.size;
++ //
++ // HACK for CorePNG to decode as normal PNG by default
++ // same method used by ffmpeg
++ avpkt.flags = AV_PKT_FLAG_KEY;
++ avcodec_decode_video2(video_st->codec,
++ picture, &got_picture, &avpkt);
++//Functions Removed from ffmpeg on 4/19/11
++//#if LIBAVFORMAT_BUILD > 4628
++// avcodec_decode_video(video_st->codec,
++// picture, &got_picture,
++// packet.data, packet.size);
++//#else
++// avcodec_decode_video(&video_st->codec,
++// picture, &got_picture,
++// packet.data, packet.size);
++//#endif
+
+ if (got_picture) {
+ // we have a new picture, so memorize it
+@@ -899,7 +911,7 @@
+ #endif
+
+ #if LIBAVFORMAT_BUILD > 4621
+- c->codec_id = av_guess_codec(oc->oformat, NULL, oc->filename, NULL, CODEC_TYPE_VIDEO);
++ c->codec_id = av_guess_codec(oc->oformat, NULL, oc->filename, NULL, AVMEDIA_TYPE_VIDEO);
+ #else
+ c->codec_id = oc->oformat->video_codec;
+ #endif
+@@ -911,7 +923,7 @@
+ //if(codec_tag) c->codec_tag=codec_tag;
+ codec = avcodec_find_encoder(c->codec_id);
+
+- c->codec_type = CODEC_TYPE_VIDEO;
++ c->codec_type = AVMEDIA_TYPE_VIDEO;
+
+ /* put sample parameters */
+ c->bit_rate = bitrate;
+@@ -998,7 +1010,7 @@
+ AVPacket pkt;
+ av_init_packet(&pkt);
+
+- pkt.flags |= PKT_FLAG_KEY;
++ pkt.flags |= AV_PKT_FLAG_KEY;
+ pkt.stream_index= video_st->index;
+ pkt.data= (uint8_t *)picture;
+ pkt.size= sizeof(AVPicture);
+@@ -1018,7 +1030,7 @@
+ pkt.pts = c->coded_frame->pts;
+ #endif
+ if(c->coded_frame->key_frame)
+- pkt.flags |= PKT_FLAG_KEY;
++ pkt.flags |= AV_PKT_FLAG_KEY;
+ pkt.stream_index= video_st->index;
+ pkt.data= outbuf;
+ pkt.size= out_size;
+@@ -1215,7 +1227,7 @@
+ av_register_all ();
+
+ /* auto detect the output format from the name and fourcc code. */
+- fmt = guess_format(NULL, filename, NULL);
++ fmt = av_guess_format(NULL, filename, NULL);
+ if (!fmt)
+ return false;
+
+@@ -1238,7 +1250,7 @@
+ #endif
+
+ // alloc memory for context
+- oc = av_alloc_format_context();
++ oc = avformat_alloc_context();
+ assert (oc);
+
+ /* set file name */
diff --git a/media-libs/opencv/files/2.2.0-ffmpeg02.patch b/media-libs/opencv/files/2.2.0-ffmpeg02.patch
index a0c5787..00ee541 100644
--- a/media-libs/opencv/files/2.2.0-ffmpeg02.patch
+++ b/media-libs/opencv/files/2.2.0-ffmpeg02.patch
@@ -1,57 +1,58 @@
-Index: D:/WaterWATCH/dev/opencv/modules/highgui/src/cap_ffmpeg.cpp
-===================================================================
---- D:/WaterWATCH/dev/opencv/modules/highgui/src/cap_ffmpeg.cpp (revision 2121)
-+++ D:/WaterWATCH/dev/opencv/modules/highgui/src/cap_ffmpeg.cpp (revision 2122)
-@@ -815,24 +815,25 @@
- #endif
- };
-
--static const char * icvFFMPEGErrStr(int err)
--{
-- switch(err) {
-- case AVERROR_NUMEXPECTED:
-- return "Incorrect filename syntax";
-- case AVERROR_INVALIDDATA:
-- return "Invalid data in header";
-- case AVERROR_NOFMT:
-- return "Unknown format";
-- case AVERROR_IO:
-- return "I/O error occurred";
-- case AVERROR_NOMEM:
-- return "Memory allocation error";
-- default:
-- break;
-- }
-- return "Unspecified error";
--}
-+//Deprecated Errors, should be using AVERROR(EINVAL) to return error strings
-+//static const char * icvFFMPEGErrStr(int err)
-+//{
-+// switch(err) {
-+// case AVERROR_NUMEXPECTED:
-+// return "Incorrect filename syntax";
-+// case AVERROR_INVALIDDATA:
-+// return "Invalid data in header";
-+// case AVERROR_NOFMT:
-+// return "Unknown format";
-+// case AVERROR_IO:
-+// return "I/O error occurred";
-+// case AVERROR_NOMEM:
-+// return "Memory allocation error";
-+// default:
-+// break;
-+// }
-+// return "Unspecified error";
-+//}
-
- /* function internal to FFMPEG (libavformat/riff.c) to lookup codec id by fourcc tag*/
- extern "C" {
-@@ -1322,7 +1323,7 @@
- /* open the codec */
- if ( (err=avcodec_open(c, codec)) < 0) {
- char errtext[256];
-- sprintf(errtext, "Could not open codec '%s': %s", codec->name, icvFFMPEGErrStr(err));
-+ sprintf(errtext, "Could not open codec '%s': %s", codec->name, AVERROR(EINVAL));
- CV_Error(CV_StsBadArg, errtext);
- }
-
+
+Index: D:/WaterWATCH/dev/opencv/modules/highgui/src/cap_ffmpeg.cpp
+===================================================================
+--- D:/WaterWATCH/dev/opencv/modules/highgui/src/cap_ffmpeg.cpp (revision 2121)
++++ D:/WaterWATCH/dev/opencv/modules/highgui/src/cap_ffmpeg.cpp (revision 2122)
+@@ -815,24 +815,25 @@
+ #endif
+ };
+
+-static const char * icvFFMPEGErrStr(int err)
+-{
+- switch(err) {
+- case AVERROR_NUMEXPECTED:
+- return "Incorrect filename syntax";
+- case AVERROR_INVALIDDATA:
+- return "Invalid data in header";
+- case AVERROR_NOFMT:
+- return "Unknown format";
+- case AVERROR_IO:
+- return "I/O error occurred";
+- case AVERROR_NOMEM:
+- return "Memory allocation error";
+- default:
+- break;
+- }
+- return "Unspecified error";
+-}
++//Deprecated Errors, should be using AVERROR(EINVAL) to return error strings
++//static const char * icvFFMPEGErrStr(int err)
++//{
++// switch(err) {
++// case AVERROR_NUMEXPECTED:
++// return "Incorrect filename syntax";
++// case AVERROR_INVALIDDATA:
++// return "Invalid data in header";
++// case AVERROR_NOFMT:
++// return "Unknown format";
++// case AVERROR_IO:
++// return "I/O error occurred";
++// case AVERROR_NOMEM:
++// return "Memory allocation error";
++// default:
++// break;
++// }
++// return "Unspecified error";
++//}
+
+ /* function internal to FFMPEG (libavformat/riff.c) to lookup codec id by fourcc tag*/
+ extern "C" {
+@@ -1322,7 +1323,7 @@
+ /* open the codec */
+ if ( (err=avcodec_open(c, codec)) < 0) {
+ char errtext[256];
+- sprintf(errtext, "Could not open codec '%s': %s", codec->name, icvFFMPEGErrStr(err));
++ sprintf(errtext, "Could not open codec '%s': %s", codec->name, AVERROR(EINVAL));
+ CV_Error(CV_StsBadArg, errtext);
+ }
+
diff --git a/media-libs/opencv/files/2.2.0-libpng1.5.patch b/media-libs/opencv/files/2.2.0-libpng1.5.patch
index 1a99998..fce010d 100644
--- a/media-libs/opencv/files/2.2.0-libpng1.5.patch
+++ b/media-libs/opencv/files/2.2.0-libpng1.5.patch
@@ -1,39 +1,40 @@
-Index: /trunk/opencv/modules/highgui/src/grfmt_png.cpp
-===================================================================
---- /trunk/opencv/modules/highgui/src/grfmt_png.cpp (revision 4337)
-+++ /trunk/opencv/modules/highgui/src/grfmt_png.cpp (revision 4945)
-@@ -108,5 +108,5 @@
- {
- png_structp png_ptr = (png_structp)_png_ptr;
-- PngDecoder* decoder = (PngDecoder*)(png_ptr->io_ptr);
-+ PngDecoder* decoder = (PngDecoder*)(png_get_io_ptr(png_ptr));
- CV_Assert( decoder );
- const Mat& buf = decoder->m_buf;
-@@ -139,5 +139,5 @@
- if( info_ptr && end_info )
- {
-- if( setjmp( png_ptr->jmpbuf ) == 0 )
-+ if( setjmp( png_jmpbuf( png_ptr ) ) == 0 )
- {
- if( !m_buf.empty() )
-@@ -201,5 +201,5 @@
- png_infop end_info = (png_infop)m_end_info;
-
-- if( setjmp(png_ptr->jmpbuf) == 0 )
-+ if( setjmp( png_jmpbuf ( png_ptr ) ) == 0 )
- {
- int y;
-@@ -285,5 +285,5 @@
- return;
- png_structp png_ptr = (png_structp)_png_ptr;
-- PngEncoder* encoder = (PngEncoder*)(png_ptr->io_ptr);
-+ PngEncoder* encoder = (PngEncoder*)(png_get_io_ptr(png_ptr));
- CV_Assert( encoder && encoder->m_buf );
- size_t cursz = encoder->m_buf->size();
-@@ -327,5 +327,5 @@
- if( info_ptr )
- {
-- if( setjmp( png_ptr->jmpbuf ) == 0 )
-+ if( setjmp( png_jmpbuf ( png_ptr ) ) == 0 )
- {
- if( m_buf )
+
+Index: /trunk/opencv/modules/highgui/src/grfmt_png.cpp
+===================================================================
+--- /trunk/opencv/modules/highgui/src/grfmt_png.cpp (revision 4337)
++++ /trunk/opencv/modules/highgui/src/grfmt_png.cpp (revision 4945)
+@@ -108,5 +108,5 @@
+ {
+ png_structp png_ptr = (png_structp)_png_ptr;
+- PngDecoder* decoder = (PngDecoder*)(png_ptr->io_ptr);
++ PngDecoder* decoder = (PngDecoder*)(png_get_io_ptr(png_ptr));
+ CV_Assert( decoder );
+ const Mat& buf = decoder->m_buf;
+@@ -139,5 +139,5 @@
+ if( info_ptr && end_info )
+ {
+- if( setjmp( png_ptr->jmpbuf ) == 0 )
++ if( setjmp( png_jmpbuf( png_ptr ) ) == 0 )
+ {
+ if( !m_buf.empty() )
+@@ -201,5 +201,5 @@
+ png_infop end_info = (png_infop)m_end_info;
+
+- if( setjmp(png_ptr->jmpbuf) == 0 )
++ if( setjmp( png_jmpbuf ( png_ptr ) ) == 0 )
+ {
+ int y;
+@@ -285,5 +285,5 @@
+ return;
+ png_structp png_ptr = (png_structp)_png_ptr;
+- PngEncoder* encoder = (PngEncoder*)(png_ptr->io_ptr);
++ PngEncoder* encoder = (PngEncoder*)(png_get_io_ptr(png_ptr));
+ CV_Assert( encoder && encoder->m_buf );
+ size_t cursz = encoder->m_buf->size();
+@@ -327,5 +327,5 @@
+ if( info_ptr )
+ {
+- if( setjmp( png_ptr->jmpbuf ) == 0 )
++ if( setjmp( png_jmpbuf ( png_ptr ) ) == 0 )
+ {
+ if( m_buf )
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-04-30 17:08 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-04-29 20:16 [gentoo-commits] proj/kde:master commit in: media-libs/opencv/files/ Tomas Chvatal
-- strict thread matches above, loose matches on Subject: below --
2011-04-30 17:08 Andreas K. Huettel
2011-04-29 21:43 Tomas Chvatal
2011-04-29 20:04 Tomas Chvatal
2011-04-29 20:02 Tomas Chvatal
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox