[Opensg-commits] OpenSG/Source/System/GraphOp OSGMaterialMergeGraphOp.cpp, 1.9, 1.10

[Gerrit V. <vo...@us...>]

Update of /cvsroot/opensg/OpenSG/Source/System/GraphOp
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv21965/Source/System/GraphOp

Modified Files:
	OSGMaterialMergeGraphOp.cpp 
Log Message:
fixed: compile errors in osg2 compat mode


Index: OSGMaterialMergeGraphOp.cpp
===================================================================
RCS file: /cvsroot/opensg/OpenSG/Source/System/GraphOp/OSGMaterialMergeGraphOp.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** OSGMaterialMergeGraphOp.cpp	12 Dec 2013 13:11:27 -0000	1.9
--- OSGMaterialMergeGraphOp.cpp	13 Feb 2014 07:58:51 -0000	1.10
***************
*** 99,104 ****
  		unsigned int height = imageA->getHeight();
  
! 		UInt8* dataA = imageA->getData();
! 		UInt8* dataB = imageB->getData();
  
  		// check if every pixel is the same
--- 99,104 ----
  		unsigned int height = imageA->getHeight();
  
! 		const UInt8* dataA = imageA->getData();
! 		const UInt8* dataB = imageB->getData();
  
  		// check if every pixel is the same