diff options
Diffstat (limited to 'capi')
| -rw-r--r-- | capi/Makefile.am | 54 | ||||
| -rw-r--r-- | capi/context_priv.cpp | 9 | ||||
| -rw-r--r-- | capi/context_priv.h | 2 |
3 files changed, 29 insertions, 36 deletions
diff --git a/capi/Makefile.am b/capi/Makefile.am index 029fd7a..6b04110 100644 --- a/capi/Makefile.am +++ b/capi/Makefile.am @@ -1,53 +1,51 @@ lib_LTLIBRARIES = libxcam_capi.la -XCAMCAPI_LIBS = \ - $(LIBCL_LIBS) \ - -ldl \ +XCAMCAPI_CXXFLAGS = \ + $(XCAM_CXXFLAGS) \ + $(LIBCL_CFLAGS) \ + -I$(top_srcdir)/xcore \ + -I$(top_srcdir)/modules \ $(NULL) -XCAMCAPI_CXXFLAGS = \ - $(XCAM_CXXFLAGS) \ - $(LIBCL_CFLAGS) \ - -I$(top_srcdir)/xcore \ - -I$(top_srcdir)/modules \ +XCAMCAPI_LIBS = \ + $(LIBCL_LIBS) -ldl \ + $(top_builddir)/xcore/libxcam_core.la \ + $(top_builddir)/modules/ocl/libxcam_ocl.la \ $(NULL) if HAVE_LIBDRM XCAMCAPI_CXXFLAGS += $(LIBDRM_CFLAGS) -XCAMCAPI_LIBS += \ - -ldrm_intel \ - $(LIBDRM_LIBS) \ +XCAMCAPI_LIBS += \ + -ldrm_intel \ + $(LIBDRM_LIBS) \ $(NULL) endif -xcam_ocl_sources = \ - xcam_handle.cpp \ - context_priv.cpp \ - $(NULL) +xcam_ocl_sources = \ + xcam_handle.cpp \ + context_priv.cpp \ + $(NULL) -libxcam_capi_la_SOURCES = \ - $(xcam_ocl_sources) \ +libxcam_capi_la_SOURCES = \ + $(xcam_ocl_sources) \ $(NULL) -libxcam_capi_la_CXXFLAGS = \ - $(XCAMCAPI_CXXFLAGS) \ +libxcam_capi_la_CXXFLAGS = \ + $(XCAMCAPI_CXXFLAGS) \ $(NULL) -libxcam_capi_la_LIBADD = \ - $(top_builddir)/modules/ocl/libxcam_ocl.la \ - $(top_builddir)/xcore/libxcam_core.la \ - $(XCAMCAPI_LIBS) \ +libxcam_capi_la_LIBADD = \ + $(XCAMCAPI_LIBS) \ $(NULL) -libxcam_capi_la_LDFLAGS = \ - $(XCAM_LT_LDFLAGS) \ - $(PTHREAD_LDFLAGS) \ +libxcam_capi_la_LDFLAGS = \ + $(XCAM_LT_LDFLAGS) \ $(NULL) libxcam_capiincludedir = $(includedir)/xcam/capi nobase_libxcam_capiinclude_HEADERS = \ - xcam_handle.h \ - $(NULL) + xcam_handle.h \ + $(NULL) libxcam_capi_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/capi/context_priv.cpp b/capi/context_priv.cpp index ecbffa6..2e685c1 100644 --- a/capi/context_priv.cpp +++ b/capi/context_priv.cpp @@ -59,8 +59,9 @@ ContextBase::ContextBase (HandleType type) , _alloc_out_buf (false) { if (!_inbuf_pool.ptr()) { - _inbuf_pool = new CLVideoBufferPool (); - XCAM_ASSERT (_inbuf_pool.ptr ()); + SmartPtr<BufferPool> pool = new CLVideoBufferPool (); + XCAM_ASSERT (pool.ptr ()); + _inbuf_pool = pool; } } @@ -222,10 +223,6 @@ StitchContext::create_handler (SmartPtr<CLContext> &context) image_360->set_output_size (sttch_width, sttch_height); XCAM_LOG_INFO ("stitch output size width:%d height:%d", sttch_width, sttch_height); -#if HAVE_OPENCV - image_360->set_feature_match_ocl (_fm_ocl); -#endif - return image_360; } diff --git a/capi/context_priv.h b/capi/context_priv.h index fe5c0a9..eb7514f 100644 --- a/capi/context_priv.h +++ b/capi/context_priv.h @@ -165,7 +165,6 @@ public: , _need_seam (false) , _fisheye_map (false) , _need_lsc (false) - , _fm_ocl (false) , _scale_mode (CLBlenderScaleLocal) , _res_mode (StitchRes1080P) {} @@ -176,7 +175,6 @@ private: bool _need_seam; bool _fisheye_map; bool _need_lsc; - bool _fm_ocl; CLBlenderScaleMode _scale_mode; StitchResMode _res_mode; }; |