[opengtl-commits] [330] PixelVistitore::get return the pointer to the structure

[subversion@xxxxxxxxxxxxx]

Revision: 330
Author:   cyrille
Date:     2008-08-31 10:29:20 +0200 (Sun, 31 Aug 2008)

Log Message:
-----------
PixelVistitore::get return the pointer to the structure

Modified Paths:
--------------
    trunk/OpenGTL/OpenShiva/OpenShiva/PixelVisitor_p.cpp
    trunk/OpenGTL/OpenShiva/tests/convolution/blur.shiva


Modified: trunk/OpenGTL/OpenShiva/OpenShiva/PixelVisitor_p.cpp
===================================================================
--- trunk/OpenGTL/OpenShiva/OpenShiva/PixelVisitor_p.cpp	2008-08-31 08:21:32 UTC (rev 329)
+++ trunk/OpenGTL/OpenShiva/OpenShiva/PixelVisitor_p.cpp	2008-08-31 08:29:20 UTC (rev 330)
@@ -66,6 +66,7 @@
 
 GTLCore::ExpressionResult PixelVisitor::get( GTLCore::GenerationContext& _generationContext, llvm::BasicBlock* _currentBlock, llvm::Value* _pointer, const GTLCore::Type* _pointerType) const
 {
+#if 0
   SHIVA_DEBUG( *_pointer << " " << *_pointerType );
   llvm::Value* result = new llvm::LoadInst(
       CodeGenerator::accessPixelDataPtr( _generationContext, _currentBlock, _pointer ),
@@ -73,6 +74,8 @@
       _currentBlock );
   SHIVA_DEBUG( *_pointer << " " << *result );
   return GTLCore::ExpressionResult( result, (*_pointerType->structDataMembers())[0].type());
+#endif
+  return GTLCore::ExpressionResult(_pointer, _pointerType);
 }
 
 llvm::BasicBlock* PixelVisitor::set( GTLCore::GenerationContext& _generationContext, llvm::BasicBlock* _currentBlock, llvm::Value* _pointer, const GTLCore::Type* _pointerType, llvm::Value* _value, const GTLCore::Type* _valueType, bool _allocatedInMemory) const

Modified: trunk/OpenGTL/OpenShiva/tests/convolution/blur.shiva
===================================================================
--- trunk/OpenGTL/OpenShiva/tests/convolution/blur.shiva	2008-08-31 08:21:32 UTC (rev 329)
+++ trunk/OpenGTL/OpenShiva/tests/convolution/blur.shiva	2008-08-31 08:29:20 UTC (rev 330)
@@ -12,7 +12,6 @@
     point3[0] = result.x + 1;
     point3[1] = result.y + 1;
     pixel v4 = img.sampleNearest( point1 ) + img.sampleNearest( point2 ) + img.sampleNearest( point3 );
-    float4 vv4 = v4;
-    result = vv4 / 3.0;
+    result = v4 / 3.0;
   }
 }