Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision

Target

Select target project
  • sugu/camtron
1 result
Select Git revision
Show changes
Commits on Source (3)
Hide whitespace changes
Inline Side-by-side
Showing
with 908 additions and 10 deletions
camtron.sublime-workspace 0 → 100644
View file @ 93950156
{
"auto_complete":
{
"selected_items":
[
]
},
"buffers":
[
],
"build_system": "Packages/User/c++_project.sublime-build",
"build_system_choices":
[
],
"build_varint": "",
"command_palette":
{
"height": 0.0,
"last_filter": "",
"selected_items":
[
],
"width": 0.0
},
"console":
{
"height": 400.0,
"history":
[
]
},
"distraction_free":
{
"menu_visible": true,
"show_minimap": false,
"show_open_files": false,
"show_tabs": false,
"side_bar_visible": false,
"status_bar_visible": false
},
"file_history":
[
"/home/m/.bash_aliases",
"/home/m/dox/cmds/cmds.cpp",
"/home/m/code/idiv/camtron/merg.c",
"/home/m/dox/priv/kaza",
"/home/m/.bash_aliases.bup",
"/home/m/code/.git/MERGE_MSG",
"/home/m/code/idiv/camtron/examples/Demo.cpp",
"/home/m/code/idiv/camtron/src/algorithms/ttoolbox.cpp",
"/home/m/code/idiv/camtron/opencv",
"/home/m/code/idiv/camtron/src/PreProcessor.cpp",
"/home/m/code/idiv/camtron/src/algorithms/Tapter.cpp",
"/home/m/code/idiv/camtron/src/algorithms/Tapter.h",
"/home/m/code/idiv/camtron/src/algorithms/IBGS.h",
"/home/m/code/idiv/camtron/src/algorithms/algorithms.h",
"/home/m/code/idiv/camtron/config/FrameProcessor.xml",
"/home/m/code/idiv/camtron/config/VideoCapture.xml",
"/home/m/code/idiv/camtron/src/algorithms/PixelBasedAdaptiveSegmenter.h",
"/home/m/code/idiv/camtron/src/algorithms/PixelBasedAdaptiveSegmenter.cpp",
"/home/m/code/idiv/camtron/src/algorithms/ttoolbox.h",
"/home/m/code/idiv/camtron/wrapper/python/ndarray_converter.h",
"/home/m/code/idiv/camtron/wrapper/python/ndarray_converter.cpp",
"/home/m/code/idiv/camtron/wrapper/python/bgslibrary_module.cpp",
"/home/m/code/c++/foo/ecotron_ip_mapping_logpath.cpp",
"/home/m/code/idiv/camtron/src/algorithms/lb/BGModelSom.h",
"/home/m/code/idiv/camtron/src/algorithms/lb/BGModelSom.cpp",
"/home/m/code/idiv/camtron/src/algorithms/lb/BGModel.h",
"/home/m/code/idiv/camtron/src/algorithms/lb/BGModel.cpp",
"/home/m/code/idiv/camtron/config/PreProcessor.xml",
"/home/m/code/idiv/camtron/src/PreProcessor.h",
"/home/m/code/idiv/camtron/src/utils/ILoadSaveConfig.h",
"/home/m/code/idiv/camtron/examples/Demo_orig.cpp",
"/home/m/dox/priv/read",
"/home/m/dox/lang/fr/b2/2/unité_5",
"/home/m/code/idiv/camtron/demo.py",
"/home/m/code/idiv/camtron/demo2.py",
"/home/m/dox/lang/fr/b2/2/expose2",
"/home/m/dox/lang/fr/b2/2/expose",
"/home/m/dox/lang/fr/b2/2/vocab",
"/home/m/dox/lang/fr/b2/2/unité_4",
"/home/m/dox/idiv/camtron/notes",
"/home/m/code/idiv/camtron/examples/CMakeLists.txt",
"/home/m/code/idiv/camtron/examples/Demo3.cpp",
"/home/m/code/idiv/camtron/examples/Demo2.cpp",
"/home/m/dox/lang/fr/b2/2/voyage21France",
"/home/m/code/idiv/synconf/sync.list",
"/home/m/dox/po/notes/misc",
"/home/m/dox/lang/fr/b2/2/journal-televisé",
"/home/m/dox/priv/quotes",
"/home/m/dox/lang/fr/b2/2/unité_3",
"/home/m/code/bash/git_repo.sh",
"/home/m/code/idiv/synconf/sync.sh",
"/home/m/code/idiv/synconf/sync.list.bup",
"/home/m/code/bash/syncThunderbirdMsgFIlter.sh",
"/home/m/code/idiv/camtron/README.md",
"/home/m/dox/po/notes/urgewald",
"/home/m/.config/user/dircolors/night",
"/home/m/.config/user/dircolors/day",
"/home/m/code/python/util/util.py",
"/home/m/dox/lang/fr/b2/2/stolen-bikebag",
"/usr/local/bin/run_terminator.sh",
"/home/m/.config/sublime-text/Packages/User/c++_project.sublime-build",
"/home/m/code/c++/bookmark_merger/joli.json",
"/home/m/.config/user/bookmarx/bookmarks-empty.json",
"/home/m/code/c++/bookmark_merger/merger.cpp",
"/home/m/dox/bureau/study_again?",
"/home/m/.config/terminator/config",
"/home/m/.config/user/bookmarx/bookmarks-sugu.json",
"/home/m/.bashrc",
"/home/m/git_repo.sh",
"/home/m/dox/todo/todo_fr",
"/home/m/dox/sport/sport",
"/home/m/dox/sport/sport_bjj",
"/home/m/dox/cmds/cmds.py",
"/home/m/dox/sport/lost",
"/opt/sport/gracie-combatives/notes",
"/home/m/.dircolors",
"/home/m/code/bash/run_terminator.sh",
"/home/m/code/idiv/synconf/.git/COMMIT_EDITMSG",
"/home/m/bla",
"/home/m/dox/cmds/cmds1.sh",
"/home/m/config",
"/home/m/.config/user-dirs.dirs",
"/home/m/.config/user-dirs.locale",
"/home/m/code/c++/bookmark_merger/bookmarks_firefox.py",
"/home/m/code/idiv/synconf/sync/.bash_aliases",
"/home/m/code/python/quotes.py",
"/home/m/dox/cmds/cmds2.sh",
"/home/m/dox/todo/todo_code",
"/home/m/code/python/util.py",
"/home/m/m/.bash_aliases",
"/home/m/code/idiv/synconf/sync/dox/priv/quotes",
"/home/m/.gitconfig",
"/home/m/code/bash/restore.sh",
"/home/m/.thunderbird/ietlzorz.default-release/favicons.sqlite-wal",
"/home/m/.config/gtk-3.0/bookmarks",
"/home/m/.config/user/browseFiles/dox_filelist",
"/home/m/.config/user/browseFiles/cpp_filelist",
"/home/m/.config/user/browseFiles/todo_filelist",
"/home/m/.config/user/browseFiles/cmds_filelist",
"/home/m/todo_code",
"/home/m/code/python/browseFiles.py",
"/home/m/hackbert"
],
"find":
{
"height": 39.0
},
"find_in_files":
{
"height": 0.0,
"where_history":
[
]
},
"find_state":
{
"case_sensitive": false,
"find_history":
[
"exception",
"abort",
"exception",
"8",
"bit",
"RegisterFactoryFunction",
"BGS_Register",
"bgs_register",
"quote",
"BGS_Register",
"factoryFunctionRegistry",
"som",
"PYBIND11_MODULE",
"CV_LOAD_IMAGE_COLOR",
"algorithmName",
"param",
"DBL_MIN",
"bgmodel",
"model",
"BGModelSom",
"algorithms",
"KDE",
"getCmdOption",
"OutputDir",
"outputDir",
"OutputDir",
"outputDir",
"OutputDir",
"outputDir",
"OutputDir",
"outputDir",
"OutputDir",
"outputDir",
"OutputDir",
"outputDir",
"myFileListAfterContourSelection",
"myFileListNoContour",
"myFileErrorList",
"beginAll",
"begin",
"hullComplete",
"outputDir",
"hullComplete",
"imgConvexHull",
"hullComplete",
"moments(",
"conHull",
"massCenters",
"masscenters",
"massCenters",
"outputDir",
"OutputDir",
"outputDir",
"OutputDir",
"outputDir",
"OutputDir",
"outputDir",
"OutputDir",
"outputDir",
"muConvexHull",
"muConvexHullMassCenter",
"conHull",
"massCenters",
"masscenters",
"massCenters",
"masscenters",
"massCenters",
"imgDebug",
"drawContours",
"everyPic",
"muConvexHullMassCenter",
"Moments",
"moments",
"Moments",
"moments",
"ConvexHull",
"convexHull",
"conHull",
"ConvexHull",
"convexHull",
"massCenters",
"ConvexHull",
"convexHull",
"ConvexHull",
"convexhull",
"ConvexHull",
"convexHull",
"conHull",
"masscenters",
"massCenters",
"minRect",
"contourRect",
"minRect",
"recCenterPoints",
"center",
"recCenterPoints",
"Moments",
"moments",
"Moments",
"moments",
"Moments",
"moments",
"massCenters",
"contourSelection",
"ContourSelection",
"contourSelection",
"ContourSelection",
"contourSelection",
"contours",
"ext",
"contourSelection",
"archive",
"ARCHIVE",
"archive",
"ARCHIVE",
"archive",
"toFrameNumber",
"glob",
"np",
"algorithms",
"bgs",
"cv2",
"numpy",
"np",
"pay",
"plok",
"blo",
"blok"
],
"highlight": true,
"in_selection": false,
"preserve_case": false,
"regex": false,
"replace_history":
[
"rel",
"~/.config/user/dircolors/night",
"${verb}",
"'${verb}'",
"ra",
"'${verb}'"
],
"reverse": false,
"scrollbar_highlights": true,
"show_context": true,
"use_buffer2": true,
"use_gitignore": true,
"whole_word": false,
"wrap": true
},
"groups":
[
{
"sheets":
[
]
}
],
"incremental_find":
{
"height": 39.0
},
"input":
{
"height": 0.0
},
"layout":
{
"cells":
[
[
0,
0,
1,
1
]
],
"cols":
[
0.0,
1.0
],
"rows":
[
0.0,
1.0
]
},
"menu_visible": true,
"output.find_results":
{
"height": 0.0
},
"pinned_build_system": "",
"project": "camtron.sublime-project",
"replace":
{
"height": 74.0
},
"save_all_on_build": true,
"select_file":
{
"height": 0.0,
"last_filter": "",
"selected_items":
[
[
"",
"~/.bash_aliases"
],
[
"al",
"~/.bash_aliases"
]
],
"width": 0.0
},
"select_project":
{
"height": 500.0,
"last_filter": "",
"selected_items":
[
],
"width": 380.0
},
"select_symbol":
{
"height": 0.0,
"last_filter": "",
"selected_items":
[
],
"width": 0.0
},
"selected_group": 0,
"settings":
{
},
"show_minimap": true,
"show_open_files": true,
"show_tabs": true,
"side_bar_visible": false,
"side_bar_width": 150.0,
"status_bar_visible": true,
"template_settings":
{
}
}
examples/ct-examples.sublime-workspace 0 → 100644
View file @ 93950156
{
"auto_complete":
{
"selected_items":
[
]
},
"buffers":
[
{
"file": "/home/m/code/c++/bookmark_merger/merger.cpp",
"settings":
{
"buffer_size": 3880,
"line_ending": "Unix"
}
}
],
"build_system": "ct-examples (Linux)",
"build_system_choices":
[
[
[
[
"ct-examples (Linux)",
""
],
[
"ct-examples (Linux)",
"run"
],
[
"ct-examples (Linux)",
"clean"
],
[
"ct-examples (Linux)",
"install/strip"
],
[
"ct-examples (Linux)",
"install"
],
[
"ct-examples (Linux)",
"list_install_components"
],
[
"ct-examples (Linux)",
"rebuild_cache"
],
[
"ct-examples (Linux)",
"bgs_demo_orig"
],
[
"ct-examples (Linux)",
"bgs_demo"
],
[
"ct-examples (Linux)",
"install/local"
],
[
"ct-examples (Linux)",
"bgslibrary"
],
[
"ct-examples (Linux)",
"libbgs"
],
[
"Packages/C++/C++ Single File.sublime-build",
""
],
[
"Packages/C++/C++ Single File.sublime-build",
"Run"
],
[
"Packages/Makefile/Make.sublime-build",
""
],
[
"Packages/Makefile/Make.sublime-build",
"Clean"
],
[
"Packages/User/c++_project.sublime-build",
""
]
],
[
"ct-examples (Linux)",
""
]
]
],
"build_varint": "",
"command_palette":
{
"height": 0.0,
"last_filter": "",
"selected_items":
[
],
"width": 0.0
},
"console":
{
"height": 400.0,
"history":
[
]
},
"distraction_free":
{
"menu_visible": true,
"show_minimap": false,
"show_open_files": false,
"show_tabs": false,
"side_bar_visible": false,
"status_bar_visible": false
},
"file_history":
[
"/home/m/code/bash/restore.sh",
"/home/m/.config/sublime-merge/Packages/User/Preferences.sublime-settings",
"/home/m/code/idiv/camtron/examples/ct-examples.sublime-project",
"/home/m/code/idiv/camtron/examples/CMakeLists.txt",
"/usr/include/opencv4/opencv2/opencv.hpp",
"/usr/include/opencv4/opencv2/opencv_modules.hpp",
"/home/m/code/idiv/camtron/src/PreProcessor.h",
"/home/m/code/idiv/camtron/src/utils/ILoadSaveConfig.h",
"/home/m/code/idiv/camtron/src/PreProcessor.cpp",
"/home/m/code/idiv/camtron/examples/Demo_orig.cpp",
"/home/m/dox/priv/read",
"/home/m/dox/lang/fr/b2/2/unité_5",
"/home/m/code/idiv/camtron/demo.py",
"/home/m/code/idiv/camtron/demo2.py",
"/home/m/dox/lang/fr/b2/2/expose2",
"/home/m/dox/lang/fr/b2/2/expose",
"/home/m/dox/lang/fr/b2/2/vocab",
"/home/m/code/.git/MERGE_MSG",
"/home/m/dox/lang/fr/b2/2/unité_4",
"/home/m/dox/idiv/camtron/notes",
"/home/m/code/idiv/camtron/src/algorithms/ttoolbox.h",
"/home/m/code/idiv/camtron/src/algorithms/ttoolbox.cpp",
"/home/m/code/idiv/camtron/src/algorithms/Tapter.h",
"/home/m/code/idiv/camtron/src/algorithms/Tapter.cpp",
"/home/m/code/idiv/camtron/examples/Demo.cpp",
"/home/m/code/idiv/camtron/examples/Demo3.cpp",
"/home/m/code/idiv/camtron/examples/Demo2.cpp",
"/home/m/dox/lang/fr/b2/2/voyage21France",
"/home/m/code/idiv/synconf/sync.list",
"/home/m/.bash_aliases",
"/home/m/dox/po/notes/misc",
"/home/m/dox/lang/fr/b2/2/journal-televisé",
"/home/m/dox/priv/quotes",
"/home/m/dox/lang/fr/b2/2/unité_3",
"/home/m/code/bash/git_repo.sh",
"/home/m/code/idiv/synconf/sync.sh",
"/home/m/.bash_aliases.bup",
"/home/m/code/idiv/synconf/sync.list.bup",
"/home/m/code/bash/syncThunderbirdMsgFIlter.sh",
"/home/m/code/idiv/camtron/README.md",
"/home/m/dox/po/notes/urgewald",
"/home/m/.config/user/dircolors/night",
"/home/m/.config/user/dircolors/day",
"/home/m/code/python/util/util.py",
"/home/m/dox/lang/fr/b2/2/stolen-bikebag",
"/usr/local/bin/run_terminator.sh",
"/home/m/.config/sublime-text/Packages/User/c++_project.sublime-build",
"/home/m/code/c++/bookmark_merger/joli.json",
"/home/m/.config/user/bookmarx/bookmarks-empty.json",
"/home/m/code/c++/bookmark_merger/merger.cpp",
"/home/m/dox/bureau/study_again?",
"/home/m/.config/terminator/config",
"/home/m/.config/user/bookmarx/bookmarks-sugu.json",
"/home/m/.bashrc",
"/home/m/git_repo.sh",
"/home/m/dox/todo/todo_fr",
"/home/m/dox/sport/sport",
"/home/m/dox/sport/sport_bjj",
"/home/m/dox/cmds/cmds.py",
"/home/m/dox/sport/lost",
"/opt/sport/gracie-combatives/notes",
"/home/m/.dircolors",
"/home/m/code/bash/run_terminator.sh",
"/home/m/code/idiv/synconf/.git/COMMIT_EDITMSG",
"/home/m/bla",
"/home/m/dox/cmds/cmds1.sh",
"/home/m/config",
"/home/m/.config/user-dirs.dirs",
"/home/m/.config/user-dirs.locale",
"/home/m/code/c++/bookmark_merger/bookmarks_firefox.py",
"/home/m/code/idiv/synconf/sync/.bash_aliases",
"/home/m/code/python/quotes.py",
"/home/m/dox/cmds/cmds2.sh",
"/home/m/dox/todo/todo_code",
"/home/m/code/python/util.py",
"/home/m/m/.bash_aliases",
"/home/m/code/idiv/synconf/sync/dox/priv/quotes",
"/home/m/.gitconfig",
"/home/m/.thunderbird/ietlzorz.default-release/favicons.sqlite-wal",
"/home/m/.config/gtk-3.0/bookmarks",
"/home/m/.config/user/browseFiles/dox_filelist",
"/home/m/.config/user/browseFiles/cpp_filelist",
"/home/m/.config/user/browseFiles/todo_filelist",
"/home/m/.config/user/browseFiles/cmds_filelist",
"/home/m/todo_code",
"/home/m/code/python/browseFiles.py",
"/home/m/hackbert"
],
"find":
{
"height": 39.0
},
"find_in_files":
{
"height": 0.0,
"where_history":
[
]
},
"find_state":
{
"case_sensitive": false,
"find_history":
[
"sublime",
"ide",
"opencv",
"USER",
"nvme0n1",
"hdd_name_without_partition"
],
"highlight": true,
"in_selection": false,
"preserve_case": false,
"regex": false,
"replace_history":
[
],
"reverse": false,
"scrollbar_highlights": true,
"show_context": true,
"use_buffer2": true,
"use_gitignore": true,
"whole_word": false,
"wrap": true
},
"groups":
[
{
"sheets":
[
{
"buffer": 0,
"file": "/home/m/code/c++/bookmark_merger/merger.cpp",
"selected": true,
"semi_transient": false,
"settings":
{
"buffer_size": 3880,
"regions":
{
},
"selection":
[
[
0,
0
]
],
"settings":
{
"syntax": "Packages/C++/C++.sublime-syntax",
"tab_size": 2,
"translate_tabs_to_spaces": false
},
"translation.x": 0.0,
"translation.y": 0.0,
"zoom_level": 1.0
},
"stack_index": 0,
"stack_multiselect": false,
"type": "text"
}
]
}
],
"incremental_find":
{
"height": 39.0
},
"input":
{
"height": 0.0
},
"layout":
{
"cells":
[
[
0,
0,
1,
1
]
],
"cols":
[
0.0,
1.0
],
"rows":
[
0.0,
1.0
]
},
"menu_visible": true,
"output.exec":
{
"height": 244.0
},
"output.find_results":
{
"height": 0.0
},
"pinned_build_system": "",
"project": "ct-examples.sublime-project",
"replace":
{
"height": 74.0
},
"save_all_on_build": true,
"select_file":
{
"height": 0.0,
"last_filter": "",
"selected_items":
[
[
"",
"~/.bash_aliases"
],
[
"al",
"~/.bash_aliases"
]
],
"width": 0.0
},
"select_project":
{
"height": 500.0,
"last_filter": "",
"selected_items":
[
[
"",
"~/code/idiv/camtron/examples/ct-examples.sublime-project"
]
],
"width": 380.0
},
"select_symbol":
{
"height": 0.0,
"last_filter": "",
"selected_items":
[
],
"width": 0.0
},
"selected_group": 0,
"settings":
{
},
"show_minimap": true,
"show_open_files": false,
"show_tabs": true,
"side_bar_visible": true,
"side_bar_width": 194.0,
"status_bar_visible": true,
"template_settings":
{
}
}
src/algorithms/DPAdaptiveMedian.cpp
View file @ 93950156
...@@ -21,7 +21,12 @@ void DPAdaptiveMedian::process(const cv::Mat &img_input, cv::Mat &img_output, cv ...@@ -21,7 +21,12 @@ void DPAdaptiveMedian::process(const cv::Mat &img_input, cv::Mat &img_output, cv
{ {
init(img_input, img_output, img_bgmodel); init(img_input, img_output, img_bgmodel);
#if CV_MAJOR_VERSION > 3 || (CV_MAJOR_VERSION == 3 && CV_SUBMINOR_VERSION >= 9)
IplImage _frame = cvIplImage(img_input);
frame = &_frame;
#else
frame = new IplImage(img_input); frame = new IplImage(img_input);
#endif
if (firstTime) if (firstTime)
frame_data.ReleaseMemory(false); frame_data.ReleaseMemory(false);
......
src/algorithms/DPEigenbackground.cpp
View file @ 93950156
...@@ -21,7 +21,12 @@ void DPEigenbackground::process(const cv::Mat &img_input, cv::Mat &img_output, c ...@@ -21,7 +21,12 @@ void DPEigenbackground::process(const cv::Mat &img_input, cv::Mat &img_output, c
{ {
init(img_input, img_output, img_bgmodel); init(img_input, img_output, img_bgmodel);
#if CV_MAJOR_VERSION > 3 || (CV_MAJOR_VERSION == 3 && CV_SUBMINOR_VERSION >= 9)
IplImage _frame = cvIplImage(img_input);
frame = &_frame;
#else
frame = new IplImage(img_input); frame = new IplImage(img_input);
#endif
if (firstTime) if (firstTime)
frame_data.ReleaseMemory(false); frame_data.ReleaseMemory(false);
......
src/algorithms/DPGrimsonGMM.cpp
View file @ 93950156
...@@ -21,7 +21,12 @@ void DPGrimsonGMM::process(const cv::Mat &img_input, cv::Mat &img_output, cv::Ma ...@@ -21,7 +21,12 @@ void DPGrimsonGMM::process(const cv::Mat &img_input, cv::Mat &img_output, cv::Ma
{ {
init(img_input, img_output, img_bgmodel); init(img_input, img_output, img_bgmodel);
#if CV_MAJOR_VERSION > 3 || (CV_MAJOR_VERSION == 3 && CV_SUBMINOR_VERSION >= 9)
IplImage _frame = cvIplImage(img_input);
frame = &_frame;
#else
frame = new IplImage(img_input); frame = new IplImage(img_input);
#endif
if (firstTime) if (firstTime)
frame_data.ReleaseMemory(false); frame_data.ReleaseMemory(false);
......
src/algorithms/DPMean.cpp
View file @ 93950156
...@@ -21,7 +21,12 @@ void DPMean::process(const cv::Mat &img_input, cv::Mat &img_output, cv::Mat &img ...@@ -21,7 +21,12 @@ void DPMean::process(const cv::Mat &img_input, cv::Mat &img_output, cv::Mat &img
{ {
init(img_input, img_output, img_bgmodel); init(img_input, img_output, img_bgmodel);
#if CV_MAJOR_VERSION > 3 || (CV_MAJOR_VERSION == 3 && CV_SUBMINOR_VERSION >= 9)
IplImage _frame = cvIplImage(img_input);
frame = &_frame;
#else
frame = new IplImage(img_input); frame = new IplImage(img_input);
#endif
if (firstTime) if (firstTime)
frame_data.ReleaseMemory(false); frame_data.ReleaseMemory(false);
......
src/algorithms/DPPratiMediod.cpp
View file @ 93950156
...@@ -21,7 +21,12 @@ void DPPratiMediod::process(const cv::Mat &img_input, cv::Mat &img_output, cv::M ...@@ -21,7 +21,12 @@ void DPPratiMediod::process(const cv::Mat &img_input, cv::Mat &img_output, cv::M
{ {
init(img_input, img_output, img_bgmodel); init(img_input, img_output, img_bgmodel);
#if CV_MAJOR_VERSION > 3 || (CV_MAJOR_VERSION == 3 && CV_SUBMINOR_VERSION >= 9)
IplImage _frame = cvIplImage(img_input);
frame = &_frame;
#else
frame = new IplImage(img_input); frame = new IplImage(img_input);
#endif
if (firstTime) if (firstTime)
frame_data.ReleaseMemory(false); frame_data.ReleaseMemory(false);
......
src/algorithms/DPTexture.cpp
View file @ 93950156
...@@ -29,7 +29,12 @@ void DPTexture::process(const cv::Mat &img_input, cv::Mat &img_output, cv::Mat & ...@@ -29,7 +29,12 @@ void DPTexture::process(const cv::Mat &img_input, cv::Mat &img_output, cv::Mat &
{ {
init(img_input, img_output, img_bgmodel); init(img_input, img_output, img_bgmodel);
#if CV_MAJOR_VERSION > 3 || (CV_MAJOR_VERSION == 3 && CV_SUBMINOR_VERSION >= 9)
IplImage _frame = cvIplImage(img_input);
frame = &_frame;
#else
frame = new IplImage(img_input); frame = new IplImage(img_input);
#endif
if (firstTime) { if (firstTime) {
width = img_input.size().width; width = img_input.size().width;
......
src/algorithms/DPWrenGA.cpp
View file @ 93950156
...@@ -21,7 +21,12 @@ void DPWrenGA::process(const cv::Mat &img_input, cv::Mat &img_output, cv::Mat &i ...@@ -21,7 +21,12 @@ void DPWrenGA::process(const cv::Mat &img_input, cv::Mat &img_output, cv::Mat &i
{ {
init(img_input, img_output, img_bgmodel); init(img_input, img_output, img_bgmodel);
#if CV_MAJOR_VERSION > 3 || (CV_MAJOR_VERSION == 3 && CV_SUBMINOR_VERSION >= 9)
IplImage _frame = cvIplImage(img_input);
frame = &_frame;
#else
frame = new IplImage(img_input); frame = new IplImage(img_input);
#endif
if (firstTime) if (firstTime)
frame_data.ReleaseMemory(false); frame_data.ReleaseMemory(false);
......
src/algorithms/DPZivkovicAGMM.cpp
View file @ 93950156
...@@ -21,7 +21,12 @@ void DPZivkovicAGMM::process(const cv::Mat &img_input, cv::Mat &img_output, cv:: ...@@ -21,7 +21,12 @@ void DPZivkovicAGMM::process(const cv::Mat &img_input, cv::Mat &img_output, cv::
{ {
init(img_input, img_output, img_bgmodel); init(img_input, img_output, img_bgmodel);
#if CV_MAJOR_VERSION > 3 || (CV_MAJOR_VERSION == 3 && CV_SUBMINOR_VERSION >= 9)
IplImage _frame = cvIplImage(img_input);
frame = &_frame;
#else
frame = new IplImage(img_input); frame = new IplImage(img_input);
#endif
if (firstTime) if (firstTime)
frame_data.ReleaseMemory(false); frame_data.ReleaseMemory(false);
......
src/algorithms/FuzzyChoquetIntegral.cpp
View file @ 93950156
...@@ -73,10 +73,24 @@ void FuzzyChoquetIntegral::process(const cv::Mat &img_input, cv::Mat &img_output ...@@ -73,10 +73,24 @@ void FuzzyChoquetIntegral::process(const cv::Mat &img_input, cv::Mat &img_output
cv::Mat img_background_f1; cv::Mat img_background_f1;
cv::cvtColor(img_background_f3, img_background_f1, CV_BGR2GRAY); cv::cvtColor(img_background_f3, img_background_f1, CV_BGR2GRAY);
#if CV_MAJOR_VERSION > 3 || (CV_MAJOR_VERSION == 3 && CV_SUBMINOR_VERSION >= 9)
IplImage _input_f3 = cvIplImage(img_input_f3);
IplImage* input_f3 = &_input_f3;
IplImage _input_f1 = cvIplImage(img_input_f1);
IplImage* input_f1 = &_input_f1;
IplImage _background_f3 = cvIplImage(img_background_f3);
IplImage* background_f3 = &_background_f3;
IplImage _background_f1 = cvIplImage(img_background_f1);
IplImage* background_f1 = &_background_f1;
#else
IplImage* input_f3 = new IplImage(img_input_f3); IplImage* input_f3 = new IplImage(img_input_f3);
IplImage* input_f1 = new IplImage(img_input_f1); IplImage* input_f1 = new IplImage(img_input_f1);
IplImage* background_f3 = new IplImage(img_background_f3); IplImage* background_f3 = new IplImage(img_background_f3);
IplImage* background_f1 = new IplImage(img_background_f1); IplImage* background_f1 = new IplImage(img_background_f1);
#endif
IplImage* lbp_input_f1 = cvCreateImage(cvSize(input_f1->width, input_f1->height), IPL_DEPTH_32F, 1); IplImage* lbp_input_f1 = cvCreateImage(cvSize(input_f1->width, input_f1->height), IPL_DEPTH_32F, 1);
cvSetZero(lbp_input_f1); cvSetZero(lbp_input_f1);
......
src/algorithms/FuzzySugenoIntegral.cpp
View file @ 93950156
...@@ -72,10 +72,24 @@ void FuzzySugenoIntegral::process(const cv::Mat &img_input, cv::Mat &img_output, ...@@ -72,10 +72,24 @@ void FuzzySugenoIntegral::process(const cv::Mat &img_input, cv::Mat &img_output,
cv::Mat img_background_f1; cv::Mat img_background_f1;
cv::cvtColor(img_background_f3, img_background_f1, CV_BGR2GRAY); cv::cvtColor(img_background_f3, img_background_f1, CV_BGR2GRAY);
#if CV_MAJOR_VERSION > 3 || (CV_MAJOR_VERSION == 3 && CV_SUBMINOR_VERSION >= 9)
IplImage _input_f3 = cvIplImage(img_input_f3);
IplImage* input_f3 = &_input_f3;
IplImage _input_f1 = cvIplImage(img_input_f1);
IplImage* input_f1 = &_input_f1;
IplImage _background_f3 = cvIplImage(img_background_f3);
IplImage* background_f3 = &_background_f3;
IplImage _background_f1 = cvIplImage(img_background_f1);
IplImage* background_f1 = &_background_f1;
#else
IplImage* input_f3 = new IplImage(img_input_f3); IplImage* input_f3 = new IplImage(img_input_f3);
IplImage* input_f1 = new IplImage(img_input_f1); IplImage* input_f1 = new IplImage(img_input_f1);
IplImage* background_f3 = new IplImage(img_background_f3); IplImage* background_f3 = new IplImage(img_background_f3);
IplImage* background_f1 = new IplImage(img_background_f1); IplImage* background_f1 = new IplImage(img_background_f1);
#endif
IplImage* lbp_input_f1 = cvCreateImage(cvSize(input_f1->width, input_f1->height), IPL_DEPTH_32F, 1); IplImage* lbp_input_f1 = cvCreateImage(cvSize(input_f1->width, input_f1->height), IPL_DEPTH_32F, 1);
cvSetZero(lbp_input_f1); cvSetZero(lbp_input_f1);
......
src/algorithms/IBGS.h
View file @ 93950156
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include "../utils/ILoadSaveConfig.h" #include "../utils/ILoadSaveConfig.h"
#ifndef CV_RGB #ifndef CV_RGB && CV_MAJOR_VERSION > 3
#define CV_RGB(r, g, b) cv::Scalar((b), (g), (r), 0) #define CV_RGB(r, g, b) cv::Scalar((b), (g), (r), 0)
#endif #endif
......
src/algorithms/LBAdaptiveSOM.cpp
View file @ 93950156
...@@ -23,8 +23,12 @@ void LBAdaptiveSOM::process(const cv::Mat &img_input, cv::Mat &img_output, cv::M ...@@ -23,8 +23,12 @@ void LBAdaptiveSOM::process(const cv::Mat &img_input, cv::Mat &img_output, cv::M
{ {
init(img_input, img_output, img_bgmodel); init(img_input, img_output, img_bgmodel);
#if CV_MAJOR_VERSION > 3 || (CV_MAJOR_VERSION == 3 && CV_SUBMINOR_VERSION >= 9)
IplImage _frame = cvIplImage(img_input);
IplImage *frame = &_frame;
#else
IplImage *frame = new IplImage(img_input); IplImage *frame = new IplImage(img_input);
#endif
if (firstTime) { if (firstTime) {
int w = cvGetSize(frame).width; int w = cvGetSize(frame).width;
int h = cvGetSize(frame).height; int h = cvGetSize(frame).height;
......
src/algorithms/LBFuzzyAdaptiveSOM.cpp
View file @ 93950156
...@@ -22,7 +22,12 @@ void LBFuzzyAdaptiveSOM::process(const cv::Mat &img_input, cv::Mat &img_output, ...@@ -22,7 +22,12 @@ void LBFuzzyAdaptiveSOM::process(const cv::Mat &img_input, cv::Mat &img_output,
{ {
init(img_input, img_output, img_bgmodel); init(img_input, img_output, img_bgmodel);
#if CV_MAJOR_VERSION > 3 || (CV_MAJOR_VERSION == 3 && CV_SUBMINOR_VERSION >= 9)
IplImage _frame = cvIplImage(img_input);
IplImage *frame = &_frame;
#else
IplImage *frame = new IplImage(img_input); IplImage *frame = new IplImage(img_input);
#endif
if (firstTime) { if (firstTime) {
int w = cvGetSize(frame).width; int w = cvGetSize(frame).width;
......
src/algorithms/LBFuzzyGaussian.cpp
View file @ 93950156
...@@ -22,8 +22,12 @@ void LBFuzzyGaussian::process(const cv::Mat &img_input, cv::Mat &img_output, cv: ...@@ -22,8 +22,12 @@ void LBFuzzyGaussian::process(const cv::Mat &img_input, cv::Mat &img_output, cv:
{ {
init(img_input, img_output, img_bgmodel); init(img_input, img_output, img_bgmodel);
#if CV_MAJOR_VERSION > 3 || (CV_MAJOR_VERSION == 3 && CV_SUBMINOR_VERSION >= 9)
IplImage _frame = cvIplImage(img_input);
IplImage *frame = &_frame;
#else
IplImage *frame = new IplImage(img_input); IplImage *frame = new IplImage(img_input);
#endif
if (firstTime) { if (firstTime) {
int w = cvGetSize(frame).width; int w = cvGetSize(frame).width;
int h = cvGetSize(frame).height; int h = cvGetSize(frame).height;
......
src/algorithms/LBMixtureOfGaussians.cpp
View file @ 93950156
...@@ -22,8 +22,12 @@ void LBMixtureOfGaussians::process(const cv::Mat &img_input, cv::Mat &img_output ...@@ -22,8 +22,12 @@ void LBMixtureOfGaussians::process(const cv::Mat &img_input, cv::Mat &img_output
{ {
init(img_input, img_output, img_bgmodel); init(img_input, img_output, img_bgmodel);
#if CV_MAJOR_VERSION > 3 || (CV_MAJOR_VERSION == 3 && CV_SUBMINOR_VERSION >= 9)
IplImage _frame = cvIplImage(img_input);
IplImage *frame = &_frame;
#else
IplImage *frame = new IplImage(img_input); IplImage *frame = new IplImage(img_input);
#endif
if (firstTime) { if (firstTime) {
int w = cvGetSize(frame).width; int w = cvGetSize(frame).width;
int h = cvGetSize(frame).height; int h = cvGetSize(frame).height;
......
src/algorithms/LBP_MRF.cpp
View file @ 93950156
...@@ -24,7 +24,12 @@ void LBP_MRF::process(const cv::Mat &img_input, cv::Mat &img_output, cv::Mat &im ...@@ -24,7 +24,12 @@ void LBP_MRF::process(const cv::Mat &img_input, cv::Mat &img_output, cv::Mat &im
{ {
init(img_input, img_output, img_bgmodel); init(img_input, img_output, img_bgmodel);
#if CV_MAJOR_VERSION > 3 || (CV_MAJOR_VERSION == 3 && CV_SUBMINOR_VERSION >= 9)
IplImage TempImage = cvIplImage(img_input);
#else
IplImage TempImage(img_input); IplImage TempImage(img_input);
#endif
lbp_mrf::MEImage InputImage(img_input.cols, img_input.rows, img_input.channels()); lbp_mrf::MEImage InputImage(img_input.cols, img_input.rows, img_input.channels());
lbp_mrf::MEImage OutputImage(img_input.cols, img_input.rows, img_input.channels()); lbp_mrf::MEImage OutputImage(img_input.cols, img_input.rows, img_input.channels());
......
src/algorithms/LBP_MRF/MEImage.cpp
View file @ 93950156
#include <opencv2/opencv.hpp> #include "opencv2/core/version.hpp"
// opencv legacy includes #if CV_MAJOR_VERSION >= 2 && CV_MAJOR_VERSION <= 3
#include <opencv2/imgproc/types_c.h>
#include <opencv2/imgproc/imgproc_c.h>
#include "MEImage.hpp" #include "MEImage.hpp"
#include "MEDefs.hpp" #include "MEDefs.hpp"
#if CV_MAJOR_VERSION >= 2 && CV_MAJOR_VERSION <= 3 //#if CV_MAJOR_VERSION == 3 && CV_SUBMINOR_VERSION >= 9
//#define CV_RGB(r, g, b) cvScalar((b), (g), (r), 0)
//#endif
#define CV_RGB_LEGACY(r, g, b) cvScalar((b), (g), (r), 0)
//using namespace bgslibrary::algorithms::lbp_mrf; //using namespace bgslibrary::algorithms::lbp_mrf;
...@@ -1286,7 +1287,7 @@ namespace bgslibrary ...@@ -1286,7 +1287,7 @@ namespace bgslibrary
Point1.y = y - Resulty / 2; Point1.y = y - Resulty / 2;
Point2.x = x + Resultx / 2; Point2.x = x + Resultx / 2;
Point2.y = y + Resulty / 2; Point2.y = y + Resulty / 2;
cvLine(ME_CAST_TO_IPLIMAGE(cvImg), Point1, Point2, CV_RGB(255, 255, 255), 1, 8); cvLine(ME_CAST_TO_IPLIMAGE(cvImg), Point1, Point2, CV_RGB_LEGACY(255, 255, 255), 1, 8);
} }
} }
......
src/algorithms/LBP_MRF/MEImage.hpp
View file @ 93950156
...@@ -3,6 +3,12 @@ ...@@ -3,6 +3,12 @@
#include "opencv2/core/version.hpp" #include "opencv2/core/version.hpp"
#if CV_MAJOR_VERSION >= 2 && CV_MAJOR_VERSION <= 3 #if CV_MAJOR_VERSION >= 2 && CV_MAJOR_VERSION <= 3
//#include <opencv2/opencv.hpp>
//#include <opencv2/imgproc.hpp>
// opencv legacy includes
#include <opencv2/imgproc/imgproc_c.h>
namespace bgslibrary namespace bgslibrary
{ {
namespace algorithms namespace algorithms
......