r14964 by jghali - fix small error + attempt to fix some gcc/msvc incompatibilities with c++ templates

[scribus-commit]

Revision: 14964
Author: jghali
Date: 2010-04-11T18:38:03.371709Z
Commit message: fix small error + attempt to fix some gcc/msvc incompatibilities with c++ templates

Changeset: 
M  /trunk/Scribus/scribus/colormgmt/sccolorspacedata_rgba.h
M  /trunk/Scribus/scribus/colormgmt/sccolorspacedata_laba.h
M  /trunk/Scribus/scribus/colormgmt/sccolorspacedata_cmyka.h

Diffs:
Index: scribus/colormgmt/sccolorspacedata_laba.h
===================================================================
--- scribus/colormgmt/sccolorspacedata_laba.h	(revision 14963)
+++ scribus/colormgmt/sccolorspacedata_laba.h	(revision 14964)
@@ -47,11 +47,11 @@
 template<typename T, eColorFormat COLORFORMAT>
 void ScColorSpaceDataTempl_LabA<T, COLORFORMAT>::flattenAlpha(void* dataIn, uint numElems) const
 {
-	typename T* data   = ((T*) dataIn) + m_aIndex;
-	typename T  nLimit = std::numeric_limits<T>::max();
+	T* data   = ((T*) dataIn) + m_aIndex;
+	T  nLimit = std::numeric_limits<T>::max();
 	while (numElems > 0)
 	{
-		(*data++) = nLimit;
+		*data = nLimit;
 		data += 4;
 		--numElems;
 	};
Index: scribus/colormgmt/sccolorspacedata_cmyka.h
===================================================================
--- scribus/colormgmt/sccolorspacedata_cmyka.h	(revision 14963)
+++ scribus/colormgmt/sccolorspacedata_cmyka.h	(revision 14964)
@@ -49,11 +49,11 @@
 template<typename T, eColorFormat COLORFORMAT>
 void ScColorSpaceDataTempl_CMYKA<T, COLORFORMAT>::flattenAlpha(void* dataIn, uint numElems) const
 {
-	typename T* data   = ((T*) dataIn) + m_aIndex;
-	typename T  nLimit = std::numeric_limits<T>::max();
+	T* data   = ((T*) dataIn) + m_aIndex;
+	T  nLimit = std::numeric_limits<T>::max();
 	while (numElems > 0)
 	{
-		(*data++) = nLimit;
+		*data = nLimit;
 		data += 5;
 		--numElems;
 	};
Index: scribus/colormgmt/sccolorspacedata_rgba.h
===================================================================
--- scribus/colormgmt/sccolorspacedata_rgba.h	(revision 14963)
+++ scribus/colormgmt/sccolorspacedata_rgba.h	(revision 14964)
@@ -61,11 +61,11 @@
 template<typename T, eColorFormat COLORFORMAT>
 void ScColorSpaceDataTempl_RGBA<T, COLORFORMAT>::flattenAlpha(void* dataIn, uint numElems) const
 {
-	typename T* data   = ((T*) dataIn) + m_aIndex;
-	typename T  nLimit = std::numeric_limits<T>::max();
+	T* data   = ((T*) dataIn) + m_aIndex;
+	T  nLimit = std::numeric_limits<T>::max();
 	while (numElems > 0)
 	{
-		(*data++) = nLimit;
+		*data = nLimit;
 		data += 4;
 		--numElems;
 	};