[opengtl-commits] [197] of course, Region is composed of floats not integers

[subversion@xxxxxxxxxxxxx]

Revision: 197
Author:   cyrille
Date:     2008-06-14 15:29:57 +0200 (Sat, 14 Jun 2008)

Log Message:
-----------
of course, Region is composed of floats not integers

Modified Paths:
--------------
    trunk/OpenGTL/OpenShiva/OpenShiva/Types_p.cpp
    trunk/OpenGTL/OpenShiva/OpenShiva/wrappers/RegionWrap_p.h


Modified: trunk/OpenGTL/OpenShiva/OpenShiva/Types_p.cpp
===================================================================
--- trunk/OpenGTL/OpenShiva/OpenShiva/Types_p.cpp	2008-06-14 09:44:23 UTC (rev 196)
+++ trunk/OpenGTL/OpenShiva/OpenShiva/Types_p.cpp	2008-06-14 13:29:57 UTC (rev 197)
@@ -84,10 +84,10 @@
 {
   static std::vector<GTLCore::Type::StructDataMember> regionDataMembers;
   static std::vector<GTLCore::Type::StructFunctionMember> regionFunctionMembers;
-  regionDataMembers.push_back( GTLCore::Type::StructDataMember( "x", GTLCore::Type::Integer32) );
-  regionDataMembers.push_back( GTLCore::Type::StructDataMember( "y", GTLCore::Type::Integer32) );
-  regionDataMembers.push_back( GTLCore::Type::StructDataMember( "width", GTLCore::Type::Integer32) );
-  regionDataMembers.push_back( GTLCore::Type::StructDataMember( "height", GTLCore::Type::Integer32) );
+  regionDataMembers.push_back( GTLCore::Type::StructDataMember( "x", GTLCore::Type::Float ) );
+  regionDataMembers.push_back( GTLCore::Type::StructDataMember( "y", GTLCore::Type::Float) );
+  regionDataMembers.push_back( GTLCore::Type::StructDataMember( "width", GTLCore::Type::Float ) );
+  regionDataMembers.push_back( GTLCore::Type::StructDataMember( "height", GTLCore::Type::Float ) );
   const GTLCore::Type* type = _typeManager->d->createStructure( "region", regionDataMembers);
   type->d->addFunctionMember( createTypeMember( "intersect", "_Z21region_wrap_intersectP10RegionWrapPKS_", GTLCore::Type::Void, 1, type ) );
   type->d->addFunctionMember( createTypeMember( "union", "_Z17region_wrap_unionP10RegionWrapPKS_", GTLCore::Type::Void, 1, type ) );

Modified: trunk/OpenGTL/OpenShiva/OpenShiva/wrappers/RegionWrap_p.h
===================================================================
--- trunk/OpenGTL/OpenShiva/OpenShiva/wrappers/RegionWrap_p.h	2008-06-14 09:44:23 UTC (rev 196)
+++ trunk/OpenGTL/OpenShiva/OpenShiva/wrappers/RegionWrap_p.h	2008-06-14 13:29:57 UTC (rev 197)
@@ -27,7 +27,7 @@
 //---------------------- WARNING ----------------------//
 
 struct RegionWrap {
-  int x, y, width, height;
+  float x, y, width, height;
 };
 
 void region_wrap_intersect( const RegionWrap& self, const RegionWrap* reg );