mirror of
https://github.com/lostjared/Acid.Cam.v2.Qt.git
synced 2025-12-19 13:19:59 +01:00
updated ac.h/ac.cpp moved blend_image and blend_set to ac.cpp
This commit is contained in:
10
src/ac.cpp
10
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<cv::Vec3b>(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;
|
||||
|
||||
@@ -13,9 +13,6 @@
|
||||
#include<unistd.h>
|
||||
#endif
|
||||
|
||||
bool blend_set = false;
|
||||
cv::Mat blend_image;
|
||||
|
||||
int main(int argc, char **argv) {
|
||||
|
||||
#ifdef LINUX_RELEASE
|
||||
|
||||
Reference in New Issue
Block a user