aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWind Yuan <feng.yuan@intel.com>2017-09-30 18:28:26 +0800
committerwindyuan <feng.yuan@intel.com>2017-11-06 18:27:29 +0800
commit139adf1c8e60145782be9ecd0d1cf715d278df26 (patch)
treee8ed4067ceec64207993d65772bb2d3eb7fed346
parent8011704f660f09ec8b390c2236d7ff65bf67f105 (diff)
downloadlibxcam-139adf1c8e60145782be9ecd0d1cf715d278df26.tar.gz
geo-mapper: change param data to const
Signed-off-by: Wind Yuan <feng.yuan@intel.com>
-rw-r--r--modules/interface/geo_mapper.h2
-rw-r--r--modules/soft/soft_geo_mapper.cpp5
-rw-r--r--modules/soft/soft_geo_mapper.h2
3 files changed, 5 insertions, 4 deletions
diff --git a/modules/interface/geo_mapper.h b/modules/interface/geo_mapper.h
index 41792a3..aa4a168 100644
--- a/modules/interface/geo_mapper.h
+++ b/modules/interface/geo_mapper.h
@@ -48,7 +48,7 @@ public:
static SmartPtr<GeoMapper> create_soft_geo_mapper ();
//2D table
- virtual bool set_lookup_table (GeoData *data, uint32_t width, uint32_t height) = 0;
+ virtual bool set_lookup_table (const GeoData *data, uint32_t width, uint32_t height) = 0;
bool set_factors (float x, float y);
void get_factors (float &x, float &y) const {
x = _factor_x;
diff --git a/modules/soft/soft_geo_mapper.cpp b/modules/soft/soft_geo_mapper.cpp
index 3a8b26b..6212d44 100644
--- a/modules/soft/soft_geo_mapper.cpp
+++ b/modules/soft/soft_geo_mapper.cpp
@@ -69,7 +69,7 @@ SoftGeoMapper::~SoftGeoMapper ()
}
bool
-SoftGeoMapper::set_lookup_table (GeoData *data, uint32_t width, uint32_t height)
+SoftGeoMapper::set_lookup_table (const GeoData *data, uint32_t width, uint32_t height)
{
XCAM_FAIL_RETURN(
ERROR, width > 1 && height > 1 && data, false,
@@ -85,7 +85,7 @@ SoftGeoMapper::set_lookup_table (GeoData *data, uint32_t width, uint32_t height)
for (uint32_t i = 0; i < height; ++i) {
Float2 *ret = _lookup_table->get_buf_ptr (0, i);
- GeoData *line = &data[i * width];
+ const GeoData *line = &data[i * width];
for (uint32_t j = 0; j < width; ++j) {
ret[j].x = line [j].x;
ret[j].y = line [j].y;
@@ -174,6 +174,7 @@ SoftGeoMapper::start_remap_task (const SmartPtr<ImageHandler::Parameters> &param
_map_task->set_local_size (local_size);
_map_task->set_global_size (global_size);
+ param->in_buf.release ();
return _map_task->work (args);
}
diff --git a/modules/soft/soft_geo_mapper.h b/modules/soft/soft_geo_mapper.h
index 9f11b88..738bace 100644
--- a/modules/soft/soft_geo_mapper.h
+++ b/modules/soft/soft_geo_mapper.h
@@ -39,7 +39,7 @@ public:
SoftGeoMapper (const char *name = "SoftGeoMap");
~SoftGeoMapper ();
- bool set_lookup_table (GeoData *data, uint32_t width, uint32_t height);
+ bool set_lookup_table (const GeoData *data, uint32_t width, uint32_t height);
void remap_task_done (
const SmartPtr<Worker> &worker, const SmartPtr<Worker::Arguments> &args, const XCamReturn error);