From bcdbb89d1e45fae7de639243379e1681194d5deb Mon Sep 17 00:00:00 2001 From: joe-w-bimedina Date: Fri, 4 Apr 2014 15:29:45 -0700 Subject: [PATCH] added size.hpp and size.cpp files with new additions --- modules/c/include/opencv2/c/size.hpp | 10 ++++++---- modules/c/src/size.cpp | 9 +++++---- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/modules/c/include/opencv2/c/size.hpp b/modules/c/include/opencv2/c/size.hpp index 6df4e807de..22e2aa61b3 100644 --- a/modules/c/include/opencv2/c/size.hpp +++ b/modules/c/include/opencv2/c/size.hpp @@ -3,12 +3,14 @@ #include extern "C" { + Size2f* cv_create_Size2f(float width, float height); Size* cv_create_Size(); - Size* cv_create_Size2(int width, int height); + Size* cv_create_Size2(double width, double height); Size* cv_Size_assignTo(Size* self, Size* other); Size* cv_Size_fromPoint(Point* p); - int cv_Size_area(Size* self); - int cv_Size_width(Size* self); - int cv_Size_height(Size* self); + double cv_Size_area(Size* self); + double cv_Size_width(Size* self); + double cv_Size_height(Size* self); } #endif + diff --git a/modules/c/src/size.cpp b/modules/c/src/size.cpp index a63501bc4b..ffdc231414 100644 --- a/modules/c/src/size.cpp +++ b/modules/c/src/size.cpp @@ -1,10 +1,11 @@ #include extern "C" { + Size* cv_create_Size() { return new Size; } - Size* cv_create_Size2(int width, int height) { + Size* cv_create_Size2(double width, double height) { return new Size(width, height); } Size* cv_Size_assignTo(Size* self, Size* other) { @@ -14,13 +15,13 @@ extern "C" { Size* cv_Size_fromPoint(Point* p) { return new Size(*p); } - int cv_Size_area(Size* self) { + double cv_Size_area(Size* self) { return self->area(); } - int cv_Size_width(Size* self) { + double cv_Size_width(Size* self) { return self->width; } - int cv_Size_height(Size* self) { + double cv_Size_height(Size* self) { return self->height; } }