From: Alexander Shishkov Date: Fri, 2 Aug 2013 21:45:20 +0000 (+0400) Subject: Fixes for Linux compilation, small changes X-Git-Tag: submit/tizen_ivi/20141117.190038~2^2~900^2~16^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6df203c4491cca10c56550b02b8a82837cab4587;p=profile%2Fivi%2Fopencv.git Fixes for Linux compilation, small changes --- diff --git a/modules/photo/include/opencv2/photo.hpp b/modules/photo/include/opencv2/photo.hpp index 35787c0..6c9eab1 100644 --- a/modules/photo/include/opencv2/photo.hpp +++ b/modules/photo/include/opencv2/photo.hpp @@ -59,8 +59,6 @@ enum INPAINT_TELEA = 1 // A. Telea algorithm }; -CV_EXPORTS_W bool initModule_photo(); - //! restores the damaged image areas using one of the available intpainting algorithms CV_EXPORTS_W void inpaint( InputArray src, InputArray inpaintMask, OutputArray dst, double inpaintRadius, int flags ); @@ -91,11 +89,7 @@ public: CV_WRAP virtual void setGamma(float gamma) = 0; }; -class CV_EXPORTS_W TonemapLinear : public Tonemap -{ -}; - -CV_EXPORTS_W Ptr createTonemapLinear(float gamma = 1.0f); +CV_EXPORTS_W Ptr createTonemapLinear(float gamma = 1.0f); // "Adaptive Logarithmic Mapping For Displaying HighContrast Scenes", Drago et al., 2003 @@ -154,10 +148,10 @@ public: class CV_EXPORTS_W AlignMTB : public ExposureAlign { public: - CV_WRAP virtual void process(InputArrayOfArrays src, OutputArrayOfArrays dst, - const std::vector& times, InputArray response) = 0; + CV_WRAP virtual void process(InputArrayOfArrays src, OutputArrayOfArrays dst, + const std::vector& times, InputArray response) = 0; - CV_WRAP virtual void process(InputArrayOfArrays src, OutputArrayOfArrays dst) = 0; + CV_WRAP virtual void process(InputArrayOfArrays src, OutputArrayOfArrays dst) = 0; CV_WRAP virtual void calculateShift(InputArray img0, InputArray img1, Point& shift) = 0; CV_WRAP virtual void shiftMat(InputArray src, OutputArray dst, const Point shift) = 0; @@ -197,7 +191,7 @@ class CV_EXPORTS_W ExposureMerge : public Algorithm { public: CV_WRAP virtual void process(InputArrayOfArrays src, OutputArray dst, - const std::vector& times, InputArray response) = 0; + const std::vector& times, InputArray response) = 0; }; // "Recovering High Dynamic Range Radiance Maps from Photographs", Debevec, Malik, 1997 @@ -205,8 +199,8 @@ public: class CV_EXPORTS_W MergeDebevec : public ExposureMerge { public: - CV_WRAP virtual void process(InputArrayOfArrays src, OutputArray dst, - const std::vector& times, InputArray response) = 0; + CV_WRAP virtual void process(InputArrayOfArrays src, OutputArray dst, + const std::vector& times, InputArray response) = 0; CV_WRAP virtual void process(InputArrayOfArrays src, OutputArray dst, const std::vector& times) = 0; }; @@ -217,8 +211,8 @@ CV_EXPORTS_W Ptr createMergeDebevec(); class CV_EXPORTS_W MergeMertens : public ExposureMerge { public: - CV_WRAP virtual void process(InputArrayOfArrays src, OutputArray dst, - const std::vector& times, InputArray response) = 0; + CV_WRAP virtual void process(InputArrayOfArrays src, OutputArray dst, + const std::vector& times, InputArray response) = 0; CV_WRAP virtual void process(InputArrayOfArrays src, OutputArray dst) = 0; CV_WRAP virtual float getContrastWeight() const = 0; diff --git a/modules/photo/src/align.cpp b/modules/photo/src/align.cpp index 804aabb..9f8b7eb 100644 --- a/modules/photo/src/align.cpp +++ b/modules/photo/src/align.cpp @@ -10,8 +10,7 @@ // License Agreement // For Open Source Computer Vision Library // -// Copyright (C) 2000-2008, Intel Corporation, all rights reserved. -// Copyright (C) 2009, Willow Garage Inc., all rights reserved. +// Copyright (C) 2013, OpenCV Foundation, all rights reserved. // Third party copyrights are property of their respective owners. // // Redistribution and use in source and binary forms, with or without modification, @@ -232,4 +231,4 @@ CV_EXPORTS_W Ptr createAlignMTB(int max_bits, int exclude_range) return new AlignMTBImpl(max_bits, exclude_range); } -} \ No newline at end of file +} diff --git a/modules/photo/src/hdr_common.cpp b/modules/photo/src/hdr_common.cpp index 202eb01..de8b16c 100644 --- a/modules/photo/src/hdr_common.cpp +++ b/modules/photo/src/hdr_common.cpp @@ -10,8 +10,7 @@ // License Agreement // For Open Source Computer Vision Library // -// Copyright (C) 2000-2008, Intel Corporation, all rights reserved. -// Copyright (C) 2009, Willow Garage Inc., all rights reserved. +// Copyright (C) 2013, OpenCV Foundation, all rights reserved. // Third party copyrights are property of their respective owners. // // Redistribution and use in source and binary forms, with or without modification, @@ -71,4 +70,4 @@ Mat tringleWeights() return w; } -}; \ No newline at end of file +}; diff --git a/modules/photo/src/hdr_common.hpp b/modules/photo/src/hdr_common.hpp index 63cfe44..9101cba 100644 --- a/modules/photo/src/hdr_common.hpp +++ b/modules/photo/src/hdr_common.hpp @@ -10,8 +10,7 @@ // License Agreement // For Open Source Computer Vision Library // -// Copyright (C) 2000-2008, Intel Corporation, all rights reserved. -// Copyright (C) 2009, Willow Garage Inc., all rights reserved. +// Copyright (C) 2013, OpenCV Foundation, all rights reserved. // Third party copyrights are property of their respective owners. // // Redistribution and use in source and binary forms, with or without modification, @@ -55,4 +54,4 @@ Mat tringleWeights(); }; -#endif \ No newline at end of file +#endif diff --git a/modules/photo/src/merge.cpp b/modules/photo/src/merge.cpp index 011b583..11a591b 100644 --- a/modules/photo/src/merge.cpp +++ b/modules/photo/src/merge.cpp @@ -10,8 +10,7 @@ // License Agreement // For Open Source Computer Vision Library // -// Copyright (C) 2000-2008, Intel Corporation, all rights reserved. -// Copyright (C) 2009, Willow Garage Inc., all rights reserved. +// Copyright (C) 2013, OpenCV Foundation, all rights reserved. // Third party copyrights are property of their respective owners. // // Redistribution and use in source and binary forms, with or without modification, @@ -260,4 +259,4 @@ Ptr createMergeMertens(float wcon, float wsat, float wexp) return new MergeMertensImpl(wcon, wsat, wexp); } -} \ No newline at end of file +} diff --git a/modules/photo/src/tonemap.cpp b/modules/photo/src/tonemap.cpp index 62725cb..8571b63 100644 --- a/modules/photo/src/tonemap.cpp +++ b/modules/photo/src/tonemap.cpp @@ -10,8 +10,7 @@ // License Agreement // For Open Source Computer Vision Library // -// Copyright (C) 2000-2008, Intel Corporation, all rights reserved. -// Copyright (C) 2009, Willow Garage Inc., all rights reserved. +// Copyright (C) 2013, OpenCV Foundation, all rights reserved. // Third party copyrights are property of their respective owners. // // Redistribution and use in source and binary forms, with or without modification, @@ -47,7 +46,7 @@ namespace cv { -class TonemapLinearImpl : public TonemapLinear +class TonemapLinearImpl : public Tonemap { public: TonemapLinearImpl(float gamma) : gamma(gamma), name("TonemapLinear") @@ -93,7 +92,7 @@ protected: float gamma; }; -Ptr createTonemapLinear(float gamma) +Ptr createTonemapLinear(float gamma) { return new TonemapLinearImpl(gamma); } @@ -115,7 +114,7 @@ public: _dst.create(src.size(), CV_32FC3); Mat img = _dst.getMat(); - Ptr linear = createTonemapLinear(1.0f); + Ptr linear = createTonemapLinear(1.0f); linear->process(src, img); Mat gray_img; @@ -286,7 +285,7 @@ public: _dst.create(src.size(), CV_32FC3); Mat img = _dst.getMat(); - Ptr linear = createTonemapLinear(1.0f); + Ptr linear = createTonemapLinear(1.0f); linear->process(src, img); Mat gray_img; @@ -363,4 +362,4 @@ Ptr createTonemapReinhardDevlin(float gamma, float contra return new TonemapReinhardDevlinImpl(gamma, contrast, sigma_color, sigma_space); } -} \ No newline at end of file +} diff --git a/modules/photo/test/test_hdr.cpp b/modules/photo/test/test_hdr.cpp index dd44b16..39c0a1e 100644 --- a/modules/photo/test/test_hdr.cpp +++ b/modules/photo/test/test_hdr.cpp @@ -10,8 +10,7 @@ // License Agreement // For Open Source Computer Vision Library // -// Copyright (C) 2000-2008, Intel Corporation, all rights reserved. -// Copyright (C) 2009, Willow Garage Inc., all rights reserved. +// Copyright (C) 2013, OpenCV Foundation, all rights reserved. // Third party copyrights are property of their respective owners. // // Redistribution and use in source and binary forms, with or without modification, @@ -61,9 +60,10 @@ void checkEqual(Mat img0, Mat img1, double threshold) ASSERT_FALSE(max > threshold) << max; } -void loadExposureSeq(String path, vector& images, vector& times = vector()) +static vector DEFAULT_VECTOR; +void loadExposureSeq(String path, vector& images, vector& times = DEFAULT_VECTOR) { - ifstream list_file(path + "list.txt"); + ifstream list_file((path + "list.txt").c_str()); ASSERT_TRUE(list_file.is_open()); string name; float val; @@ -79,7 +79,7 @@ void loadExposureSeq(String path, vector& images, vector& times = ve void loadResponseCSV(String path, Mat& response) { response = Mat(256, 3, CV_32F); - ifstream resp_file(path); + ifstream resp_file(path.c_str()); for(int i = 0; i < 256; i++) { for(int channel = 0; channel < 3; channel++) { resp_file >> response.at(i, channel); @@ -98,7 +98,7 @@ TEST(Photo_Tonemap, regression) float gamma = 2.2f; test_path += "tonemap/"; - Ptr linear = createTonemapLinear(gamma); + Ptr linear = createTonemapLinear(gamma); linear->process(img, result); loadImage(test_path + "linear.png", expected); result.convertTo(result, CV_8UC3, 255); @@ -156,7 +156,7 @@ TEST(Photo_MergeMertens, regression) string test_path = string(cvtest::TS::ptr()->get_data_path()) + "hdr/"; vector images; - loadExposureSeq(test_path + "exposures/", images); + loadExposureSeq((test_path + "exposures/").c_str() , images); Ptr merge = createMergeMertens(); diff --git a/modules/python/src2/cv2.cpp b/modules/python/src2/cv2.cpp index e68da59..948e107 100644 --- a/modules/python/src2/cv2.cpp +++ b/modules/python/src2/cv2.cpp @@ -131,6 +131,15 @@ typedef Ptr Ptr_StereoMatcher; typedef Ptr Ptr_StereoBM; typedef Ptr Ptr_StereoSGBM; +typedef Ptr Ptr_Tonemap; +typedef Ptr Ptr_TonemapDrago; +typedef Ptr Ptr_TonemapReinhardDevlin; +typedef Ptr Ptr_TonemapDurand; +typedef Ptr Ptr_AlignMTB; +typedef Ptr Ptr_CalibrateDebevec; +typedef Ptr Ptr_MergeDebevec; +typedef Ptr Ptr_MergeMertens; + typedef Ptr Ptr_ChannelFeatureBuilder; typedef SimpleBlobDetector::Params SimpleBlobDetector_Params;