From b00cbd3e1352d5426d20b5cc57daa3aed046424e Mon Sep 17 00:00:00 2001 From: lostjared Date: Thu, 8 Mar 2018 09:10:40 -0800 Subject: [PATCH] updated ac.h/ac.cpp moved blend_image and blend_set to ac.cpp --- src/ac.cpp | 10 ++++------ src/main.cpp | 3 --- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/ac.cpp b/src/ac.cpp index 882751c..961a76a 100644 --- a/src/ac.cpp +++ b/src/ac.cpp @@ -37,12 +37,6 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - * One quick note, most of the time when writing programs using x,y variables x goes first - * the OpenCV Mat at function that returns a pixel is reversed. - * y is first. Example - * cv::Vec3b &v = frame.at(y, x); - * */ #include "ac.h" #include "fractal.h" @@ -103,6 +97,10 @@ namespace ac { bool color_map_set = false; } +// globals +cv::Mat blend_image; +bool blend_set = false; + void ac::fill_filter_map() { for(int i = 0; i < ac::draw_max; ++i) { filter_map[draw_strings[i]] = i; diff --git a/src/main.cpp b/src/main.cpp index faadfd4..1b9aaca 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -13,9 +13,6 @@ #include #endif -bool blend_set = false; -cv::Mat blend_image; - int main(int argc, char **argv) { #ifdef LINUX_RELEASE