moved var from controller to ac.cpp

lostjared · Mar 8, 2018 · 7de19e8 · 7de19e8
1 parent 77fac6a
commit 7de19e8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/...xcodeproj/project.xcworkspace/xcuserdata/jared.xcuserdatad/UserInterfaceState.xcuserstate b/...xcodeproj/project.xcworkspace/xcuserdata/jared.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/Acid.Cam.v2.OSX/AC_Controller.mm b/Acid.Cam.v2.OSX/AC_Controller.mm
@@ -70,8 +70,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 void *library = NULL;
 std::ostringstream ftext;
 std::ostringstream stream;
-cv::Mat blend_image;
-bool blend_set = false;
+//cv::Mat blend_image;
 int camera_mode = 0;
 bool disableFilter;
 cv::VideoCapture *capture;
@@ -778,7 +777,6 @@ - (void) cvProc: (id) sender {
         else ac::isNegative = true;
         ac::color_order = (int) [corder indexOfSelectedItem];
     }
-
     NSInteger after = [apply_after integerValue];
     if(after == NSOffState)
         ac::ApplyColorMap(frame);
@@ -797,9 +795,7 @@ - (void) cvProc: (id) sender {
         cv::cvtColor(frame, change, cv::COLOR_BGR2GRAY);
         cv::cvtColor(change, frame, cv::COLOR_GRAY2BGR);
     }
-
     ac::ApplyColorMap(frame);
-
     NSInteger mask = [[NSApp mainWindow] styleMask];
     NSString *main_window = [[NSApp mainWindow] title];
     NSWindow *main_w = [NSApp mainWindow];
@@ -939,12 +935,10 @@ - (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColu
     if( [str isEqualTo:@"Filter"] ) {
         int value = (int)[number integerValue];
         NSString *s = [NSString stringWithFormat:@"%s", ac::draw_strings[value].c_str()];
-        //        [number release];
         return s;
     }
     else {
         NSString *s = [NSString stringWithFormat: @"%d", (int)[number integerValue]];
-        //        [number release];
         return s;
     }
 }
@@ -958,7 +952,6 @@ - (IBAction) addCustomItem: (id) sender {
     NSInteger cate = [categories_custom indexOfSelectedItem];
     NSMenuItem *item = [menu_items_custom[cate] itemAtIndex: index];
     NSString *title = [item title];
-
     if(index >= 0 && cate >= 0) {
         int filter_value = ac::filter_map[[title UTF8String]];
         [custom_array addObject: [NSNumber numberWithInt: filter_value]];

diff --git a/Acid.Cam.v2.OSX/ac.cpp b/Acid.Cam.v2.OSX/ac.cpp
@@ -97,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;