-short svalue[]={1,2,3,4,5};
-long lvalue[]={1,2,3,4,5};
-float fvalue[]={1.1f,2.2f,3.3f,4.4f,5.5f};
-double dvalue[]={1.1,2.2,3.3,4.4,5.5};
+const int16_t svalue[]={1,2,3,4,5};
+const int32_t lvalue[]={1,2,3,4,5};
+const float fvalue[]={1.1f,2.2f,3.3f,4.4f,5.5f};
+// Temporary hack, assume that long and double are correlated
+#if GDCM_SIZEOF_LONG == 4
+const double dvalue[]={1.1,2.2,3.3,4.4,5.5};
+#else
+const float dvalue[]={1.1,2.2,3.3,4.4,5.5};
+#endif