From 674532bbdadd8f476616a202dc9766533c99416c Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Sat, 10 Oct 2009 04:54:15 +0000 Subject: reverted all my changes svn path=/trunk/externals/pix_opencv/; revision=12571 --- Makefile | 159 ++++++--------------------- haarcascades/haarcascade_frontalface_alt.xml | 0 haarcascades/mouth.xml | 0 pix_opencv-meta.pd | 4 - pix_opencv_athreshold.h | 4 - pix_opencv_bgstats.h | 4 - pix_opencv_bgsubstract.h | 4 - pix_opencv_camshift.h | 4 - pix_opencv_colorfilt.cc | 4 +- pix_opencv_colorfilt.h | 4 - pix_opencv_contours_boundingrect.h | 5 - pix_opencv_contours_convexhull.cc | 4 +- pix_opencv_contours_convexhull.h | 5 - pix_opencv_contours_convexity.h | 5 - pix_opencv_dft.h | 4 - pix_opencv_distrans.h | 4 - pix_opencv_edge.h | 4 - pix_opencv_floodfill.h | 4 - pix_opencv_haarcascade.h | 4 - pix_opencv_hist_compare.h | 5 - pix_opencv_hough_circles.h | 4 - pix_opencv_hough_lines.h | 4 - pix_opencv_hu_compare.h | 5 - pix_opencv_hu_moments-help.pd | 0 pix_opencv_hu_moments.cc | 0 pix_opencv_hu_moments.h | 4 - pix_opencv_knear.h | 5 - pix_opencv_laplace.h | 5 - pix_opencv_lk.h | 4 - pix_opencv_morphology.h | 4 - pix_opencv_motempl.h | 5 - pix_opencv_pgh_compare.h | 5 - pix_opencv_surf.h | 4 - pix_opencv_threshold.h | 4 - 34 files changed, 39 insertions(+), 245 deletions(-) mode change 100644 => 100755 haarcascades/haarcascade_frontalface_alt.xml mode change 100644 => 100755 haarcascades/mouth.xml delete mode 100644 pix_opencv-meta.pd mode change 100644 => 100755 pix_opencv_hu_moments-help.pd mode change 100644 => 100755 pix_opencv_hu_moments.cc mode change 100644 => 100755 pix_opencv_hu_moments.h diff --git a/Makefile b/Makefile index 4c76898..3c7039c 100644 --- a/Makefile +++ b/Makefile @@ -1,143 +1,54 @@ -# To use this Makefile for your project, first put the name of your library in -# LIBRARY_NAME variable. The folder for your project should have the same name -# as your library. -LIBRARY_NAME = pix_opencv -LIBRARY_VERSION = 0.2 +PD_DIR = /Software/pd-svn/trunk/pd +GEM_DIR = /usr/local/pd/gem -# Next, add your source files to the SOURCES variable. -SOURCES = pix_opencv_edge.cc pix_opencv_laplace.cc pix_opencv_morphology.cc pix_opencv_distrans.cc pix_opencv_motempl.cc pix_opencv_haarcascade.cc pix_opencv_contours_boundingrect.cc pix_opencv_bgsubstract.cc pix_opencv_contours_convexity.cc pix_opencv_dft.cc pix_opencv_lk.cc pix_opencv_hist_compare.cc pix_opencv_knear.cc pix_opencv_threshold.cc pix_opencv_floodfill.cc pix_opencv_athreshold.cc pix_opencv_bgstats.cc pix_opencv_camshift.cc pix_opencv_hu_compare.cc pix_opencv_pgh_compare.cc pix_opencv_hough_circles.cc pix_opencv_hough_lines.cc pix_opencv_hu_moments.cc pix_opencv_contours_convexhull.cc pix_opencv_colorfilt.cc pix_opencv_surf.cc +GEM_OPENCV_VERSION = 0.2 -# For objects that only build on certain platforms, add those to the SOURCES -# line for the right platforms. -SOURCES_Darwin = -SOURCES_Linux = -SOURCES_Windows = +# build flags -#------------------------------------------------------------------------------# -# -# you shouldn't need to edit anything below here, if we did it right :) -# -#------------------------------------------------------------------------------# +INCLUDES = -I$(PD_DIR)/src -I. -I$(GEM_DIR)/src -I$(PD_DIR)/src +CPPFLAGS = -fPIC -DPD -O2 -funroll-loops -fomit-frame-pointer -ffast-math \ + -Wall -W -Wno-unused -Wno-parentheses -Wno-switch \ + -DGEM_OPENCV_VERSION=\"$(GEM_OPENCV_VERSION)\" -g -# where Pd lives -PD_PATH = ../../pd -GEM_PATH = ../../Gem -# where to install the library -objectsdir = $(PD_PATH)/extra - -CFLAGS = -DPD -I$(PD_PATH)/src -I$(GEM_PATH)/src -Wall -W -g -LDFLAGS = -LIBS = UNAME := $(shell uname -s) -ifeq ($(UNAME),Darwin) - SOURCES += $(SOURCES_Darwin) - EXTENSION = pd_darwin - OS = macosx - OPT_CFLAGS = -fast - FAT_FLAGS = -arch i386 -arch ppc -mmacosx-version-min=10.4 - CFLAGS += -fPIC -isysroot /Developer/SDKs/MacOSX10.4u.sdk - LDFLAGS += -bundle -undefined dynamic_lookup -isysroot /Developer/SDKs/MacOSX10.4u.sdk - LIBS += -lc -framework OpenCV - STRIP = strip -x - endif ifeq ($(UNAME),Linux) - SOURCES += $(SOURCES_Linux) - EXTENSION = pd_linux - OS = linux - OPT_CFLAGS = -O6 -funroll-loops -fomit-frame-pointer - CFLAGS += -fPIC - LDFLAGS += -Wl,--export-dynamic -shared -fPIC - LIBS += -lc - STRIP = strip --strip-unneeded -R .note -R .comment + CPPFLAGS += -DLINUX + INCLUDES += `pkg-config --cflags opencv` + LDFLAGS = -export_dynamic -shared + LIBS = `pkg-config --libs opencv` + EXTENSION = pd_linux endif -ifeq (MINGW,$(findstring MINGW,$(UNAME))) - SOURCES += $(SOURCES_Windows) - EXTENSION = dll - OS = windows - OPT_CFLAGS = -O3 -funroll-loops -fomit-frame-pointer -march=i686 -mtune=pentium4 - WINDOWS_HACKS = -D'O_NONBLOCK=1' - CFLAGS += -mms-bitfields $(WINDOWS_HACKS) - LDFLAGS += -s -shared -Wl,--enable-auto-import - LIBS += -L$(PD_PATH)/src -L$(PD_PATH)/bin -L$(PD_PATH)/obj -lpd -lwsock32 -lkernel32 -luser32 -lgdi32 - STRIP = strip --strip-unneeded -R .note -R .comment +ifeq ($(UNAME),Darwin) + CPPFLAGS += -DDARWIN + INCLUDES += -I/System/Library/Frameworks/OpenCV.framework/Headers/ + LDFLAGS = -bundle -undefined dynamic_lookup + LIBS = -lm -framework OpenCV + EXTENSION = pd_darwin endif -CFLAGS += $(OPT_CFLAGS) - - -.PHONY = install libdir_install single_install install-doc install-exec clean dist etags - -all: $(SOURCES:.cc=.$(EXTENSION)) - -%.$(EXTENSION): %.cc - $(CXX) $(CFLAGS) -o "$*.o" -c "$*.cc" - $(CC) $(LDFLAGS) -o "$*.$(EXTENSION)" "$*.o" $(LIBS) - chmod a-x "$*.$(EXTENSION)" - rm -f -- $*.o +.SUFFIXES = $(EXTENSION) +SOURCES = pix_opencv_edge.cc pix_opencv_laplace.cc pix_opencv_morphology.cc pix_opencv_distrans.cc pix_opencv_motempl.cc pix_opencv_haarcascade.cc pix_opencv_contours_boundingrect.cc pix_opencv_bgsubstract.cc pix_opencv_contours_convexity.cc pix_opencv_dft.cc pix_opencv_lk.cc pix_opencv_hist_compare.cc pix_opencv_knear.cc pix_opencv_threshold.cc pix_opencv_floodfill.cc pix_opencv_athreshold.cc pix_opencv_bgstats.cc pix_opencv_camshift.cc pix_opencv_hu_compare.cc pix_opencv_pgh_compare.cc pix_opencv_hough_circles.cc pix_opencv_hough_lines.cc pix_opencv_hu_moments.cc pix_opencv_contours_convexhull.cc pix_opencv_colorfilt.cc +SOURCES_OPT = pix_opencv_surf.cc -install: libdir_install +all: $(SOURCES:.cc=.$(EXTENSION)) $(SOURCES_OPT:.cc=.$(EXTENSION)) -# The meta and help files are explicitly installed to make sure they are -# actually there. Those files are not optional, then need to be there. -libdir_install: $(SOURCES:.cc=.$(EXTENSION)) install-doc install-exec - install -d $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) - install -m644 -p $(LIBRARY_NAME)-meta.pd $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) - install -m644 -p $(SOURCES:.c=.$(EXTENSION)) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) - $(STRIP) $(addprefix $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/,$(SOURCES:.cc=.$(EXTENSION))) +%.$(EXTENSION): %.o + gcc $(LDFLAGS) -o $*.$(EXTENSION) $*.o $(LIBS) -# install library linked as single binary -single_install: $(LIBRARY_NAME) install-doc install-exec - install -d $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) - install -m644 -p $(LIBRARY_NAME).$(EXTENSION) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) - $(STRIP) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/$(LIBRARY_NAME).$(EXTENSION) +.cc.o: + g++ $(CPPFLAGS) $(INCLUDES) -o $*.o -c $*.cc -install-doc: - install -d $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) -# install -m644 -p $(SOURCES:.c=-help.pd) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) - install -m644 -p $(wildcard *.pd) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) - install -m644 -p README $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/README.txt - install -m644 -p VERSION $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/VERSION.txt - install -m644 -p CHANGES $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/CHANGES.txt - -install-exec: - install -d $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) - install -m644 -p $(wildcard *.pd) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) +.c.o: + gcc $(CPPFLAGS) $(INCLUDES) -o $*.o -c $*.c +install: + cp -f --remove-destination *.pd $(PD_DIR)/doc/5.reference clean: - -rm -f -- $(SOURCES:.cc=.o) - -rm -f -- $(SOURCES:.cc=.$(EXTENSION)) - -rm -f -- $(LIBRARY_NAME).$(EXTENSION) - -distclean: clean - -rm -f -- ../$(LIBRARY_NAME)-$(LIBRARY_VERSION)-$(OS)-$(shell uname -m).tar.bz2 - -rm -f -- ../$(LIBRARY_NAME)-$(LIBRARY_VERSION)-$(OS).tar.bz2 - -dist: all dist_$(OS) - -dist_linux: - cd .. && tar --exclude=.svn -cjpf \ - $(LIBRARY_NAME)-$(LIBRARY_VERSION)-$(OS)-$(shell uname -m).tar.bz2 \ - $(LIBRARY_NAME) - -dist_macosx: - cd .. && tar --exclude=.svn -cjpf \ - $(LIBRARY_NAME)-$(LIBRARY_VERSION)-$(OS)-$(shell uname -m).tar.bz2 \ - $(LIBRARY_NAME) - -dist_windows: - cd .. && tar --exclude=.svn -cjpf \ - $(LIBRARY_NAME)-$(LIBRARY_VERSION)-$(OS).tar.bz2 \ - $(LIBRARY_NAME) - -etags: - etags *.[ch] ../../pd/src/*.[ch] /usr/include/*.h /usr/include/*/*.h + rm -f pix_opencv*.o + rm -f pix_opencv*.$(EXTENSION) -showpaths: - @echo "PD_PATH: $(PD_PATH)" - @echo "GEM_PATH: $(GEM_PATH)" - @echo "objectsdir: $(objectsdir)" - @echo "LIBRARY_NAME: $(LIBRARY_NAME)" - @echo "SOURCES: $(SOURCES)" +distro: clean all + rm *.o diff --git a/haarcascades/haarcascade_frontalface_alt.xml b/haarcascades/haarcascade_frontalface_alt.xml old mode 100644 new mode 100755 diff --git a/haarcascades/mouth.xml b/haarcascades/mouth.xml old mode 100644 new mode 100755 diff --git a/pix_opencv-meta.pd b/pix_opencv-meta.pd deleted file mode 100644 index 6d96612..0000000 --- a/pix_opencv-meta.pd +++ /dev/null @@ -1,4 +0,0 @@ -#N canvas 137 253 450 300 10; -#X text 34 27 AUTHORS Lluis Gomez i Bigorda and Yves Degoyon; -#X text 30 56 URL http://www.hangar.org/wikis/lab/doku.php?id=start:puredata_opencv -; diff --git a/pix_opencv_athreshold.h b/pix_opencv_athreshold.h index 4ced0e4..071449c 100644 --- a/pix_opencv_athreshold.h +++ b/pix_opencv_athreshold.h @@ -19,12 +19,8 @@ LOG #include "Base/GemPixObj.h" #ifndef _EiC -#ifdef __APPLE__ -#include -#else #include "cv.h" #endif -#endif /*----------------------------------------------------------------- ------------------------------------------------------------------- diff --git a/pix_opencv_bgstats.h b/pix_opencv_bgstats.h index 56e7157..01935d1 100644 --- a/pix_opencv_bgstats.h +++ b/pix_opencv_bgstats.h @@ -19,13 +19,9 @@ LOG #include "Base/GemPixObj.h" #ifndef _EiC -#ifdef __APPLE__ -#include -#else #include "cv.h" #include "cvaux.h" #endif -#endif /*----------------------------------------------------------------- ------------------------------------------------------------------- diff --git a/pix_opencv_bgsubstract.h b/pix_opencv_bgsubstract.h index 90c24ad..8d12a91 100644 --- a/pix_opencv_bgsubstract.h +++ b/pix_opencv_bgsubstract.h @@ -19,12 +19,8 @@ LOG #include "Base/GemPixObj.h" #ifndef _EiC -#ifdef __APPLE__ -#include -#else #include "cv.h" #endif -#endif /*----------------------------------------------------------------- ------------------------------------------------------------------- diff --git a/pix_opencv_camshift.h b/pix_opencv_camshift.h index 5b23fcd..5ec988e 100644 --- a/pix_opencv_camshift.h +++ b/pix_opencv_camshift.h @@ -19,12 +19,8 @@ LOG #include "Base/GemPixObj.h" #ifndef _EiC -#ifdef __APPLE__ -#include -#else #include "cv.h" #endif -#endif #define MAX_MARKERS 500 const int MAX_COUNT = 500; diff --git a/pix_opencv_colorfilt.cc b/pix_opencv_colorfilt.cc index d977e0a..af13535 100644 --- a/pix_opencv_colorfilt.cc +++ b/pix_opencv_colorfilt.cc @@ -118,7 +118,7 @@ void pix_opencv_colorfilt :: processRGBAImage(imageStruct &image) for( py=0; pyheight; py++ ) { for( px=0; pxwidth; px++ ) { -#ifdef __APPLE__ +#ifdef DARWIN g = ((uchar*)(rgba->imageData + rgba->widthStep*(int)py))[(int)px*4]; r = ((uchar*)(rgba->imageData + rgba->widthStep*(int)py))[(int)px*4+1]; b = ((uchar*)(rgba->imageData + rgba->widthStep*(int)py))[(int)px*4+3]; @@ -237,7 +237,7 @@ void pix_opencv_colorfilt :: pickMess (float xcur, float ycur) if ( ( xcur >= 0. ) && ( xcur <= comp_xsize ) && ( ycur > 0. ) && ( ycur < comp_ysize ) ) { -#ifdef __APPLE__ +#ifdef DARWIN x_colorR = ((uchar*)(brgb->imageData + brgb->widthStep*(int)ycur))[(int)xcur*4+1]; x_colorG = ((uchar*)(brgb->imageData + brgb->widthStep*(int)ycur))[(int)xcur*4+2]; x_colorB = ((uchar*)(brgb->imageData + brgb->widthStep*(int)ycur))[(int)xcur*4+3]; diff --git a/pix_opencv_colorfilt.h b/pix_opencv_colorfilt.h index 8881c21..b3a3949 100644 --- a/pix_opencv_colorfilt.h +++ b/pix_opencv_colorfilt.h @@ -21,12 +21,8 @@ LOG #include #ifndef _EiC -#ifdef __APPLE__ -#include -#else #include "cv.h" #endif -#endif /*----------------------------------------------------------------- ------------------------------------------------------------------- diff --git a/pix_opencv_contours_boundingrect.h b/pix_opencv_contours_boundingrect.h index f89790e..0c23402 100644 --- a/pix_opencv_contours_boundingrect.h +++ b/pix_opencv_contours_boundingrect.h @@ -19,13 +19,8 @@ LOG #include "Base/GemPixObj.h" #ifndef _EiC -#ifdef __APPLE__ -#include -#include -#else #include "cv.h" #endif -#endif #define MAX_MARKERS 100 diff --git a/pix_opencv_contours_convexhull.cc b/pix_opencv_contours_convexhull.cc index ee41e8b..ae70e20 100644 --- a/pix_opencv_contours_convexhull.cc +++ b/pix_opencv_contours_convexhull.cc @@ -182,7 +182,7 @@ void pix_opencv_contours_convexhull :: processRGBAImage(imageStruct &image) // Draw convex hull for current contour. for(i=0; i -#include -#else #include "cv.h" #endif -#endif /*----------------------------------------------------------------- ------------------------------------------------------------------- diff --git a/pix_opencv_contours_convexity.h b/pix_opencv_contours_convexity.h index bb6b85a..045cb96 100644 --- a/pix_opencv_contours_convexity.h +++ b/pix_opencv_contours_convexity.h @@ -19,13 +19,8 @@ LOG #include "Base/GemPixObj.h" #ifndef _EiC -#ifdef __APPLE__ -#include -#include -#else #include "cv.h" #endif -#endif /*----------------------------------------------------------------- ------------------------------------------------------------------- diff --git a/pix_opencv_dft.h b/pix_opencv_dft.h index 84f4330..6af0a5e 100644 --- a/pix_opencv_dft.h +++ b/pix_opencv_dft.h @@ -19,12 +19,8 @@ LOG #include "Base/GemPixObj.h" #ifndef _EiC -#ifdef __APPLE__ -#include -#else #include "cv.h" #endif -#endif /*----------------------------------------------------------------- ------------------------------------------------------------------- diff --git a/pix_opencv_distrans.h b/pix_opencv_distrans.h index 34e5662..ef283ff 100644 --- a/pix_opencv_distrans.h +++ b/pix_opencv_distrans.h @@ -19,12 +19,8 @@ LOG #include "Base/GemPixObj.h" #ifndef _EiC -#ifdef __APPLE__ -#include -#else #include "cv.h" #endif -#endif /*----------------------------------------------------------------- ------------------------------------------------------------------- diff --git a/pix_opencv_edge.h b/pix_opencv_edge.h index 341c597..e67de6c 100644 --- a/pix_opencv_edge.h +++ b/pix_opencv_edge.h @@ -19,12 +19,8 @@ LOG #include "Base/GemPixObj.h" #ifndef _EiC -#ifdef __APPLE__ -#include -#else #include "cv.h" #endif -#endif /*----------------------------------------------------------------- ------------------------------------------------------------------- diff --git a/pix_opencv_floodfill.h b/pix_opencv_floodfill.h index be3fa61..380730a 100644 --- a/pix_opencv_floodfill.h +++ b/pix_opencv_floodfill.h @@ -19,12 +19,8 @@ LOG #include "Base/GemPixObj.h" #ifndef _EiC -#ifdef __APPLE__ -#include -#else #include "cv.h" #endif -#endif #define MAX_COMPONENTS 10 diff --git a/pix_opencv_haarcascade.h b/pix_opencv_haarcascade.h index f47c388..ecdc92e 100644 --- a/pix_opencv_haarcascade.h +++ b/pix_opencv_haarcascade.h @@ -19,12 +19,8 @@ LOG #include "Base/GemPixObj.h" #ifndef _EiC -#ifdef __APPLE__ -#include -#else #include "cv.h" #endif -#endif #define MAX_MARKERS 50 diff --git a/pix_opencv_hist_compare.h b/pix_opencv_hist_compare.h index 993bd81..987dff3 100644 --- a/pix_opencv_hist_compare.h +++ b/pix_opencv_hist_compare.h @@ -19,13 +19,8 @@ LOG #include "Base/GemPixObj.h" #ifndef _EiC -#ifdef __APPLE__ -#include -#include -#else #include "cv.h" #endif -#endif #define MAX_HISTOGRAMS_TO_COMPARE 80 diff --git a/pix_opencv_hough_circles.h b/pix_opencv_hough_circles.h index 71eb9c9..9c2a63b 100644 --- a/pix_opencv_hough_circles.h +++ b/pix_opencv_hough_circles.h @@ -19,12 +19,8 @@ LOG #include "Base/GemPixObj.h" #ifndef _EiC -#ifdef __APPLE__ -#include -#else #include "cv.h" #endif -#endif #define MAX_HISTOGRAMS_TO_COMPARE 80 diff --git a/pix_opencv_hough_lines.h b/pix_opencv_hough_lines.h index a685925..a0aaef4 100644 --- a/pix_opencv_hough_lines.h +++ b/pix_opencv_hough_lines.h @@ -19,12 +19,8 @@ LOG #include "Base/GemPixObj.h" #ifndef _EiC -#ifdef __APPLE__ -#include -#else #include "cv.h" #endif -#endif #define MAX_HISTOGRAMS_TO_COMPARE 80 diff --git a/pix_opencv_hu_compare.h b/pix_opencv_hu_compare.h index 9b0c463..f083a22 100644 --- a/pix_opencv_hu_compare.h +++ b/pix_opencv_hu_compare.h @@ -19,13 +19,8 @@ LOG #include "Base/GemPixDualObj.h" #ifndef _EiC -#ifdef __APPLE__ -#include -#include -#else #include "cv.h" #endif -#endif /*----------------------------------------------------------------- CLASS diff --git a/pix_opencv_hu_moments-help.pd b/pix_opencv_hu_moments-help.pd old mode 100644 new mode 100755 diff --git a/pix_opencv_hu_moments.cc b/pix_opencv_hu_moments.cc old mode 100644 new mode 100755 diff --git a/pix_opencv_hu_moments.h b/pix_opencv_hu_moments.h old mode 100644 new mode 100755 index 18d9c09..20c031c --- a/pix_opencv_hu_moments.h +++ b/pix_opencv_hu_moments.h @@ -19,12 +19,8 @@ LOG #include "Base/GemPixObj.h" #ifndef _EiC -#ifdef __APPLE__ -#include -#else #include "cv.h" #endif -#endif /*----------------------------------------------------------------- ------------------------------------------------------------------- diff --git a/pix_opencv_knear.h b/pix_opencv_knear.h index 27b4cf8..faa9483 100644 --- a/pix_opencv_knear.h +++ b/pix_opencv_knear.h @@ -19,15 +19,10 @@ LOG #include "Base/GemPixObj.h" #ifndef _EiC -#ifdef __APPLE__ -#include -#include -#else #include "cv.h" #include "highgui.h" #include "ml.h" #endif -#endif /*----------------------------------------------------------------- ------------------------------------------------------------------- diff --git a/pix_opencv_laplace.h b/pix_opencv_laplace.h index aa6f0c4..674126b 100644 --- a/pix_opencv_laplace.h +++ b/pix_opencv_laplace.h @@ -19,13 +19,8 @@ LOG #include "Base/GemPixObj.h" #ifndef _EiC -#ifdef __APPLE__ -#include -#include -#else #include "cv.h" #endif -#endif /*----------------------------------------------------------------- ------------------------------------------------------------------- diff --git a/pix_opencv_lk.h b/pix_opencv_lk.h index 0d2e5d0..f60fa63 100644 --- a/pix_opencv_lk.h +++ b/pix_opencv_lk.h @@ -19,12 +19,8 @@ LOG #include "Base/GemPixObj.h" #ifndef _EiC -#ifdef __APPLE__ -#include -#else #include "cv.h" #endif -#endif #define MAX_MARKERS 500 const int MAX_COUNT = 500; diff --git a/pix_opencv_morphology.h b/pix_opencv_morphology.h index 9c8b6d4..be1e143 100644 --- a/pix_opencv_morphology.h +++ b/pix_opencv_morphology.h @@ -19,12 +19,8 @@ LOG #include "Base/GemPixObj.h" #ifndef _EiC -#ifdef __APPLE__ -#include -#else #include "cv.h" #endif -#endif /*----------------------------------------------------------------- ------------------------------------------------------------------- diff --git a/pix_opencv_motempl.h b/pix_opencv_motempl.h index 307a230..8a8e0b5 100644 --- a/pix_opencv_motempl.h +++ b/pix_opencv_motempl.h @@ -19,12 +19,7 @@ LOG #include "Base/GemPixObj.h" #ifndef _EiC -#ifdef __APPLE__ -#include -#include -#else #include "cv.h" -#endif #include #include #include diff --git a/pix_opencv_pgh_compare.h b/pix_opencv_pgh_compare.h index 1f62ce1..94e9c78 100644 --- a/pix_opencv_pgh_compare.h +++ b/pix_opencv_pgh_compare.h @@ -19,13 +19,8 @@ LOG #include "Base/GemPixDualObj.h" #ifndef _EiC -#ifdef __APPLE__ -#include -#include -#else #include "cv.h" #endif -#endif /*----------------------------------------------------------------- CLASS diff --git a/pix_opencv_surf.h b/pix_opencv_surf.h index 7341ecb..e551d70 100644 --- a/pix_opencv_surf.h +++ b/pix_opencv_surf.h @@ -19,12 +19,8 @@ LOG #include "Base/GemPixObj.h" #ifndef _EiC -#ifdef __APPLE__ -#include -#else #include "cv.h" #endif -#endif #define MAX_MARKERS 500 #define DSCSIZE 128 diff --git a/pix_opencv_threshold.h b/pix_opencv_threshold.h index 4d5fd10..018002b 100644 --- a/pix_opencv_threshold.h +++ b/pix_opencv_threshold.h @@ -19,12 +19,8 @@ LOG #include "Base/GemPixObj.h" #ifndef _EiC -#ifdef __APPLE__ -#include -#else #include "cv.h" #endif -#endif /*----------------------------------------------------------------- ------------------------------------------------------------------- -- cgit v1.2.1