eessppeelllloo/Acid.Cam.v2.Qt
1
0
Fork 0
mirror of https://github.com/lostjared/Acid.Cam.v2.Qt.git synced 2025-12-19 13:19:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

updated ac.h/ac.cpp moved blend_image and blend_set to ac.cpp

Browse Source
This commit is contained in:
lostjared
2018-03-08 09:10:40 -08:00
parent 6e4fa79cbd
commit b00cbd3e13
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/ac.cpp
View File

@@ -37,12 +37,6 @@
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 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. 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<cv::Vec3b>(y, x);
*
*/ */
#include "ac.h" #include "ac.h"
#include "fractal.h" #include "fractal.h"
@@ -103,6 +97,10 @@ namespace ac {
bool color_map_set = false; bool color_map_set = false;
} }
// globals
cv::Mat blend_image;
bool blend_set = false;
void ac::fill_filter_map() { void ac::fill_filter_map() {
for(int i = 0; i < ac::draw_max; ++i) { for(int i = 0; i < ac::draw_max; ++i) {
filter_map[draw_strings[i]] = i; filter_map[draw_strings[i]] = i;

3
src/main.cpp
View File

@@ -13,9 +13,6 @@
#include<unistd.h> #include<unistd.h>
#endif #endif
bool blend_set = false;
cv::Mat blend_image;
int main(int argc, char **argv) { int main(int argc, char **argv) {
#ifdef LINUX_RELEASE #ifdef LINUX_RELEASE